GeneralManager 0.69.1__tar.gz → 0.69.2__tar.gz

{generalmanager-0.69.1/src/GeneralManager.egg-info → generalmanager-0.69.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.69.1
+Version: 0.69.2
 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.69.1 → generalmanager-0.69.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.69.1"
+version = "0.69.2"
 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.69.1 → generalmanager-0.69.2/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.69.1
+Version: 0.69.2
 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.69.1 → generalmanager-0.69.2}/src/general_manager/cache/run_context.py

@@ -113,7 +113,9 @@ class CalculationRunContext:
         self._run_cache_touch_count = 0
         self._run_cache_touch_thread_id: int | None = None
         max_bytes = resolve_run_context_cache_max_bytes()
+        self._run_cache_mode_generation = -1
         self._run_cache_budget_enabled = max_bytes is not None
+        self._run_cache_recency_enabled = False
         run_context_cache_budget.register(
             self,
             max_bytes,
@@ -129,11 +131,20 @@ class CalculationRunContext:
             if key not in self._dependency_cache_pending_publications:
                 yield "dependency_hits", key, hit
 
-    def _set_run_cache_budget_enabled(self, enabled: bool) -> None:
-        """Refresh the owner hint after a coordinator transition."""
+    def _set_run_cache_modes(
+        self,
+        budget_enabled: bool,
+        recency_enabled: bool,
+        generation: int,
+    ) -> None:
+        """Refresh owner hints after a generated coordinator transition."""
         with self._run_cache_touch_lock:
-            self._run_cache_budget_enabled = enabled
-            if not enabled:
+            if generation < self._run_cache_mode_generation:
+                return
+            self._run_cache_mode_generation = generation
+            self._run_cache_budget_enabled = budget_enabled
+            self._run_cache_recency_enabled = recency_enabled
+            if not budget_enabled or not recency_enabled:
                 self._pending_run_cache_touches.clear()
                 self._last_pending_run_cache_touch = None
                 self._run_cache_touch_count = 0
@@ -209,7 +220,10 @@ class CalculationRunContext:
     ) -> None:
         pending_key = (namespace, key)
         with self._run_cache_touch_lock:
-            if not self._run_cache_budget_enabled:
+            if (
+                not self._run_cache_budget_enabled
+                or not self._run_cache_recency_enabled
+            ):
                 return
             if pending_key != self._last_pending_run_cache_touch:
                 self._pending_run_cache_touches.pop(pending_key, None)
@@ -223,11 +237,16 @@ class CalculationRunContext:
     ) -> bool:
         touch_immediately = False
         touches_to_flush: tuple[PendingRunCacheTouch, ...] = ()
+        mode_generation = -1
         with self._run_cache_touch_lock:
-            if not self._run_cache_budget_enabled:
+            if (
+                not self._run_cache_budget_enabled
+                or not self._run_cache_recency_enabled
+            ):
                 return False
             if self._run_cache_touch_thread_id != get_ident():
                 touch_immediately = True
+                mode_generation = self._run_cache_mode_generation
             elif pending_key != self._last_pending_run_cache_touch:
                 return False
             else:
@@ -235,11 +254,21 @@ class CalculationRunContext:
                 if count < RUN_CONTEXT_TOUCH_BATCH_SIZE:
                     self._run_cache_touch_count = count
                     return True
-                touches_to_flush = self._take_run_cache_touches_locked()
+                touches_to_flush, mode_generation = (
+                    self._take_run_cache_touches_locked()
+                )
         if touch_immediately:
-            run_context_cache_budget.touch(self, *pending_key)
+            run_context_cache_budget.touch(
+                self,
+                *pending_key,
+                mode_generation=mode_generation,
+            )
             return True
-        run_context_cache_budget.touch_many(self, touches_to_flush)
+        run_context_cache_budget.touch_many(
+            self,
+            touches_to_flush,
+            mode_generation=mode_generation,
+        )
         return True
 
     def _touch_run_cache_entry(
@@ -262,12 +291,13 @@ class CalculationRunContext:
 
     def _take_run_cache_touches_locked(
         self,
-    ) -> tuple[PendingRunCacheTouch, ...]:
+    ) -> tuple[tuple[PendingRunCacheTouch, ...], int]:
         touches = tuple(self._pending_run_cache_touches)
+        mode_generation = self._run_cache_mode_generation
         self._pending_run_cache_touches.clear()
         self._last_pending_run_cache_touch = None
         self._run_cache_touch_count = 0
-        return touches
+        return touches, mode_generation
 
     def _flush_run_cache_touches(self) -> None:
         with self._run_cache_touch_lock:
@@ -275,8 +305,12 @@ class CalculationRunContext:
                 self._last_pending_run_cache_touch = None
                 self._run_cache_touch_count = 0
                 return
-            touches = self._take_run_cache_touches_locked()
-        run_context_cache_budget.touch_many(self, touches)
+            touches, mode_generation = self._take_run_cache_touches_locked()
+        run_context_cache_budget.touch_many(
+            self,
+            touches,
+            mode_generation=mode_generation,
+        )
 
     @staticmethod
     def _scoped_key(key: Hashable) -> Hashable:
@@ -296,6 +330,7 @@ class CalculationRunContext:
                 self._run_cache_touch_count = 0
                 self._run_cache_touch_thread_id = get_ident()
                 self._run_cache_budget_enabled = max_bytes is not None
+                self._run_cache_recency_enabled = False
             run_context_cache_budget.register(
                 self,
                 max_bytes,
@@ -373,7 +408,8 @@ class CalculationRunContext:
             value = loader()
             self._store_run_value(scoped_key, value)
             return value
-        self._touch_run_cache_entry("values", scoped_key)
+        if self._run_cache_recency_enabled:
+            self._touch_run_cache_entry("values", scoped_key)
         return cast(T, value)
 
     def get(self, key: Hashable, default: object = None) -> object:
@@ -383,7 +419,8 @@ class CalculationRunContext:
             value = self._values[scoped_key]
         except KeyError:
             return default
-        self._touch_run_cache_entry("values", scoped_key)
+        if self._run_cache_recency_enabled:
+            self._touch_run_cache_entry("values", scoped_key)
         return value
 
     def set(self, key: Hashable, value: object) -> None:
@@ -414,7 +451,10 @@ class CalculationRunContext:
             hit = self._dependency_cache_hits[key]
         except KeyError:
             return default
-        if key not in self._dependency_cache_pending_publications:
+        if (
+            self._run_cache_recency_enabled
+            and key not in self._dependency_cache_pending_publications
+        ):
             self._touch_run_cache_entry("dependency_hits", key)
         return hit
 
@@ -838,7 +878,8 @@ class CalculationRunContext:
         scoped_key = self._scoped_key(key)
         if scoped_key not in self._values:
             return False
-        self._touch_run_cache_entry("values", scoped_key)
+        if self._run_cache_recency_enabled:
+            self._touch_run_cache_entry("values", scoped_key)
         return True
 
     def __contains__(self, key: Hashable) -> bool: