industrial-model 1.1.4__py3-none-any.whl → 1.2.0__py3-none-any.whl

industrial_model/cognite_adapters/__init__.py

@@ -59,6 +59,7 @@ class CogniteAdapter:
             properties=search_query.query_properties,
             limit=search_query.limit,
             sort=search_query.sort,
+            operator=search_query.operator or "OR",
         )
 
         return self._result_mapper.nodes_to_dict(data)

industrial_model/cognite_adapters/search_mapper.py

@@ -4,7 +4,7 @@ import cognite.client.data_classes.filters as filters
 from cognite.client.data_classes.data_modeling import InstanceSort, View
 
 from industrial_model.models import TViewInstance
-from industrial_model.statements import SearchStatement
+from industrial_model.statements import SearchOperationTypes, SearchStatement
 
 from .filter_mapper import (
     FilterMapper,
@@ -21,6 +21,7 @@ class SearchQuery:
     query_properties: list[str] | None
     limit: int
     sort: list[InstanceSort]
+    operator: SearchOperationTypes | None
 
 
 class SearchMapper:
@@ -47,4 +48,5 @@ class SearchMapper:
             query_properties=statement_values.query_properties,
             limit=statement_values.limit,
             sort=sort_clauses,
+            operator=statement_values.search_operator,
         )

industrial_model/queries/models.py

@@ -4,6 +4,7 @@ from industrial_model.models import RootModel, TAggregatedViewInstance, TViewIns
 from industrial_model.statements import (
     AggregateTypes,
     AggregationStatement,
+    SearchOperationTypes,
     SearchStatement,
     Statement,
     aggregate,
@@ -37,6 +38,7 @@ class BasePaginatedQuery(BaseQuery):
 class BaseSearchQuery(RootModel):
     query: str | None = None
     query_properties: list[Any] | None = None
+    query_operator: SearchOperationTypes | None = None
     limit: int = 1000
 
     def to_statement(
@@ -45,7 +47,11 @@ class BaseSearchQuery(RootModel):
         statement = search(entity)
         _set_base_statement_params(self, statement)
         if self.query:
-            statement.query_by(self.query, self.query_properties)
+            statement.query_by(
+                self.query,
+                self.query_properties,
+                self.query_operator,
+            )
         statement.limit(self.limit)
 
         return statement

industrial_model/statements/__init__.py

@@ -16,6 +16,7 @@ from .expressions import (
 
 T = TypeVar("T")
 AggregateTypes = Literal["count", "avg", "min", "max", "sum"]
+SearchOperationTypes = Literal["OR", "AND"]
 
 
 def _create_column(property: str | Column | Any) -> Column:
@@ -36,6 +37,7 @@ class BaseStatementValues:
 
     query: str | None = field(init=False, default=None)
     query_properties: list[str] | None = field(init=False, default=None)
+    search_operator: SearchOperationTypes | None = field(init=False, default=None)
 
 
 @dataclass
@@ -106,6 +108,7 @@ class SearchStatement(BaseStatement[T]):
         self,
         query: str,
         query_properties: list[Column] | list[str] | list[Any] | None = None,
+        operation: SearchOperationTypes | None = None,
     ) -> Self:
         self._values.query = query
         self._values.query_properties = (
@@ -120,6 +123,7 @@ class SearchStatement(BaseStatement[T]):
             if query_properties
             else None
         )
+        self._values.search_operator = operation
         return self
 
 

{industrial_model-1.1.4.dist-info → industrial_model-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: industrial-model
-Version: 1.1.4
+Version: 1.2.0
 Summary: Industrial Model ORM
 Project-URL: Homepage, https://github.com/lucasrosaalves/industrial-model
 Project-URL: Source, https://github.com/lucasrosaalves/industrial-model
@@ -244,7 +244,11 @@ from industrial_model import search
 search_statement = (
     search(CogniteAsset)
     .where(col(CogniteAsset.aliases).contains_any_(["my_alias"]))
-    .query_by("my fuzzy name", [CogniteAsset.name])
+    .query_by(
+        query="my fuzzy name",
+        query_properties=[CogniteAsset.name],
+        operator="AND",
+    )
 )
 
 search_result = engine.search(search_statement)

{industrial_model-1.1.4.dist-info → industrial_model-1.2.0.dist-info}/RECORD

@@ -3,14 +3,14 @@ industrial_model/config.py,sha256=fiwW-54fgCBY6ciFlRqeCBCNUvY41D-xuv8rCH7Ok54,29
 industrial_model/constants.py,sha256=MO85Wk05LHrpfbS4zml1hneJNFxht2oa3KFAKXw92qo,450
 industrial_model/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 industrial_model/utils.py,sha256=oh4AxwxXaWgIC2uolkCbvkgo0ququHB6yAPVIXy45Ts,663
-industrial_model/cognite_adapters/__init__.py,sha256=y8vCi2HdjDDkjqPt9y9LTpWu4ZFtc-65re70aHmc-ho,6497
+industrial_model/cognite_adapters/__init__.py,sha256=RQPPTV13gr7T3jopWvKarvK-NcB21hpOHn1ZEzh2gUA,6549
 industrial_model/cognite_adapters/aggregation_mapper.py,sha256=CYbOR7Eh447PEwCtPKFCHYh3-K6akwLTJdQ-oeSYvKo,2599
 industrial_model/cognite_adapters/filter_mapper.py,sha256=eSrEYdEKZHQuJ98gblBYy1qCe5VYpq3fjLSUg8614fk,5261
 industrial_model/cognite_adapters/models.py,sha256=2j2IS01uPkQEp9WdVk8seYzEqGcDdWFnpzXhusHB2zk,945
 industrial_model/cognite_adapters/optimizer.py,sha256=-iorsO-yOe8wuMNBMsV1KjAmC3-Yiewte4JKnyQyHOo,2345
 industrial_model/cognite_adapters/query_mapper.py,sha256=tpRdrEW6i0NKy5h6bYrIIP96nanPSokK-s5-1d0PES8,6597
 industrial_model/cognite_adapters/query_result_mapper.py,sha256=0X8Fg2kLwWZuylVtU6hB_n7x3VOl-rdfOZWOn7e_QCs,10238
-industrial_model/cognite_adapters/search_mapper.py,sha256=zRe5FgucTWHX2VVbh3iLmzM7FmUAFhJG5t42gXnnJrE,1587
+industrial_model/cognite_adapters/search_mapper.py,sha256=5RCoQSsNxnAzU-oGD1SI3MAxcx1lOwgBQNVQnamGDwA,1706
 industrial_model/cognite_adapters/sort_mapper.py,sha256=EQ2Xpfdet8jN6EK0rEZ3IA8L7sPXWVX1MA9kQg4LdXs,1083
 industrial_model/cognite_adapters/upsert_mapper.py,sha256=iHt3gOEruFkZmg7KdynVPdRA7VZbuKhjAST0uFPb5rM,5125
 industrial_model/cognite_adapters/utils.py,sha256=EFcycPxu7YCjH-GyyLzl7nylm1Aii5dqQy27s3Pn6gs,4842
@@ -25,12 +25,12 @@ industrial_model/models/entities.py,sha256=-Jf7bNCijbS3_wZohlog3bRsAkXvkUeAQW9Da
 industrial_model/models/schemas.py,sha256=EoLK9GYdS-0DQ98myTP3wOU9YpWIJOfDSLOYZUy3xEY,4559
 industrial_model/models/utils.py,sha256=MFS8OyCfh4cYPY_R66-mUaCauQfQy0vd558Rw0tiGDc,1786
 industrial_model/queries/__init__.py,sha256=lA83zOxMRgBgkseWJgK9kCr1vD8D8iSWs9NGGRnoYKk,355
-industrial_model/queries/models.py,sha256=VK69c4L0b0miPrKvOQBB8A01SPxZXYThrquv6gw5OGY,2544
+industrial_model/queries/models.py,sha256=bXQL3udhAf2Yssi00O3WycgACKrKifR65dh7CR8W_48,2709
 industrial_model/queries/params.py,sha256=50qY5BO5onLsXorhcv-7qCKhJaMO94UzhKLCmZKY55s,1667
 industrial_model/queries/utils.py,sha256=uP6PLh9IVHDK6J8x444zHWPmyV4PkxdLO-PMc6qWItc,1505
-industrial_model/statements/__init__.py,sha256=3Et9PM7AMbIS7Fh9051Q0u3qUpX6588d1yuNrvdd4wI,5429
+industrial_model/statements/__init__.py,sha256=xazAVHvN8HKsWcXR2Hp1aGxd59stg13JXO6tgpJnsC4,5660
 industrial_model/statements/expressions.py,sha256=4ZZOcZroI5-4xRw4PXIRlufi0ARndE5zSbbxLDpR2Ec,4816
-industrial_model-1.1.4.dist-info/METADATA,sha256=hEnX14-j55IQXz3gf5C_R4p_dWVFlmiJLgF12XznkLw,7700
-industrial_model-1.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-1.1.4.dist-info/licenses/LICENSE,sha256=BCHCZ1Qo7m4YvAEIQqtVBI3NebFJdZ8_7m_cxInIlN0,4934
-industrial_model-1.1.4.dist-info/RECORD,,
+industrial_model-1.2.0.dist-info/METADATA,sha256=mUD0K0gPDpPSf-yPi6rhnx_vfkmCl1h6h701nqotsuw,7770
+industrial_model-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-1.2.0.dist-info/licenses/LICENSE,sha256=BCHCZ1Qo7m4YvAEIQqtVBI3NebFJdZ8_7m_cxInIlN0,4934
+industrial_model-1.2.0.dist-info/RECORD,,