modified codes for xml serialization from xml back to dict

Author: mqnifestkelvin

src/modelspec/base_types.py

@@ -167,11 +167,14 @@ def from_bson(cls, bson_str: str) -> "Base":
     @classmethod
     def from_xml(cls, xml_str: str) -> "Base":
         """Instantiate a Base object from an XML string"""
-        from modelspec.utils import element_to_dict
+        from modelspec.utils import element_to_dict, handle_id, convert_values
 
         root = ET.fromstring(xml_str)
-        data_dict = {root.tag: element_to_dict(root)}
-        return cls.from_dict(data_dict)
+        data_dict = element_to_dict(root)
+        removed_id = handle_id(data_dict)
+        converted_to_actual_val = convert_values(removed_id)
+
+        return cls.from_dict(converted_to_actual_val)
 
     def to_json_file(
         self, filename: Optional[str] = None, include_metadata: bool = True
@@ -273,13 +276,8 @@ def to_xml_file(
         if filename is None:
             filename = f"{self.id}.xml"
 
-        # root = ET.Element(root_name)
-
         root = build_xml_element(self)
 
-        # Create an ElementTree object with the root element
-        # tree = ET.ElementTree(root)
-
         # Generate the XML string
         xml_str = ET.tostring(root, encoding="utf-8", method="xml").decode("utf-8")
 
@@ -377,14 +375,16 @@ def from_xml_file(cls, filename: str) -> "Base":
         Returns:
             A modelspec Base for this XML.
         """
-        from modelspec.utils import element_to_dict
+        from modelspec.utils import element_to_dict, handle_id, convert_values
 
         with open(filename) as infile:
             tree = ET.parse(filename)
             root = tree.getroot()
 
-        data_dict = {root.tag: element_to_dict(root)}
-        return cls.from_dict(data_dict)
+        data_dict = element_to_dict(root)
+        removed_id = handle_id(data_dict)
+        converted_to_actual_val = convert_values(removed_id)
+        return cls.from_dict(converted_to_actual_val)
 
     def get_child(self, id: str, type_: str) -> Any:
         """

src/modelspec/utils.py

@@ -72,9 +72,11 @@ def load_xml(filename: str):
         root = tree.getroot()  # Get the root element
 
     # Convert the ElementTree object to a dictionary
-    data = {root.tag: element_to_dict(root)}
+    data = element_to_dict(root)
+    removed_id = handle_id(data)
+    converted_to_actual_val = convert_values(removed_id)
 
-    return convert_values(data)
+    return convert_values(converted_to_actual_val)
 
 
 def element_to_dict(element):
@@ -106,6 +108,20 @@ def element_to_dict(element):
     return result
 
 
+def handle_id(dictionary):
+    if isinstance(dictionary, dict):
+        if "id" in dictionary:
+            nested_dict = {dictionary["id"]: dictionary.copy()}
+            del nested_dict[dictionary["id"]]["id"]
+            return {k: handle_id(v) for k, v in nested_dict.items()}
+        else:
+            return {k: handle_id(v) for k, v in dictionary.items()}
+    elif isinstance(dictionary, list):
+        return [handle_id(item) for item in dictionary]
+    else:
+        return dictionary
+
+
 def convert_values(value):
     """
     This recursively converts values to their actual types.