Merge pull request #370 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/Components.py

@@ -32,6 +32,7 @@
 import importlib
 import subprocess
 from shutil import which
+from pathlib import Path
 
 import inspect
 if not hasattr(inspect, 'getargspec'):
@@ -98,25 +99,49 @@ def GetClass(elem):
 		### return only the class that inherite of DomainBehavoir or DomainStructure which are present in the clsmembers dict
 		# return next(filter(lambda c: c != DomainClass and issubclass(c, DomainClass), clsmembers.values()), None)
 
-		DomainClass = (DomainBehavior,DomainStructure,)
+		 # Build base domain class tuple
+		DomainClass = (DomainBehavior, DomainStructure)
 		if 'Port' in clsmembers:
 			DomainClass += (clsmembers['Port'],)
-  
-		cls = next(filter(lambda c: c not in DomainClass and issubclass(c, DomainClass) and c.__name__ in elem, clsmembers.values()), None)
-
-		### try to catch and resolve instanciation of unknown class
+		
+		# First attempt: find class matching element name
+		cls = next(
+			(c for c in clsmembers.values() 
+			if c not in DomainClass 
+			and issubclass(c, DomainClass) 
+			and c.__name__ in elem),
+			None
+		)
+		
+		# Second attempt: find any valid subclass if exact match fails
 		if not cls:
-			sys.stderr.write(_(f"\nClass name and model name are different!\nWe try to instance the class {elem} that inherite of DomainClass!"))
-			cls = next(filter(lambda c: c not in DomainClass and issubclass(c, DomainClass), clsmembers.values()), None)
+			sys.stderr.write(_(
+				f"\nWarning: Class name and model name mismatch!\n"
+				f"Attempting to instantiate class '{elem}' that inherits from DomainClass...\n"
+			))
+			
+			cls = next(
+				(c for c in clsmembers.values() 
+				if c not in DomainClass 
+				and issubclass(c, DomainClass)),
+				None
+			)
+			
 			if cls:
-				sys.stderr.write(_("\nClass instanciated but you need to verify if its a good one!\n"))
+				sys.stderr.write(_(
+					f"Class '{cls.__name__}' instantiated, but please verify it's the correct one!\n"
+				))
+		
+		# Report failure if no valid class found
 		if not cls:
-
-			sys.stderr.write(_("\nClass unknown..."))
-			# sys.stderr.write(f"path: {elem} \n clsmembers:{clsmembers}\n")
+			sys.stderr.write(_(f"\nError: Unknown class '{elem}'\n"))
+			# Uncomment for debugging:
+			# sys.stderr.write(f"Path: {elem}\nClass members: {clsmembers}\n")
 			# for c in clsmembers.values():
-				# print(c.__name__, c not in DomainClass, issubclass(c, DomainClass), c.__name__ in elem)
-
+			#     print(f"{c.__name__}: not in DomainClass={c not in DomainClass}, "
+			#           f"is subclass={issubclass(c, DomainClass)}, "
+			#           f"name matches={c.__name__ in elem}")
+		
 		return cls
 
 		#for cls in [c for c in clsmembers.values() if c != DomainClass]:
@@ -533,16 +558,8 @@ def BlockModelAdapter(cls, label="", specific_behavior=""):
 		""" Return block model considering its class hierarchy
 			The implementation depends only of the argument of the class. There is no dependance with the collector module (in comment bellow)
 		"""
-		from Container import DiskGUI, ScopeGUI, CodeBlock
-		#from  Domain.Collector import *
-		#if issubclass(cls, QuickScope.QuickScope):
-				#m = ScopeGUI(label)
-			#elif issubclass(cls, (To_Disk.To_Disk, Messagecollector.Messagecollector)):
-				#m = DiskGUI(label)
-			#else:
-				## mew CodeBlock instance
-				#m = CodeBlock()
-
+		from Container import DiskGUI, ScopeGUI, CodeBlock, CollectorGUI, GeneratorGUI
+	
 		# associated python class membre
 
 		clsmbr = getClassMember(inspect.getfile(cls))
@@ -564,11 +581,18 @@ def BlockModelAdapter(cls, label="", specific_behavior=""):
 		match = [re.match('[-_a-zA-z]*collector[-_a-zA-z]*',s, re.IGNORECASE) for s in list(clsmbr.keys())+[specific_behavior]]
 		messagecollector_model = [a.group(0) for a in [s for s in match if s is not None]] != []
 
+		cls_path = Path(inspect.getfile(cls)).resolve()
+
 		# new codeBlcok instance
-		if disk_model or messagecollector_model:
-			m = DiskGUI(label)
-		elif scope_model:
-			m = ScopeGUI(label)
+		if "Collector" in cls_path.parts:
+			if disk_model or messagecollector_model:
+				m = DiskGUI(label)
+			elif scope_model:
+				m = ScopeGUI(label)
+			else:
+				m = CollectorGUI(label)
+		elif "Generator" in cls_path.parts:
+			m = GeneratorGUI(label)
 		else:
 			m = CodeBlock(label)