industrial-model 1.0.1__tar.gz → 1.1.1__tar.gz

{industrial_model-1.0.1 → industrial_model-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: industrial-model
-Version: 1.0.1
+Version: 1.1.1
 Summary: Industrial Model ORM
 Project-URL: Homepage, https://github.com/lucasrosaalves/industrial-model
 Project-URL: Source, https://github.com/lucasrosaalves/industrial-model
@@ -309,7 +309,7 @@ instances = engine.query_all_pages(
 for instance in instances:
     instance.aliases.append("new_alias")
 
-engine.upsert(instances, replace=False)
+engine.upsert(instances, replace=False, remove_unset=False)
 ```
 
 ---

{industrial_model-1.0.1 → industrial_model-1.1.1}/README.md

@@ -285,7 +285,7 @@ instances = engine.query_all_pages(
 for instance in instances:
     instance.aliases.append("new_alias")
 
-engine.upsert(instances, replace=False)
+engine.upsert(instances, replace=False, remove_unset=False)
 ```
 
 ---

{industrial_model-1.0.1 → industrial_model-1.1.1}/industrial_model/cognite_adapters/__init__.py

@@ -124,20 +124,29 @@ class CogniteAdapter:
         return data
 
     def upsert(
-        self, entries: list[TWritableViewInstance], replace: bool = False
+        self,
+        entries: list[TWritableViewInstance],
+        replace: bool = False,
+        remove_unset: bool = False,
     ) -> None:
         logger = logging.getLogger(__name__)
-        operation = self._upsert_mapper.map(entries)
+        operation = self._upsert_mapper.map(entries, remove_unset)
 
         for node_chunk in operation.chunk_nodes():
-            logger.debug(f"Upserting {len(node_chunk)} nodes (replace={replace})")
+            logger.debug(
+                f"Upserting {len(node_chunk)} nodes (replace={replace}, "
+                "remove_unset={remove_unset})"
+            )
             self._cognite_client.data_modeling.instances.apply(
                 nodes=node_chunk,
                 replace=replace,
             )
 
         for edge_chunk in operation.chunk_edges():
-            logger.debug(f"Upserting {len(edge_chunk)} edges (replace={replace})")
+            logger.debug(
+                f"Upserting {len(edge_chunk)} edges (replace={replace},"
+                "remove_unset={remove_unset})"
+            )
             self._cognite_client.data_modeling.instances.apply(
                 edges=edge_chunk,
                 replace=replace,

{industrial_model-1.0.1 → industrial_model-1.1.1}/industrial_model/cognite_adapters/upsert_mapper.py

@@ -25,14 +25,16 @@ class UpsertMapper:
     def __init__(self, view_mapper: ViewMapper):
         self._view_mapper = view_mapper
 
-    def map(self, instances: list[TWritableViewInstance]) -> UpsertOperation:
+    def map(
+        self, instances: list[TWritableViewInstance], remove_unset: bool
+    ) -> UpsertOperation:
         nodes: dict[tuple[str, str], NodeApply] = {}
         edges: dict[tuple[str, str], EdgeApply] = {}
         edges_to_delete: dict[tuple[str, str], EdgeContainer] = {}
 
         for instance in instances:
             entry_nodes, entry_edges, entry_edges_to_delete = self._map_instance(
-                instance
+                instance, remove_unset
             )
 
             nodes[instance.as_tuple()] = entry_nodes
@@ -48,7 +50,7 @@ class UpsertMapper:
         )
 
     def _map_instance(
-        self, instance: TWritableViewInstance
+        self, instance: TWritableViewInstance, remove_unset: bool
     ) -> tuple[NodeApply, list[EdgeApply], list[EdgeContainer]]:
         view = self._view_mapper.get_view(instance.get_view_external_id())
 
@@ -59,6 +61,10 @@ class UpsertMapper:
             property_key = instance.get_field_name(property_name)
             if not property_key:
                 continue
+
+            if remove_unset and property_key not in instance.model_fields_set:
+                continue
+
             entry = instance.__getattribute__(property_key)
 
             if isinstance(property, MappedProperty):

{industrial_model-1.0.1 → industrial_model-1.1.1}/industrial_model/cognite_adapters/utils.py

@@ -26,7 +26,13 @@ from industrial_model.models import (
     get_parent_and_children_nodes,
 )
 
-NODE_PROPERTIES = {"externalId", "space", "createdTime", "deletedTime"}
+NODE_PROPERTIES = {
+    "externalId",
+    "space",
+    "createdTime",
+    "deletedTime",
+    "lastUpdatedTime",
+}
 INTANCE_TYPE = Literal["node", "edge"]
 
 

{industrial_model-1.0.1 → industrial_model-1.1.1}/industrial_model/engines/async_engine.py

@@ -55,9 +55,12 @@ class AsyncEngine:
         return await self._engine.aggregate_async(statement)
 
     async def upsert_async(
-        self, entries: list[TWritableViewInstance], replace: bool = False
+        self,
+        entries: list[TWritableViewInstance],
+        replace: bool = False,
+        remove_unset: bool = False,
     ) -> None:
-        return await self._engine.upsert_async(entries, replace)
+        return await self._engine.upsert_async(entries, replace, remove_unset)
 
     async def delete_async(self, nodes: list[TViewInstance]) -> None:
         return await self._engine.delete_async(nodes)

{industrial_model-1.0.1 → industrial_model-1.1.1}/industrial_model/engines/engine.py

@@ -98,17 +98,23 @@ class Engine:
         return await run_async(self.aggregate, statement)
 
     def upsert(
-        self, entries: list[TWritableViewInstance], replace: bool = False
+        self,
+        entries: list[TWritableViewInstance],
+        replace: bool = False,
+        remove_unset: bool = False,
     ) -> None:
         if not entries:
             return
 
-        return self._cognite_adapter.upsert(entries, replace)
+        return self._cognite_adapter.upsert(entries, replace, remove_unset)
 
     async def upsert_async(
-        self, entries: list[TWritableViewInstance], replace: bool = False
+        self,
+        entries: list[TWritableViewInstance],
+        replace: bool = False,
+        remove_unset: bool = False,
     ) -> None:
-        return await run_async(self.upsert, entries, replace)
+        return await run_async(self.upsert, entries, replace, remove_unset)
 
     def delete(self, nodes: list[TViewInstance]) -> None:
         self._cognite_adapter.delete(

{industrial_model-1.0.1 → industrial_model-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "industrial-model"
-version = "1.0.1"
+version = "1.1.1"
 description = "Industrial Model ORM"
 readme = "README.md"
 requires-python = ">=3.11"