fix: correctly handle event type in as_aapi_dict

Author: shacharl

src/aapi/bases.py

@@ -14,48 +14,70 @@ class AAPIJob:
 
 
 class AAPIObject:
-    def as_aapi_dict(self):
+    def as_aapi_dict(self, ignore_event_type=True):
+        from aapi.ifbase import IfCompletionStatus
         res = {}
 
-        if "_type" in attrs.fields_dict(self.__class__):
-            if not self._type.startswith("Condition") or self._type.startswith("Event"):
-                res["Type"] = self._type
-
+        if '_type' in attrs.fields_dict(self.__class__):
+            if ignore_event_type and not self._type.startswith('Condition') and not self._type.startswith('Event'):
+                res['Type'] = self._type
+            if not ignore_event_type and self._type.startswith('Event'):
+                res['Type'] = self._type
         if attrs.has(self):
             for field in attrs.fields(self.__class__):
                 value = self.__getattribute__(field.name)
-                aapi_repr = field.metadata.get("_aapi_repr_")
+                aapi_repr = field.metadata.get('_aapi_repr_')
 
                 if value in [None, [], {}]:
                     continue
 
                 if aapi_repr:
-                    if "_type_aapi_" in field.metadata:
-                        if "_hide_type_" in field.metadata:
-                            if "Type" in res:
-                                res.__delitem__("Type")
+                    if '_type_aapi_' in field.metadata:
+                        if '_hide_type_' in field.metadata:
+                            if 'Type' in res:
+                                res.__delitem__('Type')
                         continue
-                    if "as_aapi_dict" in dir(value):
+                    if 'as_aapi_dict' in dir(value):
                         res[aapi_repr] = value.as_aapi_dict()
                     elif isinstance(value, list):
                         res[aapi_repr] = [
-                            (o.as_aapi_dict() if "as_aapi_dict" in dir(o) else o)
-                            for o in value
+                            (o.as_aapi_dict() if 'as_aapi_dict' in dir(o) else o) for o in value
                         ]
                     elif isinstance(value, enum.Enum):
                         res[aapi_repr] = value.value
                     else:
                         res[aapi_repr] = value
 
-                elif field.metadata.get("_abstract_aapi_container_"):
+                elif field.metadata.get('_abstract_aapi_container_'):
                     for obj in value:
-                        res[obj.object_name] = obj.as_aapi_dict()
+                        obj_ignore_type = ignore_event_type
+                        if isinstance(self, IfCompletionStatus):
+                            obj_ignore_type = False  # Suppress "Type" for Events in these containers
+                        res[obj.object_name] = obj.as_aapi_dict(ignore_event_type=obj_ignore_type)
 
         else:
-            res["attrsibutes_valid"] = False
+            res['attrsibutes_valid'] = False
 
         return res
 
+
+    def from_aapi_dict(self, aapi_dict):
+        # Convert a JSON-like dictionary back into Python objects
+        for key, value in aapi_dict.items():
+            if isinstance(value, dict):
+                # If the value is a dictionary, attempt to find the appropriate class
+                # You need a way to figure out which class to map this dictionary to
+                if "Type" in value:
+                    type_ = value["Type"]
+                    cls = AAPIObject.get_class_by_type(type_)
+                    if cls:
+                        value = cls.from_aapi_dict(value)
+            elif isinstance(value, list):
+                # If the value is a list, recursively process each item in the list
+                value = [self.from_aapi_dict(v) if isinstance(v, dict) else v for v in value]
+            setattr(self, key, value)
+            
+            
     def dumps_aapi(self, indent=None):
         return json.dumps(self.as_aapi_dict(), indent=indent)