industrial-model 0.1.35__py3-none-any.whl → 0.1.36__py3-none-any.whl

industrial_model/engines/engine.py

@@ -5,12 +5,12 @@ from cognite.client import CogniteClient
 from industrial_model.cognite_adapters import CogniteAdapter
 from industrial_model.config import DataModelId
 from industrial_model.models import (
-    EdgeContainer,
     PaginatedResult,
     TAggregatedViewInstance,
     TViewInstance,
     TWritableViewInstance,
     ValidationMode,
+    include_edges,
 )
 from industrial_model.statements import (
     AggregationStatement,
@@ -96,24 +96,10 @@ class Engine:
         for item in data:
             try:
                 validated_item = entity.model_validate(item)
-                self._include_edges(item, validated_item)
+                include_edges(item, validated_item)
                 result.append(validated_item)
             except Exception:
                 if validation_mode == "ignoreOnError":
                     continue
                 raise
         return result
-
-    def _include_edges(
-        self, item: dict[str, Any], validated_item: TViewInstance
-    ) -> None:
-        if "_edges" not in item or not isinstance(item["_edges"], dict):
-            return
-        entries: dict[str, list[EdgeContainer]] = {}
-        for property_, edges in item["_edges"].items():
-            if not edges or not isinstance(edges, list):
-                continue
-
-            assert isinstance(edges[0], EdgeContainer)
-            entries[property_] = edges
-        validated_item._edges = entries

industrial_model/models/__init__.py

@@ -13,12 +13,14 @@ from .entities import (
     WritableViewInstance,
 )
 from .schemas import get_parent_and_children_nodes, get_schema_properties
+from .utils import include_edges
 
 __all__ = [
     "AggregatedViewInstance",
     "RootModel",
     "EdgeContainer",
     "InstanceId",
+    "include_edges",
     "TAggregatedViewInstance",
     "TViewInstance",
     "TWritableViewInstance",

industrial_model/models/utils.py

@@ -0,0 +1,58 @@
+from typing import Any
+
+from .entities import EdgeContainer, TViewInstance, ViewInstance
+
+
+def include_edges(
+    root_item: dict[str, Any], validated_root_item: TViewInstance
+) -> None:
+    if not isinstance(root_item, dict) or not isinstance(
+        validated_root_item, ViewInstance
+    ):
+        return
+
+    for property_, value in root_item.items():
+        field_key = validated_root_item.get_field_name(property_)
+        if not field_key:
+            continue
+        _handle_edge_property(validated_root_item, value, field_key)
+    _include_edges(root_item, validated_root_item)
+
+
+def _handle_edge_property(
+    validated_root_item: TViewInstance, value: Any, field_key: str
+) -> None:
+    attr_value = getattr(validated_root_item, field_key, None)
+
+    if isinstance(value, dict):
+        _handle_dict_property(value, attr_value)
+        return
+
+    if (
+        not isinstance(value, list)
+        or not isinstance(attr_value, list)
+        or len(value) != len(attr_value)
+    ):
+        return
+
+    for index, value_item in enumerate(value):
+        entry = attr_value[index]
+        _handle_dict_property(value_item, entry)
+
+
+def _handle_dict_property(value: Any, attr_value: Any) -> None:
+    if isinstance(value, dict) and isinstance(attr_value, ViewInstance):
+        include_edges(value, attr_value)
+
+
+def _include_edges(item: dict[str, Any], validated_item: TViewInstance) -> None:
+    if "_edges" not in item or not isinstance(item["_edges"], dict):
+        return
+    entries: dict[str, list[EdgeContainer]] = {}
+    for property_, edges in item["_edges"].items():
+        if not edges or not isinstance(edges, list):
+            continue
+
+        assert isinstance(edges[0], EdgeContainer)
+        entries[property_] = edges
+    validated_item._edges = entries

{industrial_model-0.1.35.dist-info → industrial_model-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: industrial-model
-Version: 0.1.35
+Version: 0.1.36
 Summary: Industrial Model ORM
 Author-email: Lucas Alves <lucasrosaalves@gmail.com>
 Classifier: Programming Language :: Python

{industrial_model-0.1.35.dist-info → industrial_model-0.1.36.dist-info}/RECORD

@@ -17,17 +17,18 @@ industrial_model/cognite_adapters/utils.py,sha256=-9NUG84r49cKvmmzoUinxNF1zhHIlm
 industrial_model/cognite_adapters/view_mapper.py,sha256=fihoxyLKvq8xa1oArdCCkukqVpOexFcBDnEyMACpHF8,1430
 industrial_model/engines/__init__.py,sha256=7aGHrUm2MxIq39vR8h0xu3i1zNOuT9H9U-q4lV3nErQ,102
 industrial_model/engines/async_engine.py,sha256=-sQv2vn93bBmTZOxY_C1r40YP7IMl1ND2gCN2GE9BqY,2188
-industrial_model/engines/engine.py,sha256=Pwg8A3PFVdRExiLGyhcs8hhiGyKgKi6piOmiLgvCL50,3810
-industrial_model/models/__init__.py,sha256=AzJ0CyPK5PvUCX45FFtybl13tkukUvk2UAF_90s_LQ8,742
+industrial_model/engines/engine.py,sha256=jMzak4J66rtRsOnvc1xH6FdZVZDkue3v23lTdghovqo,3280
+industrial_model/models/__init__.py,sha256=g8oa95iG6c22A-vTYhiZKSYa6RG2C7Ht1dpn5_HfXxs,796
 industrial_model/models/base.py,sha256=qi44m0KW9KuXKTSJqSLea1poErBeAqm6Hv08VdRYHkU,2023
 industrial_model/models/entities.py,sha256=-Jf7bNCijbS3_wZohlog3bRsAkXvkUeAQW9DamJqGFo,5700
 industrial_model/models/schemas.py,sha256=EoLK9GYdS-0DQ98myTP3wOU9YpWIJOfDSLOYZUy3xEY,4559
+industrial_model/models/utils.py,sha256=MFS8OyCfh4cYPY_R66-mUaCauQfQy0vd558Rw0tiGDc,1786
 industrial_model/queries/__init__.py,sha256=lA83zOxMRgBgkseWJgK9kCr1vD8D8iSWs9NGGRnoYKk,355
 industrial_model/queries/models.py,sha256=VK69c4L0b0miPrKvOQBB8A01SPxZXYThrquv6gw5OGY,2544
 industrial_model/queries/params.py,sha256=50qY5BO5onLsXorhcv-7qCKhJaMO94UzhKLCmZKY55s,1667
 industrial_model/queries/utils.py,sha256=uP6PLh9IVHDK6J8x444zHWPmyV4PkxdLO-PMc6qWItc,1505
 industrial_model/statements/__init__.py,sha256=3Et9PM7AMbIS7Fh9051Q0u3qUpX6588d1yuNrvdd4wI,5429
 industrial_model/statements/expressions.py,sha256=4ZZOcZroI5-4xRw4PXIRlufi0ARndE5zSbbxLDpR2Ec,4816
-industrial_model-0.1.35.dist-info/METADATA,sha256=sKHvIearHLTa1i63nxbkpD2U7guTDl3FVSNPZIKDx2Q,6858
-industrial_model-0.1.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.35.dist-info/RECORD,,
+industrial_model-0.1.36.dist-info/METADATA,sha256=q1oGMrZ6PkFoxOyoMeGXPFORAv6ouAlWbbaf2efP-38,6858
+industrial_model-0.1.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.36.dist-info/RECORD,,