cognite-neat 0.127.15__py3-none-any.whl → 0.127.17__py3-none-any.whl

cognite/neat/_data_model/importers/_table_importer/data_classes.py

@@ -180,16 +180,15 @@ class DMSContainer(TableObj):
             return self
 
         for constraint in self.constraint:
-            # Skip if already in correct format
-            if constraint.prefix in ["requires", "uniqueness"]:
+            # Skip if already in correct format or being wrong but not legacy
+            if constraint.prefix == "requires" or constraint.properties:
                 continue
 
-            # Handle missing prefix - default to "requires"
+            # This part handles legacy constraints
             if not constraint.prefix:
                 constraint.prefix = "requires"
                 constraint.properties = {"require": constraint.suffix}
 
-            # Handle legacy format with space:external_id in prefix/suffix
             else:
                 container_space = constraint.prefix
                 container_external_id = constraint.suffix

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

@@ -13,6 +13,7 @@ from ._connections import (
     ReverseConnectionTargetMissing,
 )
 from ._consistency import ViewSpaceVersionInconsistentWithDataModel
+from ._containers import ExternalContainerDoesNotExist
 from ._limits import (
     ContainerPropertyCountIsOutOfLimits,
     ContainerPropertyListSizeIsOutOfLimits,
@@ -34,6 +35,7 @@ __all__ = [
     "DataModelMissingName",
     "DataModelViewCountIsOutOfLimits",
     "DmsDataModelValidation",
+    "ExternalContainerDoesNotExist",
     "ImplementedViewNotExisting",
     "ReverseConnectionContainerMissing",
     "ReverseConnectionContainerPropertyMissing",

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

@@ -275,23 +275,25 @@ class DataModelValidator(ABC):
             return self.local_resources.containers_by_reference
 
         merged_containers: dict[ContainerReference, ContainerRequest] = {}
-        # Merge local views, combining properties if view exists in both
-        for view_ref in self.container_references:
-            cdf_container = self.cdf_resources.containers_by_reference.get(view_ref)
-            local_container = self.local_resources.containers_by_reference.get(view_ref)
+        # 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:
-                raise RuntimeError(f"Container {view_ref!s} not found in either local or CDF resources. This is a bug!")
+                raise RuntimeError(
+                    f"Container {container_ref!s} not found in either local or CDF resources. This is a bug!"
+                )
 
-            merged_containers[view_ref] = cast(ContainerRequest, (cdf_container or local_container)).model_copy(
+            merged_containers[container_ref] = cast(ContainerRequest, (cdf_container or local_container)).model_copy(
                 deep=True
             )
 
             if local_container and local_container.properties:
-                if not merged_containers[view_ref].properties:
-                    merged_containers[view_ref].properties = local_container.properties
+                if not merged_containers[container_ref].properties:
+                    merged_containers[container_ref].properties = local_container.properties
                 else:
-                    merged_containers[view_ref].properties.update(local_container.properties)
+                    merged_containers[container_ref].properties.update(local_container.properties)
 
         return merged_containers
 

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

@@ -0,0 +1,79 @@
+"""Validators for checking containers in the data model."""
+
+from cognite.neat._data_model.models.dms._view_property import ViewCorePropertyRequest
+from cognite.neat._data_model.validation.dms._base import DataModelValidator
+from cognite.neat._issues import ConsistencyError
+
+BASE_CODE = "NEAT-DMS-CONTAINER"
+
+
+class ExternalContainerDoesNotExist(DataModelValidator):
+    """
+    Validates that any container or container property referenced by a view property, when the
+    referenced container does not belong to the data model's space, exists in CDF.
+
+    ## What it does
+    For each view property that maps to a container in a different space than the data model,
+    this validator checks that:
+    - the referenced external container exists in CDF, and
+    - that the referenced container property also exists in that external container.
+
+    ## Why is this bad?
+    If a view property references a container or container property that does not exist in CDF,
+    the data model cannot be deployed. The affected view property will not function, and the
+    deployment of the entire data model will fail.
+
+    ## Example
+    View `my_space:WindTurbine` has a property `location` that maps to container
+    `other_space:WindTurbineContainer`, where `other_space` differs from `my_space`. If that
+    container does not exist in CDF, the model cannot be deployed.
+
+    Similarly, if a view property references `other_space:WindTurbineContainer` and its property
+    `gpsCoordinates`, and `gpsCoordinates` does not exist in that container in CDF, deployment
+    will also fail.
+    """
+
+    code = f"{BASE_CODE}-001"
+
+    def run(self) -> list[ConsistencyError]:
+        errors: list[ConsistencyError] = []
+
+        for view_ref, view in self.merged_views.items():
+            for property_ref, property_ in view.properties.items():
+                if not isinstance(property_, ViewCorePropertyRequest):
+                    continue
+
+                if property_.container.space == self.local_resources.data_model_reference.space:
+                    continue
+
+                # Check existence of container in CDF
+                elif property_.container not in self.cdf_resources.containers_by_reference:
+                    errors.append(
+                        ConsistencyError(
+                            message=(
+                                f"View {view_ref!s} property {property_ref!s} maps to "
+                                f"external container {property_.container!s} which does not exist in CDF."
+                            ),
+                            fix="Define necessary container in CDF",
+                            code=self.code,
+                        )
+                    )
+
+                # Check existence of container property in CDF
+                elif (
+                    property_.container_property_identifier
+                    not in self.cdf_resources.containers_by_reference[property_.container].properties
+                ):
+                    errors.append(
+                        ConsistencyError(
+                            message=(
+                                f"View {view_ref!s} property {property_ref!s} maps to "
+                                f"external container {property_.container!s} which does not have "
+                                f"property '{property_.container_property_identifier}' in CDF."
+                            ),
+                            fix="Define necessary container property in CDF",
+                            code=self.code,
+                        )
+                    )
+
+        return errors

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

@@ -35,6 +35,7 @@ from ._connections import (
     ReverseConnectionTargetMissing,
 )
 from ._consistency import ViewSpaceVersionInconsistentWithDataModel
+from ._containers import ExternalContainerDoesNotExist
 from ._views import ImplementedViewNotExisting, ViewToContainerMappingNotPossible
 
 
@@ -113,6 +114,8 @@ class DmsDataModelValidation(OnSuccessIssuesChecker):
             # Views
             ViewToContainerMappingNotPossible(local_resources, cdf_resources, self._modus_operandi),
             ImplementedViewNotExisting(local_resources, cdf_resources, self._modus_operandi),
+            # Containers
+            ExternalContainerDoesNotExist(local_resources, cdf_resources, self._modus_operandi),
             # Consistency
             ViewSpaceVersionInconsistentWithDataModel(local_resources, cdf_resources, self._modus_operandi),
             # Connections

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.127.15"
+__version__ = "0.127.17"
 __engine__ = "^2.0.4"

{cognite_neat-0.127.15.dist-info → cognite_neat-0.127.17.dist-info}/METADATA

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

{cognite_neat-0.127.15.dist-info → cognite_neat-0.127.17.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cognite/neat/__init__.py,sha256=Lo4DbjDOwnhCYUoAgPp5RG1fDdF7OlnomalTe7n1ydw,211
 cognite/neat/_exceptions.py,sha256=ox-5hXpee4UJlPE7HpuEHV2C96aLbLKo-BhPDoOAzhA,1650
 cognite/neat/_issues.py,sha256=wH1mnkrpBsHUkQMGUHFLUIQWQlfJ_qMfdF7q0d9wNhY,1871
-cognite/neat/_version.py,sha256=TkopLCNlwlXxpTUuKeSgUFDJgQhM3EsmaUXt1_UL7Ek,47
+cognite/neat/_version.py,sha256=LjfnB6yr-MAZtYMhY0G634kZSP7d49DCRuq6vzSYrzM,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/v1.py,sha256=owqW5Mml2DSZx1AvPvwNRTBngfhBNrQ6EH-7CKL7Jp0,61
 cognite/neat/_client/__init__.py,sha256=75Bh7eGhaN4sOt3ZcRzHl7pXaheu1z27kmTHeaI05vo,114
@@ -38,7 +38,7 @@ cognite/neat/_data_model/importers/__init__.py,sha256=dHnKnC_AXk42z6wzEHK15dxIOh
 cognite/neat/_data_model/importers/_api_importer.py,sha256=H8Ow3Tt7utuAuBhC6s7yWvhGqunHAtE0r0XRsVAr6IE,7280
 cognite/neat/_data_model/importers/_base.py,sha256=NRB0FcEBj4GaethU68nRffBfTedBBA866A3zfJNfmiQ,433
 cognite/neat/_data_model/importers/_table_importer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/_data_model/importers/_table_importer/data_classes.py,sha256=z5Gx6Ii4xl9tGp1evnB4pn9i3zPMmWPUifFQGR4StDg,9541
+cognite/neat/_data_model/importers/_table_importer/data_classes.py,sha256=5gFeAjAYFlzOBb9cfKZWeih5psKynpJwPMNel7h6cO8,9496
 cognite/neat/_data_model/importers/_table_importer/importer.py,sha256=lQ4_Gpv0haEwQEDYZJaxtR9dL6Y0ys9jbjFfWxH6s2o,8870
 cognite/neat/_data_model/importers/_table_importer/reader.py,sha256=v7_PWuOtUQwRTTkZRw4z37G2IF9BtrMozmnnaM9avKE,40759
 cognite/neat/_data_model/importers/_table_importer/source.py,sha256=h7u5ur5oetmvBs3wgj7Ody5uPF21QwxeAceoIhJ5qzo,3300
@@ -72,13 +72,14 @@ cognite/neat/_data_model/models/entities/_data_types.py,sha256=DfdEWGek7gODro-_0
 cognite/neat/_data_model/models/entities/_identifiers.py,sha256=uBiK4ot3V0b_LGXuJ7bfha6AEcFI3p2letr1z2iSvig,1923
 cognite/neat/_data_model/models/entities/_parser.py,sha256=zef_pSDZYMZrJl4IKreFDR577KutfhtN1xpH3Ayjt2o,7669
 cognite/neat/_data_model/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/_data_model/validation/dms/__init__.py,sha256=6bCjHBd0_E21A5W-VuHhLQ_u-xxvkcpYTPtzuA9pJd0,2096
+cognite/neat/_data_model/validation/dms/__init__.py,sha256=EOGdTYOgDkFBmMe6haQ24fuC3fhEJwbfVD7qtJ_Lwac,2188
 cognite/neat/_data_model/validation/dms/_ai_readiness.py,sha256=SI46roGc2pbZQwY-6tuSWyS7uMbg2mIzXcVA3NPRCk4,6742
-cognite/neat/_data_model/validation/dms/_base.py,sha256=9sKDuofVPODWLyXuj20cOK8vQb8yexcN80W2Q5s0xdM,13025
+cognite/neat/_data_model/validation/dms/_base.py,sha256=y95k6HWGxX_EnnyuV2ooftgiyC-fwJaaHW28oEf9oBs,13113
 cognite/neat/_data_model/validation/dms/_connections.py,sha256=goIcsGV4yYb-d9ltXg4eM5qxt8iErIIxtkiKJXZUYyM,26937
 cognite/neat/_data_model/validation/dms/_consistency.py,sha256=K0mfAwwpW6zQXGDEldrA7Lgqk-giV_Y-gUKyb8Dw47k,2445
+cognite/neat/_data_model/validation/dms/_containers.py,sha256=62-AfweC9ZaHJkryeQ3N-3FiicnyBMnz3PcVsIXIUkU,3601
 cognite/neat/_data_model/validation/dms/_limits.py,sha256=LVxF1qmeEdUVVAPmywCgxWJ9BR7Ai6nI4X1ylJ7pv8I,15982
-cognite/neat/_data_model/validation/dms/_orchestrator.py,sha256=fjh-9SIJlMNbIGip2p7TqrlVS7Fmu_rjmdpRujJ28yM,9871
+cognite/neat/_data_model/validation/dms/_orchestrator.py,sha256=sJpJJR6JfGBGC0ADQl23-KeemHziGTkTapVemds4gnc,10048
 cognite/neat/_data_model/validation/dms/_views.py,sha256=3bHEEbFKTR_QH_tiJYHppQsZ9ruApv-kdyfehEjIlCU,4198
 cognite/neat/_session/__init__.py,sha256=owqW5Mml2DSZx1AvPvwNRTBngfhBNrQ6EH-7CKL7Jp0,61
 cognite/neat/_session/_issues.py,sha256=M_tYwYiHvvYToaVHCqeSIn4oAO0RZuVtxzd5W52Tn8s,2558
@@ -310,7 +311,7 @@ cognite/neat/v0/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4
 cognite/neat/v0/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/v0/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/v0/session/engine/_load.py,sha256=u0x7vuQCRoNcPt25KJBJRn8sJabonYK4vtSZpiTdP4k,5201
-cognite_neat-0.127.15.dist-info/METADATA,sha256=ms4xb3WULkx1g1nDQ22rSTaUhhB3DXWMtXd6BFLxo08,9150
-cognite_neat-0.127.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.127.15.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.127.15.dist-info/RECORD,,
+cognite_neat-0.127.17.dist-info/METADATA,sha256=xB9AlUyFe41UJQFX_lcgH8MKm0mJ4XCKzMOMqUOABAg,9150
+cognite_neat-0.127.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.127.17.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.127.17.dist-info/RECORD,,