cognite-neat 1.0.15__py3-none-any.whl → 1.0.17__py3-none-any.whl

cognite/neat/_data_model/deployer/data_classes.py

@@ -622,3 +622,23 @@ class DeploymentResult(BaseDeployObject):
 
             output.update(counts)
         return output
+
+
+def humanize_changes(changes: Sequence[FieldChange]) -> str:
+    primitive_changes = get_primitive_changes(changes)
+    lines = []
+    for change in primitive_changes:
+        lines.append(f"- Field '{change.field_path}': {change.description}")
+    return "\n".join(lines)
+
+
+def get_primitive_changes(changes: Sequence[FieldChange]) -> list[PrimitiveField]:
+    primitive_changes: list[PrimitiveField] = []
+    for change in changes:
+        if isinstance(change, FieldChanges):
+            primitive_changes.extend(get_primitive_changes(change.changes))
+        elif isinstance(change, PrimitiveField):
+            primitive_changes.append(change)
+        else:
+            raise NotImplementedError(f"Unknown FieldChange type: {type(change)}")
+    return primitive_changes

cognite/neat/_data_model/models/dms/_view_filter.py

@@ -250,6 +250,9 @@ def _move_filter_key(value: Any) -> Any:
         return value
     if len(value) != 1:
         raise ValueError("Filter data must have exactly one key.")
+    # legacy filter which we want to ignore
+    if "invalid" in value:
+        return None
     if "filterType" in value:
         # Already in the correct format
         return value
@@ -280,6 +283,6 @@ def _move_filter_key(value: Any) -> Any:
         return value
 
 
-Filter = Annotated[dict[FilterTypes, FilterData], BeforeValidator(_move_filter_key)]
+Filter = Annotated[dict[FilterTypes, FilterData] | None, BeforeValidator(_move_filter_key)]
 
 FilterAdapter: TypeAdapter[Filter] = TypeAdapter(Filter)

cognite/neat/_store/_provenance.py

@@ -79,3 +79,10 @@ class Provenance(UserList[Change]):
     def provenance_without_failures(self) -> "Provenance":
         """This method removes all the failed changes from the provenance list."""
         raise NotImplementedError("Not implemented yet")
+
+    def last_physical_data_model_read(self) -> Change | None:
+        """Get last physical data model read change"""
+        for change in reversed(self):
+            if change.activity.startswith("to_data_model"):
+                return change
+        return None

cognite/neat/_store/_store.py

@@ -11,7 +11,9 @@ from cognite.neat._data_model.deployer.data_classes import DeploymentResult
 from cognite.neat._data_model.deployer.deployer import SchemaDeployer
 from cognite.neat._data_model.exporters import DMSExporter, DMSFileExporter
 from cognite.neat._data_model.exporters._api_exporter import DMSAPIExporter
+from cognite.neat._data_model.exporters._table_exporter.exporter import DMSTableExporter
 from cognite.neat._data_model.importers import DMSImporter, DMSTableImporter
+from cognite.neat._data_model.importers._api_importer import DMSAPIImporter
 from cognite.neat._data_model.models.dms import RequestSchema as PhysicalDataModel
 from cognite.neat._data_model.models.dms._limits import SchemaLimits
 from cognite.neat._exceptions import DataModelImportException
@@ -62,7 +64,9 @@ class NeatStore:
         else:
             activity = writer.export
 
-        change, _ = self._do_activity(activity, on_success, data_model=self.physical_data_model[-1], **kwargs)
+        data_model = self._gather_data_model(writer)
+
+        change, _ = self._do_activity(activity, on_success, data_model=data_model, **kwargs)
 
         if not change.issues:
             change.target_entity = "ExternalEntity"
@@ -79,6 +83,35 @@ class NeatStore:
             # Update CDF snapshot after successful deployment
             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
+
+        Args:
+            writer (DMSExporter): The exporter that will be used to write the data model.
+        """
+        # getting provenance of the last successful physical data model read
+        change = self.provenance.last_physical_data_model_read()
+
+        if not change:
+            raise RuntimeError("No successful physical data model read found in provenance.")
+
+        # We do not want to modify the data model for API representations
+        if not (change.agent == DMSAPIImporter.__name__ and isinstance(writer, DMSTableExporter)):
+            return self.physical_data_model[-1]
+
+        # This will handle data model that are partially and require to be converted to
+        # tabular representation to include all containers referenced by views.
+        copy = self.physical_data_model[-1].model_copy(deep=True)
+        container_refs = {container.as_reference() for container in copy.containers}
+
+        for view in copy.views:
+            for container in view.used_containers:
+                if container not in container_refs and (cdf_container := self.cdf_snapshot.containers.get(container)):
+                    copy.containers.append(cdf_container)
+                    container_refs.add(container)
+
+        return copy
+
     def _can_agent_do_activity(self, agent: Agents) -> None:
         """Validate if activity can be performed in the current state and considering provenance"""
         if not self.state.can_transition(agent):

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.15"
+__version__ = "1.0.17"
 __engine__ = "^2.0.4"

{cognite_neat-1.0.15.dist-info → cognite_neat-1.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.15
+Version: 1.0.17
 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.15.dist-info → cognite_neat-1.0.17.dist-info}/RECORD

@@ -22,7 +22,7 @@ cognite/neat/_data_model/deployer/_differ_container.py,sha256=mcy7PhUOfnvAxnZWNo
 cognite/neat/_data_model/deployer/_differ_data_model.py,sha256=iA7Xp-7NRvzZJXLLpJaLebkKKpv_VCBKPX6f-RU9wBk,1864
 cognite/neat/_data_model/deployer/_differ_space.py,sha256=J_AaqiseLpwQsOkKc7gmho4U2oSWAGVeEdQNepZiWw0,343
 cognite/neat/_data_model/deployer/_differ_view.py,sha256=g1xHwsoxFUaTOTtQa19nntKF3rxFzc2FxpKKFAUN_NE,11412
-cognite/neat/_data_model/deployer/data_classes.py,sha256=BYIkbzVNT_UA4MwLCa_wU0DnrzB5DMxS-mgvmZUV3_I,26522
+cognite/neat/_data_model/deployer/data_classes.py,sha256=cq86u7wuKCcvH-A_cGI_gWzlQCTIG6mrXG2MahdiGco,27299
 cognite/neat/_data_model/deployer/deployer.py,sha256=acMGnAeZnfFf-kzN5UFDiErT48bsTW7qsXhwdt9h-Mw,19096
 cognite/neat/_data_model/exporters/__init__.py,sha256=AskjmB_0Vqib4kN84bWt8-M8nO42QypFf-l-E8oA5W8,482
 cognite/neat/_data_model/exporters/_api_exporter.py,sha256=G9cqezy_SH8VdhW4o862qBHh_QcbzfP6O1Yyjvdpeog,1579
@@ -60,7 +60,7 @@ cognite/neat/_data_model/models/dms/_references.py,sha256=Mx_nxfvOrvAx7nvebhhbFw
 cognite/neat/_data_model/models/dms/_schema.py,sha256=2JFLcm52smzPdtZ69Lf02UbYAD8I_hpRbI7ZAzdxJJs,641
 cognite/neat/_data_model/models/dms/_space.py,sha256=3KvWg0bVuLpgQwhkDbsJ53ZMMmK0cKUgfyDRrSrERko,1904
 cognite/neat/_data_model/models/dms/_types.py,sha256=5-cgC53AG186OZUqkltv7pMjcGNLuH7Etbn8IUcgk1c,447
-cognite/neat/_data_model/models/dms/_view_filter.py,sha256=5pskid-4gOYxvJCtmn02m_Qav4MfRUj92GPOMk_0QZ8,10479
+cognite/neat/_data_model/models/dms/_view_filter.py,sha256=uV5cI8CA_L28Ry2KhH_bSwOx1zru31s5J5ak7TGVPj0,10577
 cognite/neat/_data_model/models/dms/_view_property.py,sha256=nJBPmw4KzJOdaQmvRfCE3A4FL-E13OsNUEufI64vLKo,9271
 cognite/neat/_data_model/models/dms/_views.py,sha256=oWSqp9_tBNwKQgj4xKICQKE3f89Ya6Xyjcms-I66zN0,8931
 cognite/neat/_data_model/models/entities/__init__.py,sha256=7dDyES7fYl9LEREal59F038RdEvfGRpUOc6n_MtSgjU,836
@@ -112,8 +112,8 @@ cognite/neat/_state_machine/__init__.py,sha256=wrtQUHETiLzYM0pFo7JC6pJCiXetHADQb
 cognite/neat/_state_machine/_base.py,sha256=-ZpeAhM6l6N6W70dET25tAzOxaaK5aa474eabwZVzjA,1112
 cognite/neat/_state_machine/_states.py,sha256=nmj4SmunpDYcBsNx8A284xnXGS43wuUuWpMMORha2DE,1170
 cognite/neat/_store/__init__.py,sha256=TvM9CcFbtOSrxydPAuJi6Bv_iiGard1Mxfx42ZFoTl0,55
-cognite/neat/_store/_provenance.py,sha256=tWQGa2QNPyW7FfHQBRto9eHXCxeOTzlz7DvYjAwHfuY,3102
-cognite/neat/_store/_store.py,sha256=79D3aczHRJiPIdivusxulaMig516hFagM7o5P5tCnDs,7773
+cognite/neat/_store/_provenance.py,sha256=1zzRDWjR9twZu2jVyIG3UdYdIXtQKJ7uF8a0hV7LEuA,3368
+cognite/neat/_store/_store.py,sha256=Jibx6kKAH8V6iUOegDOcSLTplGLxmuXCLfjbdff_wvI,9367
 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=268u-66yyUprLq8ofXrWuOM4lnZC4230kYs69ctFk1s,45
+cognite/neat/_version.py,sha256=o7GgrsHFEMJXof4FVslWa-ZccQkVdswvAIXHizqt_1I,45
 cognite/neat/legacy.py,sha256=eI2ecxOV8ilGHyLZlN54ve_abtoK34oXognkFv3yvF0,219
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-1.0.15.dist-info/WHEEL,sha256=ZyFSCYkV2BrxH6-HRVRg3R9Fo7MALzer9KiPYqNxSbo,79
-cognite_neat-1.0.15.dist-info/METADATA,sha256=cduxycIq6NfXphIiQ4ERvE0zDgsSY9RZjGwPSVx1pO0,6091
-cognite_neat-1.0.15.dist-info/RECORD,,
+cognite_neat-1.0.17.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
+cognite_neat-1.0.17.dist-info/METADATA,sha256=o2xcMmYzEhkFNrboqpljF7fhET9EL6vJvjnUXdd15YI,6091
+cognite_neat-1.0.17.dist-info/RECORD,,

{cognite_neat-1.0.15.dist-info → cognite_neat-1.0.17.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.18
+Generator: uv 0.9.22
 Root-Is-Purelib: true
 Tag: py3-none-any