industrial-model 0.1.29__py3-none-any.whl → 0.1.31__py3-none-any.whl

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/cognite_adapters/upsert_mapper.py

@@ -62,15 +62,7 @@ class UpsertMapper:
             entry = instance.__getattribute__(property_key)
 
             if isinstance(property, MappedProperty):
-                properties[property_name] = (
-                    DirectRelationReference(
-                        space=entry.space, external_id=entry.external_id
-                    )
-                    if isinstance(entry, InstanceId)
-                    else datetime_to_ms_iso_timestamp(entry)
-                    if isinstance(entry, datetime.datetime)
-                    else entry
-                )
+                properties[property_name] = self._get_mapped_property_value(entry)
             elif isinstance(property, EdgeConnection) and isinstance(entry, list):
                 possible_entries = self._map_edges(instance, property, entry)
 
@@ -102,6 +94,20 @@ class UpsertMapper:
 
         return node, edges, edges_to_delete
 
+    def _get_mapped_property_value(self, entry: Any) -> Any:
+        if isinstance(entry, list):
+            return [self._get_mapped_property_value(item) for item in entry]
+
+        if isinstance(entry, InstanceId):
+            return DirectRelationReference(
+                space=entry.space, external_id=entry.external_id
+            )
+        if isinstance(entry, datetime.date):
+            return entry.strftime("%Y-%m-%d")
+        if isinstance(entry, datetime.datetime):
+            return datetime_to_ms_iso_timestamp(entry)
+        return entry
+
     def _map_edges(
         self,
         instance: TWritableViewInstance,

{industrial_model-0.1.29.dist-info → industrial_model-0.1.31.dist-info}/METADATA

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

{industrial_model-0.1.29.dist-info → industrial_model-0.1.31.dist-info}/RECORD

@@ -9,10 +9,10 @@ industrial_model/cognite_adapters/filter_mapper.py,sha256=R_OX8JOM33vzBVFvfo0iDm
 industrial_model/cognite_adapters/models.py,sha256=2j2IS01uPkQEp9WdVk8seYzEqGcDdWFnpzXhusHB2zk,945
 industrial_model/cognite_adapters/optimizer.py,sha256=EQfCe-4mSeXhYa2kcqJerPXYsCRgMJPA1AIf1o1KNH0,2415
 industrial_model/cognite_adapters/query_mapper.py,sha256=QdFVkfmL4tWcCy_oypOluT0Fo68obPk2RjBPvVA9mUs,5950
-industrial_model/cognite_adapters/query_result_mapper.py,sha256=iCcTb0AUg5rtw8nhK7D4d_x6Z53zgNMpvWrVRM0R2pY,9315
+industrial_model/cognite_adapters/query_result_mapper.py,sha256=KaBqYr5l1t8sQMxEoX_F3J2prypKIPaDJxSzGF_fMB8,10203
 industrial_model/cognite_adapters/search_mapper.py,sha256=dh69Te8oiDIRPbEMTcof-ZJ4XD-xB5iiBHUR0UETzho,1504
 industrial_model/cognite_adapters/sort_mapper.py,sha256=RJUAYlZGXoYzK0PwX63cibRF_L-MUq9g2ZsC2EeNIF4,696
-industrial_model/cognite_adapters/upsert_mapper.py,sha256=2QN4LXdUTWDmnLmXGKOLnCdTnUm5Zz2sZXD80-kAeQM,4720
+industrial_model/cognite_adapters/upsert_mapper.py,sha256=fIz2WLnn0YpsgotGH2MXAa9QYWjQehpWsX3MAKhvRkw,4951
 industrial_model/cognite_adapters/utils.py,sha256=-9NUG84r49cKvmmzoUinxNF1zhHIlmoWFypUCD_WTeM,4800
 industrial_model/cognite_adapters/view_mapper.py,sha256=fihoxyLKvq8xa1oArdCCkukqVpOexFcBDnEyMACpHF8,1430
 industrial_model/engines/__init__.py,sha256=7aGHrUm2MxIq39vR8h0xu3i1zNOuT9H9U-q4lV3nErQ,102
@@ -28,6 +28,6 @@ industrial_model/queries/params.py,sha256=50qY5BO5onLsXorhcv-7qCKhJaMO94UzhKLCmZ
 industrial_model/queries/utils.py,sha256=uP6PLh9IVHDK6J8x444zHWPmyV4PkxdLO-PMc6qWItc,1505
 industrial_model/statements/__init__.py,sha256=rjLRo2KoazHQaOpmPkxbI3_Nm8NCkJxjpuqow6IZVSc,4221
 industrial_model/statements/expressions.py,sha256=4ZZOcZroI5-4xRw4PXIRlufi0ARndE5zSbbxLDpR2Ec,4816
-industrial_model-0.1.29.dist-info/METADATA,sha256=vNGyeERDw-3hlRpxgxKjGERKp8VhwNPBhYRzoqWlArA,6858
-industrial_model-0.1.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.29.dist-info/RECORD,,
+industrial_model-0.1.31.dist-info/METADATA,sha256=BZq-MwEpDSndxkVUf5A6odc9ENMiUuOa_MnKjLTjcSo,6858
+industrial_model-0.1.31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.31.dist-info/RECORD,,