starmallow 0.7.0__tar.gz → 0.8.0__tar.gz

{starmallow-0.7.0 → starmallow-0.8.0}/PKG-INFO

@@ -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 → starmallow-0.8.0}/README.md

@@ -13,7 +13,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()
@@ -76,7 +76,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 → starmallow-0.8.0}/examples/cache_server.py

@@ -5,7 +5,7 @@ import hashlib
 import marshmallow.fields as mf
 from brotli_asgi import BrotliMiddleware
 from marshmallow.validate import Range
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.middleware import Middleware
 from starlette_context import middleware, plugins
 

{starmallow-0.7.0 → starmallow-0.8.0}/examples/flask_server.py

@@ -9,7 +9,7 @@ from flask import json as flask_json
 from flask.views import MethodView
 # from flask_compress import Compress
 from flask_smorest import Api, Blueprint
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 
 default_flask_config = {
     'OPENAPI_VERSION': '3.0.3',

{starmallow-0.7.0 → starmallow-0.8.0}/examples/goals.ipynb

@@ -23,7 +23,7 @@
    "outputs": [],
    "source": [
     "import marshmallow.fields as mf\n",
-    "from marshmallow_dataclass import dataclass as ma_dataclass\n",
+    "from marshmallow_dataclass2 import dataclass as ma_dataclass\n",
     "from starmallow import APIRouter\n",
     "from starmallow.params import (\n",
     "  Header, \n",
@@ -150,7 +150,7 @@
     "from typing import Any, Callable, TypeVar, Generic, Optional, _SpecialForm\n",
     "\n",
     "import marshmallow.fields as mf\n",
-    "from marshmallow_dataclass import dataclass as ma_dataclass\n",
+    "from marshmallow_dataclass2 import dataclass as ma_dataclass\n",
     "\n",
     "@ma_dataclass\n",
     "class CreateRequest:\n",

{starmallow-0.7.0 → starmallow-0.8.0}/examples/sample_server.py

@@ -5,7 +5,7 @@ import aiofiles.tempfile
 import marshmallow.fields as mf
 import orjson
 from marshmallow.validate import Range
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.middleware import Middleware
 from starlette.middleware.gzip import GZipMiddleware
 from starlette_context import middleware, plugins

{starmallow-0.7.0 → starmallow-0.8.0}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
   "apispec[marshmallow] >=6,<7",
   "dpath >=2.1.0,<3",
   "marshmallow >=3.18.0,<4",
-  "marshmallow-dataclass >=8.5.1,<9",
+  "marshmallow-dataclass2 >=8.8.1,<9",
   "python-multipart >=0.0.5,<0.0.7",
   "pyyaml >=5.4.1",
   "starlette >=0.35,<1",

{starmallow-0.7.0 → starmallow-0.8.0}/starmallow/__init__.py

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

{starmallow-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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-0.7.0 → starmallow-0.8.0}/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 → starmallow-0.8.0}/tests/basic_api.py

@@ -6,7 +6,7 @@ from typing import Final, FrozenSet, Literal, Optional, Union
 from uuid import UUID
 
 from marshmallow.validate import Length, Range, Regexp
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 
 from starmallow import Path, Query, StarMallow
 

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_cookie.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_cookie_description.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_cookie_optional.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.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_header.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_header_description.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_header_optional.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.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_query.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_query_description.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/api_key/test_api_key_query_optional.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.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/oauth2/test_oauth2.py

@@ -1,5 +1,5 @@
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/oauth2/test_oauth2_optional.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/oauth2/test_oauth2_optional_description.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/openid_connect/test_openid_connect.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/openid_connect/test_openid_connect_description.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/security/openid_connect/test_openid_connect_optional.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.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_additional_properties.py

@@ -1,6 +1,6 @@
 from typing import Dict
 
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_additional_responses_custom_model_in_callback.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.responses import JSONResponse
 from starlette.testclient import TestClient
 

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_additional_responses_custom_validationerror.py

@@ -1,6 +1,6 @@
 import typing
 
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.responses import JSONResponse
 from starlette.testclient import TestClient
 

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_additional_responses_response_class.py

@@ -1,6 +1,6 @@
 import typing
 
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.responses import JSONResponse
 from starlette.testclient import TestClient
 

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_additional_responses_router.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import APIRouter, StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_annotated.py

@@ -5,7 +5,7 @@ from typing import Annotated, Literal, Optional, Union
 import marshmallow as ma
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import Body, Header, Path, Query, ResolvedParam, StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_dataclass_fields.py

@@ -4,7 +4,7 @@
 from typing import List
 
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import Body, StarMallow

starmallow-0.8.0/tests/test_generics.py

@@ -0,0 +1,149 @@
+'''Test Resolved Params'''
+from dataclasses import field
+from typing import Annotated, Generic, TypeVar
+
+import pytest
+from marshmallow_dataclass2 import dataclass as ma_dataclass
+from starlette.testclient import TestClient
+
+from starmallow import Query, StarMallow
+
+from .utils import assert_json
+
+app = StarMallow()
+
+T = TypeVar("T")
+
+############################################################
+# Models  -  classes and schemas
+############################################################
+# region  -  VS Code folding marker - https://code.visualstudio.com/docs/editor/codebasics#_folding
+
+
+@ma_dataclass
+class QueryParameters(Generic[T]):
+    id: T = None
+
+
+@ma_dataclass
+class PageableResponse(Generic[T]):
+    items: list[T] = field(default_factory=list)
+# endregion
+
+
+############################################################
+# Test API
+############################################################
+# region
+@app.get("/data")
+def get_data(
+    params: Annotated[QueryParameters[int], Query()],
+) -> PageableResponse[str]:
+    return {'items': ['foo', 'bar']}
+# endregion
+
+
+############################################################
+# Tests
+############################################################
+# region
+client = TestClient(app)
+
+openapi_schema = {
+    "openapi": "3.0.2",
+    "info": {"title": "StarMallow", "version": "0.1.0"},
+    "paths": {
+        "/data": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/PageableResponse",
+                                },
+                            },
+                        },
+                    },
+                    "422": {
+                        "description": "Validation Error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/HTTPValidationError",
+                                },
+                            },
+                        },
+                    },
+                },
+                "summary": "Get Data",
+                "operationId": "get_data_data_get",
+                "parameters": [
+                    {
+                        "required": False,
+                        "schema": {
+                            "default": None,
+                            "nullable": True,
+                            "type": "integer",
+                            "title": "Id",
+                        },
+                        "name": "id",
+                        "in": "query",
+                    },
+                ],
+            },
+        },
+    },
+    "components": {
+        "schemas": {
+            "HTTPValidationError": {
+                'properties': {
+                    'detail': {
+                        'description': 'Error detail',
+                        'title': 'Detail',
+                    },
+                    'errors': {
+                        'description': 'Exception or error type',
+                        'title': 'Errors',
+                    },
+                    'status_code': {
+                        'description': 'HTTP status code',
+                        'title': 'Status Code',
+                        'type': 'integer',
+                    },
+                },
+                'required': ['detail', 'status_code'],
+                'title': 'HTTPValidationError',
+                'type': 'object',
+            },
+            "PageableResponse": {
+                "properties": {
+                    "items": {
+                        "items": {
+                            "type": "string",
+                        },
+                        "title": "Items",
+                        "type": "array",
+                    },
+                },
+                "title": "PageableResponse",
+                "type": "object",
+            },
+        },
+    },
+}
+
+
+@pytest.mark.parametrize(
+    "path,expected_status,expected_response",
+    [
+        ("/data?id=50", 200, {"items": ["foo", "bar"]}),
+        ("/openapi.json", 200, openapi_schema),
+    ],
+)
+def test_get_path(path, expected_status, expected_response):
+    response = client.get(path)
+    assert response.status_code == expected_status
+    assert_json(response.json(), expected_response)
+# endregion

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_input.py

@@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union
 import marshmallow as ma
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.background import BackgroundTasks
 from starlette.requests import HTTPConnection, Request
 from starlette.responses import Response

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_requests_orjson.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import Body, StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_requests_ujson.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import Body, StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_responses.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_responses_orjson.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_responses_ujson.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 import marshmallow.fields as mf
 import pytest
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 
 from starmallow import StarMallow

{starmallow-0.7.0 → starmallow-0.8.0}/tests/test_ws_router.py

@@ -1,4 +1,4 @@
-from marshmallow_dataclass import dataclass as ma_dataclass
+from marshmallow_dataclass2 import dataclass as ma_dataclass
 from starlette.testclient import TestClient
 from starlette.websockets import WebSocket
 

starmallow-0.7.0/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)