GeneralManager 0.10.6__py3-none-any.whl → 0.11.1__py3-none-any.whl

general_manager/api/mutation.py

@@ -1,5 +1,14 @@
 import inspect
-from typing import get_type_hints, Optional, Union, List, Tuple, get_origin, get_args
+from typing import (
+    get_type_hints,
+    Optional,
+    Union,
+    List,
+    Tuple,
+    get_origin,
+    get_args,
+    Type,
+)
 import graphene
 
 from general_manager.api.graphql import GraphQL
@@ -7,9 +16,10 @@ from general_manager.manager.generalManager import GeneralManager
 
 from general_manager.utils.formatString import snake_to_camel
 from typing import TypeAliasType
+from general_manager.permission.mutationPermission import MutationPermission
 
 
-def graphQlMutation(needs_role: Optional[str] = None, auth_required: bool = False):
+def graphQlMutation(permission: Optional[Type[MutationPermission]] = None):
     """
     Decorator that transforms a function into a GraphQL mutation class and registers it for use in a Graphene-based API.
 
@@ -109,11 +119,9 @@ def graphQlMutation(needs_role: Optional[str] = None, auth_required: bool = Fals
 
         # Define mutate method
         def _mutate(root, info, **kwargs):
-            # Auth check
-            if auth_required and not getattr(info.context, "user", None):
-                return mutation_class(
-                    **{"success": False, "errors": ["Authentication required"]}
-                )
+
+            if permission:
+                permission.check(kwargs, info.context.user)
             try:
                 result = fn(info, **kwargs)
                 data = {}

general_manager/interface/databaseBasedInterface.py

@@ -47,7 +47,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     ):
         """
         Initialize the interface and load the associated model instance by primary key.
-        
+
         If a `search_date` is provided, retrieves the historical record as of that date; otherwise, loads the current record.
         """
         super().__init__(*args, **kwargs)
@@ -136,9 +136,9 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getAttributeTypes(cls) -> dict[str, AttributeTypedDict]:
         """
         Return a dictionary mapping each attribute name of the model to its type information and metadata.
-        
+
         The returned dictionary includes all standard model fields, custom fields, foreign keys, many-to-many, and reverse relation fields, excluding any GenericForeignKey fields. For each attribute, the metadata specifies its Python type (translated from Django field types when possible), whether it is required, editable, derived, and its default value. For related models with a general manager class, the type is set to that class.
-        
+
         Returns:
             dict[str, AttributeTypedDict]: Mapping of attribute names to their type information and metadata.
         """
@@ -248,12 +248,14 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getAttributes(cls) -> dict[str, Callable[[DBBasedInterface], Any]]:
         """
         Return a dictionary mapping attribute names to callables that retrieve values from a DBBasedInterface instance.
-        
+
         The mapping includes accessors for custom fields, standard model fields, foreign keys, many-to-many relations, and reverse relations. For related models with a general manager class, the accessor returns an instance of that class; otherwise, it returns the related object or queryset. Raises a ValueError if a field name conflict is detected.
-         
+
         Returns:
             dict: A dictionary where keys are attribute names and values are callables that extract the corresponding value from a DBBasedInterface instance.
         """
+        from general_manager.manager.generalManager import GeneralManager
+
         field_values: dict[str, Any] = {}
 
         field_name_list, to_ignore_list = cls.handleCustomFields(cls._model)
@@ -274,10 +276,14 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
                 related_model,
                 "_general_manager_class",
             ):
-                generalManagerClass = related_model._general_manager_class  # type: ignore
+                generalManagerClass = cast(
+                    Type[GeneralManager], related_model._general_manager_class
+                )
                 field_values[f"{field_name}"] = (
-                    lambda self, field_name=field_name, manager_class=generalManagerClass: manager_class(
-                        getattr(self._instance, field_name).pk
+                    lambda self, field_name=field_name, manager_class=generalManagerClass: (
+                        manager_class(getattr(self._instance, field_name).pk)
+                        if getattr(self._instance, field_name)
+                        else None
                     )
                 )
             else:
@@ -339,10 +345,10 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def _getCustomFields(model: Type[models.Model] | models.Model) -> list[str]:
         """
         Return a list of custom field names defined directly as class attributes on the given Django model.
-        
+
         Parameters:
             model: The Django model class or instance to inspect.
-        
+
         Returns:
             A list of field names for fields declared directly on the model class, excluding those defined via Django's meta system.
         """
@@ -356,7 +362,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def __getModelFields(cls) -> list[str]:
         """
         Return a list of field names for the model that are neither many-to-many nor related fields.
-        
+
         Fields representing many-to-many relationships or relations to other models are excluded from the result.
         """
         return [
@@ -380,7 +386,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def __getManyToManyFields(cls) -> list[tuple[str, str]]:
         """
         Return a list of tuples representing all many-to-many fields on the model.
-        
+
         Each tuple contains the field name twice. Fields that are generic foreign keys are excluded.
         """
         return [
@@ -393,7 +399,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def __getReverseRelations(cls) -> list[tuple[str, str]]:
         """
         Return a list of reverse one-to-many relations for the model, excluding generic foreign keys.
-        
+
         Each tuple contains the related field's name and its default related accessor name (e.g., `fieldname_set`).
         """
         return [
@@ -502,7 +508,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getFieldType(cls, field_name: str) -> type:
         """
         Return the type associated with a given model field name.
-        
+
         If the field is a relation and its related model has a `_general_manager_class` attribute, that class is returned; otherwise, returns the Django field type.
         """
         field = cls._model._meta.get_field(field_name)

general_manager/manager/generalManager.py

@@ -58,6 +58,19 @@ class GeneralManager(metaclass=GeneralManagerMeta):
         else:
             raise TypeError(f"Unsupported type for union: {type(other)}")
 
+    def __eq__(
+        self,
+        other: object,
+    ) -> bool:
+        """
+        Check equality based on the identification dictionary.
+
+        Returns True if the other object is a GeneralManager with the same identification, otherwise False.
+        """
+        if not isinstance(other, GeneralManager):
+            return False
+        return self.identification == other.identification
+
     @property
     def identification(self):
         return self.__id

general_manager/permission/basePermission.py

@@ -8,6 +8,7 @@ from general_manager.permission.permissionChecks import (
 
 from django.contrib.auth.models import AnonymousUser, AbstractUser
 from general_manager.permission.permissionDataManager import PermissionDataManager
+from general_manager.permission.utils import validatePermissionString
 
 if TYPE_CHECKING:
     from general_manager.manager.generalManager import GeneralManager
@@ -153,24 +154,9 @@ class BasePermission(ABC):
         self,
         permission: str,
     ) -> bool:
-        # permission can be a combination of multiple permissions
-        # separated by "&" (e.g. "isAuthenticated&isMatchingKeyAccount")
-        # this means that all sub_permissions must be true
-        return all(
-            [
-                self.__validateSinglePermission(sub_permission)
-                for sub_permission in permission.split("&")
-            ]
-        )
-
-    def __validateSinglePermission(
-        self,
-        permission: str,
-    ) -> bool:
-        permission_function, *config = permission.split(":")
-        if permission_function not in permission_functions:
-            raise ValueError(f"Permission {permission} not found")
-
-        return permission_functions[permission_function]["permission_method"](
-            self.instance, self.request_user, config
-        )
+        """
+        Validates a permission string which can be a combination of multiple permissions
+        separated by "&" (e.g. "isAuthenticated&isMatchingKeyAccount").
+        This means that all sub_permissions must be true.
+        """
+        return validatePermissionString(permission, self.instance, self.request_user)

general_manager/permission/managerBasedPermission.py

@@ -30,8 +30,7 @@ class ManagerBasedPermission(BasePermission):
         request_user: AbstractUser,
     ) -> None:
 
-        self.__instance = instance
-        self.__request_user = request_user
+        super().__init__(instance, request_user)
         self.__attribute_permissions = self.__getAttributePermissions()
         self.__based_on_permission = self.__getBasedOnPermission()
         self.__overall_results: Dict[permission_type, Optional[bool]] = {
@@ -51,7 +50,7 @@ class ManagerBasedPermission(BasePermission):
         basis_object = getattr(self.instance, __based_on__, None)
         if basis_object is None:
             raise ValueError(
-                f"Based on object {__based_on__} not found in instance {self.__instance}"
+                f"Based on object {__based_on__} not found in instance {self.instance}"
             )
         if not isinstance(basis_object, GeneralManager) and not issubclass(
             basis_object, GeneralManager
@@ -71,14 +70,6 @@ class ManagerBasedPermission(BasePermission):
             request_user=self.request_user,
         )
 
-    @property
-    def instance(self) -> PermissionDataManager | GeneralManager:
-        return self.__instance
-
-    @property
-    def request_user(self) -> AbstractUser:
-        return self.__request_user
-
     def __getAttributePermissions(
         self,
     ) -> dict[str, dict[permission_type, list[str]]]:

general_manager/permission/mutationPermission.py

@@ -0,0 +1,88 @@
+from __future__ import annotations
+from django.contrib.auth.models import AbstractUser, AnonymousUser
+from typing import Any
+from general_manager.permission.basePermission import BasePermission
+
+from general_manager.permission.permissionDataManager import PermissionDataManager
+from general_manager.permission.utils import validatePermissionString
+
+
+class MutationPermission:
+    __mutate__: list[str]
+
+    def __init__(
+        self, data: dict[str, Any], request_user: AbstractUser | AnonymousUser
+    ) -> None:
+        self._data = PermissionDataManager(data)
+        self._request_user = request_user
+        self.__attribute_permissions = self.__getAttributePermissions()
+
+        self.__overall_result: bool | None = None
+
+    @property
+    def data(self) -> PermissionDataManager:
+        return self._data
+
+    @property
+    def request_user(self) -> AbstractUser | AnonymousUser:
+        return self._request_user
+
+    def __getAttributePermissions(
+        self,
+    ) -> dict[str, list[str]]:
+        attribute_permissions = {}
+        for attribute in self.__class__.__dict__:
+            if not attribute.startswith("__"):
+                attribute_permissions[attribute] = getattr(self.__class__, attribute)
+        return attribute_permissions
+
+    @classmethod
+    def check(
+        cls,
+        data: dict[str, Any],
+        request_user: AbstractUser | AnonymousUser | Any,
+    ) -> None:
+        """
+        Check if the user has permission to perform the mutation based on the provided data.
+        Raises:
+            PermissionError: If the user does not have permission.
+        """
+        errors = []
+        Permission = cls(data, BasePermission.getUserWithId(request_user))
+        for key in data:
+            if not Permission.checkPermission(key):
+                errors.append(
+                    f"Permission denied for {key} with value {data[key]} for user {request_user}"
+                )
+        if errors:
+            raise PermissionError(f"Permission denied with errors: {errors}")
+
+    def checkPermission(
+        self,
+        attribute: str,
+    ) -> bool:
+
+        has_attribute_permissions = attribute in self.__attribute_permissions
+
+        if not has_attribute_permissions:
+            last_result = self.__overall_result
+            if last_result is not None:
+                return last_result
+            attribute_permission = True
+        else:
+            attribute_permission = self.__checkSpecificPermission(
+                self.__attribute_permissions[attribute]
+            )
+
+        permission = self.__checkSpecificPermission(self.__mutate__)
+        self.__overall_result = permission
+        return permission and attribute_permission
+
+    def __checkSpecificPermission(
+        self,
+        permissions: list[str],
+    ) -> bool:
+        for permission in permissions:
+            if validatePermissionString(permission, self.data, self.request_user):
+                return True
+        return False

general_manager/permission/permissionDataManager.py

@@ -24,10 +24,6 @@ class PermissionDataManager(Generic[GeneralManagerData]):
             self.getData = (
                 lambda name, permission_data=permission_data: permission_data.get(name)
             )
-            if manager is None:
-                raise ValueError(
-                    "Manager must be provided if permission_data is a dict"
-                )
             self._manager = manager
         else:
             raise TypeError(
@@ -48,7 +44,7 @@ class PermissionDataManager(Generic[GeneralManagerData]):
         return self._permission_data
 
     @property
-    def manager(self) -> type[GeneralManagerData]:
+    def manager(self) -> type[GeneralManagerData] | None:
         return self._manager
 
     def __getattr__(self, name: str) -> Any:

general_manager/permission/utils.py

@@ -0,0 +1,35 @@
+from general_manager.permission.permissionChecks import (
+    permission_functions,
+)
+from general_manager.permission.permissionDataManager import PermissionDataManager
+from django.contrib.auth.models import AbstractUser, AnonymousUser
+
+from general_manager.manager.generalManager import GeneralManager
+from general_manager.manager.meta import GeneralManagerMeta
+
+
+def validatePermissionString(
+    permission: str,
+    data: PermissionDataManager | GeneralManager | GeneralManagerMeta,
+    request_user: AbstractUser | AnonymousUser,
+) -> bool:
+    # permission can be a combination of multiple permissions
+    # separated by "&" (e.g. "isAuthenticated&isMatchingKeyAccount")
+    # this means that all sub_permissions must be true
+    def _validateSinglePermission(
+        permission: str,
+    ) -> bool:
+        permission_function, *config = permission.split(":")
+        if permission_function not in permission_functions:
+            raise ValueError(f"Permission {permission} not found")
+
+        return permission_functions[permission_function]["permission_method"](
+            data, request_user, config
+        )
+
+    return all(
+        [
+            _validateSinglePermission(sub_permission)
+            for sub_permission in permission.split("&")
+        ]
+    )

{generalmanager-0.10.6.dist-info → generalmanager-0.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.10.6
+Version: 0.11.1
 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-Expression: MIT

{generalmanager-0.10.6.dist-info → generalmanager-0.11.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 general_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/apps.py,sha256=ii-48klC2kBRjxtdQU9-RtPq66lZ8fDa7BmqyH-mbzk,9904
 general_manager/api/graphql.py,sha256=jpdtaep_ql94krsVvGJRpuqT-MR6iZCFpezeJAl4Mlw,33382
-general_manager/api/mutation.py,sha256=RvKp4OnV70q4Dqmu407Cd0FXgD12WdbRgzYCS4qd_bg,5990
+general_manager/api/mutation.py,sha256=41BvkY4qYU_Kq2R6GUK14AnU7sSTydw4tSw1f4CAlxI,5954
 general_manager/api/property.py,sha256=oc93p1P8dcIvrNorRuqD1EJVsd6eYttYhZuAS0s28gs,696
 general_manager/bucket/baseBucket.py,sha256=UjEai7cVxgDJysoVY2-7s3YULW7bi-sx2mPqRKFWyTw,7728
 general_manager/bucket/calculationBucket.py,sha256=a41YVdfhxKf_gpWlRKjXYmS1YuO-6VC0hn60RyLKByU,18777
@@ -19,12 +19,12 @@ general_manager/factory/factoryMethods.py,sha256=9Bag891j0XHe3dUBAFi7gUKcKeUwcBZ
 general_manager/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/interface/baseInterface.py,sha256=cFsDU-nhj_O6Gir3eO0ukGKNn9Pplhe6gEMccHNi4O0,8648
 general_manager/interface/calculationInterface.py,sha256=fTD3WQpsn3ImaxGW5S-JwVJyJJPoPp2mR6lAambdB8U,4755
-general_manager/interface/databaseBasedInterface.py,sha256=_E4HoHmU8A_5_voSpeGp8AkiWbHGF3ZY1zO9phIezh8,21647
+general_manager/interface/databaseBasedInterface.py,sha256=F-a6P9rvPUmlcoZw1rKSWEAzbYGccQRL6uokv6C46qo,21782
 general_manager/interface/databaseInterface.py,sha256=rhKVXhg0ztdIxKikTWtgjrkA7cwZTOYlEsRh0RWajDQ,6732
 general_manager/interface/models.py,sha256=gGYW5f1AUBpBakV3O0qsZwqMiWxZGdKRYXWaCBjt1oI,3334
 general_manager/interface/readOnlyInterface.py,sha256=TkfbOeaa2wCq5kCv0a3IwJWcYOTVbtNsdNWmGAz0Mns,11217
 general_manager/manager/__init__.py,sha256=l3RYp62aEhj3Y975_XUTIzo35LUnkTJHkb_hgChnXXI,111
-general_manager/manager/generalManager.py,sha256=24eRdJW8BYPchYySxFNMywwk9LOhrab5Y4QiQWXZWT8,8730
+general_manager/manager/generalManager.py,sha256=4Qn9TYpZpqh5qC95BEAQhpiZgDrRXrAJjO2BbbXUdNg,9129
 general_manager/manager/groupManager.py,sha256=8dpZUfm7aFL4lraUWv4qbbDRClQZaYxw4prclhBZYZs,4367
 general_manager/manager/input.py,sha256=-pJXGJ-g2-OxZfl4Buj3mQkf05fN4p8MsR2Lh9BQcEo,3208
 general_manager/manager/meta.py,sha256=-9celpo-oZmkTb8TnHfvcd_4XWTy1cn2UO-jp13NFmQ,6387
@@ -32,11 +32,13 @@ general_manager/measurement/__init__.py,sha256=X97meFujBldE5v0WMF7SmKeGpC5R0JTcz
 general_manager/measurement/measurement.py,sha256=T3R2qqDkqPY_91DzN0zJF4ug62aCNyN5-75WE9Tm7ko,16067
 general_manager/measurement/measurementField.py,sha256=ixkZR_t--HGckK2iYi6sXOOa_Vbni4QRxK5Ngmy5YKc,6863
 general_manager/permission/__init__.py,sha256=5UlDERN60Vn8obGVkT-cOM8kHjzmoxgK5w5FgTCDhGE,59
-general_manager/permission/basePermission.py,sha256=14iKo6qVmaUdg1sAz-gSZyNtpVKAAapIhutVAMDf93c,6056
+general_manager/permission/basePermission.py,sha256=DeiAX2sQQhtdquO13jys2MSkp0kPdg2oo7PSqB9q5Bw,5653
 general_manager/permission/fileBasedPermission.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-general_manager/permission/managerBasedPermission.py,sha256=VgZJVgkXWdaLk6K7c0kYxTbELnTYK6UY9mMuKH5u64w,5728
+general_manager/permission/managerBasedPermission.py,sha256=DmoSLZ5m9zOyqAotKFDUbr7dahhsvS3K63kI8ChURN0,5491
+general_manager/permission/mutationPermission.py,sha256=tYeunZQOJiUkQIqW0lU0KafwJKaTkrHTYKi7zV0wqHI,2972
 general_manager/permission/permissionChecks.py,sha256=T-9khBqiwM4ASBdey9p07sC_xgzceIU9EAE0reukguM,1655
-general_manager/permission/permissionDataManager.py,sha256=Ji7fsnuaKTa6M8yzCGyzrIHyGa_ZvqJM7sXR97-uTrA,1937
+general_manager/permission/permissionDataManager.py,sha256=EzF-XKJZKvKdNpF77ATYJ_VXSF09L-HTFe8h8p-JdB4,1784
+general_manager/permission/utils.py,sha256=_cznQLk-wmK35pqs3dtgY6I94Ahyz_bTSmpkT0-MQnI,1277
 general_manager/rule/__init__.py,sha256=4Har5cfPD1fmOsilTDod-ZUz3Com-tkl58jz7yY4fD0,23
 general_manager/rule/handler.py,sha256=z8SFHTIZ0LbLh3fV56Mud0V4_OvWkqJjlHvFqau7Qfk,7334
 general_manager/rule/rule.py,sha256=3FVCKGL7BTVoStdgOTdWQwuoVRIxAIAilV4VOzouDpc,10759
@@ -49,8 +51,8 @@ general_manager/utils/makeCacheKey.py,sha256=UlFsxHXgsYy69AAelkF6GDvY4h7AImT2bBn
 general_manager/utils/noneToZero.py,sha256=KfQtMQnrT6vsYST0K7lv6pVujkDcK3XL8czHYOhgqKQ,539
 general_manager/utils/pathMapping.py,sha256=nrz5owQg2a69Yig1eCXorR9U0NSw7NmBAk5OkeoHTdA,6842
 general_manager/utils/testing.py,sha256=ElZ8p4iZHxsHjDN8Lm5TmI6527CW747ltDOmtY6gAhk,11872
-generalmanager-0.10.6.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
-generalmanager-0.10.6.dist-info/METADATA,sha256=SrGKXDLzzs69odSsBd3t7pE4DIuVS9lmlkyhbnAYgus,6206
-generalmanager-0.10.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-generalmanager-0.10.6.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.10.6.dist-info/RECORD,,
+generalmanager-0.11.1.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
+generalmanager-0.11.1.dist-info/METADATA,sha256=Sam_MBu9NlrJgwolfC2jmDM5eq8kHOMXy-bhdyiEXkE,6206
+generalmanager-0.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+generalmanager-0.11.1.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.11.1.dist-info/RECORD,,