GeneralManager 0.44.0__tar.gz → 0.45.0__tar.gz

{generalmanager-0.44.0/src/GeneralManager.egg-info → generalmanager-0.45.0}/PKG-INFO

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

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

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

@@ -53,6 +53,12 @@ class CalculationRunContext:
         """Store a value for the active run."""
         self._values[key] = value
 
+    def discard_prefix(self, prefix: tuple[Hashable, ...]) -> None:
+        """Discard tuple keys that start with the supplied prefix."""
+        for key in list(self._values):
+            if isinstance(key, tuple) and key[: len(prefix)] == prefix:
+                del self._values[key]
+
     def has(self, key: Hashable) -> bool:
         """Return whether key has a value in the active run."""
         return key in self._values

{generalmanager-0.44.0 → generalmanager-0.45.0}/src/general_manager/interface/capabilities/orm/mutations.py

@@ -21,7 +21,11 @@ from general_manager.interface.utils.errors import (
 from general_manager.interface.utils.models import model_has_field
 
 from ._compat import call_update_change_reason, call_with_observability
-from .support import get_support_capability, is_soft_delete_enabled
+from .support import (
+    discard_orm_instance_cache,
+    get_support_capability,
+    is_soft_delete_enabled,
+)
 
 if TYPE_CHECKING:  # pragma: no cover
     from general_manager.interface.orm_interface import OrmInterfaceBase
@@ -336,6 +340,7 @@ class OrmUpdateCapability(BaseCapability):
                 creator_id=creator_id,
                 history_comment=history_comment,
             )
+            discard_orm_instance_cache(interface_instance.__class__, pk)
             mutation.apply_many_to_many(
                 interface_instance.__class__,
                 instance,
@@ -419,6 +424,7 @@ class OrmDeleteCapability(BaseCapability):
                     creator_id=creator_id,
                     history_comment=history_comment_local,
                 )
+                discard_orm_instance_cache(interface_instance.__class__, pk)
                 return {"id": pk}
 
             history_comment_local = (
@@ -443,6 +449,9 @@ class OrmDeleteCapability(BaseCapability):
                     instance.delete(using=database_alias)
                 else:
                     instance.delete()
+            discard_orm_instance_cache(
+                interface_instance.__class__, interface_instance.pk
+            )
             return {"id": interface_instance.pk}
 
         return call_with_observability(

{generalmanager-0.44.0 → generalmanager-0.45.0}/src/general_manager/interface/capabilities/orm/support.py

@@ -12,6 +12,7 @@ from django.db import models
 from django.db.models import Subquery
 from django.utils import timezone
 from general_manager.bucket.database_bucket import DatabaseBucket
+from general_manager.cache.run_context import current_calculation_run_context
 from general_manager.interface.base_interface import InterfaceBase
 from general_manager.interface.capabilities.base import CapabilityName
 from general_manager.interface.capabilities.builtin import BaseCapability
@@ -270,11 +271,21 @@ class OrmReadCapability(BaseCapability):
                 raise missing_error
             raise model_cls.DoesNotExist  # type: ignore[attr-defined]
 
+        context = current_calculation_run_context()
+        read_func = (
+            _perform
+            if context is None
+            else lambda: context.get_or_set(
+                _orm_instance_cache_key(interface_instance),
+                _perform,
+            )
+        )
+
         return call_with_observability(
             interface_instance,
             operation="read",
             payload={"pk": interface_instance.pk},
-            func=_perform,
+            func=read_func,
         )
 
     def get_attribute_types(
@@ -843,3 +854,26 @@ def _history_capability_for(
         "history",
         expected_type=OrmHistoryCapability,
     )
+
+
+def _orm_instance_cache_key(interface_instance: "OrmInterfaceBase") -> tuple[Any, ...]:
+    interface_cls = interface_instance.__class__
+    support = get_support_capability(interface_cls)
+    only_active = not is_soft_delete_enabled(interface_cls)
+    return (
+        "orm_instance",
+        interface_cls,
+        interface_instance.pk,
+        support.get_database_alias(interface_cls),
+        only_active,
+        interface_instance._search_date,
+    )
+
+
+def discard_orm_instance_cache(
+    interface_cls: type["OrmInterfaceBase"],
+    pk: Any,
+) -> None:
+    context = current_calculation_run_context()
+    if context is not None:
+        context.discard_prefix(("orm_instance", interface_cls, pk))