industrial-model 1.0.0__tar.gz → 1.0.1__tar.gz

{industrial_model-1.0.0 → industrial_model-1.0.1}/PKG-INFO

@@ -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 → industrial_model-1.0.1}/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-1.0.0 → industrial_model-1.0.1}/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-1.0.0 → industrial_model-1.0.1}/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 → industrial_model-1.0.1}/pyproject.toml

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