industrial-model 0.1.4__tar.gz → 0.1.6__tar.gz

industrial_model-0.1.6/.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "editor.defaultFormatter": "charliermarsh.ruff",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll": "always",
+        "source.organizeImports": "always"
+    }
+}

{industrial_model-0.1.4 → industrial_model-0.1.6}/PKG-INFO

@@ -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 → industrial_model-0.1.6}/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-0.1.4 → industrial_model-0.1.6}/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-0.1.4 → industrial_model-0.1.6}/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-0.1.4 → industrial_model-0.1.6}/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-0.1.4/industrial_model/cognite_adapters → industrial_model-0.1.6/industrial_model/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-0.1.4 → industrial_model-0.1.6}/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-0.1.4 → industrial_model-0.1.6}/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 → industrial_model-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "industrial-model"
-version = "0.1.4"
+version = "0.1.6"
 description = "Industrial Model ORM"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -26,6 +26,7 @@ build-backend = "hatchling.build"
 dev-dependencies = [
     "dotenv>=0.9.9",
     "mypy>=1.15.0",
+    "pytest>=8.3.5",
     "pyyaml>=6.0.2",
     "ruff>=0.11.8",
     "types-pyyaml>=6.0.12.20250402",

{industrial_model-0.1.4 → industrial_model-0.1.6}/uv.lock

@@ -143,6 +143,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/85/08/38477bff9eaa7a153847718d50faea698ef68a998a3c69fdba09ad4b919a/cognite_sdk-7.75.0-py3-none-any.whl", hash = "sha256:0696ff265e11ae3a2351760def6f2bd04df1e2524bf855c5d7920a76b123d5e0", size = 623162 },
 ]
 
+[[package]]
+name = "colorama"
+version = "0.4.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 },
+]
+
 [[package]]
 name = "cryptography"
 version = "44.0.3"
@@ -206,7 +215,7 @@ wheels = [
 
 [[package]]
 name = "industrial-model"
-version = "0.1.0"
+version = "0.1.6"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },
@@ -218,6 +227,7 @@ dependencies = [
 dev = [
     { name = "dotenv" },
     { name = "mypy" },
+    { name = "pytest" },
     { name = "pyyaml" },
     { name = "ruff" },
     { name = "types-pyyaml" },
@@ -234,11 +244,21 @@ requires-dist = [
 dev = [
     { name = "dotenv", specifier = ">=0.9.9" },
     { name = "mypy", specifier = ">=1.15.0" },
+    { name = "pytest", specifier = ">=8.3.5" },
     { name = "pyyaml", specifier = ">=6.0.2" },
     { name = "ruff", specifier = ">=0.11.8" },
     { name = "types-pyyaml", specifier = ">=6.0.12.20250402" },
 ]
 
+[[package]]
+name = "iniconfig"
+version = "2.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f2/97/ebf4da567aa6827c909642694d71c9fcf53e5b504f2d96afea02718862f3/iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", size = 4793 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050 },
+]
+
 [[package]]
 name = "msal"
 version = "1.32.3"
@@ -311,6 +331,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469 },
 ]
 
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538 },
+]
+
 [[package]]
 name = "protobuf"
 version = "6.31.0"
@@ -428,6 +457,21 @@ crypto = [
     { name = "cryptography" },
 ]
 
+[[package]]
+name = "pytest"
+version = "8.3.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "iniconfig" },
+    { name = "packaging" },
+    { name = "pluggy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ae/3c/c9d525a414d506893f0cd8a8d0de7706446213181570cdbd766691164e40/pytest-8.3.5.tar.gz", hash = "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845", size = 1450891 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/30/3d/64ad57c803f1fa1e963a7946b6e0fea4a70df53c1a7fed304586539c2bac/pytest-8.3.5-py3-none-any.whl", hash = "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", size = 343634 },
+]
+
 [[package]]
 name = "python-dotenv"
 version = "1.1.0"