industrial-model 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

industrial_model/cognite_adapters/sort_mapper.py

@@ -1,4 +1,4 @@
-from cognite.client.data_classes.data_modeling import InstanceSort, View
+from cognite.client.data_classes.data_modeling import InstanceSort, MappedProperty, View
 
 from industrial_model.cognite_adapters.utils import get_property_ref
 from industrial_model.constants import SORT_DIRECTION
@@ -15,7 +15,17 @@ class SortMapper:
             InstanceSort(
                 property=get_property_ref(column.property, root_view),
                 direction=direction,
-                nulls_first=direction == "descending",
+                nulls_first=self._is_nulls_first(column, root_view, direction),
             )
             for column, direction in sort_clauses
         ]
+
+    def _is_nulls_first(
+        self, column: Column, root_view: View, direction: SORT_DIRECTION
+    ) -> bool:
+        view_property = root_view.properties.get(column.property)
+
+        if isinstance(view_property, MappedProperty) and view_property.source:
+            return direction == "ascending"
+
+        return direction == "descending"

industrial_model/engines/_internal.py

@@ -20,13 +20,13 @@ def generate_engine_params(
     file_env_parsed = env_sub_template.substitute(dict(os.environ))
 
     engine_config = yaml.safe_load(file_env_parsed)
-    assert isinstance(
-        engine_config, dict
-    ), "Configuration file must contain a dictionary"
+    assert isinstance(engine_config, dict), (
+        "Configuration file must contain a dictionary"
+    )
     assert "cognite" in engine_config, "Configuration must contain 'cognite' section"
-    assert (
-        "data_model" in engine_config
-    ), "Configuration must contain 'data_model' section"
+    assert "data_model" in engine_config, (
+        "Configuration must contain 'data_model' section"
+    )
 
     client = CogniteClient.load(engine_config["cognite"])
     dm_id = DataModelId.model_validate(engine_config["data_model"])

industrial_model/models/entities.py

@@ -73,9 +73,9 @@ class ViewInstance(InstanceId):
         return cls.view_config.get("view_external_id") or cls.__name__
 
     def get_edge_metadata(self, property: Column | str | Any) -> list[EdgeContainer]:
-        assert isinstance(
-            property, Column | str
-        ), f"Expected property to be Column, or str, got {type(property).__name__}"
+        assert isinstance(property, Column | str), (
+            f"Expected property to be Column, or str, got {type(property).__name__}"
+        )
         identifier = property.property if isinstance(property, Column) else property
 
         edge_map_key = self.get_field_alias(identifier) or self.get_field_name(

{industrial_model-1.0.0.dist-info → industrial_model-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: industrial-model
-Version: 1.0.0
+Version: 1.0.1
 Summary: Industrial Model ORM
 Project-URL: Homepage, https://github.com/lucasrosaalves/industrial-model
 Project-URL: Source, https://github.com/lucasrosaalves/industrial-model

{industrial_model-1.0.0.dist-info → industrial_model-1.0.1.dist-info}/RECORD

@@ -11,17 +11,17 @@ industrial_model/cognite_adapters/optimizer.py,sha256=-iorsO-yOe8wuMNBMsV1KjAmC3
 industrial_model/cognite_adapters/query_mapper.py,sha256=tpRdrEW6i0NKy5h6bYrIIP96nanPSokK-s5-1d0PES8,6597
 industrial_model/cognite_adapters/query_result_mapper.py,sha256=KaBqYr5l1t8sQMxEoX_F3J2prypKIPaDJxSzGF_fMB8,10203
 industrial_model/cognite_adapters/search_mapper.py,sha256=zRe5FgucTWHX2VVbh3iLmzM7FmUAFhJG5t42gXnnJrE,1587
-industrial_model/cognite_adapters/sort_mapper.py,sha256=RJUAYlZGXoYzK0PwX63cibRF_L-MUq9g2ZsC2EeNIF4,696
+industrial_model/cognite_adapters/sort_mapper.py,sha256=EQ2Xpfdet8jN6EK0rEZ3IA8L7sPXWVX1MA9kQg4LdXs,1083
 industrial_model/cognite_adapters/upsert_mapper.py,sha256=jzelnmECFcuVkQY7dgZG-xL19yD9kxtYvx827InIMO8,4951
 industrial_model/cognite_adapters/utils.py,sha256=-9NUG84r49cKvmmzoUinxNF1zhHIlmoWFypUCD_WTeM,4800
 industrial_model/cognite_adapters/view_mapper.py,sha256=9nWx0P7h8TMthLcOF5GZ4yC4UOndVuUo_s-Oz5nSAyM,1276
 industrial_model/engines/__init__.py,sha256=7aGHrUm2MxIq39vR8h0xu3i1zNOuT9H9U-q4lV3nErQ,102
-industrial_model/engines/_internal.py,sha256=bepUTKygYNHcOB810-KoWIKnzf4hFpwXZoWYJyuOUfc,1090
+industrial_model/engines/_internal.py,sha256=a3fdqqP3pVTPkfYIF5W_bNSQiIps3MA4xiGC3HOIYhI,1092
 industrial_model/engines/async_engine.py,sha256=BSuI1vjUsjHeYSvxZM4bK2cEw-WutzjlCUFU0Nnu2-M,2139
 industrial_model/engines/engine.py,sha256=icpYh-zgzMM_jsV5AytXoXz-nb2nYKug6qkekeMAQQw,4621
 industrial_model/models/__init__.py,sha256=g8oa95iG6c22A-vTYhiZKSYa6RG2C7Ht1dpn5_HfXxs,796
 industrial_model/models/base.py,sha256=qi44m0KW9KuXKTSJqSLea1poErBeAqm6Hv08VdRYHkU,2023
-industrial_model/models/entities.py,sha256=jqTgyCv8frzovKCKg6yVUNO9hoBqz_b3HGYbGwIq7gI,5698
+industrial_model/models/entities.py,sha256=-Jf7bNCijbS3_wZohlog3bRsAkXvkUeAQW9DamJqGFo,5700
 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
@@ -30,7 +30,7 @@ industrial_model/queries/params.py,sha256=50qY5BO5onLsXorhcv-7qCKhJaMO94UzhKLCmZ
 industrial_model/queries/utils.py,sha256=uP6PLh9IVHDK6J8x444zHWPmyV4PkxdLO-PMc6qWItc,1505
 industrial_model/statements/__init__.py,sha256=3Et9PM7AMbIS7Fh9051Q0u3qUpX6588d1yuNrvdd4wI,5429
 industrial_model/statements/expressions.py,sha256=4ZZOcZroI5-4xRw4PXIRlufi0ARndE5zSbbxLDpR2Ec,4816
-industrial_model-1.0.0.dist-info/METADATA,sha256=NDEiaElRHaf8EmCWcPkT1JUeRVL0xa_ZehEdR0m4iUI,7680
-industrial_model-1.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-industrial_model-1.0.0.dist-info/licenses/LICENSE,sha256=BCHCZ1Qo7m4YvAEIQqtVBI3NebFJdZ8_7m_cxInIlN0,4934
-industrial_model-1.0.0.dist-info/RECORD,,
+industrial_model-1.0.1.dist-info/METADATA,sha256=aVJIFKqwM1oLsn2s2TAwq15sE6UCYMJyhUi5GyssbMw,7680
+industrial_model-1.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+industrial_model-1.0.1.dist-info/licenses/LICENSE,sha256=BCHCZ1Qo7m4YvAEIQqtVBI3NebFJdZ8_7m_cxInIlN0,4934
+industrial_model-1.0.1.dist-info/RECORD,,