industrial-model 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

industrial_model/cognite_adapters/filter_mapper.py

@@ -1,9 +1,11 @@
 from datetime import date, datetime
+from typing import Any
 
 import cognite.client.data_classes.filters as cdf_filters
 from cognite.client.data_classes.data_modeling import MappedProperty, View
 
 from industrial_model.cognite_adapters.utils import get_property_ref
+from industrial_model.models.entities import InstanceId
 from industrial_model.statements import (
     BoolExpression,
     Expression,
@@ -54,11 +56,8 @@ class FilterMapper:
         property_ref = get_property_ref(expression.property, root_view)
 
         value_ = expression.value
-        if isinstance(value_, datetime):
-            value_ = datetime_to_ms_iso_timestamp(value_)
 
-        if isinstance(value_, date):
-            value_ = value_.strftime("%Y-%m-%d")
+        value_ = self._handle_type_value_convertion(value_)
 
         if expression.operator == "==":
             return cdf_filters.Equals(property_ref, value_)
@@ -96,3 +95,14 @@ class FilterMapper:
         assert isinstance(view_definiton, MappedProperty)
         assert view_definiton.source
         return self._view_mapper.get_view(view_definiton.source.external_id)
+
+    def _handle_type_value_convertion(self, value_: Any) -> Any:
+        if isinstance(value_, datetime):
+            return datetime_to_ms_iso_timestamp(value_)
+        elif isinstance(value_, date):
+            return value_.strftime("%Y-%m-%d")
+        elif isinstance(value_, InstanceId):
+            return value_.model_dump(mode="json", by_alias=True)
+        elif isinstance(value_, list):
+            return [self._handle_type_value_convertion(v) for v in value_]
+        return value_

industrial_model/queries/models.py

@@ -18,7 +18,7 @@ class BaseQuery(RootModel):
 
         for key, item in self.__class__.model_fields.items():
             values = getattr(self, key)
-            if not values:
+            if values is None:
                 continue
             for metadata_item in item.metadata:
                 if isinstance(metadata_item, SortParam):
@@ -43,7 +43,7 @@ class BasePaginatedQuery(BaseQuery):
 
 class BaseSearchQuery(RootModel):
     query: str | None = None
-    query_properties: list[str] | list[Any] | None = None
+    query_properties: list[Any] | None = None
     limit: int = 1000
 
     def to_statement(
@@ -53,7 +53,7 @@ class BaseSearchQuery(RootModel):
 
         for key, item in self.__class__.model_fields.items():
             values = getattr(self, key)
-            if not values:
+            if values is None:
                 continue
             for metadata_item in item.metadata:
                 if isinstance(metadata_item, SortParam):
@@ -69,7 +69,7 @@ class BaseSearchQuery(RootModel):
 
 class BaseAggregationQuery(RootModel):
     aggregate: AggregateTypes | None = None
-    group_by_properties: list[str] | list[Any] | None = None
+    group_by_properties: list[Any] | None = None
     aggregation_property: str | None = None
     limit: int | None = None
 
@@ -80,7 +80,7 @@ class BaseAggregationQuery(RootModel):
 
         for key, item in self.__class__.model_fields.items():
             values = getattr(self, key)
-            if not values:
+            if values is None:
                 continue
             for metadata_item in item.metadata:
                 if isinstance(metadata_item, QueryParam | NestedQueryParam):

industrial_model/queries/params.py

@@ -5,7 +5,7 @@ from industrial_model.constants import (
     LEAF_EXPRESSION_OPERATORS,
     SORT_DIRECTION,
 )
-from industrial_model.statements import LeafExpression
+from industrial_model.statements import BoolExpression, Expression, LeafExpression
 
 
 @dataclass
@@ -13,9 +13,21 @@ class QueryParam:
     property: str
     operator: LEAF_EXPRESSION_OPERATORS
 
-    def to_expression(self, value: Any) -> LeafExpression:
+    def to_expression(self, value: Any) -> Expression:
         if self.operator == "nested":
-            raise ValueError("Can not have nested operator on QuertParam")
+            raise ValueError(
+                "Nested operator not allowed in QueryParam - use NestedQueryParam"
+            )
+
+        if self.operator == "exists" and isinstance(value, bool) and not value:
+            return BoolExpression(
+                operator="not",
+                filters=[
+                    LeafExpression(
+                        property=self.property, operator=self.operator, value=True
+                    )
+                ],
+            )
 
         return LeafExpression(
             property=self.property,
@@ -29,7 +41,7 @@ class NestedQueryParam:
     property: str
     value: QueryParam
 
-    def to_expression(self, value: Any) -> LeafExpression:
+    def to_expression(self, value: Any) -> Expression:
         return LeafExpression(
             property=self.property,
             operator="nested",

{industrial_model-0.1.23.dist-info → industrial_model-0.1.25.dist-info}/METADATA

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

{industrial_model-0.1.23.dist-info → industrial_model-0.1.25.dist-info}/RECORD

@@ -5,7 +5,7 @@ industrial_model/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 industrial_model/utils.py,sha256=oh4AxwxXaWgIC2uolkCbvkgo0ququHB6yAPVIXy45Ts,663
 industrial_model/cognite_adapters/__init__.py,sha256=cKPW5y-wWiyWYLPDaNjhqc5zdsgdLc40vunIlz2Debg,6246
 industrial_model/cognite_adapters/aggregation_mapper.py,sha256=qglWUnyhgSPG005HzIRyjYkt9V2WKsab5y4ruwuKLcA,2503
-industrial_model/cognite_adapters/filter_mapper.py,sha256=xXTzxCYKU1-6TxG5W_bb8zNyWi2bfIM9RiujyOHUujg,3900
+industrial_model/cognite_adapters/filter_mapper.py,sha256=R_OX8JOM33vzBVFvfo0iDmSJl5rhGjsTBLyKDoesHO0,4349
 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
@@ -23,10 +23,10 @@ industrial_model/models/base.py,sha256=iGhDjXqA5ULEQIFHtkMi7WYJl0nQq1wi8_zqOr-Ep
 industrial_model/models/entities.py,sha256=tHOFjS-9XsaXVrZ-x0tZR1DWL2Cc8MHe82qsIazqmnM,2811
 industrial_model/models/schemas.py,sha256=EoLK9GYdS-0DQ98myTP3wOU9YpWIJOfDSLOYZUy3xEY,4559
 industrial_model/queries/__init__.py,sha256=0cF-KTTGHLhdFKe3T_5cEVHsTN95iAV7R6FUutvuoaU,317
-industrial_model/queries/models.py,sha256=wn4I8bTUGCT5keF6mUA7bEYNgSsOxeN-zibY5CYhzj8,3267
-industrial_model/queries/params.py,sha256=ehgCoR5n6E-tkEuoymZ2lkLcSzMaBAx_HnyJ7sWpqz0,964
+industrial_model/queries/models.py,sha256=XS-50Ja11fVM5G7XTvrFf4OSUD3QO58rAKkkFBQ3Xbg,3255
+industrial_model/queries/params.py,sha256=U2LCdmDs_jrROvJIsWdopAmZAhXrK2gDr4kuDlVK7Ug,1384
 industrial_model/statements/__init__.py,sha256=rjLRo2KoazHQaOpmPkxbI3_Nm8NCkJxjpuqow6IZVSc,4221
 industrial_model/statements/expressions.py,sha256=4ZZOcZroI5-4xRw4PXIRlufi0ARndE5zSbbxLDpR2Ec,4816
-industrial_model-0.1.23.dist-info/METADATA,sha256=HoA3Ba1kVrvGjtZQEqGvFHL2NnvV8G1S1uIcq7Of53c,6858
-industrial_model-0.1.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.23.dist-info/RECORD,,
+industrial_model-0.1.25.dist-info/METADATA,sha256=derKswE0QRuEHyTTA3oq3wD2jxq06-NnkJYiDiHqNQY,6858
+industrial_model-0.1.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.25.dist-info/RECORD,,