industrial-model 0.1.23__tar.gz → 0.1.25__tar.gz

{industrial_model-0.1.23 → industrial_model-0.1.25}/PKG-INFO

@@ -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 → industrial_model-0.1.25}/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-0.1.23 → industrial_model-0.1.25}/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-0.1.23 → industrial_model-0.1.25}/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 → industrial_model-0.1.25}/pyproject.toml

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

{industrial_model-0.1.23 → industrial_model-0.1.25}/tests/models.py

@@ -37,7 +37,7 @@ class Event(ViewInstance):
         view_external_id="OEEEvent",
         instance_spaces_prefix="OEE-",
     )
-
+    event_definition: str | None = None
     start_date_time: datetime.datetime | None = None
     ref_site: ReportingSite | None = None
     ref_unit: DescribableEntity | None = None

industrial_model-0.1.25/tests/tests_query.py

@@ -0,0 +1,33 @@
+import datetime
+import json
+from typing import Annotated
+
+from industrial_model.queries.models import BasePaginatedQuery
+from industrial_model.queries.params import QueryParam
+
+from .hubs import generate_engine
+from .models import Event
+
+if __name__ == "__main__":
+    adapter = generate_engine()
+
+    class EventRequest(BasePaginatedQuery):
+        start_date_time_gt: Annotated[
+            datetime.datetime | None,
+            QueryParam(property="startDateTime", operator=">"),
+        ] = None
+        event_definition_exists: Annotated[
+            bool | None, QueryParam(property="eventDefinition", operator="exists")
+        ] = None
+
+    filter = EventRequest(
+        start_date_time_gt=datetime.datetime(2025, 3, 1),
+        event_definition_exists=False,
+        limit=1,
+    )
+
+    statement = filter.to_statement(Event)
+
+    result = adapter.query(statement)
+    print(len(result.data))
+    json.dump(result.model_dump(mode="json"), open("events.json", "w"), indent=2)

{industrial_model-0.1.23 → industrial_model-0.1.25}/uv.lock

@@ -215,7 +215,7 @@ wheels = [
 
 [[package]]
 name = "industrial-model"
-version = "0.1.23"
+version = "0.1.25"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },