GeneralManager 0.53.0__tar.gz → 0.53.1__tar.gz

{generalmanager-0.53.0/src/GeneralManager.egg-info → generalmanager-0.53.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.53.0
+Version: 0.53.1
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.53.0 → generalmanager-0.53.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.53.0"
+version = "0.53.1"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]

{generalmanager-0.53.0 → generalmanager-0.53.1/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.53.0
+Version: 0.53.1
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.53.0 → generalmanager-0.53.1}/src/general_manager/bucket/calculation_bucket.py

@@ -521,21 +521,21 @@ class CalculationBucket(Bucket[GeneralManagerType]):
         if self._data is None:
             from general_manager.cache.run_context import ensure_calculation_run_context
 
-            sorted_inputs = self.topological_sort_inputs()
-            sorted_filters = self._sort_filters(sorted_inputs)
-            current_combinations = self._generate_input_combinations(
-                sorted_inputs,
-                sorted_filters["input_filters"],
-                sorted_filters["input_excludes"],
-            )
-            sort_key = self._normalized_sort_key()
-            needs_manager_access = (
-                bool(sorted_filters["prop_filters"])
-                or bool(sorted_filters["prop_excludes"])
-                or not self._sort_uses_only_inputs(sort_key)
-            )
-
             with ensure_calculation_run_context():
+                sorted_inputs = self.topological_sort_inputs()
+                sorted_filters = self._sort_filters(sorted_inputs)
+                current_combinations = self._generate_input_combinations(
+                    sorted_inputs,
+                    sorted_filters["input_filters"],
+                    sorted_filters["input_excludes"],
+                )
+                sort_key = self._normalized_sort_key()
+                needs_manager_access = (
+                    bool(sorted_filters["prop_filters"])
+                    or bool(sorted_filters["prop_excludes"])
+                    or not self._sort_uses_only_inputs(sort_key)
+                )
+
                 if needs_manager_access:
                     manager_combinations = self._manager_combinations(
                         current_combinations
@@ -564,9 +564,9 @@ class CalculationBucket(Bucket[GeneralManagerType]):
                             sort_key,
                         )
 
-            if self.reverse:
-                identifications.reverse()
-            self._data = identifications
+                if self.reverse:
+                    identifications.reverse()
+                self._data = identifications
 
         return self._data
 

{generalmanager-0.53.0 → generalmanager-0.53.1}/src/general_manager/bucket/database_bucket.py

@@ -398,11 +398,17 @@ class DatabaseBucket(Bucket[GeneralManagerType]):
         if cached is not None:
             return cached  # type: ignore[return-value]
 
-        primary_keys = tuple(
-            self._data.values_list("pk", flat=True)[
-                : MAX_RUN_SCOPED_BUCKET_RESULT_ROWS + 1
-            ]
-        )
+        if self._data.ordered:
+            primary_keys = tuple(
+                self._data.values_list("pk", flat=True)[
+                    : MAX_RUN_SCOPED_BUCKET_RESULT_ROWS + 1
+                ]
+            )
+        else:
+            # Preserve the order normal queryset iteration would expose.
+            primary_keys = tuple(
+                row.pk for row in self._data[: MAX_RUN_SCOPED_BUCKET_RESULT_ROWS + 1]
+            )
         if len(primary_keys) > MAX_RUN_SCOPED_BUCKET_RESULT_ROWS:
             return None
         context.set_orm_bucket_result(signature, primary_keys)