bugfix for validation

Author: valentin-gauthier-geosiris

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

@@ -1130,13 +1130,14 @@ def copy_attributes(
 # Utility functions
 
 
-def get_obj_uuid(obj: Any) -> str:
+def get_obj_uuid(obj: Any) -> Optional[str]:
     """
     Return the object uuid (attribute must match the following regex : "[Uu]u?id|UUID").
     :param obj:
     :return:
     """
-    return get_object_attribute_rgx(obj, "[Uu]u?id|UUID")
+    return getattr(obj, "uuid", None) or getattr(obj, "uid", None)
+    # return get_object_attribute_rgx(obj, "[Uu]u?id|UUID")
 
 
 def get_obj_version(obj: Any) -> Optional[str]:
@@ -1146,20 +1147,21 @@ def get_obj_version(obj: Any) -> Optional[str]:
     :return:
     """
     try:
-        return get_object_attribute_no_verif(obj, "object_version")
+        return (
+            getattr(obj, "object_version", None)
+            or getattr(obj, "version_string", None)
+            or (getattr(obj, "citation", None) and getattr(obj.citation, "version_string", None))
+        )
     except AttributeError:
-        # AttributeError is expected when attribute doesn't exist - try alternative
-        try:
-            return get_object_attribute_no_verif(obj, "version_string")
-        except Exception:
-            # Log with full call stack to see WHO called this function
-            logging.error(
-                f"Error getting version for {type(obj)} -- {obj}",
-                exc_info=True,
-                stack_info=True,  # This shows the full call stack including caller
-            )
-            return None
-            # raise e
+        # Log with full call stack to see WHO called this function
+        # logging.error(
+        #     f"Error getting version for {type(obj)} -- {obj}",
+        #     exc_info=True,
+        #     stack_info=True,  # This shows the full call stack including caller
+        # )
+        pass
+    return None
+    # raise e
 
 
 def get_obj_title(obj: Any) -> Optional[str]:
@@ -1169,7 +1171,8 @@ def get_obj_title(obj: Any) -> Optional[str]:
     :return:
     """
     try:
-        return get_object_attribute_advanced(obj, "citation.title")
+        return getattr(obj, "citation", None) and getattr(obj.citation, "title", None)
+        # return get_object_attribute_advanced(obj, "citation.title")
     except AttributeError:
         return None
 
@@ -1430,6 +1433,9 @@ def get_content_type_from_class(cls: Union[type, Any], print_dev_version=True, n
 
 
 def get_object_type_for_file_path_from_class(cls) -> str:
+    """
+    Return the object type to use in file path or content type. It is not always the same as the class name, for example for resqml201, the class "TriangulatedSetRepresentation" has to be written "obj_TriangulatedSetRepresentation" in file path and content type.
+    """
     if not isinstance(cls, type):
         cls = type(cls)
     classic_type = get_obj_type(cls)

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

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

energyml-utils/src/energyml/utils/validation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2023-2024 Geosiris.
 # SPDX-License-Identifier: Apache-2.0
+import logging
 import re
 from dataclasses import dataclass, field, Field
 from enum import Enum
@@ -203,6 +204,8 @@ def dor_validation_object(
                     _msg=f"[DOR ERR] has wrong information. Unknown object with uuid '{dor_uuid}'",
                 )
             )
+
+        object_version_list_failed = False
         if target_uuid is not None and target_identifier is None:
             accessible_version = [get_obj_version(ref_obj) for ref_obj in dict_obj_uuid[dor_uuid]]
             errs.append(
@@ -214,6 +217,7 @@ def dor_validation_object(
                     f"Version must be one of {accessible_version}",
                 )
             )
+            object_version_list_failed = True
 
         if target_prop is not None and target_uuid is None:
             errs.append(
@@ -226,6 +230,32 @@ def dor_validation_object(
             )
 
         target = target_identifier or target_uuid or target_prop
+
+        # debug
+        if isinstance(target, list):
+            # logging.error(
+            #     f"Multiple objects found with uuid '{dor_uuid}' for DOR in object '{get_obj_identifier(obj)}' at path '{dor_path}'. This should not happen and can lead to wrong validation results.",
+            #     exc_info=True,
+            #     stack_info=True,  # This shows the full call stack including caller
+            # )
+            # logging.error(
+            #     f'\t{target} => Object ct and qt {get_object_attribute_rgx(dor, "content_type")} : {get_object_attribute_rgx(dor, "qualified_type")}'
+            # )
+            if len(target) == 0:
+                target = None
+            else:
+                if len(target) > 1:
+                    errs.append(
+                        ValidationObjectError(
+                            error_type=ErrorType.WARNING,
+                            target_obj=obj,
+                            attribute_dot_path=dor_path,
+                            _msg=f"[DOR ERR] Multiple objects found with uuid '{dor_uuid}' for DOR in object '{get_obj_identifier(obj)}' at path '{dor_path}'. This should not happen and can lead to wrong validation results.",
+                        )
+                    )
+                target = target[0]
+
+        # ====
         if target is not None:
             # target = dict_obj_identifier[dor_target_id]
             target_title = get_object_attribute_rgx(target, "citation.title")
@@ -267,7 +297,8 @@ def dor_validation_object(
                         )
                     )
 
-            if target_version != dor_version:
+            if not object_version_list_failed and target_version != dor_version:
+                # checking object_version_list_failed to avoid multiple version errors
                 errs.append(
                     ValidationObjectError(
                         error_type=ErrorType.WARNING,