GeneralManager 0.52.0__tar.gz → 0.52.2__tar.gz

{generalmanager-0.52.0/src/GeneralManager.egg-info → generalmanager-0.52.2}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.52.0
+Version: 0.52.2
 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.52.0 → generalmanager-0.52.2}/src/general_manager/api/graphql_mutations.py

@@ -66,6 +66,24 @@ def _normalize_mutation_kwargs_for_manager(
 # ---------------------------------------------------------------------------
 
 
+def _is_direct_relation_raw_id_alias(
+    name: str,
+    attribute_types: dict[str, Any],
+) -> bool:
+    """Return true when ``name`` is the raw ``*_id`` alias for a direct relation."""
+    if not name.endswith("_id"):
+        return False
+
+    relation_name = name.removesuffix("_id")
+    relation_info = attribute_types.get(relation_name)
+    if relation_info is None:
+        return False
+
+    return relation_info.get("relation_kind") == "direct" and not relation_info.get(
+        "is_derived", False
+    )
+
+
 def create_write_fields(
     interface_cls: InterfaceBase,
     *,
@@ -74,8 +92,10 @@ def create_write_fields(
     """
     Create Graphene input fields for writable attributes defined by an Interface.
 
-    Skips system fields (``changed_by``, ``created_at``, ``updated_at``) and
-    attributes marked as derived.  For attributes whose type is a
+    Skips system fields (``changed_by``, ``created_at``, ``updated_at``),
+    attributes marked as derived, and raw ``*_id`` aliases for direct
+    relations already exposed by their canonical relation field.  For
+    attributes whose type is a
     ``GeneralManager``, produces an ID field or a list of ID fields for names
     ending with ``"_list"``.  Always includes an optional ``history_comment``
     string field.
@@ -91,11 +111,14 @@ def create_write_fields(
         Mapping from attribute name to a Graphene input field instance.
     """
     fields: dict[str, Any] = {}
-    for name, info in interface_cls.get_attribute_types().items():
+    attribute_types = interface_cls.get_attribute_types()
+    for name, info in attribute_types.items():
         if name in ["changed_by", "created_at", "updated_at"]:
             continue
         if info["is_derived"]:
             continue
+        if _is_direct_relation_raw_id_alias(name, attribute_types):
+            continue
 
         typ = info["type"]
         req = info["is_required"] if require_fields else False
@@ -184,6 +207,7 @@ def generate_create_mutation_class(
                     field_name: field
                     for field_name, field in create_write_fields(interface_cls).items()
                     if field_name not in generalManagerClass.Interface.input_fields
+                    and field.editable
                 },
             ),
             "mutate": create_mutation,

{generalmanager-0.52.0 → generalmanager-0.52.2}/src/general_manager/cache/dependency_shards.py

@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 import hashlib
+from collections import defaultdict
 from dataclasses import dataclass, field
-from typing import Any, Iterable, Literal
+from typing import Any, Iterable, Literal, Mapping
 
 from django.core.cache import cache
 
@@ -37,6 +38,14 @@ class ReverseDependencyMembership:
     simple_dependencies: frozenset[SimpleDependency] = field(default_factory=frozenset)
 
 
+@dataclass(frozen=True, slots=True)
+class _DependencyShardPlan:
+    shard_keys: frozenset[str]
+    composite_dependencies: frozenset[CompositeDependency]
+    simple_dependencies: frozenset[SimpleDependency]
+    lookup_registrations: frozenset[tuple[str, str, str]]
+
+
 def _hash_text(value: str) -> str:
     return hashlib.sha256(value.encode("utf-8")).hexdigest()
 
@@ -104,19 +113,78 @@ def cache_set_members(key: str) -> set[str]:
     return set(members)
 
 
+def _cache_get_many(keys: Iterable[str]) -> dict[str, Any]:
+    key_tuple = tuple(dict.fromkeys(keys))
+    if not key_tuple:
+        return {}
+    return dict(cache.get_many(key_tuple))
+
+
+def _cache_set_many(payloads: Mapping[str, Any]) -> None:
+    if payloads:
+        cache.set_many(dict(payloads), None)
+
+
+def _cache_delete_many(keys: Iterable[str]) -> None:
+    key_tuple = tuple(dict.fromkeys(keys))
+    if not key_tuple:
+        return
+    delete_many = getattr(cache, "delete_many", None)
+    if callable(delete_many):
+        delete_many(key_tuple)
+        return
+    for key in key_tuple:
+        cache.delete(key)
+
+
+def _cache_member_set(value: Any) -> set[str]:
+    if value is None:
+        return set()
+    if isinstance(value, (set, frozenset, list, tuple)):
+        return {member for member in value if isinstance(member, str)}
+    return set()
+
+
+def _cache_set_add_many(additions: Mapping[str, set[str]]) -> None:
+    pending = {key: set(members) for key, members in additions.items() if members}
+    if not pending:
+        return
+
+    existing_sets = _cache_get_many(pending)
+    payloads: dict[str, set[str]] = {}
+    for key, members in pending.items():
+        current = _cache_member_set(existing_sets.get(key, set()))
+        current.update(members)
+        payloads[key] = current
+    _cache_set_many(payloads)
+
+
+def _cache_set_discard_many(removals: Mapping[str, set[str]]) -> None:
+    pending = {key: set(members) for key, members in removals.items() if members}
+    if not pending:
+        return
+
+    existing_sets = _cache_get_many(pending)
+    payloads: dict[str, set[str]] = {}
+    delete_keys: list[str] = []
+    for key, members in pending.items():
+        current = _cache_member_set(existing_sets.get(key, set()))
+        current.difference_update(members)
+        if current:
+            payloads[key] = current
+        else:
+            delete_keys.append(key)
+
+    _cache_set_many(payloads)
+    _cache_delete_many(delete_keys)
+
+
 def _cache_set_add(key: str, member: str) -> None:
-    members = cache_set_members(key)
-    members.add(member)
-    cache.set(key, members, None)
+    _cache_set_add_many({key: {member}})
 
 
 def _cache_set_discard(key: str, member: str) -> None:
-    members = cache_set_members(key)
-    members.discard(member)
-    if members:
-        cache.set(key, members, None)
-    else:
-        cache.delete(key)
+    _cache_set_discard_many({key: {member}})
 
 
 def _lookup_name_for_candidate(lookup: str) -> str:
@@ -190,20 +258,31 @@ def _shard_keys_for_dependency(
     manager_name: str,
     action: DependencyAction,
     identifier: str,
-) -> tuple[set[str], set[CompositeDependency], set[SimpleDependency]]:
+) -> _DependencyShardPlan:
     shard_keys: set[str] = set()
     composites: set[CompositeDependency] = set()
     simple_dependencies: set[SimpleDependency] = set()
+    lookup_registrations: set[tuple[str, str, str]] = set()
 
     if action == "all":
         shard_keys.add(all_records_shard_key(manager_name))
         simple_dependencies.add((manager_name, action, identifier))
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(shard_keys),
+            frozenset(composites),
+            frozenset(simple_dependencies),
+            frozenset(lookup_registrations),
+        )
 
     if action == "request_query":
         shard_keys.add(request_query_shard_key(manager_name))
         simple_dependencies.add((manager_name, action, identifier))
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(shard_keys),
+            frozenset(composites),
+            frozenset(simple_dependencies),
+            frozenset(lookup_registrations),
+        )
 
     if action == "identification":
         shard_keys.add(
@@ -216,19 +295,39 @@ def _shard_keys_for_dependency(
             )
         )
         simple_dependencies.add((manager_name, action, identifier))
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(shard_keys),
+            frozenset(composites),
+            frozenset(simple_dependencies),
+            frozenset(lookup_registrations),
+        )
 
     if action not in {"filter", "exclude"}:
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(),
+            frozenset(),
+            frozenset(),
+            frozenset(),
+        )
 
     params = parse_dependency_identifier(identifier)
     if not isinstance(params, dict):
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(),
+            frozenset(),
+            frozenset(),
+            frozenset(),
+        )
 
     if not params:
         shard_keys.add(all_records_shard_key(manager_name))
         simple_dependencies.add((manager_name, action, identifier))
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(shard_keys),
+            frozenset(composites),
+            frozenset(simple_dependencies),
+            frozenset(lookup_registrations),
+        )
 
     sort_lookups = [
         str(lookup).removeprefix("__sort__")
@@ -239,18 +338,23 @@ def _shard_keys_for_dependency(
         composite = (manager_name, action, identifier)
         composites.add(composite)
         for sort_lookup in sort_lookups:
-            _register_lookup(manager_name, action, sort_lookup)
+            lookup_registrations.add((manager_name, action, sort_lookup))
             shard_keys.add(
                 composite_lookup_shard_key(manager_name, action, sort_lookup)
             )
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(shard_keys),
+            frozenset(composites),
+            frozenset(simple_dependencies),
+            frozenset(lookup_registrations),
+        )
 
     if len(params) > 1:
         composite = (manager_name, action, identifier)
         composites.add(composite)
         for lookup in params:
             candidate_lookup = _lookup_name_for_candidate(str(lookup))
-            _register_lookup(manager_name, action, candidate_lookup)
+            lookup_registrations.add((manager_name, action, candidate_lookup))
             shard_keys.add(
                 composite_lookup_shard_key(
                     manager_name,
@@ -258,12 +362,17 @@ def _shard_keys_for_dependency(
                     candidate_lookup,
                 )
             )
-        return shard_keys, composites, simple_dependencies
+        return _DependencyShardPlan(
+            frozenset(shard_keys),
+            frozenset(composites),
+            frozenset(simple_dependencies),
+            frozenset(lookup_registrations),
+        )
 
     lookup, value = next(iter(params.items()))
     spec = lookup_spec_from_key(str(lookup))
     candidate_lookup = "__".join(spec.attr_path)
-    _register_lookup(manager_name, action, candidate_lookup)
+    lookup_registrations.add((manager_name, action, candidate_lookup))
     if spec.operator == "eq":
         shard_keys.add(
             exact_lookup_shard_key(manager_name, action, spec.lookup, "eq", value)
@@ -273,56 +382,96 @@ def _shard_keys_for_dependency(
             scan_lookup_shard_key(manager_name, action, spec.lookup, spec.operator)
         )
     simple_dependencies.add((manager_name, action, identifier))
-    return shard_keys, composites, simple_dependencies
+    return _DependencyShardPlan(
+        frozenset(shard_keys),
+        frozenset(composites),
+        frozenset(simple_dependencies),
+        frozenset(lookup_registrations),
+    )
 
 
-def record_cache_dependencies(
+def _reverse_membership_for_dependencies(
     cache_key: str,
-    dependencies: Iterable[Dependency],
-) -> None:
-    """Record dependency metadata for one cache key in deterministic shards."""
-    dependency_set = set(dependencies)
-    if not dependency_set:
-        return
-
-    clear_legacy_dependency_index()
-    remove_cache_key_from_shards(cache_key)
-
+    dependency_set: set[Dependency],
+) -> tuple[ReverseDependencyMembership, set[tuple[str, str, str]]]:
     shard_keys: set[str] = set()
     composites: set[CompositeDependency] = set()
     simple_dependencies: set[SimpleDependency] = set()
-    for manager_name, action, identifier in dependency_set:
-        new_shards, new_composites, new_simple = _shard_keys_for_dependency(
-            manager_name,
-            action,
-            identifier,
-        )
-        shard_keys.update(new_shards)
-        composites.update(new_composites)
-        simple_dependencies.update(new_simple)
+    lookup_registrations: set[tuple[str, str, str]] = set()
 
-    for shard_key in shard_keys:
-        _cache_set_add(shard_key, cache_key)
+    for manager_name, action, identifier in dependency_set:
+        plan = _shard_keys_for_dependency(manager_name, action, identifier)
+        shard_keys.update(plan.shard_keys)
+        composites.update(plan.composite_dependencies)
+        simple_dependencies.update(plan.simple_dependencies)
+        lookup_registrations.update(plan.lookup_registrations)
 
-    cache.set(
-        reverse_membership_key(cache_key),
+    return (
         ReverseDependencyMembership(
             cache_key=cache_key,
             shard_keys=frozenset(shard_keys),
             composite_dependencies=frozenset(composites),
             simple_dependencies=frozenset(simple_dependencies),
         ),
-        None,
+        lookup_registrations,
     )
-    _cache_set_add(REVERSE_MEMBERSHIP_REGISTRY_KEY, reverse_membership_key(cache_key))
+
+
+def record_cache_dependencies(
+    cache_key: str,
+    dependencies: Iterable[Dependency],
+) -> None:
+    """Record dependency metadata for one cache key in deterministic shards."""
+    record_many_cache_dependencies(((cache_key, dependencies),))
 
 
 def record_many_cache_dependencies(
     entries: Iterable[tuple[str, Iterable[Dependency]]],
 ) -> None:
     """Record dependency metadata for many cache keys."""
+    normalized: dict[str, set[Dependency]] = {}
     for cache_key, dependencies in entries:
-        record_cache_dependencies(cache_key, dependencies)
+        dependency_set = set(dependencies)
+        if dependency_set:
+            normalized.setdefault(cache_key, set()).update(dependency_set)
+    if not normalized:
+        return
+
+    clear_legacy_dependency_index()
+
+    reverse_keys = {
+        cache_key: reverse_membership_key(cache_key) for cache_key in normalized
+    }
+    existing_reverses = _cache_get_many(reverse_keys.values())
+
+    shard_removals: dict[str, set[str]] = defaultdict(set)
+    for cache_key, reverse_key in reverse_keys.items():
+        reverse = existing_reverses.get(reverse_key)
+        if isinstance(reverse, ReverseDependencyMembership):
+            for shard_key in reverse.shard_keys:
+                shard_removals[shard_key].add(cache_key)
+
+    _cache_set_discard_many(shard_removals)
+
+    set_additions: dict[str, set[str]] = defaultdict(set)
+    reverse_payloads: dict[str, ReverseDependencyMembership] = {}
+
+    for cache_key, dependency_set in normalized.items():
+        reverse, lookup_registrations = _reverse_membership_for_dependencies(
+            cache_key,
+            dependency_set,
+        )
+        for shard_key in reverse.shard_keys:
+            set_additions[shard_key].add(cache_key)
+        for manager_name, action, lookup in lookup_registrations:
+            set_additions[lookup_registry_key(manager_name, action)].add(lookup)
+
+        reverse_key = reverse_keys[cache_key]
+        reverse_payloads[reverse_key] = reverse
+        set_additions[REVERSE_MEMBERSHIP_REGISTRY_KEY].add(reverse_key)
+
+    _cache_set_add_many(set_additions)
+    _cache_set_many(reverse_payloads)
 
 
 def remove_cache_key_from_shards(cache_key: str) -> None: