cognite-neat 1.0.18__py3-none-any.whl → 1.0.20__py3-none-any.whl

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

@@ -152,6 +152,7 @@ class DMSView(TableObj):
     description: str | None = None
     implements: EntityList | None = None
     filter: str | None = None
+    in_model: bool | None = Field(None, exclude=True, description="Legacy column")
 
     @field_validator("filter", mode="after")
     def _legacy_filter(cls, value: str | None) -> str | None:
@@ -231,6 +232,31 @@ class TableDMS(TableObj):
             return {title_case(k): v for k, v in data.items()}
         return data
 
+    @model_validator(mode="after")
+    def _drop_in_model_false_views_definitions(self) -> "TableDMS":
+        """These method is used to drop definition of legacy views which have In Model column set to False
+        We need to drop these views from Views sheet and also drop their properties from Properties sheet.
+        """
+
+        views_to_drop: set[Entity] = set()
+        for view in self.views:
+            if isinstance(view.in_model, bool) and not view.in_model:
+                views_to_drop.add(view.view)
+
+        if not views_to_drop:
+            return self
+
+        print(
+            "You are using legacy `In Model` column which is no longer in use!"
+            f"\nTotal of {len(views_to_drop)} views has `In Model` set to False."
+            f"\nThese views and their property definitions will be dropped from the session!"
+        )
+
+        self.views = [view for view in self.views if view.view not in views_to_drop]
+        self.properties = [prop for prop in self.properties if prop.view not in views_to_drop]
+
+        return self
+
     @classmethod
     def get_sheet_columns(
         cls, sheet_id: str, sheet: FieldInfo | None = None, *, column_type: Literal["all", "required"] = "required"

cognite/neat/_session/_physical.py

@@ -106,7 +106,7 @@ class ReadPhysicalDataModel:
         on_success = DmsDataModelValidation(
             modus_operandi=self._config.modeling.mode,
             cdf_snapshot=self._store.cdf_snapshot,
-            limits=self._store.limits,
+            limits=self._store.cdf_limits,
             can_run_validator=self._config.validation.can_run_validator,
             enable_alpha_validators=self._config.alpha.enable_experimental_validators,
         )
@@ -135,7 +135,7 @@ class ReadPhysicalDataModel:
         on_success = DmsDataModelValidation(
             modus_operandi=self._config.modeling.mode,
             cdf_snapshot=self._store.cdf_snapshot,
-            limits=self._store.limits,
+            limits=self._store.cdf_limits,
             can_run_validator=self._config.validation.can_run_validator,
             enable_alpha_validators=self._config.alpha.enable_experimental_validators,
         )
@@ -155,7 +155,7 @@ class ReadPhysicalDataModel:
         on_success = DmsDataModelValidation(
             modus_operandi=self._config.modeling.mode,
             cdf_snapshot=self._store.cdf_snapshot,
-            limits=self._store.limits,
+            limits=self._store.cdf_limits,
             can_run_validator=self._config.validation.can_run_validator,
             enable_alpha_validators=self._config.alpha.enable_experimental_validators,
         )
@@ -178,7 +178,7 @@ class ReadPhysicalDataModel:
         on_success = DmsDataModelValidation(
             modus_operandi=self._config.modeling.mode,
             cdf_snapshot=self._store.cdf_snapshot,
-            limits=self._store.limits,
+            limits=self._store.cdf_limits,
             can_run_validator=self._config.validation.can_run_validator,
             enable_alpha_validators=self._config.alpha.enable_experimental_validators,
         )

cognite/neat/_store/_store.py

@@ -34,9 +34,21 @@ class NeatStore:
         self._client = client
         self._config = config
 
-        # Caching CDF Schema limits and snapshot
-        self.limits = SchemaLimits.from_api_response(self._client.statistics.project())
-        self.cdf_snapshot = SchemaSnapshot.fetch_entire_cdf(self._client)
+        # Placeholder for CDF schema and limit snapshot
+        self._cdf_snapshot: SchemaSnapshot | None = None
+        self._cdf_limits: SchemaLimits | None = None
+
+    @property
+    def cdf_limits(self) -> SchemaLimits:
+        if not self._cdf_limits:
+            self._cdf_limits = SchemaLimits.from_api_response(self._client.statistics.project())
+        return self._cdf_limits
+
+    @property
+    def cdf_snapshot(self) -> SchemaSnapshot:
+        if not self._cdf_snapshot:
+            self._cdf_snapshot = SchemaSnapshot.fetch_entire_cdf(self._client)
+        return self._cdf_snapshot
 
     def read_physical(self, reader: DMSImporter, on_success: OnSuccess | None = None) -> None:
         """Read object from the store"""
@@ -81,7 +93,7 @@ class NeatStore:
             and not on_success.options.dry_run
         ):
             # Update CDF snapshot after successful deployment
-            self.cdf_snapshot = SchemaSnapshot.fetch_entire_cdf(self._client)
+            self._cdf_snapshot = SchemaSnapshot.fetch_entire_cdf(self._client)
 
     def _gather_data_model(self, writer: DMSExporter) -> PhysicalDataModel:
         """Gather the current physical data model from the store

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.18"
+__version__ = "1.0.20"
 __engine__ = "^2.0.4"

{cognite_neat-1.0.18.dist-info → cognite_neat-1.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.18
+Version: 1.0.20
 Summary: Knowledge graph transformation
 Author: Nikola Vasiljevic, Anders Albert
 Author-email: Nikola Vasiljevic <nikola.vasiljevic@cognite.com>, Anders Albert <anders.albert@cognite.com>

{cognite_neat-1.0.18.dist-info → cognite_neat-1.0.20.dist-info}/RECORD

@@ -35,7 +35,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=-S379Apvz2QSchBTG89mrVdOrAo7LH_O1kjqMOlv-fk,9619
+cognite/neat/_data_model/importers/_table_importer/data_classes.py,sha256=MU3gZg9w3OO0FCJfYdbfa4e8tSNPVhkPOzpJNab4jG4,10762
 cognite/neat/_data_model/importers/_table_importer/importer.py,sha256=lQ4_Gpv0haEwQEDYZJaxtR9dL6Y0ys9jbjFfWxH6s2o,8870
 cognite/neat/_data_model/importers/_table_importer/reader.py,sha256=I9-zHCpJLo7bj4BabAzSgNBDVUAocdhlvBfy95JkWRw,49451
 cognite/neat/_data_model/importers/_table_importer/source.py,sha256=h7u5ur5oetmvBs3wgj7Ody5uPF21QwxeAceoIhJ5qzo,3300
@@ -94,7 +94,7 @@ cognite/neat/_session/_html/templates/__init__.py,sha256=hgufJuBxUZ2nLCMTCxGixmk
 cognite/neat/_session/_html/templates/deployment.html,sha256=aLDXMbF3pcSqnCpUYVGmIWfqU2jyYUUTaGfpSHRLzdU,3715
 cognite/neat/_session/_html/templates/issues.html,sha256=zjhkJcPK0hMp_ZKJ9RCf88tuZxQyTYRPxzpqx33Nkt0,1661
 cognite/neat/_session/_issues.py,sha256=E8UQeSJURg2dm4MF1pfD9dp-heSRT7pgQZgKlD1-FGs,2723
-cognite/neat/_session/_physical.py,sha256=uQ1ny5Sy3mvkSIdT5kaCwlDCA1W2U-RQouITNAu7TE0,12433
+cognite/neat/_session/_physical.py,sha256=e3i9xuLa4bMOa-mJxbf4AyLZ2UnPOPh05P-E7E0lRHY,12449
 cognite/neat/_session/_result/__init__.py,sha256=8A0BKgsqnjxkiHUlCpHBNl3mrFWtyjaWYnh0jssE6QU,50
 cognite/neat/_session/_result/_deployment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_session/_result/_deployment/_physical/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -113,7 +113,7 @@ cognite/neat/_state_machine/_base.py,sha256=-ZpeAhM6l6N6W70dET25tAzOxaaK5aa474ea
 cognite/neat/_state_machine/_states.py,sha256=nmj4SmunpDYcBsNx8A284xnXGS43wuUuWpMMORha2DE,1170
 cognite/neat/_store/__init__.py,sha256=TvM9CcFbtOSrxydPAuJi6Bv_iiGard1Mxfx42ZFoTl0,55
 cognite/neat/_store/_provenance.py,sha256=1zzRDWjR9twZu2jVyIG3UdYdIXtQKJ7uF8a0hV7LEuA,3368
-cognite/neat/_store/_store.py,sha256=Jibx6kKAH8V6iUOegDOcSLTplGLxmuXCLfjbdff_wvI,9367
+cognite/neat/_store/_store.py,sha256=PwW4hYQ-ENbCtKpGdGmsJjk0qGU4PPg0LIfhn5nNGSI,9751
 cognite/neat/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_utils/_reader.py,sha256=9dXrODNNqWU0Gx1zXjRTOiiByFuDZlpQkQEzx3HAxYQ,5390
 cognite/neat/_utils/auxiliary.py,sha256=Cx-LP8dfN782R3iUcm--q26zdzQ0k_RFnVbJ0bwVZMI,1345
@@ -316,9 +316,9 @@ cognite/neat/_v0/session/_template.py,sha256=BNcvrW5y7LWzRM1XFxZkfR1Nc7e8UgjBClH
 cognite/neat/_v0/session/_to.py,sha256=AnsRSDDdfFyYwSgi0Z-904X7WdLtPfLlR0x1xsu_jAo,19447
 cognite/neat/_v0/session/_wizard.py,sha256=baPJgXAAF3d1bn4nbIzon1gWfJOeS5T43UXRDJEnD3c,1490
 cognite/neat/_v0/session/exceptions.py,sha256=jv52D-SjxGfgqaHR8vnpzo0SOJETIuwbyffSWAxSDJw,3495
-cognite/neat/_version.py,sha256=Buh8SWFXU0sxa-m7s9PiJfRvoR-zxpBJB4QrFLZmqHk,45
+cognite/neat/_version.py,sha256=sA2ZsS8D9yHBhDKFo6czh0Y817b0hccxIxB45Dzk75o,45
 cognite/neat/legacy.py,sha256=eI2ecxOV8ilGHyLZlN54ve_abtoK34oXognkFv3yvF0,219
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-1.0.18.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
-cognite_neat-1.0.18.dist-info/METADATA,sha256=7Lg6EUBwa0BYxDgRz8iNpZY8kim0xsRIqRCDSHhYLFo,6689
-cognite_neat-1.0.18.dist-info/RECORD,,
+cognite_neat-1.0.20.dist-info/WHEEL,sha256=eycQt0QpYmJMLKpE3X9iDk8R04v2ZF0x82ogq-zP6bQ,79
+cognite_neat-1.0.20.dist-info/METADATA,sha256=-nVza3PgQsgHSNGru9JTxml_7T4k4UqxhQo4hrbMMG0,6689
+cognite_neat-1.0.20.dist-info/RECORD,,