Merge pull request #393 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/DEVSKernel/PyDEVS/SimStrategies.py

@@ -29,28 +29,20 @@
 from DEVSKernel.PyDEVS.DEVS import AtomicDEVS, CoupledDEVS, IPort, OPort
 
 def getFlatImmChildrenList(model, flat_imm_list: list = None) -> list:
-	"""Set priority flat list compatible avec DEFAULT_DEVS_DIRNAME."""
-	if flat_imm_list is None:
-		flat_imm_list = []
-
-	devs_backend_name = getattr(builtins, 'DEFAULT_DEVS_DIRNAME', 'PyDEVS')
-	devs_mod = globals().get(devs_backend_name, None)
-	if devs_mod is None:
-		raise RuntimeError(f"Backend DEVS '{devs_backend_name}' non importé")
-
-	AtomicDEVS = getattr(devs_mod, 'AtomicDEVS', None)
-	CoupledDEVS = getattr(devs_mod, 'CoupledDEVS', None)
-	if AtomicDEVS is None or CoupledDEVS is None:
-		raise RuntimeError(f"Classes AtomicDEVS/CoupledDEVS introuvables dans backend '{devs_backend_name}'")
-
-	for m in model.immChildren:
-		if isinstance(m, AtomicDEVS):
-			flat_imm_list.append(m)
-		elif isinstance(m, CoupledDEVS):
-			getFlatImmChildrenList(m, flat_imm_list)
-
-	return flat_imm_list
-
+    """Set priority flat list compatible avec DEFAULT_DEVS_DIRNAME."""
+    if flat_imm_list is None:
+        flat_imm_list = []
+
+    # Use the imported classes directly instead of trying to get them from globals()
+    for m in model.immChildren:
+        if isinstance(m, AtomicDEVS):
+            flat_imm_list.append(m)
+        elif isinstance(m, CoupledDEVS):
+            getFlatImmChildrenList(m, flat_imm_list)
+        else:
+            sys.stdout.write(_(f'Unknown model {m}'))
+
+    return flat_imm_list
 
 def getFlatPriorityList(model, flat_priority_list: list = None) -> list:
 	"""Set priority flat list."""

devsimpy/DomainInterface/DomainBehavior.py

@@ -131,6 +131,9 @@ def getSigma(self)->float:
 	def getStatus(self)->str:
 		return self.state['status']
 
+	def getPhase(self)->str:
+		return self.getStatus()
+	
 	def getState(self)->dict:
 		return self.state
 

devsimpy/Editor.py

@@ -2215,7 +2215,7 @@ def setChoices(self,block):
 				self._choices = collections.OrderedDict([(_('New init phase'),self.OnInitPhase), (_('New peek'),self.OnPeek), (_('New all peek'),self.OnAllPeek), 
 					(_('New poke'),self.OnPoke), (_('New hold in state'),self.OnInsertHoldInState), (_('New passivate in state'),self.OnInsertPassivateInState), 
 					(_('New passivate state'),self.OnInsertPassivateState), (_('New Phase test'),self.OnInsertPhaseIs), (_('New debugger stdout'),self.OnInsertDebug), 
-					(_('Get state'),self.OnInsertGetState), (_('Get sigma'),self.OnInsertGetSigma), (_('Get elapsed'),self.OnInsertGetElapsed), (_('Get message value'),self.OnInsertGetMsgValue), (_('Get message time'),self.OnInsertGetMsgTime)])
+					(_('Get state'),self.OnInsertGetState), (_('Get phase'),self.OnInsertGetPhase), (_('Get sigma'),self.OnInsertGetSigma), (_('Get elapsed'),self.OnInsertGetElapsed), (_('Get message value'),self.OnInsertGetMsgValue), (_('Get message time'),self.OnInsertGetMsgTime)])
 			else:
 				if 'PyPDEVS' in getattr(builtins, 'DEFAULT_DEVS_DIRNAME'):
 					self._choices = collections.OrderedDict([(_("New add sub model"),self.OnAddModel),(_("New remove sub model"),self.OnRemoveModel),(_("New port connection"),self.OnDisConnectPorts),(_("New port connection"),self.OnConnectPorts),(_('New debugger stdout'),self.OnInsertDebug)])
@@ -2349,13 +2349,20 @@ def OnInsertGetState(self, event):
 		cp.AddText("self.getState()")
 		self.Notification(True, _('%s modified' % (os.path.basename(cp.GetFilename()))), '', '')
 
+	def OnInsertGetPhase(self, event):
+		""" Insert a sentence to get the status.
+		"""
+		cp = self.nb.GetCurrentPage()
+		cp.AddText("self.getPhase()")
+		self.Notification(True, _('%s modified' % (os.path.basename(cp.GetFilename()))), '', '')
+		
 	def OnInsertGetStatus(self, event):
 		""" Insert a sentence to get the status.
 		"""
 		cp = self.nb.GetCurrentPage()
 		cp.AddText("self.getStatus()")
 		self.Notification(True, _('%s modified' % (os.path.basename(cp.GetFilename()))), '', '')
-		
+
 	def OnInsertGetSigma(self, event):
 		""" Insert a sentence to get the sigma value.
 		"""

devsimpy/Mixins/Savable.py

@@ -194,6 +194,8 @@ def Save(self, obj_dumped, fileName=None) -> bool:
 
 			with open(dump_filename, 'wb') as file:
 				pickle.dump(obj=PickledCollection(obj_dumped), file=file, protocol=pickle.HIGHEST_PROTOCOL)
+				file.flush()  # Ensure data is written to disk
+				os.fsync(file.fileno())  # Force OS to write to disk
 
 		except (OSError, pickle.PickleError) as error:
 			tb = traceback.format_exc()
@@ -301,6 +303,16 @@ def Load(self, obj_loaded, fileName = None):
 		try:
 			with open(path,'rb') as f:
 				L = pickle.load(f)
+		except (pickle.UnpicklingError, EOFError) as info:
+			tb = traceback.format_exc()
+			file_size = os.path.getsize(path)
+			sys.stderr.write(_("Problem loading: %s -- %s \n")%(str(fileName), str(tb)))
+			sys.stderr.write(_("The pickle file appears to be corrupted or truncated (size: %d bytes).\n") % file_size)
+			sys.stderr.write(_("This file cannot be loaded. Possible solutions:\n"))
+			sys.stderr.write(_("1. Restore from a backup if available\n"))
+			sys.stderr.write(_("2. Delete the corrupted file and recreate the model\n"))
+			sys.stderr.write(_("File location: %s\n") % path)
+			return info
 		except Exception as info:
 			tb = traceback.format_exc()
 			sys.stderr.write(_("Problem loading: %s -- %s \n")%(str(fileName), str(tb)))
@@ -471,6 +483,15 @@ def Load(self, obj_loaded, fileName=None) -> bool:
 					f.read(1)  # Teste si le fichier est compressé
 					f.seek(0)  # Remet le curseur au début
 					dsp = pickle.load(f)  # Charge l'objet sérialisé
+				except (pickle.UnpicklingError, EOFError) as error:
+					tb = traceback.format_exc()
+					file_size = os.path.getsize(fileName)
+					sys.stderr.write(f"Problem loading: {fileName} -- The pickle file appears to be corrupted or truncated (size: {file_size} bytes).\n")
+					sys.stderr.write(f"This file cannot be loaded. Possible solutions:\n")
+					sys.stderr.write(f"1. Restore from a backup if available\n")
+					sys.stderr.write(f"2. Delete the corrupted file and recreate the diagram\n")
+					sys.stderr.write(f"Full traceback: {tb}\n")
+					return error
 				except Exception as error:
 					tb = traceback.format_exc()
 					sys.stderr.write(f"Problem loading: {fileName} -- {tb}\n")

devsimpy/WizardGUI.py

@@ -216,7 +216,7 @@ def Validate(self, win):
 				textCtrl.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
 			finally:
 				textCtrl.Refresh()
-				return True
+			return True
 
 	def TransferToWindow(self):
 		""" Prevent wxDialog from complaining.

requirements.txt

@@ -4,6 +4,8 @@
 wxPython <= 4.2.3 ; python_version >= '3.10'
 wxPython <= 4.1.1 ; python_version >= '3.8' and python_version < '3.10'
 
+wxPython > 4.2 ; python_version >= '3.14'
+
 PyPubSub #<= 3.3.0
 
 PyYAML #>= 5.1.2
@@ -47,4 +49,6 @@ pydantic
 msgpack
 
 paho-mqtt
-kafka-python
+kafka-python
+
+confluent_kafka