GeneralManager 0.41.5__tar.gz → 0.41.7__tar.gz

{generalmanager-0.41.5/src/GeneralManager.egg-info → generalmanager-0.41.7}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.41.5
+Version: 0.41.7
 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.41.5 → generalmanager-0.41.7}/src/general_manager/interface/capabilities/orm_utils/field_descriptors.py

@@ -270,10 +270,27 @@ class _FieldDescriptorBuilder:
         Iterates the model's many-to-many and reverse (one-to-many) relations and registers a collection descriptor for each, deriving descriptor names from each relation's base name and accessor name.
         """
         for m2m_field in _iter_many_to_many_fields(self.model):
+            if getattr(m2m_field, "auto_created", False) and not getattr(
+                m2m_field, "concrete", False
+            ):
+                relation_field_name = getattr(
+                    getattr(m2m_field, "field", None),
+                    "name",
+                    None,
+                )
+                relation_filter_name = None
+            else:
+                relation_field_name = None
+                relation_filter_name = _many_to_many_relation_filter_name(
+                    m2m_field,
+                    self.model,
+                )
             self._register_collection_field(
                 field=m2m_field,
                 base_name=m2m_field.name,
                 accessor_name=m2m_field.name,
+                relation_field_name=relation_field_name,
+                relation_filter_name=relation_filter_name,
             )
         for reverse_relation in _iter_reverse_relations(self.model):
             accessor_name = (
@@ -305,6 +322,7 @@ class _FieldDescriptorBuilder:
         base_name: str,
         accessor_name: str,
         relation_field_name: str | None = None,
+        relation_filter_name: str | None = None,
     ) -> None:
         """
         Register a collection relation as a FieldDescriptor under the generated "<base>_list" attribute.
@@ -341,6 +359,7 @@ class _FieldDescriptorBuilder:
                 general_manager_class=general_manager_class,
                 source_model=self.model,
                 relation_field_name=relation_field_name,
+                relation_filter_name=relation_filter_name,
             )
             relation_type = cast(type, general_manager_class)
         else:
@@ -675,6 +694,7 @@ def _general_manager_many_accessor(
     general_manager_class: type,
     source_model: type[models.Model],
     relation_field_name: str | None = None,
+    relation_filter_name: str | None = None,
 ) -> DescriptorAccessor:
     """
     Create an accessor that returns a manager filtered to objects related to the given source model instance.
@@ -688,7 +708,9 @@ def _general_manager_many_accessor(
     Returns:
         DescriptorAccessor: A callable that accepts an OrmInterfaceBase instance and returns the manager/QuerySet of related_model instances whose foreign-key fields pointing to `source_model` match the instance's primary key.
     """
-    if relation_field_name is not None:
+    if relation_filter_name is not None:
+        related_fields: list[models.Field] = []
+    elif relation_field_name is not None:
         related_fields = [
             cast(models.Field, related_model._meta.get_field(relation_field_name))
         ]
@@ -706,7 +728,10 @@ def _general_manager_many_accessor(
         Returns:
             A manager or queryset containing related model instances whose foreign-key fields equal this interface instance's primary key.
         """
-        filter_kwargs = {field.name: self.pk for field in related_fields}
+        if relation_filter_name is not None:
+            filter_kwargs = {relation_filter_name: self.pk}
+        else:
+            filter_kwargs = {field.name: self.pk for field in related_fields}
         manager_cls = cast(Any, general_manager_class)
         if not filter_kwargs:
             raise MissingRelatedFieldsError(
@@ -719,6 +744,29 @@ def _general_manager_many_accessor(
     return getter
 
 
+def _many_to_many_relation_filter_name(
+    field: models.Field,
+    source_model: type[models.Model],
+) -> str | None:
+    """Return the target-side query lookup for a direct many-to-many field."""
+    remote_field = getattr(field, "remote_field", None)
+    related_query_name = getattr(remote_field, "related_query_name", None)
+    if callable(related_query_name):
+        related_query_name = related_query_name()
+    if isinstance(related_query_name, str) and related_query_name:
+        return related_query_name
+    related_name = getattr(remote_field, "related_name", None)
+    if related_name == "+":
+        return None
+    if isinstance(related_name, str) and related_name:
+        return related_name
+    source_meta = getattr(source_model, "_meta", None)
+    source_model_name = getattr(source_meta, "model_name", None)
+    if isinstance(source_model_name, str) and source_model_name:
+        return source_model_name
+    return None
+
+
 def _direct_many_accessor(
     resolver: Callable[["OrmInterfaceBase", str, str], Any],
     field_call: str,

{generalmanager-0.41.5 → generalmanager-0.41.7}/src/general_manager/permission/base_permission.py

@@ -5,9 +5,10 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Literal, TypeAlias
+from typing import TYPE_CHECKING, Any, Literal, TypeAlias, cast
 
 from django.contrib.auth.models import AbstractBaseUser, AnonymousUser
+from django.utils.functional import SimpleLazyObject, empty
 
 from general_manager.logging import get_logger
 from general_manager.permission.audit import (
@@ -74,7 +75,7 @@ class BasePermission(ABC):
     ) -> None:
         """Initialise the permission context for a specific manager and user."""
         self._instance = instance
-        self._request_user = request_user
+        self._request_user = self.get_user_with_id(request_user)
 
     @property
     def instance(self) -> PermissionDataManager | GeneralManager | GeneralManagerMeta:
@@ -446,6 +447,12 @@ class BasePermission(ABC):
         """
         from django.contrib.auth import get_user_model
 
+        if isinstance(user, SimpleLazyObject):
+            lazy_user = cast(Any, user)
+            if lazy_user._wrapped is empty:
+                lazy_user._setup()
+            user = lazy_user._wrapped
+
         User = get_user_model()
         if isinstance(user, (AbstractBaseUser, AnonymousUser)):
             return user

{generalmanager-0.41.5 → generalmanager-0.41.7}/src/general_manager/permission/graphql_capabilities.py

@@ -100,7 +100,15 @@ class CapabilityEvaluationContext:
     """Operation-scoped cache for GraphQL permission capability evaluation."""
 
     def __init__(self, *, user: Any | None = None) -> None:
-        self.user = user if user is not None else _AnonymousUser()
+        from django.contrib.auth.models import AnonymousUser
+
+        from general_manager.permission.base_permission import BasePermission
+
+        self.user = (
+            BasePermission.get_user_with_id(user)
+            if user is not None
+            else AnonymousUser()
+        )
         self._cache: dict[tuple[str, str, str, str], bool] = {}
 
     def evaluate(self, declaration: GraphQLPermissionCapability, instance: Any) -> bool:
@@ -210,7 +218,7 @@ def get_graphql_capabilities(
 def get_capability_context(info: Any) -> CapabilityEvaluationContext:
     """Return the operation-scoped capability context for a GraphQL resolver."""
     request_context = getattr(info, "context", None)
-    user = getattr(request_context, "user", _AnonymousUser())
+    user = getattr(request_context, "user", None)
     operation_key = id(getattr(info, "operation", None))
     storage_name = "_general_manager_graphql_capability_contexts"
     contexts = getattr(request_context, storage_name, None)
@@ -272,10 +280,3 @@ def _instance_identity(instance: Any) -> str:
 
 def _user_identity(user: Any) -> str:
     return repr(getattr(user, "pk", getattr(user, "id", None)))
-
-
-class _AnonymousUser:
-    is_authenticated = False
-    is_superuser = False
-    pk = None
-    id = None