cognite-neat 0.103.0__tar.gz → 0.103.1__tar.gz

{cognite_neat-0.103.0 → cognite_neat-0.103.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.103.0
+Version: 0.103.1
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

{cognite_neat-0.103.0 → cognite_neat-0.103.1}/cognite/neat/_rules/models/dms/_validation.py

@@ -194,6 +194,8 @@ class DMSValidation:
     ) -> dict[ViewId, set[ViewId]]:
         @lru_cache
         def get_parents(child_view_id: ViewId) -> set[ViewId]:
+            if child_view_id not in all_views_by_id:
+                return set()
             child_view = all_views_by_id[child_view_id]
             parents = set(child_view.implements or [])
             for parent_id in child_view.implements or []:

{cognite_neat-0.103.0 → cognite_neat-0.103.1}/cognite/neat/_rules/models/entities/_single_value.py

@@ -201,16 +201,36 @@ class Entity(BaseModel, extra="ignore"):
             for field_name, field in self.model_fields.items()
             if (v := getattr(self, field_name)) is not None and field_name not in {"prefix", "suffix"}
         }
+        # We only remove the default values if all the fields are default
+        # For example, if we dump `cdf_cdm:CogniteAsset(version=v1)` and the default is `version=v1`,
+        # we should not remove it unless the space is `cdf_cdm`
+        to_delete: list[str] = []
+        is_removing_defaults = True
         if isinstance(defaults, dict):
             for key, value in defaults.items():
-                if key in model_dump and model_dump[key] == value:
-                    del model_dump[key]
-        # Sorting to ensure deterministic order
-        args = ",".join(f"{k}={v}" for k, v in sorted(model_dump.items(), key=lambda x: x[0]))
-        if self.prefix == Undefined or (isinstance(defaults, dict) and self.prefix == defaults.get("prefix")):
+                if key not in model_dump:
+                    continue
+                if model_dump[key] == value:
+                    to_delete.append(key)
+                elif isinstance(self, EdgeEntity):
+                    # Exception is edge entity, then, we remove all the defaults we can.
+                    continue
+                else:
+                    # Not all fields are default. We should not remove any of them.
+                    is_removing_defaults = False
+                    break
+        if isinstance(defaults, dict) and self.prefix == defaults.get("prefix") and is_removing_defaults:
+            base_id = str(self.suffix)
+        elif self.prefix == Undefined:
             base_id = str(self.suffix)
         else:
+            is_removing_defaults = False
             base_id = f"{self.prefix}:{self.suffix!s}"
+        if is_removing_defaults:
+            for key in to_delete:
+                del model_dump[key]
+        # Sorting to ensure deterministic order
+        args = ",".join(f"{k}={v}" for k, v in sorted(model_dump.items(), key=lambda x: x[0]))
         if args:
             return f"{base_id}({args})"
         else:

{cognite_neat-0.103.0 → cognite_neat-0.103.1}/cognite/neat/_session/_show.py

@@ -13,6 +13,7 @@ from cognite.neat._rules.models.dms._rules import DMSRules
 from cognite.neat._rules.models.entities._single_value import ClassEntity, ViewEntity
 from cognite.neat._rules.models.information._rules import InformationRules
 from cognite.neat._session.exceptions import NeatSessionError
+from cognite.neat._utils.io_ import to_directory_compatible
 from cognite.neat._utils.rdf_ import remove_namespace_from_uri
 
 from ._state import SessionState
@@ -106,16 +107,16 @@ class ShowDataModelAPI(ShowBaseAPI):
         rules = self._state.data_model.last_verified_rule[1]
 
         if isinstance(rules, DMSRules):
-            di_graph = self._generate_dms_di_graph(self._state.data_model.last_verified_dms_rules[1])
-            name = "dms_data_model.html"
+            di_graph = self._generate_dms_di_graph(rules)
         elif isinstance(rules, InformationRules):
-            di_graph = self._generate_info_di_graph(self._state.data_model.last_verified_information_rules[1])
-            name = "information_data_model.html"
+            di_graph = self._generate_info_di_graph(rules)
         else:
             # This should never happen, but we need to handle it to satisfy mypy
             raise NeatSessionError(
                 f"Unsupported type {type(rules) }. Make sure you have either information or DMS rules."
             )
+        identifier = to_directory_compatible(str(rules.metadata.identifier))
+        name = f"{identifier}.html"
 
         return self._generate_visualization(di_graph, name)
 
@@ -195,17 +196,16 @@ class ShowDataModelImplementsAPI(ShowBaseAPI):
         rules = self._state.data_model.last_verified_rule[1]
 
         if isinstance(rules, DMSRules):
-            di_graph = self._generate_dms_di_graph(self._state.data_model.last_verified_dms_rules[1])
-            name = "dms_data_model_implements.html"
+            di_graph = self._generate_dms_di_graph(rules)
         elif isinstance(rules, InformationRules):
-            di_graph = self._generate_info_di_graph(self._state.data_model.last_verified_information_rules[1])
-            name = "information_data_model_implements.html"
+            di_graph = self._generate_info_di_graph(rules)
         else:
             # This should never happen, but we need to handle it to satisfy mypy
             raise NeatSessionError(
                 f"Unsupported type {type(rules) }. Make sure you have either information or DMS rules."
             )
-
+        identifier = to_directory_compatible(str(rules.metadata.identifier))
+        name = f"{identifier}_implements.html"
         return self._generate_visualization(di_graph, name)
 
     def _generate_dms_di_graph(self, rules: DMSRules) -> nx.DiGraph:

cognite_neat-0.103.1/cognite/neat/_utils/io_.py

@@ -0,0 +1,11 @@
+import re
+
+# Spaces are allowed, but we replace them as well
+_ILLEGAL_CHARACTERS = re.compile(r"[<>:\"/\\|?*\s]")
+
+
+def to_directory_compatible(text: str) -> str:
+    """Convert a string to be compatible with directory names on all platforms"""
+    cleaned = _ILLEGAL_CHARACTERS.sub("_", text)
+    # Replace multiple underscores with a single one
+    return re.sub(r"_+", "_", cleaned)

cognite_neat-0.103.1/cognite/neat/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.103.1"
+__engine__ = "^2.0.3"

{cognite_neat-0.103.0 → cognite_neat-0.103.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.103.0"
+version = "0.103.1"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.103.0/cognite/neat/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.103.0"
-__engine__ = "^2.0.3"