industrial-model 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

industrial_model/__init__.py

@@ -8,12 +8,13 @@ from .models import (
     ViewInstance,
     ViewInstanceConfig,
 )
-from .statements import and_, col, or_, select
+from .statements import and_, col, not_, or_, select
 
 __all__ = [
     "and_",
     "or_",
     "col",
+    "not_",
     "select",
     "ViewInstance",
     "InstanceId",

industrial_model/cognite_adapters/optimizer.py

@@ -49,8 +49,11 @@ class QueryOptimizer:
                 where_clause, BoolExpression
             ) and self._has_space_filter(where_clause.filters):
                 return True
-            elif isinstance(where_clause, LeafExpression):
-                return where_clause.property == SPACE_PROPERTY
+            elif (
+                isinstance(where_clause, LeafExpression)
+                and where_clause.property == SPACE_PROPERTY
+            ):
+                return True
 
         return False
 

industrial_model/cognite_adapters/query_mapper.py

@@ -21,13 +21,12 @@ from cognite.client.data_classes.data_modeling.views import (
 )
 
 from industrial_model.constants import EDGE_MARKER, MAX_LIMIT, NESTED_SEP
-from industrial_model.models import TViewInstance
+from industrial_model.models import TViewInstance, get_schema_properties
 from industrial_model.statements import Statement
 
 from .filter_mapper import (
     FilterMapper,
 )
-from .schemas import get_schema_properties
 from .sort_mapper import SortMapper
 from .view_mapper import ViewMapper
 
@@ -135,19 +134,22 @@ class QueryMapper:
                     with_,
                     select_,
                 )
-                if not props:
-                    with_[property_key] = NodeResultSetExpression(
-                        from_=key,
-                        direction="inwards",
-                        through=property.source.as_property_ref(
-                            property.through.property
-                        ),
-                        limit=MAX_LIMIT,
-                    )
 
-                    select_[property_key] = self._get_select(
-                        property.source, props
-                    )
+                with_[property_key] = NodeResultSetExpression(
+                    from_=key,
+                    direction="inwards",
+                    through=property.source.as_property_ref(
+                        property.through.property
+                    ),
+                    limit=MAX_LIMIT,
+                )
+
+                if property.through.property not in props:
+                    props.append(property.through.property)
+
+                select_[property_key] = self._get_select(
+                    property.source, props
+                )
             elif isinstance(property, EdgeConnection) and property.source:
                 edge_property_key = f"{property_key}{NESTED_SEP}{EDGE_MARKER}"
 

industrial_model/models/__init__.py

@@ -7,6 +7,7 @@ from .entities import (
     ViewInstance,
     ViewInstanceConfig,
 )
+from .schemas import get_schema_properties
 
 __all__ = [
     "RootModel",
@@ -16,4 +17,5 @@ __all__ = [
     "ValidationMode",
     "PaginatedResult",
     "ViewInstanceConfig",
+    "get_schema_properties",
 ]

industrial_model/{cognite_adapters → models}/schemas.py

@@ -12,14 +12,12 @@ from typing import (
 
 from pydantic import BaseModel
 
-from industrial_model.constants import NESTED_SEP
-
 TBaseModel = TypeVar("TBaseModel", bound=BaseModel)
 
 
 def get_schema_properties(
     cls: type[TBaseModel],
-    nested_separator: str = NESTED_SEP,
+    nested_separator: str,
     prefix: str | None = None,
 ) -> list[str]:
     data = _get_type_properties(cls) or {}

industrial_model/statements/__init__.py

@@ -10,6 +10,7 @@ from .expressions import (
     LeafExpression,
     and_,
     col,
+    not_,
     or_,
 )
 
@@ -66,5 +67,6 @@ __all__ = [
     "LeafExpression",
     "BoolExpression",
     "and_",
+    "not_",
     "or_",
 ]

industrial_model/statements/expressions.py

@@ -161,5 +161,11 @@ def or_(*expressions: bool | LeafExpression | BoolExpression) -> bool:
     )  # type: ignore
 
 
+def not_(*expressions: bool | LeafExpression | BoolExpression) -> bool:
+    return BoolExpression(
+        operator="not", filters=_unwrap_expressions(*expressions)
+    )  # type: ignore
+
+
 def col(property: Any) -> Column:
     return Column(property)

{industrial_model-0.1.4.dist-info → industrial_model-0.1.6.dist-info}/METADATA

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

{industrial_model-0.1.4.dist-info → industrial_model-0.1.6.dist-info}/RECORD

@@ -1,28 +1,28 @@
-industrial_model/__init__.py,sha256=EDOULHjsfkh_XJVHVajSpQycMWLsQ3STmVj_WoKfiWc,507
+industrial_model/__init__.py,sha256=qst1HvSXw7ytYTvi_hgg8989rSqKXF3n_8jv3wO73x8,525
 industrial_model/config.py,sha256=wzSKVKHIdGlxCRtu0PIeL3SLYvnQBR4Py46CcETxa8U,238
 industrial_model/constants.py,sha256=wtFdxkR9gojqekwXeyVCof6VUkJYuqjjgAgVVKrcxaw,450
 industrial_model/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 industrial_model/utils.py,sha256=OuuAkIqu-551axsZJPuqHu5d9iReGcfY9ROBFtHIwkY,933
 industrial_model/cognite_adapters/__init__.py,sha256=9N4oT7tWZx5wjVr7q64Ef5FLT75Omep48xGYv1PhxV8,1917
 industrial_model/cognite_adapters/filter_mapper.py,sha256=NqH-OW7_iKFY9POCG8W3KjkwXUgrZP1d_yxDx1J0fXM,3859
-industrial_model/cognite_adapters/optimizer.py,sha256=msOXAU2nY2-7U0-AlST3_SWuLHnyQ9wNa5_BzMRQfdw,2166
-industrial_model/cognite_adapters/query_mapper.py,sha256=lYKRiIEmFiX7CQUnrOh5_-t1UkAMcT3dr9ORgErDXOY,6233
+industrial_model/cognite_adapters/optimizer.py,sha256=G8I07jJ9tarE5GZXXUSpTMKUei6ptV-cudJSLsoykX4,2223
+industrial_model/cognite_adapters/query_mapper.py,sha256=3fEcaLsGjLKIh-g1BbMcffQ6rp99JeCW555iJo8JW44,6260
 industrial_model/cognite_adapters/query_result_mapper.py,sha256=jUreXqsaLnq7hp6T_JZQNRtL8TL8hoLSFvD4SkJ4TEE,7002
-industrial_model/cognite_adapters/schemas.py,sha256=EiRe0HK6thCzk0WYOPrAIRe8GkkG7_ykQsy7WVfT_Og,3430
 industrial_model/cognite_adapters/sort_mapper.py,sha256=RJUAYlZGXoYzK0PwX63cibRF_L-MUq9g2ZsC2EeNIF4,696
 industrial_model/cognite_adapters/utils.py,sha256=nBYHK8697L2yGEAcyKjQV9NEZQmWy_aSGq_iMl7gofM,907
 industrial_model/cognite_adapters/view_mapper.py,sha256=lnv64KezSQTAr6XdcExa8d92GU5Ll9K9HfMcQGzhX6k,488
 industrial_model/engines/__init__.py,sha256=7aGHrUm2MxIq39vR8h0xu3i1zNOuT9H9U-q4lV3nErQ,102
 industrial_model/engines/async_engine.py,sha256=3Y4Ao14CDJJAZFbgTX9I6LOJUxfe8nwOOukGVeiw914,1070
 industrial_model/engines/engine.py,sha256=8-wfktRLZpad_V7_F1Vz7vtjE_bQhga_jXXjuwSgfrE,1897
-industrial_model/models/__init__.py,sha256=j8e54oDCY_rh6GOyacK9UtjjI4nwKLpsy3r5GSJTXpY,334
+industrial_model/models/__init__.py,sha256=YcNLjpYnxdU_wTpn1n0AhwlZ-XHWYqX6FzfbuevG3jo,406
 industrial_model/models/base.py,sha256=jbiaICJ0R1mmxXtDqxxlVdq-tTX4RLdqnLTgs9HLm_4,1279
 industrial_model/models/entities.py,sha256=NrFV_a3ZP6Y4b1M2PFl_746qcCsexsyO2cuB0snZhkw,1319
+industrial_model/models/schemas.py,sha256=FzreMCR2TGX89-tMRpCNdcYqHj1u9QlocRLNwE_J2rA,3366
 industrial_model/queries/__init__.py,sha256=7aheTE5qs03rxWm9fmGWptbz_p9OIXXYD8if56cqs18,227
 industrial_model/queries/models.py,sha256=iiHQ7-cfg0nukEv5PoCx9QPF-w1gVSnoNbXBOK9Mzeo,1185
 industrial_model/queries/params.py,sha256=ehgCoR5n6E-tkEuoymZ2lkLcSzMaBAx_HnyJ7sWpqz0,964
-industrial_model/statements/__init__.py,sha256=mqPIvfQ-XZ_IILwha7RbkdIKH_MRAdAvfrw80pCKU1c,1753
-industrial_model/statements/expressions.py,sha256=bsUnkFDGVHpOQ1RUtEbSPE1nfVkF0zC3m5-9JFkSqu8,4751
-industrial_model-0.1.4.dist-info/METADATA,sha256=zJFOaUlsd7sEzyZDxNXRF7Lj80DfHA2kSGHrAc3HvQA,4806
-industrial_model-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-0.1.4.dist-info/RECORD,,
+industrial_model/statements/__init__.py,sha256=9fD-qpNXIkrjoahxC_R6hS4DKSVelehimvRPKbpYfA0,1775
+industrial_model/statements/expressions.py,sha256=Sar1cIvy3sYi7tkWJN3ylHlZ252oN2mZJpZ1TX9jN3s,4940
+industrial_model-0.1.6.dist-info/METADATA,sha256=M-BS6_DyB4pIwwqPlvBp4_7XCqFDBbdver_EXwZ8WMo,4806
+industrial_model-0.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-0.1.6.dist-info/RECORD,,