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

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.16"
+__version__ = "1.0.17"
 __engine__ = "^2.0.4"

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

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

@@ -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=NWe6vYJNJJT0Uxz7Lq74J6fpGVLlbxI8usM-joa7U2M,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.16.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
-cognite_neat-1.0.16.dist-info/METADATA,sha256=c8Vvlzs386LWDcbannET6hwQeUN3jqro7eLUdRRvzoQ,6091
-cognite_neat-1.0.16.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,,