industrial-model 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

industrial_model/cognite_adapters/query_result_mapper.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
-from typing import Any, TypedDict
+from enum import StrEnum
+from typing import Any, Literal, TypedDict
 
 from cognite.client.data_classes.data_modeling import (
     Edge,
@@ -19,8 +20,15 @@ from industrial_model.models import EdgeContainer
 from .view_mapper import ViewMapper
 
 
+class ConnectionTypeEnum(StrEnum):
+    DIRECT_RELATION = "DirectRelation"
+    REVERSE_DIRECT_RELATION = "ReverseDirectRelation"
+    EDGE = "Edge"
+
+
 class _PropertyMapping(TypedDict):
     is_list: bool
+    connection_type: ConnectionTypeEnum
     nodes: dict[tuple[str, str], list[Node]]
     edges: dict[tuple[str, str], list[Edge]]
 
@@ -92,16 +100,26 @@ class QueryResultMapper:
             for mapping_key, mapping_value in mappings.items():
                 element = properties.get(mapping_key)
 
+                mapping_nodes = mapping_value.get("nodes", {})
+                mapping_edges = mapping_value.get("edges", {})
+                is_list = mapping_value.get("is_list", False)
+                connection_type = mapping_value.get(
+                    "connection_type",
+                    ConnectionTypeEnum.DIRECT_RELATION,
+                )
+
+                if (
+                    element is None
+                    and connection_type == ConnectionTypeEnum.DIRECT_RELATION
+                ):
+                    continue
+
                 element_key: tuple[str, str] = (
                     (element.get("space", ""), element.get("externalId", ""))
                     if isinstance(element, dict)
                     else (node.space, node.external_id)
                 )
 
-                mapping_nodes = mapping_value.get("nodes", {})
-                mapping_edges = mapping_value.get("edges", {})
-                is_list = mapping_value.get("is_list", False)
-
                 node_entries = mapping_nodes.get(element_key)
                 if not node_entries:
                     continue
@@ -116,6 +134,7 @@ class QueryResultMapper:
                         edge_entries
                     )
             properties["_edges"] = edges_mapping
+
             node.properties[view_id] = properties
 
             result[node_id].append(node)
@@ -136,6 +155,9 @@ class QueryResultMapper:
             nodes: dict[tuple[str, str], list[Node]] | None = None
             edges: dict[tuple[str, str], list[Edge]] | None = None
             is_list = False
+            connection_type: ConnectionTypeEnum = (
+                ConnectionTypeEnum.DIRECT_RELATION
+            )
 
             if isinstance(property, MappedProperty) and property.source:
                 nodes = self._map_node_property(
@@ -144,6 +166,7 @@ class QueryResultMapper:
                     query_result,
                 )
                 is_list = False
+                connection_type = ConnectionTypeEnum.DIRECT_RELATION
             elif (
                 isinstance(property, SingleReverseDirectRelation)
                 and property.source
@@ -155,6 +178,7 @@ class QueryResultMapper:
                     property.through.property,
                 )
                 is_list = False
+                connection_type = ConnectionTypeEnum.REVERSE_DIRECT_RELATION
             elif (
                 isinstance(property, MultiReverseDirectRelation)
                 and property.source
@@ -166,6 +190,7 @@ class QueryResultMapper:
                     property.through.property,
                 )
                 is_list = True
+                connection_type = ConnectionTypeEnum.REVERSE_DIRECT_RELATION
 
             elif isinstance(property, EdgeConnection) and property.source:
                 nodes, edges = self._map_edge_property(
@@ -175,10 +200,14 @@ class QueryResultMapper:
                     property.direction,
                 )
                 is_list = True
+                connection_type = ConnectionTypeEnum.EDGE
 
             if nodes:
                 mappings[property_name] = _PropertyMapping(
-                    is_list=is_list, nodes=nodes, edges=edges or {}
+                    is_list=is_list,
+                    connection_type=connection_type,
+                    nodes=nodes,
+                    edges=edges or {},
                 )
 
         return mappings

industrial_model/models/entities.py

@@ -101,5 +101,8 @@ class PaginatedResult(RootModel, Generic[TViewInstance]):
     has_next_page: bool
     next_cursor: str | None
 
+    def first_or_default(self) -> TViewInstance | None:
+        return self.data[0] if self.data else None
+
 
 ValidationMode = Literal["raiseOnError", "ignoreOnError"]

{industrial_model-0.1.16.dist-info → industrial_model-0.1.18.dist-info}/METADATA

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

{industrial_model-0.1.16.dist-info → industrial_model-0.1.18.dist-info}/RECORD

@@ -9,7 +9,7 @@ industrial_model/cognite_adapters/filter_mapper.py,sha256=X2BVp305v1Wt00DTZEnCoo
 industrial_model/cognite_adapters/models.py,sha256=2j2IS01uPkQEp9WdVk8seYzEqGcDdWFnpzXhusHB2zk,945
 industrial_model/cognite_adapters/optimizer.py,sha256=BbbsA3r9ZKJt6mN1wVRZc046ov-vbml9_ESfurTNRUg,2477
 industrial_model/cognite_adapters/query_mapper.py,sha256=3fEcaLsGjLKIh-g1BbMcffQ6rp99JeCW555iJo8JW44,6260
-industrial_model/cognite_adapters/query_result_mapper.py,sha256=lsKz0wiqMOo54MVEw_YqLcHXa_HWYgAbSLnBbbdVupw,8451
+industrial_model/cognite_adapters/query_result_mapper.py,sha256=e2W2QPDUusZh0cgpvIKF21_dP7QyZjLKrp_H_OQ4Ddk,9516
 industrial_model/cognite_adapters/sort_mapper.py,sha256=RJUAYlZGXoYzK0PwX63cibRF_L-MUq9g2ZsC2EeNIF4,696
 industrial_model/cognite_adapters/upsert_mapper.py,sha256=tWEiBJQeeNz1HDu0AoBIfCw_LL156Zg4h7ORKlZ__uw,4870
 industrial_model/cognite_adapters/utils.py,sha256=rztCtS10ZTQmXfBv0nLgDiQIMWemhdSFK-SwrbRjVxM,4792
@@ -19,13 +19,13 @@ industrial_model/engines/async_engine.py,sha256=XgDKCHh4gi2mPBknp7MM4mRsuA_224Ne
 industrial_model/engines/engine.py,sha256=DaA34P1aL_qvL691OG_-g_yCC-U2ZJr9tF32Pl5vpP4,3098
 industrial_model/models/__init__.py,sha256=AzJ0CyPK5PvUCX45FFtybl13tkukUvk2UAF_90s_LQ8,742
 industrial_model/models/base.py,sha256=iGhDjXqA5ULEQIFHtkMi7WYJl0nQq1wi8_zqOr-Ep78,1649
-industrial_model/models/entities.py,sha256=GZu-Y5ZalhXM8EHTzBe4hCKA2Dryk8J99p_FTVNX2jc,2709
+industrial_model/models/entities.py,sha256=1ZmijxOXEAWocf3HTJ9a7ci5cJEjzA3hbt0QvVP8Gb8,2817
 industrial_model/models/schemas.py,sha256=-ZnDO-yJL2PR4QmsduzDsC-rjS7CZnqPS-wYAo65Mbo,4612
 industrial_model/queries/__init__.py,sha256=7aheTE5qs03rxWm9fmGWptbz_p9OIXXYD8if56cqs18,227
 industrial_model/queries/models.py,sha256=iiHQ7-cfg0nukEv5PoCx9QPF-w1gVSnoNbXBOK9Mzeo,1185
 industrial_model/queries/params.py,sha256=ehgCoR5n6E-tkEuoymZ2lkLcSzMaBAx_HnyJ7sWpqz0,964
 industrial_model/statements/__init__.py,sha256=15LI9POLUdh6i3Zw0Aek0fVFfcTj8P8ZEa1Cli3pgXQ,3095
 industrial_model/statements/expressions.py,sha256=Sar1cIvy3sYi7tkWJN3ylHlZ252oN2mZJpZ1TX9jN3s,4940
-industrial_model-0.1.16.dist-info/METADATA,sha256=5Bq6L2p-45gPQWKPZPPl1yFQ3JAqT8w9-IonyNnT844,6144
-industrial_model-0.1.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.16.dist-info/RECORD,,
+industrial_model-0.1.18.dist-info/METADATA,sha256=s9T_m788nocZAMzq-wbf1bTi9VLDW8vdCryL-DO4BtU,6144
+industrial_model-0.1.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.18.dist-info/RECORD,,