GeneralManager 0.41.6__tar.gz → 0.41.7__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.41.6
+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.6 → 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.6 → 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