Fix namespace of attributes after review comment

Signed-off-by: Guillaume Roger <[email protected]>

modernpython/utils/base.py

@@ -4,6 +4,7 @@
 from functools import cached_property
 from typing import Any, TypeAlias, TypedDict
 
+from pycgmes.utils.constants import NAMESPACES
 from pydantic.dataclasses import dataclass
 
 from .dataclassconfig import DataclassConfig
@@ -51,6 +52,13 @@ def resource_name(self) -> str:
         """Returns the resource type."""
         return self.__class__.__name__
 
+    @cached_property
+    def namespace(self) -> str:
+        """Returns the namespace. By default, the namespace is the cim namespace for all resources.
+        Custom resources can override this.
+        """
+        return NAMESPACES["cim"]
+
     @classmethod  # From python 3.11, you cannot wrap @classmethod in @property anymore.
     def apparent_name(cls) -> str:
         """
@@ -109,12 +117,25 @@ def cgmes_attributes_in_profile(self, profile: BaseProfile | None) -> dict[str,
                     # Wrong profile or already found from a parent.
                     continue
                 else:
+                    # Namespace finding
+                    # "class namespace" means the first namespace defined in the inheritance tree.
+                    # This can go up to Base, which will give the default cim NS.
+                    if (extra := getattr(f.default, "extra", None)) is None:
+                        # The attribute does not have extra metadata. It might be a custom atttribute
+                        # without it, or a base type (int...).
+                        # Use the class namespace.
+                        namespace = self.namespace
+                    elif (attr_ns := extra.get("namespace", None)) is None:
+                        # The attribute has some extras, but not namespace.
+                        # Use the class namespace.
+                        namespace = self.namespace
+                    else:
+                        # The attribute has an explicit namesapce
+                        namespace = attr_ns
+
                     qual_attrs[qualname] = CgmesAttribute(
                         value=getattr(self, shortname),
-                        # base types (e.g. int) do not have extras
-                        namespace=extra.get("namespace", None)
-                        if (extra := getattr(f.default, "extra", None))
-                        else None,
+                        namespace=namespace,
                     )
                     seen_attrs.add(shortname)
 
@@ -123,6 +144,8 @@ def cgmes_attributes_in_profile(self, profile: BaseProfile | None) -> dict[str,
     def __str__(self) -> str:
         """Returns the string representation of this resource."""
         return "\n".join([f"{k}={v}" for k, v in sorted(self.to_dict().items())])
+
+
 CgmesAttributeTypes: TypeAlias = str | int | float | Base | list | None
 
 

modernpython/utils/constants.py

@@ -1,7 +1,8 @@
 # Default namespaces used by CGMES.
 NAMESPACES = {
-    "cim": "http://iec.ch/TC57/2013/CIM-schema-cim16#",
+    "cim": "http://iec.ch/TC57/CIM100#",
     "entsoe": "http://entsoe.eu/CIM/SchemaExtension/3/1#",
     "md": "http://iec.ch/TC57/61970-552/ModelDescription/1#",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "xsd": "http://www.w3.org/2001/XMLSchema#",
 }

modernpython/utils/profile.py

@@ -10,11 +10,13 @@ class BaseProfile(str, Enum):
     Enum with fields cannot be inherited or composed, just create your own CustomProfile without
     trying to extend Profile. It will work.
     """
+
     @cached_property
     def long_name(self) -> str:
         """Return the long name of the profile."""
         return self.value
 
+
 class Profile(BaseProfile):
     """
     Enum containing all CGMES profiles and their export priority.