cognite-neat 0.103.0__py3-none-any.whl → 0.103.1__py3-none-any.whl

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/_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/_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/_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/_version.py

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

{cognite_neat-0.103.0.dist-info → cognite_neat-0.103.1.dist-info}/METADATA

@@ -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.dist-info → cognite_neat-0.103.1.dist-info}/RECORD

@@ -182,12 +182,12 @@ cognite/neat/_rules/models/dms/__init__.py,sha256=fRaUH0IwG0YwWd_DNKM6j-jHHFyiIV
 cognite/neat/_rules/models/dms/_exporter.py,sha256=eB5uDX06XYkQkON96eykSk7ZCegb9a5dCxTmTIr252c,28020
 cognite/neat/_rules/models/dms/_rules.py,sha256=xQ8NoSE9D4tMjcEwKn4z7HdF9l_3OR-1xRlH3uamQPM,20186
 cognite/neat/_rules/models/dms/_rules_input.py,sha256=mVW-gHrjjlqFuq82qTkxIaMZ7OlzQFxjopxdlwQergY,12949
-cognite/neat/_rules/models/dms/_validation.py,sha256=c3egIGDlsQTETReX57JkolBidn7H3zNV6Y-dUGY8Cl8,27652
+cognite/neat/_rules/models/dms/_validation.py,sha256=PNFHsDNHJZfbHY1qt6D4t3eFOGjqe6Koa702Gzcz0I8,27734
 cognite/neat/_rules/models/entities/__init__.py,sha256=Hlucp3LyV6ncLl79aqRTbSy2qgiGzoyN8x54D_zaJCY,1469
 cognite/neat/_rules/models/entities/_constants.py,sha256=ToiLaaF-hGLPfn3AsKIIrfB4ZdTk4cY1RjM9gA1Qjkg,288
 cognite/neat/_rules/models/entities/_loaders.py,sha256=jFllRty5XpS6uLklr9wJkx7Bzm-qwg65um6hnVistvw,2728
 cognite/neat/_rules/models/entities/_multi_value.py,sha256=6j-nlUA392yQP_uB_CFB6_qFReNhi54ZlbFTcOKpbKY,2755
-cognite/neat/_rules/models/entities/_single_value.py,sha256=dVfqIx3_Agi_LddhsqPOyWcAt0s06PNpRxrW-7n-z0Y,18513
+cognite/neat/_rules/models/entities/_single_value.py,sha256=GW1R8ko1vwjGhAs2Fl5BGgpz3qtiYnYoahT4hBgJdkA,19441
 cognite/neat/_rules/models/entities/_types.py,sha256=df9rnXJJKciv2Bp-Ve2q4xdEJt6WWniq12Z0hW2d6sk,1917
 cognite/neat/_rules/models/entities/_wrapped.py,sha256=FxC8HztW_tUUtuArAOwxyFfkdJnSEB4bgZoNmmmfiPk,7137
 cognite/neat/_rules/models/information/__init__.py,sha256=lV7l8RTfWBvN_DFkzea8OzADjq0rZGgWe_0Fiwtfje0,556
@@ -212,7 +212,7 @@ cognite/neat/_session/_mapping.py,sha256=brXv1C7426OwknAulYzv55xKVBtCdeAqwPZ1Moe
 cognite/neat/_session/_prepare.py,sha256=uJemU23b-mR-fsgkvlYIQe_qrEC2ZicuNO8GATLWHWE,29588
 cognite/neat/_session/_read.py,sha256=3HbzXbfXmIv6D5f47OgzF1Lgs8gvyH_pyWHfBvlEQH4,20459
 cognite/neat/_session/_set.py,sha256=DflpDN4gc9Iu7RfuitId-1IJZDBIW8pn4wBOLYJs71s,2353
-cognite/neat/_session/_show.py,sha256=imSp95XTAOXJf9l-Vxxtmhen4n7i8D2h8QTlDeYlZt4,15500
+cognite/neat/_session/_show.py,sha256=4PAqOxS_T0Q1S9ltCiqDh4yKl4m5FHls8pBFDSRp-60,15402
 cognite/neat/_session/_state.py,sha256=rqKHkikagO1pf_fKpY-LZI1X5R_v6AyYpV72_3eSduM,5783
 cognite/neat/_session/_to.py,sha256=7SBZ-wXkmJE9f1UgMdqlaQ31yU4l_E81I3ftLXWzi1w,9316
 cognite/neat/_session/_wizard.py,sha256=O8d0FA87RIoiTOD2KLyTVsxwA2-ewAG2By4JfxXSL84,1474
@@ -230,6 +230,7 @@ cognite/neat/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 cognite/neat/_utils/auth.py,sha256=Y35foeQHHbnAWhfDtgNqXGOoPqBk5gtrfhPWgoSa5XQ,13444
 cognite/neat/_utils/auxiliary.py,sha256=WFOycFgoYipvDmtGvn6ZNH3H8iNZmHamrfe2kXRb8lM,6667
 cognite/neat/_utils/collection_.py,sha256=Q_LN1qypr0SeAV3dAR5KLD1szHNohSdYxyA8hr3n4T8,1433
+cognite/neat/_utils/io_.py,sha256=D2Mg8sOxfBoDg3fC0jBzaxO3vkXmr0QvZSgYIv6xRkM,386
 cognite/neat/_utils/rdf_.py,sha256=_nmZqo6_Ef7Aep0kXR_uoiRxGQR2u5lMK4g5mxWneeY,8586
 cognite/neat/_utils/reader/__init__.py,sha256=fPkrNB_9hLB7CyHTCFV_xEbIfOMqUQzNly5JN33-QfM,146
 cognite/neat/_utils/reader/_base.py,sha256=mk_kZDnfg5LcvYJr5IiBosYwbF82mLWo1p1Wq3K2p_Y,4681
@@ -238,7 +239,7 @@ cognite/neat/_utils/text.py,sha256=0IffvBIAmeGh92F4T6xiEdd-vv3B7FOGEMbfuTktO5Y,4
 cognite/neat/_utils/time_.py,sha256=O30LUiDH9TdOYz8_a9pFqTtJdg8vEjC3qHCk8xZblG8,345
 cognite/neat/_utils/upload.py,sha256=iWKmsQgw4EHLv-11NjYu7zAj5LtqTAfNa87a1kWeuaU,5727
 cognite/neat/_utils/xml_.py,sha256=FQkq84u35MUsnKcL6nTMJ9ajtG9D5i1u4VBnhGqP2DQ,1710
-cognite/neat/_version.py,sha256=XasIHNUoR5yEKcSpbN-2IEcv1b20UHkxPc8KrEJo6II,46
+cognite/neat/_version.py,sha256=CxnOw_AydGeiyL5JDLpMWSJxR74QM4HNXJkepkmVhjo,46
 cognite/neat/_workflows/__init__.py,sha256=CbnZi0l84-ixeQQCnhE6ldpemzCf-mZtf5UpxW_sS8U,420
 cognite/neat/_workflows/base.py,sha256=O1pcmfbme2gIVF2eOGrKZSUDmhZc8L9rI8UfvLN2YAM,26839
 cognite/neat/_workflows/cdf_store.py,sha256=3pebnATPo6In4-1srpa3wzstynTOi3T6hwFX5uaie4c,18050
@@ -267,8 +268,8 @@ cognite/neat/_workflows/tasks.py,sha256=dr2xuIb8P5e5e9p_fjzRlvDbKsre2xGYrkc3wnRx
 cognite/neat/_workflows/triggers.py,sha256=u69xOsaTtM8_WD6ZeIIBB-XKwvlZmPHAsZQh_TnyHcM,7073
 cognite/neat/_workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-0.103.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.103.0.dist-info/METADATA,sha256=2369m9OcvLldJSc94bGxCbHHlPAr3ERzHPk2dy1Ruv4,5708
-cognite_neat-0.103.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-cognite_neat-0.103.0.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
-cognite_neat-0.103.0.dist-info/RECORD,,
+cognite_neat-0.103.1.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.103.1.dist-info/METADATA,sha256=2ti0M9vLhaDHSBgHIQYAxUjVGmxBNdPkwImBvqlQIhA,5708
+cognite_neat-0.103.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cognite_neat-0.103.1.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
+cognite_neat-0.103.1.dist-info/RECORD,,