GeneralManager 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

general_manager/auxiliary/jsonEncoder.py

@@ -0,0 +1,19 @@
+from datetime import datetime, date, time
+import json
+from general_manager.manager.generalManager import GeneralManager
+
+
+class CustomJSONEncoder(json.JSONEncoder):
+    def default(self, o):
+
+        # Serialize datetime objects as ISO strings
+        if isinstance(o, (datetime, date, time)):
+            return o.isoformat()
+        # Handle GeneralManager instances
+        if isinstance(o, GeneralManager):
+            return f"{o.__class__.__name__}(**{o.identification})"
+        try:
+            return super().default(o)
+        except TypeError:
+            # Fallback: convert all other objects to str
+            return str(o)

general_manager/auxiliary/makeCacheKey.py

@@ -0,0 +1,30 @@
+import inspect
+import json
+from general_manager.auxiliary.jsonEncoder import CustomJSONEncoder
+from hashlib import sha256
+
+
+def make_cache_key(func, args, kwargs):
+    """
+    Generate a deterministic cache key for a function call.
+
+    Args:
+        func: The function being called
+        args: Positional arguments to the function
+        kwargs: Keyword arguments to the function
+
+    Returns:
+        str: A hexadecimal SHA-256 hash that uniquely identifies this function call
+    """
+    sig = inspect.signature(func)
+    bound = sig.bind_partial(*args, **kwargs)
+    bound.apply_defaults()
+    payload = {
+        "module": func.__module__,
+        "name": func.__name__,
+        "args": bound.arguments,
+    }
+    raw = json.dumps(
+        payload, sort_keys=True, default=str, cls=CustomJSONEncoder
+    ).encode()
+    return sha256(raw, usedforsecurity=False).hexdigest()

general_manager/cache/cacheDecorator.py

@@ -1,70 +1,43 @@
-from typing import Callable, Optional
+from typing import Any, Callable, Optional, Protocol, Set
 from functools import wraps
 from django.core.cache import cache as django_cache
-from hashlib import sha256
 from general_manager.cache.cacheTracker import DependencyTracker
-from general_manager.cache.dependencyIndex import record_dependencies, get_full_index
+from general_manager.cache.dependencyIndex import record_dependencies, Dependency
+from general_manager.cache.modelDependencyCollector import ModelDependencyCollector
+from general_manager.auxiliary.makeCacheKey import make_cache_key
 
 
-def cached(timeout: Optional[int] = None) -> Callable:
-    """
-    Decorator to cache the result of a function for a specified timeout.
-    If no timeout is provided, the cache will expire when a dependency is invalidated.
-    """
+class CacheBackend(Protocol):
+    def get(self, key: str) -> Any: ...
+    def set(self, key: str, value: Any, timeout: Optional[int] = None) -> None: ...
 
-    def decorator(func: Callable) -> Callable:
 
+RecordFn = Callable[[str, Set[Dependency]], None]
+
+
+def cached(
+    timeout: Optional[int] = None,
+    cache_backend: CacheBackend = django_cache,
+    record_fn: RecordFn = record_dependencies,
+) -> Callable:
+    def decorator(func: Callable) -> Callable:
         @wraps(func)
         def wrapper(*args, **kwargs):
-            from general_manager.manager.generalManager import GeneralManager, Bucket
+            key = make_cache_key(func, args, kwargs)
+
+            result = cache_backend.get(key)
+            if result is not None:
+                return result
 
-            django_cache_key = sha256(
-                f"{func.__module__}.{func.__name__}:{args}:{kwargs}".encode(),
-                usedforsecurity=False,
-            ).hexdigest()
-            cached_result = django_cache.get(django_cache_key)
-            if cached_result is not None:
-                return cached_result
-            # Dependency Tracking aktivieren
             with DependencyTracker() as dependencies:
                 result = func(*args, **kwargs)
+                ModelDependencyCollector.addArgs(dependencies, args, kwargs)
 
-            def collect_model_dependencies(obj):
-                """Rekursiv Django-Model-Instanzen im Objekt finden."""
-                if isinstance(obj, GeneralManager):
-                    yield (
-                        obj.__class__.__name__,
-                        "identification",
-                        f"{obj.identification}",
-                    )
-                elif isinstance(obj, Bucket):
-                    yield (obj._manager_class.__name__, "filter", f"{obj.filters}")
-                    yield (obj._manager_class.__name__, "exclude", f"{obj.excludes}")
-                elif isinstance(obj, dict):
-                    for v in obj.values():
-                        yield from collect_model_dependencies(v)
-                elif isinstance(obj, (list, tuple, set)):
-                    for item in obj:
-                        yield from collect_model_dependencies(item)
-
-            if args and isinstance(args[0], GeneralManager):
-                self = args[0]
-                for attr_val in self.__dict__.values():
-                    for dependency_tuple in collect_model_dependencies(attr_val):
-                        dependencies.add(dependency_tuple)
-
-            for dependency_tuple in collect_model_dependencies(args):
-                dependencies.add(dependency_tuple)
-            for dependency_tuple in collect_model_dependencies(kwargs):
-                dependencies.add(dependency_tuple)
+            cache_backend.set(key, result, timeout)
 
-            django_cache.set(django_cache_key, result, timeout)
+            if dependencies and timeout is None:
+                record_fn(key, dependencies)
 
-            if dependencies and not timeout:
-                record_dependencies(
-                    django_cache_key,
-                    dependencies,
-                )
             return result
 
         return wrapper

general_manager/cache/cacheTracker.py

@@ -1,7 +1,9 @@
 import threading
-from general_manager.cache.dependencyIndex import general_manager_name
-from typing import Any, Literal
-
+from general_manager.cache.dependencyIndex import (
+    general_manager_name,
+    Dependency,
+    filter_type,
+)
 
 # Thread-lokale Variable zur Speicherung der Abhängigkeiten
 _dependency_storage = threading.local()
@@ -10,24 +12,23 @@ _dependency_storage = threading.local()
 class DependencyTracker:
     def __enter__(
         self,
-    ) -> set[
-        tuple[general_manager_name, Literal["filter", "exclude", "identification"], str]
-    ]:
+    ) -> set[Dependency]:
         _dependency_storage.dependencies = set()
         return _dependency_storage.dependencies
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        # Optional: Aufräumen oder weitere Verarbeitung
-        pass
-
-
-def addDependency(class_name: str, operation: str, identifier: str) -> None:
-    """
-    Adds a dependency to the dependency storage.
-    """
-    if hasattr(_dependency_storage, "dependencies"):
-        dependencies: set[
-            tuple[general_manager_name, Literal["filter", "exclude", "id"], str]
-        ] = _dependency_storage.dependencies
-
-        _dependency_storage.dependencies.add((class_name, operation, identifier))
+        if hasattr(_dependency_storage, "dependencies"):
+            del _dependency_storage.dependencies
+
+    @staticmethod
+    def track(
+        class_name: general_manager_name,
+        operation: filter_type,
+        identifier: str,
+    ) -> None:
+        """
+        Adds a dependency to the dependency storage.
+        """
+        if hasattr(_dependency_storage, "dependencies"):
+            dependencies: set[Dependency] = _dependency_storage.dependencies
+            dependencies.add((class_name, operation, identifier))

general_manager/cache/dependencyIndex.py

@@ -6,7 +6,7 @@ import re
 from django.core.cache import cache
 from general_manager.cache.signals import post_data_change, pre_data_change
 from django.dispatch import receiver
-from typing import Literal, Any, Iterable, TYPE_CHECKING, Type
+from typing import Literal, Any, Iterable, TYPE_CHECKING, Type, Tuple
 
 if TYPE_CHECKING:
     from general_manager.manager.generalManager import GeneralManager
@@ -24,6 +24,8 @@ type dependency_index = dict[
     ],
 ]
 
+type filter_type = Literal["filter", "exclude", "identification"]
+type Dependency = Tuple[general_manager_name, filter_type, str]
 
 # -----------------------------------------------------------------------------
 # CONFIG

general_manager/cache/modelDependencyCollector.py

@@ -0,0 +1,51 @@
+from typing import Generator
+from general_manager.manager.generalManager import GeneralManager, Bucket
+from general_manager.cache.dependencyIndex import (
+    general_manager_name,
+    Dependency,
+    filter_type,
+)
+
+
+class ModelDependencyCollector:
+
+    def __init__(self, dependencies: set[Dependency]):
+        """
+        Initialize the ModelDependencyCollector with a set of dependencies.
+        """
+        self.dependencies = dependencies
+
+    @staticmethod
+    def collect(obj) -> Generator[tuple[general_manager_name, filter_type, str]]:
+        """Recursively find Django model instances in the object."""
+        if isinstance(obj, GeneralManager):
+            yield (
+                obj.__class__.__name__,
+                "identification",
+                f"{obj.identification}",
+            )
+        elif isinstance(obj, Bucket):
+            yield (obj._manager_class.__name__, "filter", f"{obj.filters}")
+            yield (obj._manager_class.__name__, "exclude", f"{obj.excludes}")
+        elif isinstance(obj, dict):
+            for v in obj.values():
+                yield from ModelDependencyCollector.collect(v)
+        elif isinstance(obj, (list, tuple, set)):
+            for item in obj:
+                yield from ModelDependencyCollector.collect(item)
+
+    @staticmethod
+    def addArgs(dependencies: set[Dependency], args: tuple, kwargs: dict) -> None:
+        """
+        Add dependencies to the dependency set.
+        """
+        if args and isinstance(args[0], GeneralManager):
+            inner_self = args[0]
+            for attr_val in inner_self.__dict__.values():
+                for dependency_tuple in ModelDependencyCollector.collect(attr_val):
+                    dependencies.add(dependency_tuple)
+
+        for dependency_tuple in ModelDependencyCollector.collect(args):
+            dependencies.add(dependency_tuple)
+        for dependency_tuple in ModelDependencyCollector.collect(kwargs):
+            dependencies.add(dependency_tuple)

general_manager/manager/generalManager.py

@@ -7,7 +7,7 @@ from general_manager.interface.baseInterface import (
     GeneralManagerType,
 )
 from general_manager.api.property import GraphQLProperty
-from general_manager.cache.cacheTracker import addDependency
+from general_manager.cache.cacheTracker import DependencyTracker
 from general_manager.cache.signals import dataChange
 
 if TYPE_CHECKING:
@@ -21,7 +21,9 @@ class GeneralManager(Generic[GeneralManagerType], metaclass=GeneralManagerMeta):
     def __init__(self, *args: Any, **kwargs: Any):
         self._interface = self.Interface(*args, **kwargs)
         self.__id: dict[str, Any] = self._interface.identification
-        addDependency(self.__class__.__name__, "identification", f"{self.__id}")
+        DependencyTracker.track(
+            self.__class__.__name__, "identification", f"{self.__id}"
+        )
 
     def __str__(self):
         return f"{self.__class__.__name__}(**{self.__id})"
@@ -108,12 +110,16 @@ class GeneralManager(Generic[GeneralManagerType], metaclass=GeneralManagerMeta):
 
     @classmethod
     def filter(cls, **kwargs: Any) -> Bucket[GeneralManagerType]:
-        addDependency(cls.__name__, "filter", f"{cls.__parse_identification(kwargs)}")
+        DependencyTracker.track(
+            cls.__name__, "filter", f"{cls.__parse_identification(kwargs)}"
+        )
         return cls.Interface.filter(**kwargs)
 
     @classmethod
     def exclude(cls, **kwargs: Any) -> Bucket[GeneralManagerType]:
-        addDependency(cls.__name__, "exclude", f"{cls.__parse_identification(kwargs)}")
+        DependencyTracker.track(
+            cls.__name__, "exclude", f"{cls.__parse_identification(kwargs)}"
+        )
         return cls.Interface.exclude(**kwargs)
 
     @classmethod

general_manager/rule/rule.py

@@ -81,7 +81,7 @@ class Rule(Generic[GeneralManagerType]):
             inst = cls()
             self._handlers[inst.function_name] = inst
         for path in getattr(settings, "RULE_HANDLERS", []):
-            handler_cls = import_string(path)
+            handler_cls: type[BaseRuleHandler] = import_string(path)
             inst = handler_cls()
             self._handlers[inst.function_name] = inst
 

{generalmanager-0.2.0.dist-info → generalmanager-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.2.0
+Version: 0.3.0
 Summary: Kurzbeschreibung deines Pakets
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: Non-Commercial MIT License

{generalmanager-0.2.0.dist-info → generalmanager-0.3.0.dist-info}/RECORD

@@ -6,10 +6,13 @@ general_manager/api/property.py,sha256=oc93p1P8dcIvrNorRuqD1EJVsd6eYttYhZuAS0s28
 general_manager/auxiliary/__init__.py,sha256=4IwKJzsNxGduF-Ej0u1BNHVaMhkql8PjHbVtx9DOTSY,76
 general_manager/auxiliary/argsToKwargs.py,sha256=kmp1xonpQp4X_y8ZJG6c5uOW7zQwo0HtPqsHWVzXRSM,921
 general_manager/auxiliary/filterParser.py,sha256=wmR4YzsnYgjI2Co5eyvCFROldotAraHx_GiCDJo79IY,5410
+general_manager/auxiliary/jsonEncoder.py,sha256=TDsgFQvheITHZgdmn-m8tk1_QCzpT0XwEHo7bY3Qe-M,638
+general_manager/auxiliary/makeCacheKey.py,sha256=o2ZPe5ZjiZhHxYgSESBSMnOmQutkTxw5DLeJM7tOw84,881
 general_manager/auxiliary/noneToZero.py,sha256=KfQtMQnrT6vsYST0K7lv6pVujkDcK3XL8czHYOhgqKQ,539
-general_manager/cache/cacheDecorator.py,sha256=RmUDyJfkouO2-R2KZZJF1n8RCB0FjVa2OoTeLQ0vUyg,2934
-general_manager/cache/cacheTracker.py,sha256=vUQCarqABIW_O02hbKeRo0thurmPD0TfrOlIUh7kneI,1045
-general_manager/cache/dependencyIndex.py,sha256=KUDroajKrWfJv0PO2EQVNTrYq7XxrpBT4MGKBgPwMwo,10676
+general_manager/cache/cacheDecorator.py,sha256=7DbPMw-2Xm1-5eCMVWyjUl_jdVtTJUKNpLW2WNJEhI0,1471
+general_manager/cache/cacheTracker.py,sha256=RmUWwAXMS5LQT8-w7IiG67FTBSxF1V0w4IDH1WzgmuM,998
+general_manager/cache/dependencyIndex.py,sha256=iuOjthmH5ehHCkWiM9iLbgzGlo4Cf2wRKkm-QhIQ024,10813
+general_manager/cache/modelDependencyCollector.py,sha256=Lt8mNpnp-AJaPCYrTu_UB1m_Hj1prfEXaPrxRwk3Qqs,1983
 general_manager/cache/pathMapping.py,sha256=WtECIek9fI-2_nqIYI4Ux9Lan6g8P9TMO_AfthkznX8,5656
 general_manager/cache/signals.py,sha256=ZHeXKFMN7tj9t0J-vSqf_05_NhGqEF2sZtbZO3vaRqI,1234
 general_manager/factory/__init__.py,sha256=DLSQbpSBpujPtDSZcruPc43OLWzKCCtf20gbalCDYRU,91
@@ -20,7 +23,7 @@ general_manager/interface/baseInterface.py,sha256=mvSKUlA-0fazNnaIXGBwkiZxmX8DM_
 general_manager/interface/calculationInterface.py,sha256=GzSNXjU6Z7bFz60gHyMKkI5xNUDIPuniV8wbyVtQT50,14250
 general_manager/interface/databaseInterface.py,sha256=i3Z-rkHnoGzV8cFZjBKBmIjlWjGJ2CzdlsiQfL2JUas,28288
 general_manager/manager/__init__.py,sha256=l3RYp62aEhj3Y975_XUTIzo35LUnkTJHkb_hgChnXXI,111
-general_manager/manager/generalManager.py,sha256=xt7tvwTaPGhh7Z8VhbdMJuScsl78B9QDVQoMWv4amuo,5158
+general_manager/manager/generalManager.py,sha256=md-3zVCOMa-vC8ToCOEMKXeDuV7JtHLlSStQXh4cgBE,5258
 general_manager/manager/groupManager.py,sha256=O4FABqbm7KlZw6t36Ot3HU1FsBYN0h6Zhmk7ktN8a-Y,10087
 general_manager/manager/input.py,sha256=iKawV3P1QICz-0AQUF00OvH7LZYxussg3svpvCUl8hE,2977
 general_manager/manager/meta.py,sha256=5wHrCVnua5c38vpVZSCesrNvgydQDH8h6pxW6_QgCDg,3107
@@ -35,9 +38,9 @@ general_manager/permission/permissionChecks.py,sha256=T-9khBqiwM4ASBdey9p07sC_xg
 general_manager/permission/permissionDataManager.py,sha256=Ji7fsnuaKTa6M8yzCGyzrIHyGa_ZvqJM7sXR97-uTrA,1937
 general_manager/rule/__init__.py,sha256=4Har5cfPD1fmOsilTDod-ZUz3Com-tkl58jz7yY4fD0,23
 general_manager/rule/handler.py,sha256=z8SFHTIZ0LbLh3fV56Mud0V4_OvWkqJjlHvFqau7Qfk,7334
-general_manager/rule/rule.py,sha256=jmZxMFxthMPcc85Xx_zb8l7hajJK2SFAIgBZpE8bk8g,10736
-generalmanager-0.2.0.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
-generalmanager-0.2.0.dist-info/METADATA,sha256=RIR7LsPxNSSbPErDku5Vv-YdlFb2BYD9QjXowcEOais,8188
-generalmanager-0.2.0.dist-info/WHEEL,sha256=A8Eltl-h0W-qZDVezsLjjslosEH_pdYC2lQ0JcbgCzs,91
-generalmanager-0.2.0.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.2.0.dist-info/RECORD,,
+general_manager/rule/rule.py,sha256=3FVCKGL7BTVoStdgOTdWQwuoVRIxAIAilV4VOzouDpc,10759
+generalmanager-0.3.0.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
+generalmanager-0.3.0.dist-info/METADATA,sha256=sKfEf7wuzdUhszsnlCJ49iydcFKidlwV58863yosGlw,8188
+generalmanager-0.3.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+generalmanager-0.3.0.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.3.0.dist-info/RECORD,,

{generalmanager-0.2.0.dist-info → generalmanager-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any