bugfix for uri and obj_ prefix

Author: valentin-gauthier-geosiris

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

@@ -1312,6 +1312,12 @@ def get_object_type_for_file_path_from_class(cls) -> str:
                 return parent_cls.Meta.name
         except AttributeError:
             pass
+    if hasattr(cls, "Meta"):
+        try:
+            if cls.Meta.name is not None and len(cls.Meta.name) > 0:
+                return cls.Meta.name
+        except AttributeError:
+            pass
 
     return classic_type
 

energyml-utils/tests/test_epc.py

@@ -23,6 +23,7 @@
     get_obj_pkg_pkgv_type_uuid_version,
     get_obj_uri,
     get_qualified_type_from_class,
+    set_attribute_from_path,
 )
 
 fi_cit = Citation20(
@@ -76,6 +77,12 @@
     uuid=gen_uuid(),
     represented_object=dor_correct23,
 )
+tr_versioned = TriangulatedSetRepresentation(
+    citation=tr_cit,
+    uuid=gen_uuid(),
+    represented_object=dor_correct23,
+    object_version="3",
+)
 
 
 def test_get_obj_identifier():
@@ -135,7 +142,15 @@ def test_gen_energyml_object_path():
     assert gen_energyml_object_path(tr) == f"TriangulatedSetRepresentation_{tr.uuid}.xml"
     assert (
         gen_energyml_object_path(tr, EpcExportVersion.EXPANDED)
-        == f"namespace_resqml22/{tr.uuid}/TriangulatedSetRepresentation_{tr.uuid}.xml"
+        == f"namespace_resqml22/TriangulatedSetRepresentation_{tr.uuid}.xml"
+    )
+
+
+def test_gen_energyml_object_path_versioned():
+    assert gen_energyml_object_path(tr_versioned) == f"TriangulatedSetRepresentation_{tr_versioned.uuid}.xml"
+    assert (
+        gen_energyml_object_path(tr_versioned, EpcExportVersion.EXPANDED)
+        == f"namespace_resqml22/version_{tr_versioned.object_version}/TriangulatedSetRepresentation_{tr_versioned.uuid}.xml"
     )
 
 

energyml-utils/tests/test_uri.py

@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from src.energyml.utils.uri import Uri, parse_uri
+from energyml.utils.introspection import get_obj_uri
+from energyml.resqml.v2_0_1.resqmlv2 import TriangulatedSetRepresentation, ObjTriangulatedSetRepresentation
+
+TR_UUID = "12345678-1234-1234-1234-123456789012"
 
 
 def test_uri_constructor():
@@ -113,3 +117,13 @@ def test_uuid():
     )
     assert uri.uuid == "ec8c3f16-1454-4f36-ae10-27d2a2680cf2"
     assert uri.version == "1.0"
+
+
+def test_resqml201_uri():
+    tr = ObjTriangulatedSetRepresentation(uuid=TR_UUID)
+    uri = get_obj_uri(tr)
+    assert str(uri) == f"eml:///resqml20.obj_TriangulatedSetRepresentation({TR_UUID})"
+
+
+if __name__ == "__main__":
+    print(get_obj_uri(ObjTriangulatedSetRepresentation(uuid=TR_UUID)))