bugfix for get_obj_uri for dict objects + utility functions in RgbaColor

Author: valentin-gauthier-geosiris

energyml-utils/example/attic/misc_test.py

@@ -1,6 +1,9 @@
-from energyml.utils.epc_utils import get_dor_uris_from_obj
+import json
+
+from energyml.utils.epc_utils import as_dor, get_dor_uris_from_obj
 from energyml.utils.introspection import get_obj_uri, search_attribute_matching_type_with_path
 from energyml.utils.serialization import (
+    serialize_json,
     serialize_xml,
     read_energyml_xml_str,
     read_energyml_xml_file,
@@ -25,8 +28,20 @@ def test_as_uri(xml_path: str):
     print("=" * 40)
     for p, o in search_attribute_matching_type_with_path(obj, "DataObjectreference"):
         print(f"{p}: {o} ({get_obj_uri(o)})\n")
+        
+        
+def test_serialize_dor(xml_path: str):
+    obj = read_energyml_xml_file(xml_path)
+    dor = as_dor(obj)
+    print(dor)
+    json_dict = json.loads(serialize_json(dor))
+    print(json_dict)
+    
+    print(get_obj_uri(json_dict))
 
 
 if __name__ == "__main__":
     # test_as_uri("rc/ContinuousProperty_1d34249c-4c4f-4705-870e-b5dea9c0d78e.xml")
-    test_as_uri("rc/DiscreteProperty.xml")
+    # test_as_uri("rc/DiscreteProperty.xml")
+    test_serialize_dor("rc/DiscreteProperty.xml")
+

energyml-utils/src/energyml/utils/data/helper.py

@@ -1952,6 +1952,15 @@ def to_uint8(self) -> Tuple[int, int, int, int]:
             int(round(self.b * 255)),
             int(round(self.a * 255)),
         )
+        
+    def to_hex(self) -> str:
+        """Return color as a hex string, e.g. '#RRGGBBAA'."""
+        return "#{:02X}{:02X}{:02X}{:02X}".format(*self.to_uint8())
+    
+    def to_hex_argb(self) -> str:
+        """Return color as a hex string in ARGB order, e.g. '#AARRGGBB'."""
+        r, g, b, a = self.to_uint8()
+        return "#{:02X}{:02X}{:02X}{:02X}".format(a, r, g, b)
 
     @staticmethod
     def from_hsv(hsv_obj: Any) -> "RgbaColor":
@@ -2328,3 +2337,45 @@ def read_graphical_rendering_info(
         # because it drives label text, not colour/size - handle separately if needed.
 
     return result if found else None
+
+# def numpy_dtype_to_resqml_22_type(dtype: np.dtype, is_external: bool = True) -> Optional[str]:
+#     import energyml.resqml.v2_2.resqmlv2
+#     # ======== resqml22
+#     # BooleanXmlArrayList
+#     # FloatingPointXmlArrayList
+#     # IntegerXmlArrayList
+#     # BooleanXmlArray
+#     # StringXmlArray
+#     # FloatingPointXmlArray
+#     # IntegerXmlArray
+#     # ======= common23
+#     # BooleanExternalArray
+#     # StringExternalArray
+#     # FloatingPointExternalArray
+#     # IntegerExternalArray
+#     # ======= common21
+#     # Point2DHdf5Array
+#     # Point2dHdf5Array
+#     # Point3DHdf5Array
+#     # Point3dHdf5Array
+#     # StringHdf5Array
+#     # BooleanHdf5Array
+#     # DoubleHdf5Array
+#     # IntegerHdf5Array
+    
+#     suffix = "ExternalArray" if is_external else "XmlArray"
+#     if np.issubdtype(dtype, np.bool_):
+
+
+
+
+# def numpy_to_resqml_array(np_array: np.ndarray, resqlm_version: str = "2.2") -> Any:
+#     """
+#     Convert a NumPy array to a RESQML array object (e.g. RealArray, IntegerArray).
+
+#     :param np_array: The input NumPy array to convert.
+#     :param resqlm_version: The target RESQML version (default "2.2").
+#     :return: A RESQML array object containing the data from the NumPy array.
+#     """
+#     dtype = np_array.dtype
+    

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

@@ -1330,11 +1330,11 @@ def get_obj_version(obj: Any) -> Optional[str]:
         # )
         if isinstance(obj, dict):
             for k in obj.keys():
-                if re.match(r"object_version|version_string", k, re.IGNORECASE):
+                if re.match(r"object_?version|version_?string", k, re.IGNORECASE):
                     return obj[k]
                 elif re.match(r"citation", k, re.IGNORECASE) and isinstance(obj[k], dict):
                     for ck in obj[k].keys():
-                        if re.match(r"version_string", ck, re.IGNORECASE):
+                        if re.match(r"version_?string", ck, re.IGNORECASE):
                             return obj[k][ck]
         pass
     return None
@@ -1390,7 +1390,12 @@ def get_obj_pkg_pkgv_type_uuid_version(
     :param obj:
     :return:
     """
-    pkg: Optional[str] = get_class_pkg(obj)
+    pkg: Optional[str] = None
+    try:
+        pkg = get_class_pkg(obj)
+    except AttributeError:
+        # could occur if obj is a dict
+        pass
     pkg_v: Optional[str] = get_class_pkg_version(obj)
     obj_type: Optional[str] = get_object_type_for_file_path_from_class(obj)
     obj_uuid = get_obj_uuid(obj)
@@ -1400,24 +1405,33 @@ def get_obj_pkg_pkgv_type_uuid_version(
     try:
         ct = get_object_attribute_no_verif(obj, "content_type")
     except:
-        pass
-
+        try:
+            ct = get_object_attribute_no_verif(obj, "ContentType")
+        except:
+            pass
+    
     if ct is not None:
         ct_match = parse_content_type(ct)
         if ct_match is not None:
             pkg = ct_match.group("domain")
             pkg_v = ct_match.group("domainVersion")
             obj_type = ct_match.group("type")
     else:
+        qt = None
         try:
             qt = get_object_attribute_no_verif(obj, "qualified_type")
+        except:
+            try:
+                qt = get_object_attribute_no_verif(obj, "QualifiedType")
+            except:
+                pass
+        
+        if qt is not None:
             qt_match = parse_qualified_type(qt)
             if qt_match is not None:
                 pkg = qt_match.group("domain")
                 pkg_v = qt_match.group("domainVersion")
                 obj_type = qt_match.group("type")
-        except:
-            pass
 
     # flattening version
     if pkg_v is not None:

energyml-utils/src/energyml/utils/manager.py

@@ -183,8 +183,8 @@ def get_class_pkg(cls):
         match = p.search(cls.__module__)
         return match.group("pkg")  # type: ignore
     except AttributeError as e:
-        logging.error(f"Exception to get class package for '{cls}'")
-        logging.error(
+        logging.debug(f"Exception to get class package for '{cls}'")
+        logging.debug(
             f"Error getting package for {type(cls)} -- {cls}",
             exc_info=True,
             stack_info=True,  # This shows the full call stack including caller

energyml-utils/tests/test_introspection.py

@@ -6,8 +6,10 @@
 This module contains comprehensive tests for introspection utilities used to
 inspect, manipulate, and extract information from Energyml objects.
 """
+import json
 from dataclasses import dataclass
 from energyml.utils.epc_utils import MimeType, as_dor
+from energyml.utils.serialization import serialize_json
 import pytest
 from typing import Any
 
@@ -761,6 +763,13 @@ def test_get_obj_uri(triangulated_set_no_version, fault_interpretation):
         uri_str_fi_dataspace
         == f"eml:///dataspace('/MyDataspace/')/resqml20.obj_FaultInterpretation(uuid={fault_interpretation.uuid},version='{fault_interpretation.object_version}')"
     )
+    
+    uri_dict_dor = str(get_obj_uri(json.loads(serialize_json(as_dor(fault_interpretation)))))
+    
+    assert (
+        uri_dict_dor
+        == f"eml:///resqml20.obj_FaultInterpretation(uuid={fault_interpretation.uuid},version='{fault_interpretation.object_version}')"
+    )
 
 
 # =============================================================================