GeneralManager 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

general_manager/cache/dependencyIndex.py

@@ -33,18 +33,19 @@ type Dependency = Tuple[general_manager_name, filter_type, str]
 INDEX_KEY = "dependency_index"  # Key unter dem der gesamte Index liegt
 LOCK_KEY = "dependency_index_lock"  # Key für das Sperr‑Mutex
 LOCK_TIMEOUT = 5  # Sekunden TTL für den Lock
+UNDEFINED = object()  # Dummy für nicht definierte Werte
 
 
 # -----------------------------------------------------------------------------
 # LOCKING HELPERS
 # -----------------------------------------------------------------------------
 def acquire_lock(timeout: int = LOCK_TIMEOUT) -> bool:
-    """Atomar: legt den LOCK_KEY an, wenn noch frei."""
+    """Atomar: create Lock key if it doesn't exist."""
     return cache.add(LOCK_KEY, "1", timeout)
 
 
 def release_lock() -> None:
-    """Gibt den Lock frei."""
+    """Release Lock key."""
     cache.delete(LOCK_KEY)
 
 
@@ -52,7 +53,7 @@ def release_lock() -> None:
 # INDEX ACCESS
 # -----------------------------------------------------------------------------
 def get_full_index() -> dependency_index:
-    """Lädt oder initialisiert den kompletten Index."""
+    """Load or initialize the full index."""
     idx = cache.get(INDEX_KEY, None)
     if idx is None:
         idx: dependency_index = {"filter": {}, "exclude": {}}
@@ -61,7 +62,7 @@ def get_full_index() -> dependency_index:
 
 
 def set_full_index(idx: dependency_index) -> None:
-    """Schreibt den kompletten Index zurück in den Cache."""
+    """Write the complete index back to the cache."""
     cache.set(INDEX_KEY, idx, None)
 
 
@@ -78,15 +79,6 @@ def record_dependencies(
         ]
     ],
 ) -> None:
-    """
-    Speichert die Abhängigkeiten eines Cache Eintrags.
-    :param cache_key:   der Key unter dem das Ergebnis im cache steht
-    :param dependencies: Iterable von Tuplen (model_name, action, identifier)
-                         action ∈ {'filter','exclude'} oder sonstige → 'id'
-                         identifier = für filter/exclude: Dict String,
-                                      sonst: Primärschlüssel als String
-    """
-    # 1) Lock holen (Spin‑Lock mit Timeout)
     start = time.time()
     while not acquire_lock():
         if time.time() - start > LOCK_TIMEOUT:
@@ -105,7 +97,7 @@ def record_dependencies(
                     lookup_map.setdefault(val_key, set()).add(cache_key)
 
             else:
-                # Direkter ID‑Lookup als simpler filter auf 'id'
+                # director ID Lookup as simple filter on 'id'
                 section = idx["filter"].setdefault(model_name, {})
                 lookup_map = section.setdefault("identification", {})
                 val_key = identifier
@@ -120,15 +112,12 @@ def record_dependencies(
 # -----------------------------------------------------------------------------
 # INDEX CLEANUP
 # -----------------------------------------------------------------------------
-def remove_cache_key_from_index(cache_key: str) -> bool:
-    """
-    Entfernt einen cache_key aus allen Einträgen in filter/​exclude.
-    Nützlich, sobald Du den Cache gelöscht hast.
-    """
+def remove_cache_key_from_index(cache_key: str) -> None:
+    """Remove a cache key from the index."""
     start = time.time()
     while not acquire_lock():
         if time.time() - start > LOCK_TIMEOUT:
-            return False
+            raise TimeoutError("Could not aquire lock for remove_cache_key_from_index")
         time.sleep(0.05)
 
     try:
@@ -149,14 +138,12 @@ def remove_cache_key_from_index(cache_key: str) -> bool:
         set_full_index(idx)
     finally:
         release_lock()
-    return True
 
 
 # -----------------------------------------------------------------------------
 # CACHE INVALIDATION
 # -----------------------------------------------------------------------------
 def invalidate_cache_key(cache_key: str) -> None:
-    """Löscht den CacheEintrag – hier nutzt du deinen CacheBackend."""
     cache.delete(cache_key)
 
 
@@ -165,33 +152,28 @@ def capture_old_values(
     sender: Type[GeneralManager], instance: GeneralManager | None, **kwargs
 ) -> None:
     if instance is None:
-        # Wenn es kein Modell ist, gibt es nichts zu tun
         return
     manager_name = sender.__name__
     idx = get_full_index()
-    # Welche Lookups interessieren uns für diesen Model?
+    # get all lookups for this model
     lookups = set()
     for action in ("filter", "exclude"):
         lookups |= set(idx.get(action, {}).get(manager_name, {}))
     if lookups and instance.identification:
-        # Speichere alle relevanten Attribute für später
+        # save old values for later comparison
         vals = {}
         for lookup in lookups:
             attr_path = lookup.split("__")
             obj = instance
-            for attr in attr_path:
-                obj = getattr(obj, attr, None)
-                if obj is None:
+            for i, attr in enumerate(attr_path):
+                if getattr(obj, attr, UNDEFINED) is UNDEFINED:
+                    lookup = "__".join(attr_path[:i])
                     break
+                obj = getattr(obj, attr, None)
             vals[lookup] = obj
         setattr(instance, "_old_values", vals)
 
 
-# -----------------------------------------------------------------------------
-# GENERIC CACHE INVALIDATION: vergleicht alt vs. neu und invalidiert nur bei Übergang
-# -----------------------------------------------------------------------------
-
-
 @receiver(post_data_change)
 def generic_cache_invalidation(
     sender: type[GeneralManager],
@@ -236,18 +218,32 @@ def generic_cache_invalidation(
         # wildcard / regex
         if op in ("contains", "startswith", "endswith", "regex"):
             try:
-                pattern = re.compile(val_key)
-            except:
-                return False
-            text = value or ""
-            return bool(pattern.search(text))
+                literal = ast.literal_eval(val_key)
+            except Exception:
+                literal = val_key
+
+            # ensure we always work with strings to avoid TypeErrors
+            text = "" if value is None else str(value)
+            if op == "contains":
+                return literal in text
+            if op == "startswith":
+                return text.startswith(literal)
+            if op == "endswith":
+                return text.endswith(literal)
+            # regex: val_key selbst als Pattern benutzen
+            if op == "regex":
+                try:
+                    pattern = re.compile(val_key)
+                except re.error:
+                    return False
+                return bool(pattern.search(text))
 
         return False
 
     for action in ("filter", "exclude"):
         model_section = idx.get(action, {}).get(manager_name, {})
         for lookup, lookup_map in model_section.items():
-            # 1) Operator und Attributpfad ermitteln
+            # 1) get operator and attribute path
             parts = lookup.split("__")
             if parts[-1] in (
                 "gt",
@@ -266,8 +262,8 @@ def generic_cache_invalidation(
                 op = "eq"
                 attr_path = parts
 
-            # 2) Alten und neuen Wert holen
-            old_val = old_relevant_values.get(lookup)
+            # 2) get old & new value
+            old_val = old_relevant_values.get("__".join(attr_path))
 
             obj = instance
             for attr in attr_path:
@@ -276,14 +272,14 @@ def generic_cache_invalidation(
                     break
             new_val = obj
 
-            # 3) Für jedes val_key prüfen
+            # 3) check against all cache_keys
             for val_key, cache_keys in list(lookup_map.items()):
                 old_match = matches(op, old_val, val_key)
                 new_match = matches(op, new_val, val_key)
 
                 if action == "filter":
-                    # Direkte & alle Filter-Abhängigkeiten: immer invalidieren, wenn neu matcht
-                    if new_match:
+                    # Filter: invalidate if new match or old match
+                    if new_match or old_match:
                         print(
                             f"Invalidate cache key {cache_keys} for filter {lookup} with value {val_key}"
                         )
@@ -292,7 +288,7 @@ def generic_cache_invalidation(
                             remove_cache_key_from_index(ck)
 
                 else:  # action == 'exclude'
-                    # Excludes: nur invalidieren, wenn sich der Match-Status ändert
+                    # Excludes: invalidate only if matches changed
                     if old_match != new_match:
                         print(
                             f"Invalidate cache key {cache_keys} for exclude {lookup} with value {val_key}"

{generalmanager-0.3.1.dist-info → generalmanager-0.3.2.dist-info}/METADATA

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

{generalmanager-0.3.1.dist-info → generalmanager-0.3.2.dist-info}/RECORD

@@ -12,7 +12,7 @@ general_manager/auxiliary/noneToZero.py,sha256=KfQtMQnrT6vsYST0K7lv6pVujkDcK3XL8
 general_manager/auxiliary/pathMapping.py,sha256=nrz5owQg2a69Yig1eCXorR9U0NSw7NmBAk5OkeoHTdA,6842
 general_manager/cache/cacheDecorator.py,sha256=DK2ANIJgPpMxazfMSiFrI9OuVE_7K9zlIZQRrgaC2Lw,3268
 general_manager/cache/cacheTracker.py,sha256=rRw3OhBDf86hTC2Xbt1ocRgZqwu8_kXk4lczamcADFg,2955
-general_manager/cache/dependencyIndex.py,sha256=iuOjthmH5ehHCkWiM9iLbgzGlo4Cf2wRKkm-QhIQ024,10813
+general_manager/cache/dependencyIndex.py,sha256=kEbIAzzMzKlQgplKfcMYBPZ562zCBkOBKvJusxO_iC4,10537
 general_manager/cache/modelDependencyCollector.py,sha256=wS2edbZsQ1aTfRlHj02lhuasZHCc2ucRGob-E7ejuoY,2433
 general_manager/cache/signals.py,sha256=ZHeXKFMN7tj9t0J-vSqf_05_NhGqEF2sZtbZO3vaRqI,1234
 general_manager/factory/__init__.py,sha256=DLSQbpSBpujPtDSZcruPc43OLWzKCCtf20gbalCDYRU,91
@@ -39,8 +39,8 @@ general_manager/permission/permissionDataManager.py,sha256=Ji7fsnuaKTa6M8yzCGyzr
 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=3FVCKGL7BTVoStdgOTdWQwuoVRIxAIAilV4VOzouDpc,10759
-generalmanager-0.3.1.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
-generalmanager-0.3.1.dist-info/METADATA,sha256=uintWwJEHfXzzHYW1Gwi1BQwqycnwdQI_oQW-XUWLiM,8188
-generalmanager-0.3.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-generalmanager-0.3.1.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.3.1.dist-info/RECORD,,
+generalmanager-0.3.2.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
+generalmanager-0.3.2.dist-info/METADATA,sha256=xE5D8fR08XEmMO8Fn2GbO5cu9Y1ESY1vvjZE660JfUA,8188
+generalmanager-0.3.2.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+generalmanager-0.3.2.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.3.2.dist-info/RECORD,,