industrial-model 0.1.18__tar.gz → 0.1.20__tar.gz

{industrial_model-0.1.18 → industrial_model-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: industrial-model
-Version: 0.1.18
+Version: 0.1.20
 Summary: Industrial Model ORM
 Author-email: Lucas Alves <lucasrosaalves@gmail.com>
 Classifier: Programming Language :: Python
@@ -229,6 +229,22 @@ class AggregateByNamePerson(AggregatedViewInstance):
 aggregate_result = engine.aggregate(aggregate(AggregateByNamePerson, "count"))
 
 
+
+# 9. Deletion
+
+class Entity(ViewInstance):
+    view_config = ViewInstanceConfig(
+        view_external_id="Person"
+    )
+    name: str
+
+
+statement = select(Entity).where(Entity.external_id == "Lucas")
+person = engine.query_all_pages(statement)[0]
+
+
+engine.delete([person])
+
 ```
 
 ---

{industrial_model-0.1.18 → industrial_model-0.1.20}/README.md

@@ -209,6 +209,22 @@ class AggregateByNamePerson(AggregatedViewInstance):
 aggregate_result = engine.aggregate(aggregate(AggregateByNamePerson, "count"))
 
 
+
+# 9. Deletion
+
+class Entity(ViewInstance):
+    view_config = ViewInstanceConfig(
+        view_external_id="Person"
+    )
+    name: str
+
+
+statement = select(Entity).where(Entity.external_id == "Lucas")
+person = engine.query_all_pages(statement)[0]
+
+
+engine.delete([person])
+
 ```
 
 ---

{industrial_model-0.1.18 → industrial_model-0.1.20}/industrial_model/cognite_adapters/__init__.py

@@ -111,7 +111,7 @@ class CogniteAdapter:
         operation = self._upsert_mapper.map(entries)
 
         for node_chunk in operation.chunk_nodes():
-            logger.info(
+            logger.debug(
                 f"Upserting {len(node_chunk)} nodes (replace={replace})"
             )
             self._cognite_client.data_modeling.instances.apply(
@@ -120,7 +120,7 @@ class CogniteAdapter:
             )
 
         for edge_chunk in operation.chunk_edges():
-            logger.info(
+            logger.debug(
                 f"Upserting {len(edge_chunk)} edges (replace={replace})"
             )
             self._cognite_client.data_modeling.instances.apply(
@@ -129,11 +129,16 @@ class CogniteAdapter:
             )
 
         for edges_to_remove_chunk in operation.chunk_edges_to_delete():
-            logger.info(f"Deleting {len(edges_to_remove_chunk)} edges")
+            logger.debug(f"Deleting {len(edges_to_remove_chunk)} edges")
             self._cognite_client.data_modeling.instances.delete(
                 edges=[item.as_tuple() for item in edges_to_remove_chunk],
             )
 
+    def delete(self, nodes: list[TViewInstance]) -> None:
+        self._cognite_client.data_modeling.instances.delete(
+            nodes=[item.as_tuple() for item in nodes],
+        )
+
     def _query_dependencies_pages(
         self,
         cognite_query: CogniteQuery,

{industrial_model-0.1.18 → industrial_model-0.1.20}/industrial_model/cognite_adapters/query_result_mapper.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from enum import StrEnum
-from typing import Any, Literal, TypedDict
+from typing import Any, TypedDict
 
 from cognite.client.data_classes.data_modeling import (
     Edge,

{industrial_model-0.1.18 → industrial_model-0.1.20}/industrial_model/cognite_adapters/utils.py

@@ -142,6 +142,7 @@ def _get_leaf_cursors(
             cursor_key == view_external_id
             or not cursor_value
             or len(query_result[cursor_key]) != MAX_LIMIT
+            or cursor_key not in nodes_children
         ):
             continue
 

{industrial_model-0.1.18 → industrial_model-0.1.20}/industrial_model/engines/async_engine.py

@@ -47,3 +47,6 @@ class AsyncEngine:
         self, entries: list[TWritableViewInstance], replace: bool = False
     ) -> None:
         return await run_async(self._engine.upsert, entries, replace)
+
+    async def delete_async(self, nodes: list[TViewInstance]) -> None:
+        return await run_async(self._engine.delete, nodes)

{industrial_model-0.1.18 → industrial_model-0.1.20}/industrial_model/engines/engine.py

@@ -63,6 +63,11 @@ class Engine:
 
         return self._cognite_adapter.upsert(entries, replace)
 
+    def delete(self, nodes: list[TViewInstance]) -> None:
+        self._cognite_adapter.delete(
+            nodes,
+        )
+
     def _validate_data(
         self,
         entity: type[TViewInstance],

{industrial_model-0.1.18 → industrial_model-0.1.20}/industrial_model/models/schemas.py

@@ -99,7 +99,7 @@ def _get_field_type(
     entries: list[type[BaseModel] | None] = []
     for arg in get_args(type_hint):
         if _type_is_list_or_union(arg):
-            return _get_field_type(arg, visited_count)
+            return _get_field_type(arg, parent_type, visited_count)
         entries.append(_cast_base_model(arg))
 
     return _get_field_relations(entries, parent_type, visited_count)

{industrial_model-0.1.18 → industrial_model-0.1.20}/pyproject.toml

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

industrial_model-0.1.20/scripts/build.sh

@@ -0,0 +1,4 @@
+sh ./scripts/lint.sh
+rm -rf dist
+uv sync
+uv build

industrial_model-0.1.20/scripts/publish.sh

@@ -0,0 +1,2 @@
+sh ./scripts/build.sh
+uv publish

industrial_model-0.1.20/tests/test_schema.py

@@ -0,0 +1,352 @@
+from pydantic import BaseModel
+
+from industrial_model.models import get_schema_properties
+from tests.models import (
+    DescribableEntity,
+    Event,
+    EventDetail,
+    Msdp,
+    ReportingSite,
+    WritableEvent,
+)
+
+SEP = "|"
+
+
+class _Car(BaseModel):
+    model: str
+    year: int
+    owner: "SuperNestedModel"
+    previous_owners: list["SuperNestedModel"] | None
+
+
+class SuperNestedModel(DescribableEntity):
+    parent: "SuperNestedModel"
+    children: list["SuperNestedModel"]
+    cars: list[_Car] | None
+
+
+def test_get_schema_properties() -> None:
+    for entity, expected_schema in _get_test_schema().items():
+        schema = get_schema_properties(entity, SEP)
+        assert schema == expected_schema, (
+            f"Expected {expected_schema}, got {schema}"
+        )
+
+
+def _get_test_schema() -> dict[type[BaseModel], list[str]]:
+    return {
+        Msdp: ["effectiveDate", "externalId", "space"],
+        DescribableEntity: ["description", "externalId", "name", "space"],
+        ReportingSite: [
+            "description",
+            "externalId",
+            "name",
+            "space",
+            "timeZone",
+            "timeZone|description",
+            "timeZone|externalId",
+            "timeZone|name",
+            "timeZone|space",
+        ],
+        EventDetail: [
+            "externalId",
+            "refDiscipline",
+            "refDiscipline|description",
+            "refDiscipline|externalId",
+            "refDiscipline|name",
+            "refDiscipline|space",
+            "refEquipment",
+            "refEquipment|description",
+            "refEquipment|externalId",
+            "refEquipment|name",
+            "refEquipment|space",
+            "refEventCode",
+            "refEventCode|description",
+            "refEventCode|externalId",
+            "refEventCode|name",
+            "refEventCode|space",
+            "refMetricCode",
+            "refMetricCode|description",
+            "refMetricCode|externalId",
+            "refMetricCode|name",
+            "refMetricCode|space",
+            "refSubCategoryL1",
+            "refSubCategoryL1|description",
+            "refSubCategoryL1|externalId",
+            "refSubCategoryL1|name",
+            "refSubCategoryL1|space",
+            "refSubCategoryL2",
+            "refSubCategoryL2|description",
+            "refSubCategoryL2|externalId",
+            "refSubCategoryL2|name",
+            "refSubCategoryL2|space",
+            "refSubCategoryL3",
+            "refSubCategoryL3|description",
+            "refSubCategoryL3|externalId",
+            "refSubCategoryL3|name",
+            "refSubCategoryL3|space",
+            "refSubCategoryL4",
+            "refSubCategoryL4|description",
+            "refSubCategoryL4|externalId",
+            "refSubCategoryL4|name",
+            "refSubCategoryL4|space",
+            "refSubCategoryL5",
+            "refSubCategoryL5|description",
+            "refSubCategoryL5|externalId",
+            "refSubCategoryL5|name",
+            "refSubCategoryL5|space",
+            "space",
+        ],
+        Event: [
+            "externalId",
+            "refMaterial",
+            "refMaterial|description",
+            "refMaterial|externalId",
+            "refMaterial|name",
+            "refMaterial|space",
+            "refOEEEventDetail",
+            "refOEEEventDetail|externalId",
+            "refOEEEventDetail|refDiscipline",
+            "refOEEEventDetail|refDiscipline|description",
+            "refOEEEventDetail|refDiscipline|externalId",
+            "refOEEEventDetail|refDiscipline|name",
+            "refOEEEventDetail|refDiscipline|space",
+            "refOEEEventDetail|refEquipment",
+            "refOEEEventDetail|refEquipment|description",
+            "refOEEEventDetail|refEquipment|externalId",
+            "refOEEEventDetail|refEquipment|name",
+            "refOEEEventDetail|refEquipment|space",
+            "refOEEEventDetail|refEventCode",
+            "refOEEEventDetail|refEventCode|description",
+            "refOEEEventDetail|refEventCode|externalId",
+            "refOEEEventDetail|refEventCode|name",
+            "refOEEEventDetail|refEventCode|space",
+            "refOEEEventDetail|refMetricCode",
+            "refOEEEventDetail|refMetricCode|description",
+            "refOEEEventDetail|refMetricCode|externalId",
+            "refOEEEventDetail|refMetricCode|name",
+            "refOEEEventDetail|refMetricCode|space",
+            "refOEEEventDetail|refSubCategoryL1",
+            "refOEEEventDetail|refSubCategoryL1|description",
+            "refOEEEventDetail|refSubCategoryL1|externalId",
+            "refOEEEventDetail|refSubCategoryL1|name",
+            "refOEEEventDetail|refSubCategoryL1|space",
+            "refOEEEventDetail|refSubCategoryL2",
+            "refOEEEventDetail|refSubCategoryL2|description",
+            "refOEEEventDetail|refSubCategoryL2|externalId",
+            "refOEEEventDetail|refSubCategoryL2|name",
+            "refOEEEventDetail|refSubCategoryL2|space",
+            "refOEEEventDetail|refSubCategoryL3",
+            "refOEEEventDetail|refSubCategoryL3|description",
+            "refOEEEventDetail|refSubCategoryL3|externalId",
+            "refOEEEventDetail|refSubCategoryL3|name",
+            "refOEEEventDetail|refSubCategoryL3|space",
+            "refOEEEventDetail|refSubCategoryL4",
+            "refOEEEventDetail|refSubCategoryL4|description",
+            "refOEEEventDetail|refSubCategoryL4|externalId",
+            "refOEEEventDetail|refSubCategoryL4|name",
+            "refOEEEventDetail|refSubCategoryL4|space",
+            "refOEEEventDetail|refSubCategoryL5",
+            "refOEEEventDetail|refSubCategoryL5|description",
+            "refOEEEventDetail|refSubCategoryL5|externalId",
+            "refOEEEventDetail|refSubCategoryL5|name",
+            "refOEEEventDetail|refSubCategoryL5|space",
+            "refOEEEventDetail|space",
+            "refProcessType",
+            "refProcessType|description",
+            "refProcessType|externalId",
+            "refProcessType|name",
+            "refProcessType|space",
+            "refProduct",
+            "refProduct|description",
+            "refProduct|externalId",
+            "refProduct|name",
+            "refProduct|space",
+            "refReportingLine",
+            "refReportingLine|description",
+            "refReportingLine|externalId",
+            "refReportingLine|name",
+            "refReportingLine|space",
+            "refReportingLocation",
+            "refReportingLocation|description",
+            "refReportingLocation|externalId",
+            "refReportingLocation|name",
+            "refReportingLocation|space",
+            "refSite",
+            "refSite|description",
+            "refSite|externalId",
+            "refSite|name",
+            "refSite|space",
+            "refSite|timeZone",
+            "refSite|timeZone|description",
+            "refSite|timeZone|externalId",
+            "refSite|timeZone|name",
+            "refSite|timeZone|space",
+            "refUnit",
+            "refUnit|description",
+            "refUnit|externalId",
+            "refUnit|name",
+            "refUnit|space",
+            "space",
+            "startDateTime",
+        ],
+        WritableEvent: [
+            "externalId",
+            "refOEEEventDetail",
+            "refOEEEventDetail|externalId",
+            "refOEEEventDetail|refDiscipline",
+            "refOEEEventDetail|refDiscipline|description",
+            "refOEEEventDetail|refDiscipline|externalId",
+            "refOEEEventDetail|refDiscipline|name",
+            "refOEEEventDetail|refDiscipline|space",
+            "refOEEEventDetail|refEquipment",
+            "refOEEEventDetail|refEquipment|description",
+            "refOEEEventDetail|refEquipment|externalId",
+            "refOEEEventDetail|refEquipment|name",
+            "refOEEEventDetail|refEquipment|space",
+            "refOEEEventDetail|refEventCode",
+            "refOEEEventDetail|refEventCode|description",
+            "refOEEEventDetail|refEventCode|externalId",
+            "refOEEEventDetail|refEventCode|name",
+            "refOEEEventDetail|refEventCode|space",
+            "refOEEEventDetail|refMetricCode",
+            "refOEEEventDetail|refMetricCode|description",
+            "refOEEEventDetail|refMetricCode|externalId",
+            "refOEEEventDetail|refMetricCode|name",
+            "refOEEEventDetail|refMetricCode|space",
+            "refOEEEventDetail|refSubCategoryL1",
+            "refOEEEventDetail|refSubCategoryL1|description",
+            "refOEEEventDetail|refSubCategoryL1|externalId",
+            "refOEEEventDetail|refSubCategoryL1|name",
+            "refOEEEventDetail|refSubCategoryL1|space",
+            "refOEEEventDetail|refSubCategoryL2",
+            "refOEEEventDetail|refSubCategoryL2|description",
+            "refOEEEventDetail|refSubCategoryL2|externalId",
+            "refOEEEventDetail|refSubCategoryL2|name",
+            "refOEEEventDetail|refSubCategoryL2|space",
+            "refOEEEventDetail|refSubCategoryL3",
+            "refOEEEventDetail|refSubCategoryL3|description",
+            "refOEEEventDetail|refSubCategoryL3|externalId",
+            "refOEEEventDetail|refSubCategoryL3|name",
+            "refOEEEventDetail|refSubCategoryL3|space",
+            "refOEEEventDetail|refSubCategoryL4",
+            "refOEEEventDetail|refSubCategoryL4|description",
+            "refOEEEventDetail|refSubCategoryL4|externalId",
+            "refOEEEventDetail|refSubCategoryL4|name",
+            "refOEEEventDetail|refSubCategoryL4|space",
+            "refOEEEventDetail|refSubCategoryL5",
+            "refOEEEventDetail|refSubCategoryL5|description",
+            "refOEEEventDetail|refSubCategoryL5|externalId",
+            "refOEEEventDetail|refSubCategoryL5|name",
+            "refOEEEventDetail|refSubCategoryL5|space",
+            "refOEEEventDetail|space",
+            "refReportingLine",
+            "refReportingLine|description",
+            "refReportingLine|externalId",
+            "refReportingLine|name",
+            "refReportingLine|space",
+            "refSite",
+            "refSite|description",
+            "refSite|externalId",
+            "refSite|name",
+            "refSite|space",
+            "refSite|timeZone",
+            "refSite|timeZone|description",
+            "refSite|timeZone|externalId",
+            "refSite|timeZone|name",
+            "refSite|timeZone|space",
+            "space",
+            "startDateTime",
+        ],
+        SuperNestedModel: [
+            "cars",
+            "cars|model",
+            "cars|owner",
+            "cars|owner|cars",
+            "cars|owner|cars|model",
+            "cars|owner|cars|owner",
+            "cars|owner|cars|previous_owners",
+            "cars|owner|cars|year",
+            "cars|owner|children",
+            "cars|owner|description",
+            "cars|owner|externalId",
+            "cars|owner|name",
+            "cars|owner|parent",
+            "cars|owner|parent|cars",
+            "cars|owner|parent|cars|model",
+            "cars|owner|parent|cars|owner",
+            "cars|owner|parent|cars|previous_owners",
+            "cars|owner|parent|cars|year",
+            "cars|owner|parent|children",
+            "cars|owner|parent|description",
+            "cars|owner|parent|externalId",
+            "cars|owner|parent|name",
+            "cars|owner|parent|parent",
+            "cars|owner|parent|parent|cars",
+            "cars|owner|parent|parent|cars|model",
+            "cars|owner|parent|parent|cars|owner",
+            "cars|owner|parent|parent|cars|previous_owners",
+            "cars|owner|parent|parent|cars|year",
+            "cars|owner|parent|parent|children",
+            "cars|owner|parent|parent|description",
+            "cars|owner|parent|parent|externalId",
+            "cars|owner|parent|parent|name",
+            "cars|owner|parent|parent|parent",
+            "cars|owner|parent|parent|space",
+            "cars|owner|parent|space",
+            "cars|owner|space",
+            "cars|previous_owners",
+            "cars|year",
+            "children",
+            "children|cars",
+            "children|cars|model",
+            "children|cars|owner",
+            "children|cars|previous_owners",
+            "children|cars|year",
+            "children|children",
+            "children|description",
+            "children|externalId",
+            "children|name",
+            "children|parent",
+            "children|parent|cars",
+            "children|parent|cars|model",
+            "children|parent|cars|owner",
+            "children|parent|cars|previous_owners",
+            "children|parent|cars|year",
+            "children|parent|children",
+            "children|parent|description",
+            "children|parent|externalId",
+            "children|parent|name",
+            "children|parent|parent",
+            "children|parent|space",
+            "children|space",
+            "description",
+            "externalId",
+            "name",
+            "parent",
+            "parent|cars",
+            "parent|cars|model",
+            "parent|cars|owner",
+            "parent|cars|previous_owners",
+            "parent|cars|year",
+            "parent|children",
+            "parent|description",
+            "parent|externalId",
+            "parent|name",
+            "parent|parent",
+            "parent|parent|cars",
+            "parent|parent|cars|model",
+            "parent|parent|cars|owner",
+            "parent|parent|cars|previous_owners",
+            "parent|parent|cars|year",
+            "parent|parent|children",
+            "parent|parent|description",
+            "parent|parent|externalId",
+            "parent|parent|name",
+            "parent|parent|parent",
+            "parent|parent|space",
+            "parent|space",
+            "space",
+        ],
+    }

{industrial_model-0.1.18 → industrial_model-0.1.20}/uv.lock

@@ -215,7 +215,7 @@ wheels = [
 
 [[package]]
 name = "industrial-model"
-version = "0.1.18"
+version = "0.1.20"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },

industrial_model-0.1.18/scripts/build.sh

@@ -1 +0,0 @@
-uv build