cognite-neat 1.0.18__tar.gz → 1.0.20__tar.gz

{cognite_neat-1.0.18 → cognite_neat-1.0.20}/PKG-INFO

@@ -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 → cognite_neat-1.0.20}/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-1.0.18 → cognite_neat-1.0.20}/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-1.0.18 → cognite_neat-1.0.20}/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-1.0.20/cognite/neat/_version.py

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

{cognite_neat-1.0.18 → cognite_neat-1.0.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-neat"
-version = "1.0.18"
+version = "1.0.20"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-1.0.18/cognite/neat/_version.py

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