GeneralManager 0.10.1__tar.gz → 0.10.2__tar.gz

{generalmanager-0.10.1 → generalmanager-0.10.2}/GeneralManager.egg-info/PKG-INFO

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

{generalmanager-0.10.1 → generalmanager-0.10.2}/PKG-INFO

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

{generalmanager-0.10.1 → generalmanager-0.10.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.10.1"
+version = "0.10.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.10.1 → generalmanager-0.10.2}/src/general_manager/api/mutation.py

@@ -6,6 +6,7 @@ from general_manager.api.graphql import GraphQL
 from general_manager.manager.generalManager import GeneralManager
 
 from general_manager.utils.formatString import snake_to_camel
+from typing import TypeAliasType
 
 
 def graphQlMutation(needs_role: Optional[str] = None, auth_required: bool = False):
@@ -56,15 +57,17 @@ def graphQlMutation(needs_role: Optional[str] = None, auth_required: bool = Fals
                 required = False
                 # extract inner type
                 ann = [a for a in get_args(ann) if a is not type(None)][0]
+                kwargs["required"] = False
 
             # Resolve list types to List scalar
             if get_origin(ann) is list or get_origin(ann) is List:
                 inner = get_args(ann)[0]
                 field = graphene.List(
-                    GraphQL._mapFieldToGrapheneBaseType(inner)(**kwargs)
+                    GraphQL._mapFieldToGrapheneBaseType(inner),
+                    **kwargs,
                 )
             else:
-                if isinstance(ann, GeneralManager):
+                if inspect.isclass(ann) and issubclass(ann, GeneralManager):
                     field = graphene.ID(**kwargs)
                 else:
                     field = GraphQL._mapFieldToGrapheneBaseType(ann)(**kwargs)
@@ -89,13 +92,20 @@ def graphQlMutation(needs_role: Optional[str] = None, auth_required: bool = Fals
             else [return_ann]
         )
         for out in out_types:
-            if not isinstance(out, type):
+            is_named_type = isinstance(out, TypeAliasType)
+            is_type = isinstance(out, type)
+            if not is_type and not is_named_type:
                 raise TypeError(
                     f"Mutation {fn.__name__} return type {out} is not a type"
                 )
             name = out.__name__
             field_name = name[0].lower() + name[1:]
-            outputs[field_name] = GraphQL._mapFieldToGrapheneRead(out, field_name)
+
+            basis_type = out.__value__ if is_named_type else out
+
+            outputs[field_name] = GraphQL._mapFieldToGrapheneRead(
+                basis_type, field_name
+            )
 
         # Define mutate method
         def _mutate(root, info, **kwargs):

{generalmanager-0.10.1 → generalmanager-0.10.2}/src/general_manager/interface/databaseBasedInterface.py

@@ -1,14 +1,11 @@
 from __future__ import annotations
-from typing import Type, ClassVar, Any, Callable, TYPE_CHECKING, TypeVar, Generic
+from typing import Type, Any, Callable, TYPE_CHECKING, TypeVar, Generic
 from django.db import models
-from django.conf import settings
 from datetime import datetime, timedelta
-from simple_history.models import HistoricalRecords  # type: ignore
 from general_manager.measurement.measurement import Measurement
 from general_manager.measurement.measurementField import MeasurementField
 from decimal import Decimal
 from general_manager.factory.autoFactory import AutoFactory
-from django.core.exceptions import ValidationError
 from general_manager.interface.baseInterface import (
     InterfaceBase,
     classPostCreationMethod,
@@ -30,8 +27,6 @@ from general_manager.interface.models import (
 )
 
 if TYPE_CHECKING:
-    from general_manager.manager.generalManager import GeneralManager
-    from django.contrib.auth.models import AbstractUser
     from general_manager.rule.rule import Rule
 
 modelsModel = TypeVar("modelsModel", bound=models.Model)