GeneralManager 0.16.1__py3-none-any.whl → 0.17.0__py3-none-any.whl

general_manager/cache/dependencyIndex.py

@@ -5,6 +5,7 @@ import time
 import ast
 import re
 import logging
+from datetime import date, datetime
 
 from django.core.cache import cache
 from general_manager.cache.signals import post_data_change, pre_data_change
@@ -138,6 +139,9 @@ def record_dependencies(
                 action_key = cast(Literal["filter", "exclude"], action)
                 params = ast.literal_eval(identifier)
                 section = idx[action_key].setdefault(model_name, {})
+                if len(params) > 1:
+                    cache_dependencies = section.setdefault("__cache_dependencies__", {})
+                    cache_dependencies.setdefault(cache_key, set()).add(identifier)
                 for lookup, val in params.items():
                     lookup_map = section.setdefault(lookup, {})
                     val_key = repr(val)
@@ -183,7 +187,10 @@ def remove_cache_key_from_index(cache_key: str) -> None:
         for action in ("filter", "exclude"):
             action_section = idx.get(action, {})
             for mname, model_section in list(action_section.items()):
+                cache_dependencies = model_section.get("__cache_dependencies__", {})
                 for lookup, lookup_map in list(model_section.items()):
+                    if lookup.startswith("__"):
+                        continue
                     for val_key, key_set in list(lookup_map.items()):
                         if cache_key in key_set:
                             key_set.remove(cache_key)
@@ -191,6 +198,10 @@ def remove_cache_key_from_index(cache_key: str) -> None:
                                 del lookup_map[val_key]
                     if not lookup_map:
                         del model_section[lookup]
+                if cache_dependencies:
+                    cache_dependencies.pop(cache_key, None)
+                    if not cache_dependencies:
+                        model_section.pop("__cache_dependencies__", None)
                 if not model_section:
                     del action_section[mname]
         set_full_index(idx)
@@ -238,7 +249,15 @@ def capture_old_values(
     # get all lookups for this model
     lookups = set()
     for action in ("filter", "exclude"):
-        lookups |= set(idx.get(action, {}).get(manager_name, {}))
+        model_section = idx.get(action, {}).get(manager_name, {})
+        if isinstance(model_section, dict):
+            lookups |= {
+                lookup
+                for lookup in model_section.keys()
+                if isinstance(lookup, str) and not lookup.startswith("__")
+            }
+        elif isinstance(model_section, list):
+            lookups |= set(model_section)
     if lookups and instance.identification:
         # save old values for later comparison
         vals: dict[str, object] = {}
@@ -276,27 +295,86 @@ def generic_cache_invalidation(
     manager_name = sender.__name__
     idx = get_full_index()
 
+    def _safe_literal_eval(value: Any) -> Any:
+        if isinstance(value, str):
+            try:
+                return ast.literal_eval(value)
+            except (ValueError, SyntaxError):
+                return value
+        return value
+
+    def _coerce_to_type(sample: Any, raw: Any) -> Any | None:
+        if sample is None:
+            return None
+
+        if isinstance(sample, datetime):
+            if isinstance(raw, datetime):
+                parsed = raw
+            elif isinstance(raw, str):
+                candidate = raw.replace("Z", "+00:00")
+                candidate = candidate.replace(" ", "T", 1)
+                try:
+                    parsed = datetime.fromisoformat(candidate)
+                except ValueError:
+                    return None
+            else:
+                return None
+
+            if sample.tzinfo and parsed.tzinfo is None:
+                parsed = parsed.replace(tzinfo=sample.tzinfo)
+            elif not sample.tzinfo and parsed.tzinfo is not None:
+                parsed = parsed.replace(tzinfo=None)
+            return parsed
+
+        if isinstance(sample, date) and not isinstance(sample, datetime):
+            if isinstance(raw, date) and not isinstance(raw, datetime):
+                return raw
+            if isinstance(raw, str):
+                try:
+                    return date.fromisoformat(raw)
+                except ValueError:
+                    return None
+            return None
+
+        try:
+            return type(sample)(raw) # type: ignore
+        except Exception:
+            if isinstance(raw, type(sample)):
+                return raw
+            return None
+
     def matches(op: str, value: Any, val_key: Any) -> bool:
         if value is None:
             return False
 
         # eq
         if op == "eq":
-            return repr(value) == val_key
+            literal_val = _safe_literal_eval(val_key)
+            comparable = _coerce_to_type(value, literal_val)
+            if comparable is None:
+                return repr(value) == val_key
+            return value == comparable
 
         # in
         if op == "in":
             try:
                 seq = ast.literal_eval(val_key)
-                return value in seq
-            except:
+            except (ValueError, SyntaxError):
                 return False
+            for item in seq:
+                comparable = _coerce_to_type(value, item)
+                if comparable is not None:
+                    if value == comparable:
+                        return True
+                elif repr(value) == repr(item):
+                    return True
+            return False
 
         # range comparisons
         if op in ("gt", "gte", "lt", "lte"):
-            try:
-                thr = type(value)(ast.literal_eval(val_key))
-            except:
+            literal_val = _safe_literal_eval(val_key)
+            thr = _coerce_to_type(value, literal_val)
+            if thr is None:
                 return False
             if op == "gt":
                 return value > thr
@@ -311,7 +389,7 @@ def generic_cache_invalidation(
         if op in ("contains", "startswith", "endswith", "regex"):
             try:
                 literal = ast.literal_eval(val_key)
-            except Exception:
+            except (ValueError, SyntaxError):
                 literal = val_key
 
             # ensure we always work with strings to avoid TypeErrors
@@ -325,16 +403,78 @@ def generic_cache_invalidation(
             # regex: treat the stored key as the regex pattern
             if op == "regex":
                 try:
-                    pattern = re.compile(val_key)
+                    pattern_source = literal if isinstance(literal, str) else str(literal)
+                    pattern = re.compile(pattern_source)
                 except re.error:
                     return False
                 return bool(pattern.search(text))
 
         return False
 
+    def current_value_for_path(path: list[str]) -> Any:
+        current: object = instance
+        for attr in path:
+            current = getattr(current, attr, UNDEFINED)
+            if current is UNDEFINED:
+                return None
+        return current
+
+    def evaluate_composite(
+        cache_key: str, lookup_key: str, action: str
+    ) -> bool | None:
+        cache_dependencies = model_section.get("__cache_dependencies__", {})
+        identifiers = cache_dependencies.get(cache_key) if cache_dependencies else None
+        if not identifiers:
+            return None
+
+        for identifier in identifiers:
+            params = ast.literal_eval(identifier)
+            if lookup_key not in params:
+                continue
+            old_all = True
+            new_all = True
+            for param_lookup, expected in params.items():
+                parts_param = param_lookup.split("__")
+                if parts_param[-1] in (
+                    "gt",
+                    "gte",
+                    "lt",
+                    "lte",
+                    "in",
+                    "contains",
+                    "startswith",
+                    "endswith",
+                    "regex",
+                ):
+                    op_param = parts_param[-1]
+                    attr_path_param = parts_param[:-1]
+                else:
+                    op_param = "eq"
+                    attr_path_param = parts_param
+                expected_key = repr(expected)
+                old_val_param = old_relevant_values.get("__".join(attr_path_param))
+                new_val_param = current_value_for_path(attr_path_param)
+                if not matches(op_param, old_val_param, expected_key):
+                    old_all = False
+                if not matches(op_param, new_val_param, expected_key):
+                    new_all = False
+                if not old_all and not new_all and action == "filter":
+                    break
+            if action == "filter":
+                if old_all or new_all:
+                    return True
+            else:  # exclude
+                if old_all != new_all:
+                    return True
+        return False
+
     for action in ("filter", "exclude"):
         model_section = idx.get(action, {}).get(manager_name, {})
+        if not model_section:
+            continue
         for lookup, lookup_map in model_section.items():
+            if lookup.startswith("__"):
+                continue
             # 1) get operator and attribute path
             parts = lookup.split("__")
             if parts[-1] in (
@@ -371,20 +511,32 @@ def generic_cache_invalidation(
 
                 if action == "filter":
                     # Filter: invalidate if new match or old match
-                    if new_match or old_match:
-                        logger.info(
-                            f"Invalidate cache key {cache_keys} for filter {lookup} with value {val_key}"
+                    for ck in list(cache_keys):
+                        composite_decision = evaluate_composite(ck, lookup, action)
+                        should_invalidate = (
+                            composite_decision
+                            if composite_decision is not None
+                            else (new_match or old_match)
                         )
-                        for ck in list(cache_keys):
+                        if should_invalidate:
+                            logger.info(
+                                f"Invalidate cache key {ck} for filter {lookup} with value {val_key}"
+                            )
                             invalidate_cache_key(ck)
                             remove_cache_key_from_index(ck)
 
                 else:  # action == 'exclude'
                     # Excludes: invalidate only if matches changed
-                    if old_match != new_match:
-                        logger.info(
-                            f"Invalidate cache key {cache_keys} for exclude {lookup} with value {val_key}"
+                    for ck in list(cache_keys):
+                        composite_decision = evaluate_composite(ck, lookup, action)
+                        should_invalidate = (
+                            composite_decision
+                            if composite_decision is not None
+                            else (old_match != new_match)
                         )
-                        for ck in list(cache_keys):
+                        if should_invalidate:
+                            logger.info(
+                                f"Invalidate cache key {ck} for exclude {lookup} with value {val_key}"
+                            )
                             invalidate_cache_key(ck)
                             remove_cache_key_from_index(ck)

general_manager/manager/groupManager.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 from typing import Any, Generic, Iterator, Type, cast, get_args
 from datetime import datetime, date, time
-from general_manager.api.graphql import GraphQLProperty
+from general_manager.api.property import GraphQLProperty
 from general_manager.measurement import Measurement
 from general_manager.manager.generalManager import GeneralManager
 from general_manager.bucket.baseBucket import (

general_manager/utils/testing.py

@@ -80,15 +80,18 @@ class GMTestCaseMeta(type):
         attrs: dict[str, object],
     ) -> type:
         """
-        Construct a new test case class that wires GeneralManager-specific initialisation into `setUpClass`.
-
+        Create a new test case class that injects GeneralManager-specific initialization into `setUpClass`.
+        
+        The constructed class replaces or wraps any user-defined `setUpClass` with logic that resets GraphQL and manager registries, configures an optional fallback app lookup, ensures database tables for managed models exist, initializes GeneralManager and GraphQL registrations, and then calls the standard GraphQL test setup.
+        
         Parameters:
-            name (str): Name of the dynamically created test case class.
-            bases (tuple[type, ...]): Base classes that the new test case should inherit.
-            attrs (dict[str, Any]): Namespace containing class attributes, potentially including a custom `setUpClass`.
-
+            mcs (type[GMTestCaseMeta]): Metaclass constructing the new class.
+            name (str): Name of the class to create.
+            bases (tuple[type, ...]): Base classes for the new class.
+            attrs (dict[str, object]): Class namespace; may contain a user-defined `setUpClass` and `fallback_app`.
+        
         Returns:
-            type: Newly constructed class with an augmented `setUpClass` implementation.
+            type: The newly created test case class whose `setUpClass` has been augmented for GeneralManager testing.
         """
         user_setup = attrs.get("setUpClass")
         fallback_app = cast(str | None, attrs.get("fallback_app", "general_manager"))
@@ -99,22 +102,22 @@ class GMTestCaseMeta(type):
             cls: type["GeneralManagerTransactionTestCase"],
         ) -> None:
             """
-            Prepare the test harness with GeneralManager-specific setup prior to executing tests.
-
-            The method resets GraphQL registries, configures optional fallback app lookups, synchronises database tables for managed models, and finally invokes the parent `setUpClass`.
-
-            Parameters:
-                cls (type[GeneralManagerTransactionTestCase]): Test case subclass whose environment is being initialised.
-
-            Returns:
-                None
+            Prepare the test environment for GeneralManager GraphQL tests.
+            
+            Resets GraphQL and manager registries, optionally patches Django's app-config lookup to use a fallback app, ensures database tables exist for models provided by the test's configured manager classes, initializes GeneralManager classes (including read-only interfaces) and GraphQL registrations, and finally invokes the base class setUpClass.
             """
             GraphQL._query_class = None
             GraphQL._mutation_class = None
+            GraphQL._subscription_class = None
             GraphQL._mutations = {}
             GraphQL._query_fields = {}
+            GraphQL._subscription_fields = {}
             GraphQL.graphql_type_registry = {}
             GraphQL.graphql_filter_type_registry = {}
+            GraphQL._subscription_payload_registry = {}
+            GraphQL._page_type_registry = {}
+            GraphQL.manager_registry = {}
+            GraphQL._schema = None
 
             if fallback_app is not None:
                 setattr(
@@ -219,11 +222,17 @@ class LoggingCache(LocMemCache):
             "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
             "LOCATION": "test-cache",
         }
-    }
+    },
+    CHANNEL_LAYERS={
+        "default": {
+            "BACKEND": "channels.layers.InMemoryChannelLayer",
+        }
+    },
 )
 class GeneralManagerTransactionTestCase(
     GraphQLTransactionTestCase, metaclass=GMTestCaseMeta
 ):
+    GRAPHQL_URL = "/graphql/"
     general_manager_classes: list[type[GeneralManager]] = []
     read_only_classes: list[type[GeneralManager]] = []
     fallback_app: str | None = "general_manager"

{generalmanager-0.16.1.dist-info → generalmanager-0.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.16.1
+Version: 0.17.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
@@ -43,6 +43,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asgiref>=3.8.1
+Requires-Dist: channels>=4.1.0
 Requires-Dist: Django>=5.2.7
 Requires-Dist: django-simple-history>=3.8.0
 Requires-Dist: exrex>=0.12.0

{generalmanager-0.16.1.dist-info → generalmanager-0.17.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 general_manager/__init__.py,sha256=OmRYpjg3N9w0yX1eAq32WdLtcf8I55M3sqhO-Qrawjo,742
-general_manager/apps.py,sha256=On2nTp2-QwNcOpYfIzjNE0Xnum4BMk_5YHbEloBIM-U,10351
+general_manager/apps.py,sha256=Fsqvh7Xznp_7zOAyHABGtwJz10oT4kdY3C4MgmOGnAs,16723
 general_manager/public_api_registry.py,sha256=xKfgbyvXB_oZZku9ksLNzOGQbmL5QfWuRGE2qH2FOtc,7338
 general_manager/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/_types/__init__.py,sha256=RmS0Ok-1-CwWOZL_socLWksEk9MfsshL9eQx879I4mU,60
@@ -15,7 +15,8 @@ general_manager/_types/permission.py,sha256=BG-RMsGgVCRVHyJgns9a1VTcwtqS9WzbG2HO
 general_manager/_types/rule.py,sha256=Ju5t7NhGO76KnqwOElXk2cMI6cIYyMW5sEPayXExJPM,239
 general_manager/_types/utils.py,sha256=jze1yRZQw_OKVOmJNMv4MEu92rP01CVtjLBCEMqxCqk,1026
 general_manager/api/__init__.py,sha256=6Usf6aEc5RalaOE4xzqqSp7KChxi9W4Nts4nFIFHtt4,677
-general_manager/api/graphql.py,sha256=4pox3eRXWtZG9VshSgCJVrJ_9ONUUuzWhmXwetV5EgI,42798
+general_manager/api/graphql.py,sha256=2OYYYtCDu5-L5aBRTv2Ns6s6O2lnyEQvootmoXQiuPY,74261
+general_manager/api/graphql_subscription_consumer.py,sha256=JXJ8FRi3kP07jTXs9kSeSLaAc_AueiqJf_eeaVu8w4s,17916
 general_manager/api/mutation.py,sha256=6T-UHElnTxWubG99-Svy7AeFlHuXaKc8nKvRPADmI0E,7347
 general_manager/api/property.py,sha256=tT-eAKcuPhy0q_v0fKL4gPXcCVASC5M15_DYWMCQXjc,4358
 general_manager/bucket/__init__.py,sha256=Ay3kVmdxWC8nt3jYx3FFnND89ysD_z0GaD5rIr-v7Ec,690
@@ -26,7 +27,7 @@ general_manager/bucket/groupBucket.py,sha256=-cN9jA_AOsnrpwmjiy6jTB_TFoUqLMeM1Sd
 general_manager/cache/__init__.py,sha256=_jwrpqGzlwaL1moqG1B9XL9V-QW08VVdtDbkVDfN_sU,698
 general_manager/cache/cacheDecorator.py,sha256=kgUvJHcC8tilqf1JH2QvyG-158AT_rmuKf6pgUy1IBs,3406
 general_manager/cache/cacheTracker.py,sha256=rb637hGHOe79sehpTZLhfO979qrYLw3ATufo7kr_VvM,2991
-general_manager/cache/dependencyIndex.py,sha256=gaSbEpw9qdIMgf_5jRryuTAvq9x3hwMxP2bi5S4xj84,13206
+general_manager/cache/dependencyIndex.py,sha256=FWUqnG1BAqF7FdAFl8bqa4JX3ecN8dpesyeRbo0JsQU,19389
 general_manager/cache/modelDependencyCollector.py,sha256=iFiuuQKO3-sEcUxbpA1svxL2TMkr8F6afAtRXK5fUBk,2645
 general_manager/cache/signals.py,sha256=pKibv1EL7fYL4KB7O13TpqVTKZLnqo6A620vKlXaNkg,2015
 general_manager/factory/__init__.py,sha256=t9RLlp_ZPU_0Xu5I7hg-xwo3yy1eSwnvfXMYvpGCFtE,714
@@ -42,7 +43,7 @@ general_manager/interface/models.py,sha256=rtuhOKeSgD2DboeZIMAQU99JyCOT7SuiuGqWv
 general_manager/interface/readOnlyInterface.py,sha256=UcaCClVJv8IT-EBm__IN4jU6td_sXRRCN_Y_OKngs_4,11392
 general_manager/manager/__init__.py,sha256=UwvLs13_UpYsq5igSY78cbyg11C6iTrHlr-rtDql43I,703
 general_manager/manager/generalManager.py,sha256=A6kYjM2duxT0AAeN0er87gRWjLmcPmEjPmNHTQgACgs,9577
-general_manager/manager/groupManager.py,sha256=3Wl40cBRc1hL35zBCQDi8V2AIERh_dtbUeL1h1ZCnak,6428
+general_manager/manager/groupManager.py,sha256=zGSupjNVgASinyjLkpaM_SeR4Kb61hyXbkcj-R3sPa0,6429
 general_manager/manager/input.py,sha256=UoVU0FDXHDEmuOk7mppx63DuwbPK2_qolcILar2Kk6U,3031
 general_manager/manager/meta.py,sha256=iGYwuVrM0SWyvzVPLTS0typ8VT38QoxFuWhA1b1FBnA,5032
 general_manager/measurement/__init__.py,sha256=Tt2Es7J-dGWcd8bFK4PR2m4AKBlRoj2WGXcKy64fOTY,711
@@ -68,9 +69,9 @@ general_manager/utils/makeCacheKey.py,sha256=T9YTHDW8VN50iW_Yzklm9Xw-mp1Q7PKMphQ
 general_manager/utils/noneToZero.py,sha256=e3zk8Ofh3AsYW8spYmZWiv7FjOsr0jvfB9AOQbaPMWY,665
 general_manager/utils/pathMapping.py,sha256=3BWRUM1EimUKeh8i_UK6nYsKtOJDykgmZgCA9dgYjqU,9531
 general_manager/utils/public_api.py,sha256=SNTI_tRMcbv0qMttm-wMBoAEkqSEFMTI6ZHMajOnDlg,1437
-general_manager/utils/testing.py,sha256=BCquJ5RNiLbRFdcrgYP227TxSRfQKgpkvmWvsJqJAjk,13276
-generalmanager-0.16.1.dist-info/licenses/LICENSE,sha256=OezwCA4X2-xXmRDvMaqHvHCeUmGtyCYjZ8F3XUxSGwc,1069
-generalmanager-0.16.1.dist-info/METADATA,sha256=YHfoHcCYb9AdJH0_XkWeVXHmfmW6vzZ5AnBaral6Jrk,8175
-generalmanager-0.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-generalmanager-0.16.1.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.16.1.dist-info/RECORD,,
+general_manager/utils/testing.py,sha256=etf_JlSaulD85A1CjPeOS0M0CbWCfPnaOxgHi0ozJLQ,14083
+generalmanager-0.17.0.dist-info/licenses/LICENSE,sha256=OezwCA4X2-xXmRDvMaqHvHCeUmGtyCYjZ8F3XUxSGwc,1069
+generalmanager-0.17.0.dist-info/METADATA,sha256=-YVROYZscJ9qFKOuwPEN7IJ8vunvto6P4OEm_Elsevo,8206
+generalmanager-0.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+generalmanager-0.17.0.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.17.0.dist-info/RECORD,,