starmallow 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

starmallow/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 
 from .applications import StarMallow
 from .exceptions import RequestValidationError

starmallow/endpoint.py

@@ -20,6 +20,7 @@ from typing import (
 import marshmallow as ma
 import marshmallow.fields as mf
 from marshmallow.utils import missing as missing_
+from marshmallow_dataclass2 import class_schema, is_generic_alias_of_dataclass
 from starlette.background import BackgroundTasks
 from starlette.requests import HTTPConnection, Request
 from starlette.responses import Response
@@ -243,6 +244,9 @@ class EndpointMixin:
         if is_marshmallow_dataclass(model):
             model = model.Schema
 
+        if is_generic_alias_of_dataclass(model):
+            model = class_schema(model)
+
         if isinstance(model, NewType) and getattr(model, '_marshmallow_field', None):
             return model._marshmallow_field(**kwargs)
         elif is_marshmallow_schema(model):

starmallow/ext/marshmallow/openapi.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import marshmallow as ma
 import marshmallow.fields as mf
-import marshmallow_dataclass.collection_field as collection_field
+import marshmallow_dataclass2.collection_field as collection_field
 from apispec import APISpec
 from apispec.ext.marshmallow.common import get_fields
 from apispec.ext.marshmallow.field_converter import (
@@ -12,9 +12,9 @@ from apispec.ext.marshmallow.field_converter import (
 )
 from apispec.ext.marshmallow.openapi import OpenAPIConverter as ApiSpecOpenAPIConverter
 from marshmallow.utils import is_collection
+from marshmallow_dataclass2.union_field import Union as UnionField
 from packaging.version import Version
 
-from starmallow.union_field import Union as UnionField
 from starmallow.utils import MARSHMALLOW_ITERABLES
 
 # marshmallow field => (JSON Schema type, format)

starmallow/security/api_key.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import ClassVar, Optional
 
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.requests import Request
 from starlette.status import HTTP_403_FORBIDDEN
 

starmallow/security/base.py

@@ -2,7 +2,7 @@ from enum import Enum
 from typing import Any, ClassVar, Dict, Optional
 
 import marshmallow as ma
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 
 
 # Provided by: https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#security-scheme-object

starmallow/security/http.py

@@ -2,7 +2,7 @@ import binascii
 from base64 import b64decode
 from typing import ClassVar, Optional
 
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.requests import Request
 from starlette.status import HTTP_401_UNAUTHORIZED, HTTP_403_FORBIDDEN
 

starmallow/security/oauth2.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Optional, Union
 
 import marshmallow as ma
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.requests import Request
 from starlette.status import HTTP_401_UNAUTHORIZED, HTTP_403_FORBIDDEN
 

starmallow/security/open_id_connect_url.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.exceptions import HTTPException
 from starlette.requests import Request
 from starlette.status import HTTP_403_FORBIDDEN

starmallow/types.py

@@ -2,7 +2,7 @@ import uuid
 from typing import Any, Callable, List, TypeVar, Union
 
 import marshmallow.fields as mf
-from marshmallow_dataclass import NewType
+from marshmallow_dataclass2 import NewType
 
 import starmallow.fields as sf
 from starmallow.endpoints import APIHTTPEndpoint

starmallow/utils.py

@@ -33,15 +33,16 @@ from typing import (
 import dpath.util
 import marshmallow as ma
 import marshmallow.fields as mf
-import marshmallow_dataclass.collection_field as collection_field
+import marshmallow_dataclass2.collection_field as collection_field
 import typing_inspect
 from marshmallow.validate import Equal, OneOf
+from marshmallow_dataclass2 import class_schema, is_generic_alias_of_dataclass
+from marshmallow_dataclass2.union_field import Union as UnionField
 from starlette.responses import Response
 from typing_inspect import is_final_type, is_generic_type, is_literal_type
 
 from starmallow.concurrency import contextmanager_in_threadpool
 from starmallow.datastructures import DefaultPlaceholder, DefaultType
-from starmallow.union_field import Union as UnionField
 
 if TYPE_CHECKING:  # pragma: nocover
     from starmallow.routing import APIRoute
@@ -105,6 +106,9 @@ def get_model_field(model: Any, **kwargs) -> mf.Field:
     if is_marshmallow_dataclass(model):
         model = model.Schema
 
+    if is_generic_alias_of_dataclass(model):
+        model = class_schema(model)
+
     if is_marshmallow_schema(model):
         return mf.Nested(model if isinstance(model, ma.Schema) else model())
 

{starmallow-0.7.0.dist-info → starmallow-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: starmallow
-Version: 0.7.0
+Version: 0.8.0
 Summary: StarMallow framework
 Project-URL: Homepage, https://github.com/mvanderlee/starmallow
 Author-email: Michiel Vanderlee <jmt.vanderlee@gmail.com>
@@ -28,7 +28,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Requires-Dist: apispec[marshmallow]<7,>=6
 Requires-Dist: dpath<3,>=2.1.0
-Requires-Dist: marshmallow-dataclass<9,>=8.5.1
+Requires-Dist: marshmallow-dataclass2<9,>=8.8.1
 Requires-Dist: marshmallow<4,>=3.18.0
 Requires-Dist: python-multipart<0.0.7,>=0.0.5
 Requires-Dist: pyyaml>=5.4.1
@@ -68,7 +68,7 @@ Create a file `main.py` with:
 
 ```python
 from typing import Annotated
-from marshmallow_dataclass import dataclass
+from marshmallow_dataclass2 import dataclass
 from starmallow import Body, Path, StarMallow
 
 app = StarMallow()
@@ -131,7 +131,7 @@ INFO:     Application startup complete.
 You can also use class-based views. This can make it easier to organize your code and gives you an easy migration path if you use [flask-smorest](https://flask-smorest.readthedocs.io/)
 
 ```python
-from marshmallow_dataclass import dataclass
+from marshmallow_dataclass2 import dataclass
 from starmallow import StarMallow
 from starmallow.decorators import route
 from starmallow.endpoints import APIHTTPEndpoint

{starmallow-0.7.0.dist-info → starmallow-0.8.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-starmallow/__init__.py,sha256=9E5AxUkYZG-q-eDh8OMP4YBFBCKro7Lp7hn2VFQe5E8,322
+starmallow/__init__.py,sha256=_rVQsLfQ3QzRRXvJYKcuR9Ki79d7xvWU1Mhk7E4y2KY,322
 starmallow/applications.py,sha256=mSL4YDozP8n6v22g4NX7EAMXmGhzzhtjtZd68YHcFvw,31720
 starmallow/background.py,sha256=qxT6-9SfnkcGZzvecNOpIsCOMW0TPwDtpQ81GHI28P0,995
 starmallow/concurrency.py,sha256=MVRjo4Vqss_yqhaoeVt3xb7rLaSuAq_q9uYgTwbsojE,1375
@@ -8,7 +8,7 @@ starmallow/datastructures.py,sha256=iH_KJuJ6kBCWEsnHFLdA3iyb6ZxhfdMHYrJlhiEZtDU,
 starmallow/decorators.py,sha256=MYk3WEFRSfQTN0Y3JoL3Y_Cz47gatMrVEPtNDw42XwU,4105
 starmallow/delimited_field.py,sha256=gonWgYg6G5xH2yXAyfDgkePmQ8dUaRSp2hdJ3mCfOBw,3466
 starmallow/docs.py,sha256=eA39LunVMEoPU5ge4qxm2eiJbrFTUSUu5EhG1L_LKxk,6268
-starmallow/endpoint.py,sha256=aNsbN0mdcVvIIcdgqICRgoGjIYJAeSVFXcpDlAji0Oc,16017
+starmallow/endpoint.py,sha256=WChgjb47lYUrbyeaQiyUbuyHFCREYPiZJMNLqnz_iuA,16186
 starmallow/endpoints.py,sha256=UrwVZCxbmWI20iNtJ0oXxo4d3-y12TjsOGs_jnStTiU,939
 starmallow/exception_handlers.py,sha256=gr2qLYWEtsIEH28n7OreEiiLVz6Y7b6osRyS9esJbBk,891
 starmallow/exceptions.py,sha256=vabtPJkTmtCdC8_2OPBE8Osz0v0KxaSOX6IWf1jgNkc,872
@@ -20,23 +20,22 @@ starmallow/responses.py,sha256=k2pf_m21ykf_FECdODUz400pMucMJJf_Zm8TXFujvaU,2012
 starmallow/routing.py,sha256=VSotmrEerVzuUfn20mpmSbuRVS4XiHrPtNRvBP8KJ4M,45397
 starmallow/schema_generator.py,sha256=yi368FwF9B50ZHSNOG0rvYVirVUeMFq2kXkUDeJUz4w,17961
 starmallow/serializers.py,sha256=rBEKMNgONgz_bai12uDvAEMCI_aEFGsqMSeIoWtlrOI,12514
-starmallow/types.py,sha256=8GXWjvzXQhF5NMHf14fbid6uErxVd1Xk_w2I4FoUgZ4,717
-starmallow/union_field.py,sha256=psc5GPWDGVeu4vxFf2ItgtHEK8tT62IZHrxoRZidyxc,3113
-starmallow/utils.py,sha256=ilJyQHXZq1o6XRaDdninTNTt4u4KzIPQwImbhNQeZUs,12285
+starmallow/types.py,sha256=xp4eitWenXRZCPlsopTfG4aMs86kOrvioDTCVLg-MXU,718
+starmallow/utils.py,sha256=lI6qWalsBsEaJLSiGsCC_vBN6Sw-r5aDTl9hWuHCW-Q,12459
 starmallow/websockets.py,sha256=yIz3LzTBMNclpEoG7oTMbQwxbcdKNU6M8XcqZMyBTuA,2223
 starmallow/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 starmallow/ext/marshmallow/__init__.py,sha256=33jENGdfPq4-CDG0LOmN3KOGW1pXTy7a2oMwy4hrYzM,208
-starmallow/ext/marshmallow/openapi.py,sha256=BOPgTmolpZxQaPvyg0VcHLTjWSlvEj2L1OOHGFKfWik,10189
+starmallow/ext/marshmallow/openapi.py,sha256=LHFcdw8ISpPsS2drefL2h8AiKk_B_I7UffloEH3-xXI,10202
 starmallow/middleware/__init__.py,sha256=vtNm85Z9pUPjJd-9giJGg3YL1wO7Jm5ooXBm31pDOK8,53
 starmallow/middleware/asyncexitstack.py,sha256=0GPhQSxqSVmAiVIqBIN5slueWYZ8bwh9f2bBPy7AbP0,1191
 starmallow/security/__init__.py,sha256=1rQFBIGnEbE51XDZSSi9NgPjXLScFq3RoLu4vk0KVYw,191
-starmallow/security/api_key.py,sha256=E326Sxb_qhWbfN70vHuq4KEJcToW1Fxw0qGL0pHmQjc,3144
-starmallow/security/base.py,sha256=_7PR7tepr0CHJxg6uTc_cBAeY90jBS5gu8z5598yEM0,1144
-starmallow/security/http.py,sha256=cpGjM1kFDq3i_bOY96kMkf4cspBUxFkkET9lTK3NA-0,6607
-starmallow/security/oauth2.py,sha256=1nv1580PY4cwgu5gzpQCf2MfMNv2Cfv05753AUHPOhQ,10005
-starmallow/security/open_id_connect_url.py,sha256=IPsL2YzWc2mPwJbrUn6oFRTi7uRAG6mR62CGwmzBs1k,1399
+starmallow/security/api_key.py,sha256=OWogzuwqPC3H0xf4jzx_RQjC8UoM8WDVtOhjq1lQ5ik,3145
+starmallow/security/base.py,sha256=PtTsBViTUEtNUT9q_zFFydnOqIvGLfKggtgyCYeYRZk,1145
+starmallow/security/http.py,sha256=O4mUrBHp6JTJNewOvcG_dgsx0IwjMonL8usswOqGdOY,6608
+starmallow/security/oauth2.py,sha256=wlc5K6rURqOrMLwSYeOcd_2ZtFcvMqG3OwbiAwpft3E,10006
+starmallow/security/open_id_connect_url.py,sha256=NONotu-uAWJUps06wdyVCJSRrK71Bl23z8gWWi7ymmw,1400
 starmallow/security/utils.py,sha256=bd8T0YM7UQD5ATKucr1bNtAvz_Y3__dVNAv5UebiPvc,293
-starmallow-0.7.0.dist-info/METADATA,sha256=nfu-fi46UGqJcsgp88z9WTm_D1qepTVczqHGdkb-a_w,5615
-starmallow-0.7.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-starmallow-0.7.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
-starmallow-0.7.0.dist-info/RECORD,,
+starmallow-0.8.0.dist-info/METADATA,sha256=w3SFqGhVi71VdQQZBQyQsM0Kk7dPvrGRAte3GpVAH5M,5618
+starmallow-0.8.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+starmallow-0.8.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
+starmallow-0.8.0.dist-info/RECORD,,

starmallow/union_field.py

@@ -1,86 +0,0 @@
-'''Copied from marshmallow_dataclass, https://github.com/lovasoa/marshmallow_dataclass/blob/master/marshmallow_dataclass/union_field.py
-    Didn't want to add the dependency to this project1
-'''
-
-import copy
-import inspect
-from typing import Any, List, Optional, Tuple
-
-import typeguard
-from marshmallow import Schema, ValidationError, fields
-
-try:
-    from typeguard import TypeCheckError  # type: ignore[attr-defined]
-except ImportError:
-    # typeguard < 3
-    TypeCheckError = TypeError  # type: ignore[misc, assignment]
-
-if "argname" not in inspect.signature(typeguard.check_type).parameters:
-
-    def _check_type(value, expected_type, argname: str):
-        return typeguard.check_type(value=value, expected_type=expected_type)
-
-else:
-    # typeguard < 3.0.0rc2
-    def _check_type(value, expected_type, argname: str):
-        return typeguard.check_type(  # type: ignore[call-overload]
-            value=value, expected_type=expected_type, argname=argname,
-        )
-
-
-class Union(fields.Field):
-    """A union field, composed other `Field` classes or instances.
-    This field serializes elements based on their type, with one of its child fields.
-
-    Example: ::
-
-        number_or_string = UnionField([
-                    (float, fields.Float()),
-                    (str, fields.Str())
-                ])
-
-    :param union_fields: A list of types and their associated field instance.
-    :param kwargs: The same keyword arguments that :class:`Field` receives.
-    """
-
-    def __init__(self, union_fields: List[Tuple[type, fields.Field]], **kwargs):
-        super().__init__(**kwargs)
-        self.union_fields = union_fields
-
-    def _bind_to_schema(self, field_name: str, schema: Schema) -> None:
-        super()._bind_to_schema(field_name, schema)
-        new_union_fields = []
-        for typ, field in self.union_fields:
-            field = copy.deepcopy(field)
-            field._bind_to_schema(field_name, self)
-            new_union_fields.append((typ, field))
-
-        self.union_fields = new_union_fields
-
-    def _serialize(self, value: Any, attr: Optional[str], obj, **kwargs) -> Any:
-        errors = []
-        if value is None:
-            return value
-        for typ, field in self.union_fields:
-            try:
-                _check_type(value=value, expected_type=typ, argname=attr or "anonymous")
-                return field._serialize(value, attr, obj, **kwargs)
-            except TypeCheckError as e:
-                errors.append(e)
-        raise TypeError(
-            f"Unable to serialize value with any of the fields in the union: {errors}",
-        )
-
-    def _deserialize(self, value: Any, attr: Optional[str], data, **kwargs) -> Any:
-        errors = []
-        for typ, field in self.union_fields:
-            try:
-                result = field.deserialize(value, **kwargs)
-                _check_type(
-                    value=result, expected_type=typ, argname=attr or "anonymous",
-                )
-                return result
-            except (TypeCheckError, ValidationError) as e:
-                errors.append(e)
-
-        raise ValidationError(errors)