GeneralManager 0.40.4__tar.gz → 0.40.6__tar.gz

{generalmanager-0.40.4/src/GeneralManager.egg-info → generalmanager-0.40.6}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.40.4
+Version: 0.40.6
 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.40.4 → generalmanager-0.40.6}/src/general_manager/bootstrap.py

@@ -276,6 +276,12 @@ def initialize_general_manager_classes(
         "creating manager attributes",
         context={"pending_attributes": len(pending_attribute_initialization)},
     )
+    for general_manager_class in dict.fromkeys(all_classes):
+        interface = getattr(general_manager_class, "Interface", None)
+        if hasattr(interface, "_field_descriptors"):
+            interface_with_cache: Any = interface
+            interface_with_cache._field_descriptors = None
+
     for general_manager_class in pending_attribute_initialization:
         attributes = general_manager_class.Interface.get_attributes()
         general_manager_class._attributes = attributes

{generalmanager-0.40.4 → generalmanager-0.40.6}/src/general_manager/cache/dependency_index.py

@@ -661,7 +661,8 @@ def generic_cache_invalidation(
         - "regex": treats `val_key` as a regular expression pattern and tests it against the string form of `value`.
 
         Behavior notes:
-        - If `value` is None the function returns `False`.
+        - If `value` is None the function only matches explicit null equality
+          or membership checks.
         - ``val_key`` is a JSON-serialised string produced by
           :func:`json.dumps`.  Parsing is done with :func:`json.loads`; if
           JSON parsing or type coercion fails, the function falls back to
@@ -676,12 +677,11 @@ def generic_cache_invalidation(
         Returns:
             bool: `True` if the comparison defined by `op` and `val_key` matches `value`, `False` otherwise.
         """
-        if value is None:
-            return False
-
         # eq
         if op == "eq":
             literal_val = _json_loads_val_key(val_key)
+            if literal_val is None:
+                return value is None
             repr_marker = _repr_marker(literal_val)
             if repr_marker is not None:
                 return repr(value) == repr_marker
@@ -697,6 +697,10 @@ def generic_cache_invalidation(
             except (json.JSONDecodeError, ValueError):
                 return False
             for item in seq:
+                if item is None:
+                    if value is None:
+                        return True
+                    continue
                 repr_marker = _repr_marker(item)
                 if repr_marker is not None:
                     if repr(value) == repr_marker:
@@ -712,6 +716,8 @@ def generic_cache_invalidation(
 
         # range comparisons
         if op in ("gt", "gte", "lt", "lte"):
+            if value is None:
+                return False
             literal_val = _json_loads_val_key(val_key)
             thr = _coerce_to_type(value, literal_val)
             if thr is None:
@@ -727,6 +733,8 @@ def generic_cache_invalidation(
 
         # wildcard / regex comparisons
         if op in ("contains", "startswith", "endswith", "regex"):
+            if value is None:
+                return False
             try:
                 literal = json.loads(val_key)
             except (json.JSONDecodeError, ValueError):

{generalmanager-0.40.4 → generalmanager-0.40.6}/src/general_manager/interface/capabilities/orm_utils/field_descriptors.py

@@ -9,6 +9,7 @@ import re
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional, cast
 from uuid import UUID
 
+from django.apps import apps
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.db import models
 
@@ -395,12 +396,39 @@ class _FieldDescriptorBuilder:
         """
         if related_model == "self":
             return cast(type[models.Model], self.model)
+        if isinstance(related_model, str):
+            resolved_model = self._resolve_string_related_model(related_model)
+            if resolved_model is not None:
+                return resolved_model
         if isinstance(related_model, type) and issubclass(related_model, models.Model):
             return cast(type[models.Model], related_model)
         if related_model is not None:
             return None
         return cast(Optional[type[models.Model]], related_model)
 
+    def _resolve_string_related_model(
+        self,
+        related_model: str,
+    ) -> Optional[type[models.Model]]:
+        app_label: str | None
+        if "." in related_model:
+            app_label, model_name = related_model.split(".", 1)
+        else:
+            meta = getattr(self.model, "_meta", None)
+            app_label = getattr(meta, "app_label", None)
+            model_name = related_model
+        if not app_label:
+            return None
+        try:
+            resolved_model = apps.get_model(app_label, model_name)
+        except (LookupError, ValueError):
+            return None
+        if isinstance(resolved_model, type) and issubclass(
+            resolved_model, models.Model
+        ):
+            return cast(type[models.Model], resolved_model)
+        return None
+
 
 def _collect_custom_fields(
     model: type[models.Model] | models.Model,