bugfix for xml serialization. namespace was missing for obj_ prefixed classes

Author: valentin-gauthier-geosiris

energyml-utils/src/energyml/utils/introspection.py

@@ -1197,6 +1197,11 @@ def as_obj_prefixed_class_if_possible(o: Any) -> Any:
                     # print(bc)
                     if bc.__name__.lower() == f"obj{get_obj_type(o_type).lower()}":
                         try:
+                            try:
+                                if bc.Meta is not None:
+                                    bc.Meta.namespace = o_type.Meta.namespace  # keep the same namespace
+                            except Exception:
+                                logging.error(f"Failed to set namespace for {bc}")
                             return bc(**o.__dict__)
                         except Exception as e:
                             logging.error(f"Failed to convert {o} to {bc}")
@@ -1554,81 +1559,3 @@ def _random_value_from_class(
 
     logging.error(f"@_random_value_from_class Not supported object type generation {cls}")
     return None
-
-
-if __name__ == "__main__":
-
-    from energyml.eml.v2_3.commonv2 import *
-    from energyml.eml.v2_0.commonv2 import Citation as Cit201
-    from energyml.resqml.v2_0_1.resqmlv2 import TriangulatedSetRepresentation as Tr20, ObjTriangulatedSetRepresentation
-    from energyml.resqml.v2_2.resqmlv2 import (
-        TriangulatedSetRepresentation,
-        FaultInterpretation,
-    )
-    from .serialization import *
-
-    fi_cit = Citation(
-        title="An interpretation",
-        originator="Valentin",
-        creation=epoch_to_date(epoch()),
-        editor="test",
-        format="Geosiris",
-        last_update=epoch_to_date(epoch()),
-    )
-
-    fi = FaultInterpretation(
-        citation=fi_cit,
-        uuid=gen_uuid(),
-        object_version="0",
-    )
-
-    tr_cit = Citation(
-        title="--",
-        # title="test title",
-        originator="Valentin",
-        creation=epoch_to_date(epoch()),
-        editor="test",
-        format="Geosiris",
-        last_update=epoch_to_date(epoch()),
-    )
-
-    tr_cit201 = Cit201(
-        title="--",
-        # title="test title",
-        originator="Valentin",
-        # creation=str(epoch_to_date(epoch()))
-        editor="test",
-        format="Geosiris",
-        # last_update=str(epoch_to_date(epoch())),
-    )
-    dor = DataObjectReference(
-        uuid=fi.uuid,
-        title="a DOR title",
-        object_version="0",
-        qualified_type="a wrong qualified type",
-    )
-    tr = TriangulatedSetRepresentation(
-        citation=tr_cit,
-        uuid=gen_uuid(),
-        represented_object=dor,
-    )
-
-    tr201 = Tr20(
-        citation=tr_cit201,
-        uuid=gen_uuid(),
-    )
-    tr201_bis = ObjTriangulatedSetRepresentation(
-        citation=tr_cit201,
-        uuid=gen_uuid(),
-    )
-    # print(get_obj_uri(tr201, "coucou"))
-
-    print(get_obj_usable_class(tr))
-    print(get_obj_usable_class(tr201))
-
-    print(serialize_xml(tr201_bis))
-    print(serialize_xml(tr201))
-    print(serialize_json(tr201))
-    print(serialize_xml(as_obj_prefixed_class_if_possible(tr201)))
-    print("--> ", serialize_json(tr))
-    # print(serialize_xml((get_usable_class(tr201))(tr201)))

energyml-utils/src/energyml/utils/serialization.py

@@ -254,8 +254,8 @@ def read_energyml_json_file(
 # /____/\___/_/  /_/\__,_/_/_/ /___/\__,_/\__/_/\____/_/ /_/
 
 
-def serialize_xml(obj) -> str:
-    obj = as_obj_prefixed_class_if_possible(obj)
+def serialize_xml(obj, check_obj_prefixed_classes: bool = True) -> str:
+    obj = as_obj_prefixed_class_if_possible(obj) if check_obj_prefixed_classes else obj
     context = XmlContext(
         # element_name_generator=text.camel_case,
         # attribute_name_generator=text.kebab_case
@@ -265,8 +265,10 @@ def serialize_xml(obj) -> str:
     return serializer.render(obj, ns_map=ENERGYML_NAMESPACES)
 
 
-def serialize_json(obj, json_version: JSON_VERSION = JSON_VERSION.OSDU_OFFICIAL) -> str:
-    obj = as_obj_prefixed_class_if_possible(obj)
+def serialize_json(
+    obj, json_version: JSON_VERSION = JSON_VERSION.OSDU_OFFICIAL, check_obj_prefixed_classes: bool = True
+) -> str:
+    obj = as_obj_prefixed_class_if_possible(obj) if check_obj_prefixed_classes else obj
     if json_version == JSON_VERSION.XSDATA:
         context = XmlContext(
             # element_name_generator=text.camel_case,

energyml-utils/src/energyml/utils/xml.py

@@ -9,7 +9,7 @@
 
 
 def get_pkg_from_namespace(namespace: str) -> Optional[str]:
-    for (k, v) in ENERGYML_NAMESPACES_PACKAGE.items():
+    for k, v in ENERGYML_NAMESPACES_PACKAGE.items():
         if namespace in v:
             return k
     return None
@@ -22,7 +22,7 @@ def is_energyml_content_type(content_type: str) -> bool:
 
 
 def get_root_namespace(tree: ETREE.Element) -> str:
-    return tree.nsmap[tree.prefix]
+    return tree.nsmap.get(tree.prefix, tree.nsmap.get(None, ""))
 
 
 def get_class_name_from_xml(tree: ETREE.Element) -> str:
@@ -34,11 +34,7 @@ def get_class_name_from_xml(tree: ETREE.Element) -> str:
         if pkg == "opc":
             return "energyml.opc.opc." + get_root_type(tree)
         else:
-            schema_version = (
-                (find_schema_version_in_element(tree) or "")
-                .replace(".", "_")
-                .replace("-", "_")
-            )
+            schema_version = (find_schema_version_in_element(tree) or "").replace(".", "_").replace("-", "_")
             if pkg == "resqml" and schema_version == "2_0":
                 schema_version = "2_0_1"
 
@@ -48,7 +44,7 @@ def get_class_name_from_xml(tree: ETREE.Element) -> str:
                 + ".v"
                 + schema_version
                 + "."
-                + root_namespace[root_namespace.rindex("/") + 1:]
+                + root_namespace[root_namespace.rindex("/") + 1 :]
                 + "."
                 + get_root_type(tree)
             )
@@ -67,11 +63,7 @@ def get_tree(xml_content: Union[bytes, str]) -> ETREE.Element:
     if isinstance(xml_bytes, str):
         # return ETREE.fromstring(xml_content)
         encoding = get_xml_encoding(xml_content)
-        xml_bytes = xml_content.encode(
-            encoding=encoding.strip().lower()
-            if encoding is not None
-            else "utf-8"
-        )
+        xml_bytes = xml_content.encode(encoding=encoding.strip().lower() if encoding is not None else "utf-8")
 
     return ETREE.parse(BytesIO(xml_bytes)).getroot()
 
@@ -84,9 +76,7 @@ def energyml_xpath(tree: ETREE.Element, xpath: str) -> Optional[list]:
         return None
 
 
-def search_element_has_child_xpath(
-    tree: ETREE.Element, child_name: str
-) -> list:
+def search_element_has_child_xpath(tree: ETREE.Element, child_name: str) -> list:
     """
     Search elements that has a child named (xml tag) as 'child_name'.
     Warning : child_name must contain the namespace (see. ENERGYML_NAMESPACES)