industrial-model 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

industrial_model/cognite_adapters/query_result_mapper.py

@@ -70,13 +70,14 @@ class QueryResultMapper:
 
             return entry.get("space", ""), entry.get("externalId", "")
 
-        nodes = {
-            (node.space, node.external_id): node
-            for node in query_result[key]
-            if isinstance(node, Node)
-        }
+        visited: set[tuple[str, str]] = set()
         result: defaultdict[tuple[str, str], list[Node]] = defaultdict(list)
-        for node in nodes.values():
+        for node in query_result[key]:
+            identify = (node.space, node.external_id)
+            if not isinstance(node, Node) or identify in visited:
+                continue
+
+            visited.add(identify)
             properties = node.properties.get(view_id, {})
             node_id = get_node_id(node)
             for mapping_key, (values, is_list) in mappings.items():
@@ -85,7 +86,7 @@ class QueryResultMapper:
                 element_key: tuple[str, str] = (
                     (element.get("space", ""), element.get("externalId", ""))
                     if isinstance(element, dict)
-                    else node_id
+                    else (node.space, node.external_id)
                 )
 
                 entries = values.get(element_key)
@@ -178,14 +179,14 @@ class QueryResultMapper:
         if not nodes:
             return None
 
+        visited: set[tuple[str, str]] = set()
         result: defaultdict[tuple[str, str], list[Node]] = defaultdict(list)
+        for edge in query_result[edge_key]:
+            identify = (edge.space, edge.external_id)
+            if not isinstance(edge, Edge) or identify in visited:
+                continue
 
-        edges = {
-            (edge.space, edge.external_id): edge
-            for edge in query_result[edge_key]
-            if isinstance(edge, Edge)
-        }
-        for edge in edges.values():
+            visited.add(identify)
             entry_key, node_key = (
                 (
                     edge.end_node.as_tuple(),

{industrial_model-0.1.7.dist-info → industrial_model-0.1.9.dist-info}/METADATA

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

{industrial_model-0.1.7.dist-info → industrial_model-0.1.9.dist-info}/RECORD

@@ -7,7 +7,7 @@ industrial_model/cognite_adapters/__init__.py,sha256=SjI-cO8tsZpd1uBSyP6nt3WvWbM
 industrial_model/cognite_adapters/filter_mapper.py,sha256=NqH-OW7_iKFY9POCG8W3KjkwXUgrZP1d_yxDx1J0fXM,3859
 industrial_model/cognite_adapters/optimizer.py,sha256=G8I07jJ9tarE5GZXXUSpTMKUei6ptV-cudJSLsoykX4,2223
 industrial_model/cognite_adapters/query_mapper.py,sha256=3fEcaLsGjLKIh-g1BbMcffQ6rp99JeCW555iJo8JW44,6260
-industrial_model/cognite_adapters/query_result_mapper.py,sha256=NowXR501CywuuX5X_UdVVq7cus9JcmsnOBuTsJ774qU,7013
+industrial_model/cognite_adapters/query_result_mapper.py,sha256=cDQ2eEOqKRr4Ifowal7qvUlKSDLUj-xMFSo6qcR_UPE,7179
 industrial_model/cognite_adapters/sort_mapper.py,sha256=RJUAYlZGXoYzK0PwX63cibRF_L-MUq9g2ZsC2EeNIF4,696
 industrial_model/cognite_adapters/utils.py,sha256=rztCtS10ZTQmXfBv0nLgDiQIMWemhdSFK-SwrbRjVxM,4792
 industrial_model/cognite_adapters/view_mapper.py,sha256=lnv64KezSQTAr6XdcExa8d92GU5Ll9K9HfMcQGzhX6k,488
@@ -23,6 +23,6 @@ industrial_model/queries/models.py,sha256=iiHQ7-cfg0nukEv5PoCx9QPF-w1gVSnoNbXBOK
 industrial_model/queries/params.py,sha256=ehgCoR5n6E-tkEuoymZ2lkLcSzMaBAx_HnyJ7sWpqz0,964
 industrial_model/statements/__init__.py,sha256=9fD-qpNXIkrjoahxC_R6hS4DKSVelehimvRPKbpYfA0,1775
 industrial_model/statements/expressions.py,sha256=Sar1cIvy3sYi7tkWJN3ylHlZ252oN2mZJpZ1TX9jN3s,4940
-industrial_model-0.1.7.dist-info/METADATA,sha256=Fk1SRRo3Yg3kqBJN2-H1ZICh1Cz00E03ZEVlAksGQFA,4806
-industrial_model-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.7.dist-info/RECORD,,
+industrial_model-0.1.9.dist-info/METADATA,sha256=E1MZ0OJAQiRttTC-Dea6eEthmVdj_N0bLYQ7ccNSWXI,4806
+industrial_model-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.9.dist-info/RECORD,,