GeneralManager 0.10.1__py3-none-any.whl → 0.10.2__py3-none-any.whl

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):

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)

{generalmanager-0.10.1.dist-info → generalmanager-0.10.2.dist-info}/METADATA

@@ -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.dist-info → generalmanager-0.10.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 general_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/apps.py,sha256=dNzdcOTLs53y7JAGjQ7rqY1VWLtwO43NTTGJhbmbq1s,9906
 general_manager/api/graphql.py,sha256=ZMzlpgmyn2X9Zwxo12r-b5UZ2R-u1pXys_nhNczxyX8,31622
-general_manager/api/mutation.py,sha256=muoQxXFCSJl4CGWQ9sqmyt4WzHB9H4lqDc0Qgtpg7II,5653
+general_manager/api/mutation.py,sha256=RvKp4OnV70q4Dqmu407Cd0FXgD12WdbRgzYCS4qd_bg,5990
 general_manager/api/property.py,sha256=oc93p1P8dcIvrNorRuqD1EJVsd6eYttYhZuAS0s28gs,696
 general_manager/bucket/baseBucket.py,sha256=65oQbSE6C8TE0yVPP_Aoi_Fwq0Uo2TLVPWMG6l2qxyQ,7836
 general_manager/bucket/calculationBucket.py,sha256=7AjoqdTOrbUCfWu7kZDjtu7vaFFJ7SPHELvtOZ8wfQg,18578
@@ -19,7 +19,7 @@ general_manager/factory/factoryMethods.py,sha256=9Bag891j0XHe3dUBAFi7gUKcKeUwcBZ
 general_manager/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/interface/baseInterface.py,sha256=IWEtY--IuFiB3cjrCgtyXBTMpAPTayiFDnRQY7JZeaw,8600
 general_manager/interface/calculationInterface.py,sha256=Kg_OqLw67tcLwdzYNLq31eKVLzkM7taw-8Mzmk0CYi0,4232
-general_manager/interface/databaseBasedInterface.py,sha256=OpKHpN509mcS86q3WgyAp7gQBwEqmA3BQPCFgF5q_Ig,20686
+general_manager/interface/databaseBasedInterface.py,sha256=fm5G-AVuTzAa59YwQRiFRGvy-DqsZZ3AfIBG9mls4sg,20398
 general_manager/interface/databaseInterface.py,sha256=rhKVXhg0ztdIxKikTWtgjrkA7cwZTOYlEsRh0RWajDQ,6732
 general_manager/interface/models.py,sha256=gGYW5f1AUBpBakV3O0qsZwqMiWxZGdKRYXWaCBjt1oI,3334
 general_manager/interface/readOnlyInterface.py,sha256=TkfbOeaa2wCq5kCv0a3IwJWcYOTVbtNsdNWmGAz0Mns,11217
@@ -49,8 +49,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=IdVvrgLuYIvHRgdSj_j9mC-damQ-2ivSJ7Ngguez5vo,9366
-generalmanager-0.10.1.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
-generalmanager-0.10.1.dist-info/METADATA,sha256=1s7xiuMN9uzioICRAl19thEixmRzZPtD70aYJ6psR-w,6206
-generalmanager-0.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-generalmanager-0.10.1.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.10.1.dist-info/RECORD,,
+generalmanager-0.10.2.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
+generalmanager-0.10.2.dist-info/METADATA,sha256=HRmeeeiPsxm_UGNOm_-MfW7m94hKL4IIxkM_5_8oGAA,6206
+generalmanager-0.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+generalmanager-0.10.2.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.10.2.dist-info/RECORD,,