industrial-model 1.1.4__tar.gz → 1.2.0__tar.gz

{industrial_model-1.1.4 → industrial_model-1.2.0}/PKG-INFO

@@ -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 → industrial_model-1.2.0}/README.md

@@ -220,7 +220,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 → industrial_model-1.2.0}/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-1.1.4 → industrial_model-1.2.0}/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-1.1.4 → industrial_model-1.2.0}/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-1.1.4 → industrial_model-1.2.0}/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 → industrial_model-1.2.0}/pyproject.toml

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