industrial-model 0.1.28__py3-none-any.whl → 0.1.30__py3-none-any.whl

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/models/entities.py

@@ -1,4 +1,5 @@
 from abc import abstractmethod
+from datetime import date, datetime
 from typing import (
     Any,
     ClassVar,
@@ -10,6 +11,8 @@ from typing import (
 
 from pydantic import PrivateAttr
 
+from industrial_model.statements import Column
+
 from .base import DBModelMetaclass, RootModel
 
 
@@ -45,6 +48,7 @@ class ViewInstanceConfig(TypedDict, total=False):
     view_external_id: str | None
     instance_spaces: list[str] | None
     instance_spaces_prefix: str | None
+    view_code: str | None
 
 
 class ViewInstance(InstanceId, metaclass=DBModelMetaclass):
@@ -56,6 +60,54 @@ class ViewInstance(InstanceId, metaclass=DBModelMetaclass):
     def get_view_external_id(cls) -> str:
         return cls.view_config.get("view_external_id") or cls.__name__
 
+    def generate_model_id(
+        self,
+        fields: list[str] | list[Column] | list[Any],
+        view_code_as_prefix: bool = True,
+        separator: str = "-",
+    ) -> str:
+        if not fields:
+            raise ValueError("Fields list cannot be empty")
+        field_values = self._get_field_values(fields)
+
+        view_code = self.view_config.get("view_code")
+
+        result = separator.join(field_values)
+        return (
+            f"{view_code}{separator}{result}"
+            if view_code_as_prefix and view_code
+            else result
+        )
+
+    def _get_field_values(
+        self, fields: list[str] | list[Column] | list[Any]
+    ) -> list[str]:
+        field_values: list[str] = []
+        for field in fields:
+            if not isinstance(field, str | Column):
+                field_type = type(field).__name__
+                raise TypeError(
+                    f"Expected field to be a string or Column, got {field_type}"
+                )
+            field_name = self.get_field_name(
+                field.property if isinstance(field, Column) else field
+            )
+            if field_name is None:
+                raise ValueError(f"Field {field} not found in the model")
+            field_entry = getattr(self, field_name)
+
+            field_entry_str = ""
+            if isinstance(field_entry, str):
+                field_entry_str = field_entry
+            elif isinstance(field_entry, date | datetime):
+                field_entry_str = field_entry.isoformat()
+            elif isinstance(field_entry, InstanceId):
+                field_entry_str = field_entry.external_id
+            else:
+                field_entry_str = str(field_entry)
+            field_values.append(field_entry_str.replace(" ", ""))
+        return field_values
+
 
 class WritableViewInstance(ViewInstance):
     @abstractmethod

{industrial_model-0.1.28.dist-info → industrial_model-0.1.30.dist-info}/METADATA

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

{industrial_model-0.1.28.dist-info → industrial_model-0.1.30.dist-info}/RECORD

@@ -12,7 +12,7 @@ industrial_model/cognite_adapters/query_mapper.py,sha256=QdFVkfmL4tWcCy_oypOluT0
 industrial_model/cognite_adapters/query_result_mapper.py,sha256=iCcTb0AUg5rtw8nhK7D4d_x6Z53zgNMpvWrVRM0R2pY,9315
 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
@@ -20,7 +20,7 @@ industrial_model/engines/async_engine.py,sha256=-sQv2vn93bBmTZOxY_C1r40YP7IMl1ND
 industrial_model/engines/engine.py,sha256=lECOpjN6fGvKt28b441isT_u4UNF3LeLiJH-zwHmkYw,3798
 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=tHOFjS-9XsaXVrZ-x0tZR1DWL2Cc8MHe82qsIazqmnM,2811
+industrial_model/models/entities.py,sha256=BC85P8THwvVmcNpYq2spJuFJtlK8Oegkmd0kx3CI_wU,4704
 industrial_model/models/schemas.py,sha256=EoLK9GYdS-0DQ98myTP3wOU9YpWIJOfDSLOYZUy3xEY,4559
 industrial_model/queries/__init__.py,sha256=lA83zOxMRgBgkseWJgK9kCr1vD8D8iSWs9NGGRnoYKk,355
 industrial_model/queries/models.py,sha256=VK69c4L0b0miPrKvOQBB8A01SPxZXYThrquv6gw5OGY,2544
@@ -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.28.dist-info/METADATA,sha256=yO8ZEkhR61_BadoJ0yyr3vsSCSicIT9qY428DP_v8qU,6858
-industrial_model-0.1.28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.28.dist-info/RECORD,,
+industrial_model-0.1.30.dist-info/METADATA,sha256=r4KKWy2zg_TDqDCvkMTSJ8TyrsT105tRKASNb3XyxMM,6858
+industrial_model-0.1.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.30.dist-info/RECORD,,