cognite-neat 0.100.0__py3-none-any.whl → 0.100.1__py3-none-any.whl

cognite/neat/_client/_api/data_modeling_loaders.py

@@ -3,7 +3,7 @@ from abc import ABC, abstractmethod
 from collections.abc import Callable, Collection, Iterable, Sequence
 from dataclasses import dataclass, field
 from graphlib import TopologicalSorter
-from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar, cast
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, Literal, TypeVar, cast
 
 from cognite.client.data_classes import filters
 from cognite.client.data_classes._base import (
@@ -363,9 +363,16 @@ class SpaceLoader(DataModelingLoader[str, SpaceApply, Space, SpaceApplyList, Spa
         return SpaceApplyList(schema.spaces.values())
 
     def has_data(self, item_id: str) -> bool:
-        return bool(self._client.data_modeling.instances.list("node", limit=1, space=item_id)) or bool(
-            self._client.data_modeling.instances.list("edge", limit=1, space=item_id)
-        )
+        if self._client.data_modeling.instances.list("node", limit=1, space=item_id):
+            return True
+        if self._client.data_modeling.instances.list("edge", limit=1, space=item_id):
+            return True
+        # Need to check if there are any containers with data in the space. Typically,
+        # a schema space will not contain data, while it will have containers that have data in an instance space.
+        for container in self._client.data_modeling.containers(space=item_id, include_global=False):
+            if self._client.loaders.containers.has_data(container.as_id()):
+                return True
+        return False
 
 
 class ContainerLoader(DataModelingLoader[ContainerId, ContainerApply, Container, ContainerApplyList, ContainerList]):
@@ -490,10 +497,23 @@ class ContainerLoader(DataModelingLoader[ContainerId, ContainerApply, Container,
         return ContainerApplyList(schema.containers.values())
 
     def has_data(self, item_id: ContainerId) -> bool:
-        has_data = filters.HasData(containers=[item_id])
-        return bool(self._client.data_modeling.instances.list("node", limit=1, filter=has_data)) or bool(
-            self._client.data_modeling.instances.list("edge", limit=1, filter=has_data)
-        )
+        has_data_filter = filters.HasData(containers=[item_id])
+        has_data = False
+        instance_type: Literal["node", "edge"]
+        # Mypy does not understand that the instance type is Literal["node", "edge"]
+        for instance_type in ["node", "edge"]:  # type: ignore[assignment]
+            try:
+                has_data = bool(
+                    self._client.data_modeling.instances.list(instance_type, limit=1, filter=has_data_filter)
+                )
+            except CogniteAPIError as e:
+                if e.code != 400:
+                    # If the container is used for nodes and we ask for edges, we get a 400 error. This
+                    # means there is no edge data for this container.
+                    raise
+            if has_data:
+                return True
+        return has_data
 
 
 class ViewLoader(DataModelingLoader[ViewId, ViewApply, View, ViewApplyList, ViewList]):

cognite/neat/_rules/exporters/_rules2dms.py

@@ -304,12 +304,12 @@ class DMSExporter(CDFExporter[DMSRules, DMSSchema]):
                 and not loader.in_space(item, self.include_space)
             ):
                 continue
-
-            cdf_item = cdf_item_by_id.get(loader.get_id(item))
+            item_id = loader.get_id(item)
+            cdf_item = cdf_item_by_id.get(item_id)
             if cdf_item is None:
                 categorized.to_create.append(item)
             elif is_redeploying or self.existing == "recreate":
-                if loader.has_data(cdf_item) and not self.drop_data:
+                if not self.drop_data and loader.has_data(item_id):
                     categorized.to_skip.append(cdf_item)
                 else:
                     categorized.to_delete.append(cdf_item.as_write())

cognite/neat/_session/_to.py

@@ -132,7 +132,7 @@ class CDFToAPI:
         dry_run: bool = False,
         drop_data: bool = False,
         components: Component | Collection[Component] | None = None,
-    ):
+    ) -> UploadResultList:
         """Export the verified DMS data model to CDF.
 
         Args:
@@ -164,5 +164,5 @@ class CDFToAPI:
             result = exporter.export_to_cdf(self._state.data_model.last_verified_dms_rules[1], self._client, dry_run)
         result.insert(0, UploadResultCore(name="schema", issues=conversion_issues))
         self._state.data_model.outcome.append(result)
-        print("You can inspect the details with the .inspect.data_model.outcome(...) method.")
+        print("You can inspect the details with the .inspect.outcome.data_model(...) method.")
         return result

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.100.0"
+__version__ = "0.100.1"
 __engine__ = "^2.0.1"

{cognite_neat-0.100.0.dist-info → cognite_neat-0.100.1.dist-info}/METADATA

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

{cognite_neat-0.100.0.dist-info → cognite_neat-0.100.1.dist-info}/RECORD

@@ -73,7 +73,7 @@ cognite/neat/_app/ui/neat-app/src/views/WorkflowView.tsx,sha256=dU6xZip3MVaVzKAF
 cognite/neat/_app/ui/neat-app/tsconfig.json,sha256=sw7AweQXRyJAIQ8Beft_380Q8zBr54pG1P_wutdPAIQ,664
 cognite/neat/_client/__init__.py,sha256=XpWT30mZdAJNHV84NJAWyAd2jZEGq9-IwvwK_wsOHdQ,177
 cognite/neat/_client/_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/_client/_api/data_modeling_loaders.py,sha256=1uxFZCVOSShWOy4wyMfCGVzOSJML_2GFrDn3Xqwz8ic,32943
+cognite/neat/_client/_api/data_modeling_loaders.py,sha256=SBAz0MDJjw7FWjZOLpZZWJ741DdiEYI16iEJu_u5iuQ,33965
 cognite/neat/_client/_api/schema.py,sha256=ZxO9FkgFGF_sI6yVmrztWvb2zo7Exgxtq4-SX2dpISY,4830
 cognite/neat/_client/_api_client.py,sha256=6cNMizDuqMJZiOqiNRLX46BEtlCB-BpgGLyypksRVYU,616
 cognite/neat/_client/data_classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -149,7 +149,7 @@ cognite/neat/_rules/catalog/__init__.py,sha256=dzx-DYYJDc861aFiOI5o1FsySD9F1agY8
 cognite/neat/_rules/catalog/info-rules-imf.xlsx,sha256=7odm5CoAU72-VTZk_z1u7GbycIb-X-8Yy3mtBGLjhE4,55511
 cognite/neat/_rules/exporters/__init__.py,sha256=jCwXAeyZJv7GNJ3hGG-80gb8LAidozsyFMzdNIsGt_Y,1204
 cognite/neat/_rules/exporters/_base.py,sha256=vadYWb5hVbjiPIhVIzlY6ARisoqhtJa6Ce0ysNHPXQc,1328
-cognite/neat/_rules/exporters/_rules2dms.py,sha256=13vr0RfZ1OdJKQh9Ye06HhY9MibyI6fIjAZNXOjPzM8,15784
+cognite/neat/_rules/exporters/_rules2dms.py,sha256=csaFRdebr8WzqjUcUpjnKkTfbPctk_5D-w-G0p_WtsA,15812
 cognite/neat/_rules/exporters/_rules2excel.py,sha256=puFgIf_dolxv38Lkgzl9lDDREWDPdTApqgYCu9H-hf4,11689
 cognite/neat/_rules/exporters/_rules2instance_template.py,sha256=8HM1SkzcucaEYpQi96ncMnL8STArX9Oe09JBhJJAN4I,5810
 cognite/neat/_rules/exporters/_rules2ontology.py,sha256=ioMi1GUhnbvcfVOPb3Z0a24mIEe74AfxySETWMDS9Lc,21776
@@ -213,7 +213,7 @@ cognite/neat/_session/_read.py,sha256=4G34X_7hNs5V0gCLHPR1ktva6-fyGmwVc1Qu7T5yQd
 cognite/neat/_session/_set.py,sha256=NY0Vz8xD_a-UA8qWE1GFxHdmBl1BkT1KHQehQVKUorI,1914
 cognite/neat/_session/_show.py,sha256=_ev_Z41rkW4nlvhLf69PmttggKksnkCchOow7CmICyU,14124
 cognite/neat/_session/_state.py,sha256=rqKHkikagO1pf_fKpY-LZI1X5R_v6AyYpV72_3eSduM,5783
-cognite/neat/_session/_to.py,sha256=4BlDplDeWpKDtlU_gRsnWUtUU5O8udu60M99Clkj8uE,7345
+cognite/neat/_session/_to.py,sha256=_NJn8tGTEcAoWpuCI6stquKNBuD8CqHqXLpSKkeT_1g,7365
 cognite/neat/_session/_wizard.py,sha256=O8d0FA87RIoiTOD2KLyTVsxwA2-ewAG2By4JfxXSL84,1474
 cognite/neat/_session/engine/__init__.py,sha256=aeI5pzljU5n1B-SVu3LwjYVsN1tSVhnJj-4ddflEo4U,120
 cognite/neat/_session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
@@ -236,7 +236,7 @@ cognite/neat/_utils/text.py,sha256=PvTEsEjaTu8SE8yYaKUrce4msboMj933dK7-0Eey_rE,3
 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=eh_DxNC2vregq7YQ4Xva_dCIhx2cQZZzwj9dWC8c9Ro,46
+cognite/neat/_version.py,sha256=nA_YK6_YjwJqujTlS_0t_IcLFjNgqEIsI8sSheyAdKI,46
 cognite/neat/_workflows/__init__.py,sha256=S0fZq7kvoqDKodHu1UIPsqcpdvXoefUWRPt1lqeQkQs,420
 cognite/neat/_workflows/base.py,sha256=O1pcmfbme2gIVF2eOGrKZSUDmhZc8L9rI8UfvLN2YAM,26839
 cognite/neat/_workflows/cdf_store.py,sha256=3pebnATPo6In4-1srpa3wzstynTOi3T6hwFX5uaie4c,18050
@@ -265,8 +265,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.100.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.100.0.dist-info/METADATA,sha256=AjYvxb6mNdDWqksrQB8VxU32DVzWV-Hth9obwsZL6gU,9699
-cognite_neat-0.100.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-cognite_neat-0.100.0.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
-cognite_neat-0.100.0.dist-info/RECORD,,
+cognite_neat-0.100.1.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.100.1.dist-info/METADATA,sha256=_uca35iR6CWYhSThIO4TX9xD6alAHLmNcjr9Jwda7UE,9699
+cognite_neat-0.100.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cognite_neat-0.100.1.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
+cognite_neat-0.100.1.dist-info/RECORD,,