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

industrial_model/cognite_adapters/query_result_mapper.py

@@ -90,6 +90,8 @@ class QueryResultMapper:
 
             visited.add(identify)
             properties = node.properties.get(view_id, {})
+            if len(properties) == 0:
+                continue
 
             edges_mapping: dict[str, list[EdgeContainer]] = {}
             node_id = get_node_id(node)
@@ -118,6 +120,8 @@ class QueryResultMapper:
 
                 node_entries = mapping_nodes.get(element_key)
                 if not node_entries:
+                    if mapping_key in properties:
+                        properties.pop(mapping_key)
                     continue
 
                 entry_data = self.nodes_to_dict(node_entries)
@@ -186,7 +190,7 @@ class QueryResultMapper:
                 is_list = True
                 connection_type = ConnectionTypeEnum.EDGE
 
-            if nodes:
+            if nodes is not None:
                 mappings[property_name] = _PropertyMapping(
                     is_list=is_list,
                     connection_type=connection_type,

industrial_model/queries/__init__.py

@@ -1,5 +1,5 @@
 from .models import BaseAggregationQuery, BasePaginatedQuery, BaseQuery, BaseSearchQuery
-from .params import NestedQueryParam, QueryParam, SortParam
+from .params import BoolQueryParam, NestedQueryParam, QueryParam, SortParam
 
 __all__ = [
     "BaseQuery",
@@ -9,4 +9,5 @@ __all__ = [
     "SortParam",
     "QueryParam",
     "NestedQueryParam",
+    "BoolQueryParam",
 ]

industrial_model/queries/models.py

@@ -7,24 +7,17 @@ from industrial_model.statements import (
     SearchStatement,
     Statement,
     aggregate,
+    search,
+    select,
 )
 
-from .params import NestedQueryParam, QueryParam, SortParam
+from .utils import extract_base_statement_params
 
 
 class BaseQuery(RootModel):
     def to_statement(self, entity: type[TViewInstance]) -> Statement[TViewInstance]:
-        statement = Statement(entity)
-
-        for key, item in self.__class__.model_fields.items():
-            values = getattr(self, key)
-            if values is None:
-                continue
-            for metadata_item in item.metadata:
-                if isinstance(metadata_item, SortParam):
-                    statement.sort(values, metadata_item.direction)
-                elif isinstance(metadata_item, QueryParam | NestedQueryParam):
-                    statement.where(metadata_item.to_expression(values))
+        statement = select(entity)
+        _set_base_statement_params(self, statement)
 
         return statement
 
@@ -49,17 +42,8 @@ class BaseSearchQuery(RootModel):
     def to_statement(
         self, entity: type[TViewInstance]
     ) -> SearchStatement[TViewInstance]:
-        statement = SearchStatement(entity)
-
-        for key, item in self.__class__.model_fields.items():
-            values = getattr(self, key)
-            if values is None:
-                continue
-            for metadata_item in item.metadata:
-                if isinstance(metadata_item, SortParam):
-                    statement.sort(values, metadata_item.direction)
-                elif isinstance(metadata_item, QueryParam | NestedQueryParam):
-                    statement.where(metadata_item.to_expression(values))
+        statement = search(entity)
+        _set_base_statement_params(self, statement)
         if self.query:
             statement.query_by(self.query, self.query_properties)
         statement.limit(self.limit)
@@ -78,13 +62,7 @@ class BaseAggregationQuery(RootModel):
     ) -> AggregationStatement[TAggregatedViewInstance]:
         statement = aggregate(entity, self.aggregate)
 
-        for key, item in self.__class__.model_fields.items():
-            values = getattr(self, key)
-            if values is None:
-                continue
-            for metadata_item in item.metadata:
-                if isinstance(metadata_item, QueryParam | NestedQueryParam):
-                    statement.where(metadata_item.to_expression(values))
+        _set_base_statement_params(self, statement)
 
         if self.group_by_properties:
             statement.group_by(*self.group_by_properties)
@@ -96,3 +74,19 @@ class BaseAggregationQuery(RootModel):
             statement.limit(self.limit)
 
         return statement
+
+
+def _set_base_statement_params(
+    entity: RootModel,
+    statement: Statement[TViewInstance]
+    | SearchStatement[TViewInstance]
+    | AggregationStatement[TAggregatedViewInstance],
+) -> None:
+    filters_, sort_params = extract_base_statement_params(entity)
+    statement.where(*filters_)
+
+    if isinstance(statement, AggregationStatement):
+        return
+
+    for sort_value, direction in sort_params:
+        statement.sort(sort_value, direction)

industrial_model/queries/params.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Any
 
 from industrial_model.constants import (
+    BOOL_EXPRESSION_OPERATORS,
     LEAF_EXPRESSION_OPERATORS,
     SORT_DIRECTION,
 )
@@ -49,6 +50,17 @@ class NestedQueryParam:
         )
 
 
+@dataclass
+class BoolQueryParam:
+    operator: BOOL_EXPRESSION_OPERATORS
+
+    def to_expression(self, filters: list[Expression]) -> Expression:
+        return BoolExpression(
+            operator=self.operator,
+            filters=filters,
+        )
+
+
 @dataclass
 class SortParam:
     direction: SORT_DIRECTION

industrial_model/queries/utils.py

@@ -0,0 +1,42 @@
+from typing import Any
+
+from industrial_model.constants import SORT_DIRECTION
+from industrial_model.models import RootModel
+from industrial_model.statements import Expression
+
+from .params import BoolQueryParam, NestedQueryParam, QueryParam, SortParam
+
+
+def extract_base_statement_params(
+    entity: RootModel,
+) -> tuple[list[Expression], list[tuple[Any, SORT_DIRECTION]]]:
+    filters_: list[Expression] = []
+    sort_params: list[tuple[Any, SORT_DIRECTION]] = []
+
+    for key, item in entity.__class__.model_fields.items():
+        values = getattr(entity, key)
+        if values is None:
+            continue
+        for metadata_item in item.metadata:
+            if isinstance(metadata_item, SortParam):
+                sort_params.append((values, metadata_item.direction))
+            elif isinstance(
+                metadata_item, QueryParam | NestedQueryParam | BoolQueryParam
+            ):
+                filter_ = _extract_expression(metadata_item, values)
+                if filter_ is not None:
+                    filters_.append(filter_)
+    return filters_, sort_params
+
+
+def _extract_expression(
+    metadata_item: QueryParam | NestedQueryParam | BoolQueryParam, values: Any
+) -> Expression | None:
+    if isinstance(metadata_item, QueryParam | NestedQueryParam):
+        return metadata_item.to_expression(values)
+
+    if not isinstance(values, RootModel):
+        return None
+
+    filters_, _ = extract_base_statement_params(values)
+    return metadata_item.to_expression(filters_)

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

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

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

@@ -9,7 +9,7 @@ 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=dzj5CdteITq-E3uQjX9s_B3WmryQV69pnwrGGHdcWDE,9139
+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
@@ -22,11 +22,12 @@ industrial_model/models/__init__.py,sha256=AzJ0CyPK5PvUCX45FFtybl13tkukUvk2UAF_9
 industrial_model/models/base.py,sha256=iGhDjXqA5ULEQIFHtkMi7WYJl0nQq1wi8_zqOr-Ep78,1649
 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=XS-50Ja11fVM5G7XTvrFf4OSUD3QO58rAKkkFBQ3Xbg,3255
-industrial_model/queries/params.py,sha256=U2LCdmDs_jrROvJIsWdopAmZAhXrK2gDr4kuDlVK7Ug,1384
+industrial_model/queries/__init__.py,sha256=lA83zOxMRgBgkseWJgK9kCr1vD8D8iSWs9NGGRnoYKk,355
+industrial_model/queries/models.py,sha256=VK69c4L0b0miPrKvOQBB8A01SPxZXYThrquv6gw5OGY,2544
+industrial_model/queries/params.py,sha256=50qY5BO5onLsXorhcv-7qCKhJaMO94UzhKLCmZKY55s,1667
+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.26.dist-info/METADATA,sha256=ucUIAoAcw63yUQmLmrxaVijuuUp1rrQ4ctBo2RwR4Pc,6858
-industrial_model-0.1.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.26.dist-info/RECORD,,
+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,,