cognite-neat 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

cognite/neat/_data_model/exporters/_table_exporter/writer.py

@@ -23,6 +23,7 @@ from cognite.neat._data_model.models.dms import (
     DataType,
     DirectNodeRelation,
     EnumProperty,
+    FilterAdapter,
     ListablePropertyTypeDefinition,
     NodeReference,
     RequestSchema,
@@ -298,7 +299,9 @@ class DMSTableWriter:
                 implements=[self._create_view_entity(parent) for parent in view.implements]
                 if view.implements
                 else None,
-                filter=json.dumps(view.filter) if view.filter else None,
+                filter=FilterAdapter.dump_json(view.filter, by_alias=True).decode(encoding="utf-8")
+                if view.filter
+                else None,
             )
             for view in views
         ]

cognite/neat/_data_model/validation/dms/_base.py

@@ -224,27 +224,41 @@ class DataModelValidator(ABC):
             RuntimeError: If a referenced view is not found in either local or CDF resources.
         """
 
-        if self.modus_operandi != "additive":
-            return self.local_resources.views_by_reference
-
         merged_views: dict[ViewReference, ViewRequest] = {}
+
         # Merge local views, combining properties if view exists in both
+        # if rebuild mode , self.view_references returns only local views ref
         for view_ref in self.views_references:
             cdf_view = self.cdf_resources.views_by_reference.get(view_ref)
             local_view = self.local_resources.views_by_reference.get(view_ref)
 
-            if not cdf_view and not local_view:
+            if self.modus_operandi == "additive" and not cdf_view and not local_view:
                 raise RuntimeError(f"View {view_ref!s} not found in either local or CDF resources. This is a bug!")
+            elif self.modus_operandi == "rebuild" and not local_view:
+                raise RuntimeError(f"View {view_ref!s} not found in local resources. This is a bug!")
 
-            # this will later update of local properties and implements
             merged_views[view_ref] = cast(ViewRequest, (cdf_view or local_view)).model_copy(deep=True)
 
+            # in additive mode, we start off with CDF view as base , which we will update with local
+            if (
+                self.modus_operandi == "additive"
+                or cast(ViewRequest, local_view).space != self.local_resources.data_model_reference.space
+            ):
+                merged_views[view_ref] = cast(ViewRequest, (cdf_view or local_view)).model_copy(deep=True)
+
+            # rebuild mode
+            else:
+                merged_views[view_ref] = cast(ViewRequest, local_view).model_copy(deep=True)
+
+            # this will later update of local properties and implements
             if local_view and local_view.properties:
                 if not merged_views[view_ref].properties:
                     merged_views[view_ref].properties = local_view.properties
                 else:
                     merged_views[view_ref].properties.update(local_view.properties)
 
+            # Special handling for properties which originates from implements
+
             if local_view and local_view.implements:
                 if not merged_views[view_ref].implements:
                     merged_views[view_ref].implements = local_view.implements
@@ -253,6 +267,27 @@ class DataModelValidator(ABC):
                         if impl not in cast(list[ViewReference], merged_views[view_ref].implements):
                             cast(list[ViewReference], merged_views[view_ref].implements).append(impl)
 
+                # this handles an edge case where view is defined locally, implements another view, which is not
+                # present locally, but only in CDF, this could be typically the case when we define a view which
+                # implements a Core Data Model view, while not defining any of its own properties (not uncommon)
+                # locally in for example Excel sheets
+                for implement in local_view.implements:
+                    if cdf_implement_view := self.cdf_resources.views_by_reference.get(implement):
+                        # in rebuild mode, we skip CDF views from the same space as rebuild mode is supposed to
+                        # rebuild everything from local resources only, but we still need to merge in properties
+                        # from CDF implements from other spaces
+                        if (
+                            self.modus_operandi == "rebuild"
+                            and cdf_implement_view.space == self.local_resources.data_model_reference.space
+                        ):
+                            continue
+
+                        for prop_name, prop in cdf_implement_view.properties.items():
+                            if merged_views[view_ref].properties and prop_name not in merged_views[view_ref].properties:
+                                merged_views[view_ref].properties[prop_name] = prop
+                            elif not merged_views[view_ref].properties:
+                                merged_views[view_ref].properties = {prop_name: prop}
+
         return merged_views
 
     @cached_property
@@ -274,23 +309,30 @@ class DataModelValidator(ABC):
             RuntimeError: If a referenced container is not found in either local or CDF resources.
         """
 
-        if self.modus_operandi != "additive":
-            return self.local_resources.containers_by_reference
-
         merged_containers: dict[ContainerReference, ContainerRequest] = {}
         # Merge local containers, combining properties if container exists in both
         for container_ref in self.container_references:
             cdf_container = self.cdf_resources.containers_by_reference.get(container_ref)
             local_container = self.local_resources.containers_by_reference.get(container_ref)
 
-            if not cdf_container and not local_container:
+            if self.modus_operandi == "additive" and not cdf_container and not local_container:
                 raise RuntimeError(
                     f"Container {container_ref!s} not found in either local or CDF resources. This is a bug!"
                 )
-
-            merged_containers[container_ref] = cast(ContainerRequest, (cdf_container or local_container)).model_copy(
-                deep=True
-            )
+            elif self.modus_operandi == "rebuild" and not local_container:
+                raise RuntimeError(f"Container {container_ref!s} not found in local resources. This is a bug!")
+
+            # in additive mode, we start off with CDF container as base , which we will update with local
+            if (
+                self.modus_operandi == "additive"
+                or cast(ContainerRequest, local_container).space != self.local_resources.data_model_reference.space
+            ):
+                merged_containers[container_ref] = cast(
+                    ContainerRequest, (cdf_container or local_container)
+                ).model_copy(deep=True)
+
+            else:  # rebuild mode
+                merged_containers[container_ref] = cast(ContainerRequest, local_container).model_copy(deep=True)
 
             if local_container and local_container.properties:
                 if not merged_containers[container_ref].properties:

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.1"
+__version__ = "1.0.3"
 __engine__ = "^2.0.4"

{cognite_neat-1.0.1.dist-info → cognite_neat-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.1
+Version: 1.0.3
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/

{cognite_neat-1.0.1.dist-info → cognite_neat-1.0.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ cognite/neat/__init__.py,sha256=u5EhnGuNS2GKydU6lVFCNrBpHBBKUnCDAE63Cqk__eo,244
 cognite/neat/_config.py,sha256=NXObeA-860LV40KlY4orsqjMGACa0jKRz2UE5L9kH6U,8401
 cognite/neat/_exceptions.py,sha256=ox-5hXpee4UJlPE7HpuEHV2C96aLbLKo-BhPDoOAzhA,1650
 cognite/neat/_issues.py,sha256=wH1mnkrpBsHUkQMGUHFLUIQWQlfJ_qMfdF7q0d9wNhY,1871
-cognite/neat/_version.py,sha256=4u0odea2n_kDMh-RrqZiEQvbH-i7WPm2CMDSC6GsjRA,44
+cognite/neat/_version.py,sha256=frvUE6medkh8ryei1FSKVbaV9GjqKvs0ByOYDnxdRO0,44
 cognite/neat/legacy.py,sha256=eI2ecxOV8ilGHyLZlN54ve_abtoK34oXognkFv3yvF0,219
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_client/__init__.py,sha256=75Bh7eGhaN4sOt3ZcRzHl7pXaheu1z27kmTHeaI05vo,114
@@ -34,7 +34,7 @@ cognite/neat/_data_model/exporters/_base.py,sha256=rG_qAU5i5Hh5hUMep2UmDFFZID4x3
 cognite/neat/_data_model/exporters/_table_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/exporters/_table_exporter/exporter.py,sha256=4BPu_Chtjh1EyOaKbThXYohsqllVOkCbSoNekNZuBXc,5159
 cognite/neat/_data_model/exporters/_table_exporter/workbook.py,sha256=1Afk1WqeNe9tiNeSAm0HrF8jTQ1kTbIv1D9hMztKwO8,18482
-cognite/neat/_data_model/exporters/_table_exporter/writer.py,sha256=QsO2BWB-_Jw_hpawHtG26NOnLu6wwtDosT-c1acNLPw,19270
+cognite/neat/_data_model/exporters/_table_exporter/writer.py,sha256=WAXPXjbIXrKtAKebXQ3npShbgWs_rUwdyQsCsm_jt3I,19374
 cognite/neat/_data_model/importers/__init__.py,sha256=dHnKnC_AXk42z6wzEHK15dxIOh8xSEkuUf_AFRZls0E,193
 cognite/neat/_data_model/importers/_api_importer.py,sha256=H8Ow3Tt7utuAuBhC6s7yWvhGqunHAtE0r0XRsVAr6IE,7280
 cognite/neat/_data_model/importers/_base.py,sha256=NRB0FcEBj4GaethU68nRffBfTedBBA866A3zfJNfmiQ,433
@@ -76,7 +76,7 @@ cognite/neat/_data_model/models/entities/_parser.py,sha256=zef_pSDZYMZrJl4IKreFD
 cognite/neat/_data_model/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/validation/dms/__init__.py,sha256=kKD18-Bg_G-w11Cs7Wv_TKV0C_q62Pm2RKLpOz27ar4,2642
 cognite/neat/_data_model/validation/dms/_ai_readiness.py,sha256=hFrnRzBBf143ejLHRk3BpylzrVpxUX537BouOlv4PFE,15552
-cognite/neat/_data_model/validation/dms/_base.py,sha256=3Lqs8pzMQZznxhUr8esEe9H7F2wM3EKEl2H64GLS5OA,13344
+cognite/neat/_data_model/validation/dms/_base.py,sha256=207zS_aTQYZc16jLHfJSz5Idma0ZAgIuZZjVFnN0q4A,16271
 cognite/neat/_data_model/validation/dms/_connections.py,sha256=6ea8WZNqYT9SPluwXvg0mgDJpzZMqpPC5xonbdLrT4E,27305
 cognite/neat/_data_model/validation/dms/_consistency.py,sha256=uJ6coAVupD3WfeeXxoCIebM8WSnR78GXBXIBnN59aao,2477
 cognite/neat/_data_model/validation/dms/_containers.py,sha256=UuvzrBBw45F5f9uzCh97lW4t7m7XIIT1I9FnzzYUYv4,7533
@@ -312,7 +312,7 @@ cognite/neat/_v0/session/_to.py,sha256=AnsRSDDdfFyYwSgi0Z-904X7WdLtPfLlR0x1xsu_j
 cognite/neat/_v0/session/_wizard.py,sha256=baPJgXAAF3d1bn4nbIzon1gWfJOeS5T43UXRDJEnD3c,1490
 cognite/neat/_v0/session/exceptions.py,sha256=jv52D-SjxGfgqaHR8vnpzo0SOJETIuwbyffSWAxSDJw,3495
 cognite/neat/_v0/session/_state/README.md,sha256=o6N7EL98lgyWffw8IoEUf2KG5uSKveD5__TW45YzVjA,902
-cognite_neat-1.0.1.dist-info/METADATA,sha256=l7yHL8mmgURNdl9lHb2Gy6QmuUg8zaMJCYwEzUDTt8o,6030
-cognite_neat-1.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-cognite_neat-1.0.1.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-1.0.1.dist-info/RECORD,,
+cognite_neat-1.0.3.dist-info/METADATA,sha256=8WESd9hWsL4-9kskDTTa4oYXY_Dv9RJJiy2W8ngdBLA,6030
+cognite_neat-1.0.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+cognite_neat-1.0.3.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-1.0.3.dist-info/RECORD,,