industrial-model 0.1.30__tar.gz → 0.1.31__tar.gz

{industrial_model-0.1.30 → industrial_model-0.1.31}/PKG-INFO

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

{industrial_model-0.1.30 → industrial_model-0.1.31}/industrial_model/cognite_adapters/query_result_mapper.py

@@ -10,6 +10,10 @@ from cognite.client.data_classes.data_modeling import (
     NodeList,
     View,
 )
+from cognite.client.data_classes.data_modeling.data_types import (
+    ListablePropertyType,
+)
+from cognite.client.data_classes.data_modeling.instances import PropertyValue
 from cognite.client.data_classes.data_modeling.views import (
     MultiReverseDirectRelation,
     SingleReverseDirectRelation,
@@ -112,13 +116,13 @@ class QueryResultMapper:
                 ):
                     continue
 
-                element_key: tuple[str, str] = (
-                    (element.get("space", ""), element.get("externalId", ""))
-                    if isinstance(element, dict)
-                    else (node.space, node.external_id)
-                )
+                element_keys = self._get_element_keys(node, element)
 
-                node_entries = mapping_nodes.get(element_key)
+                node_entries = [
+                    item
+                    for element_key in element_keys
+                    for item in mapping_nodes.get(element_key, [])
+                ]
                 if not node_entries:
                     if mapping_key in properties:
                         properties.pop(mapping_key)
@@ -126,7 +130,11 @@ class QueryResultMapper:
 
                 entry_data = self.nodes_to_dict(node_entries)
                 properties[mapping_key] = entry_data if is_list else entry_data[0]
-                edge_entries = mapping_edges.get(element_key)
+                edge_entries = [
+                    item
+                    for element_key in element_keys
+                    for item in mapping_edges.get(element_key, [])
+                ]
                 if edge_entries:
                     edges_mapping[mapping_key] = self._edges_to_model(edge_entries)
             properties["_edges"] = edges_mapping
@@ -137,6 +145,21 @@ class QueryResultMapper:
 
         return dict(result)
 
+    def _get_element_keys(
+        self, node: Node, element: PropertyValue | None
+    ) -> list[tuple[str, str]]:
+        if isinstance(element, dict):
+            return [(element.get("space", ""), element.get("externalId", ""))]
+
+        if isinstance(element, list):
+            return [
+                (item.get("space", ""), item.get("externalId", ""))
+                for item in element
+                if isinstance(item, dict)
+            ]
+
+        return [(node.space, node.external_id)]
+
     def _get_property_mappings(
         self,
         key: str,
@@ -159,7 +182,10 @@ class QueryResultMapper:
                     self._view_mapper.get_view(property.source.external_id),
                     query_result,
                 )
-                is_list = False
+                is_list = (
+                    isinstance(property.type, ListablePropertyType)
+                    and property.type.is_list
+                )
                 connection_type = ConnectionTypeEnum.DIRECT_RELATION
             elif isinstance(property, SingleReverseDirectRelation) and property.source:
                 nodes = self._map_node_property(

{industrial_model-0.1.30 → industrial_model-0.1.31}/pyproject.toml

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