starmallow 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

starmallow/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.9.1"
+__version__ = "0.9.2"
 
 from .applications import StarMallow as StarMallow
 from .exceptions import RequestValidationError as RequestValidationError

starmallow/delimited_field.py

@@ -15,17 +15,10 @@ tells webargs where to parse the request argument from.
         "content_type": fields.Str(data_key="Content-Type", location="headers"),
     }
 """
-import sys
-from typing import Any, ClassVar, Generic, Protocol, TypeVar
+from typing import Any, ClassVar, Generic, Protocol, TypeVar, TypeVarTuple
 
 import marshmallow as ma
 
-if sys.version_info >= (3, 11):
-    from typing import TypeVarTuple
-else:
-    # Python 3.10 and below
-    from typing_extensions import TypeVarTuple
-
 from .generics import get_orig_class
 
 T = TypeVar('T', bound=ma.fields.Field | type[ma.fields.Field])
@@ -73,7 +66,7 @@ class DelimitedFieldMixin:
             if not isinstance(value, str):
                 raise self.make_error("invalid")
 
-            values = value.split(self.delimiter) if value else []
+            values = value.split(self.delimiter)  # if value else []
             return super()._deserialize(values, attr, data, **kwargs)
 
 
@@ -101,7 +94,7 @@ class DelimitedList(DelimitedFieldMixin, ma.fields.List, Generic[T]):  # type: i
         super().__init__(cls_or_instance, **kwargs)
 
 
-class DelimitedTuple(DelimitedFieldMixin, ma.fields.Tuple, Generic[Ts]):  # type: ignore
+class DelimitedTuple(DelimitedFieldMixin, ma.fields.Tuple, Generic[*Ts]):  # type: ignore
     """A field which is similar to a Tuple, but takes its input as a delimited
     string (e.g. "foo,bar,baz").
 

starmallow/endpoint.py

@@ -1,6 +1,6 @@
 import inspect
 import logging
-from collections.abc import Callable, Iterable, Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from dataclasses import dataclass, field
 from typing import (
     TYPE_CHECKING,
@@ -15,8 +15,8 @@ from typing import (
 import marshmallow as ma
 import marshmallow.fields as mf
 import typing_inspect
-from marshmallow.types import StrSequenceOrSet
-from marshmallow.utils import missing as missing_
+from marshmallow.constants import missing as missing_
+from marshmallow.types import StrSequenceOrSet, UnknownOption
 from marshmallow_dataclass2 import class_schema, is_generic_alias_of_dataclass
 from starlette.background import BackgroundTasks
 from starlette.requests import HTTPConnection, Request
@@ -159,11 +159,11 @@ class SchemaModel(ma.Schema):
 
     def load(
         self,
-        data: Mapping[str, Any] | Iterable[Mapping[str, Any]],
+        data: Mapping[str, Any] | Sequence[Mapping[str, Any]],
         *,
         many: bool | None = None,
         partial: bool | StrSequenceOrSet | None = None,
-        unknown: str | None = None,
+        unknown: UnknownOption | None = None,
     ) -> Any:
         if not data and self.load_default:
             return self.load_default
@@ -258,7 +258,10 @@ class EndpointMixin:
 
             model.required = kwargs['required']
             model.load_default = kwargs.get('load_default', ma.missing)
-            model.metadata.update(kwargs['metadata'])
+            model.metadata = {
+                **model.metadata,
+                **kwargs['metadata'],
+            }
 
             return model
 

starmallow/ext/marshmallow/openapi.py

@@ -203,7 +203,7 @@ class OpenAPIConverter(ApiSpecOpenAPIConverter):
         ret = {}
 
         if isinstance(field, mf.Enum):
-            choices = [x.value for x in field.enum] if field.by_value else list(field.enum.__members__)
+            choices = [x.value for x in field.enum] if field.by_value else list(field.enum.__members__) # type: ignore
 
             if choices:
                 ret['enum'] = choices

starmallow/request_resolver.py

@@ -7,9 +7,9 @@ from typing import Any, cast
 
 import marshmallow as ma
 import marshmallow.fields as mf
+from marshmallow.constants import missing as missing_
 from marshmallow.error_store import ErrorStore
 from marshmallow.exceptions import SCHEMA
-from marshmallow.utils import missing as missing_
 from starlette.background import BackgroundTasks as StarletteBackgroundTasks
 from starlette.datastructures import FormData, Headers, QueryParams
 from starlette.exceptions import HTTPException

starmallow/utils.py

@@ -3,7 +3,6 @@ import datetime as dt
 import inspect
 import logging
 import re
-import sys
 import uuid
 import warnings
 from collections.abc import Callable, Mapping, Sequence
@@ -16,6 +15,7 @@ from typing import (
     TYPE_CHECKING,
     Any,
     ForwardRef,
+    NotRequired,
     Protocol,
     TypeGuard,
     TypeVar,
@@ -39,12 +39,6 @@ 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
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired
-else:
-    # Python 3.10 and below
-    from typing_extensions import NotRequired
-
 if TYPE_CHECKING:  # pragma: nocover
     from starmallow.routing import APIRoute
 

{starmallow-0.9.1.dist-info → starmallow-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: starmallow
-Version: 0.9.1
+Version: 0.9.2
 Summary: StarMallow framework
 Project-URL: Homepage, https://github.com/mvanderlee/starmallow
 Author-email: Michiel Vanderlee <jmt.vanderlee@gmail.com>
@@ -16,7 +16,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -28,7 +27,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: apispec[marshmallow]<7,>=6
 Requires-Dist: dpath<3,>=2.1.0
 Requires-Dist: marshmallow-dataclass2<9,>=8.8.1

{starmallow-0.9.1.dist-info → starmallow-0.9.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-starmallow/__init__.py,sha256=KdL5v_AucJIjcuf2DlTvRPZKr6nqyyrpMORXs3FyKCg,691
+starmallow/__init__.py,sha256=cnJ0uuTI6vSNBSC11DOBlViasfQ1ibVWYiB7u8m5GBE,691
 starmallow/applications.py,sha256=wI3mViPAgMAGDUy0PzDLyd6GFQaFY_d1-85LBASATNY,30396
 starmallow/background.py,sha256=asjTMgO25zqZiKsxcEVBGPKd_Nb7RVZDEmzR4PNy6-k,996
 starmallow/concurrency.py,sha256=YNIFo8jmHZYXfFkqzL1xFiE5QFwWYnGUsYgAROv041Q,1404
@@ -6,9 +6,9 @@ starmallow/constants.py,sha256=u0h8cJKhJY0oIZqzr7wpEZG2bPLrw5FroMnn3d8KBNQ,129
 starmallow/dataclasses.py,sha256=P8Eft25Q5UBhDp-3b0T-n2IOtjrQpxmRUxs3WAwlRFQ,2787
 starmallow/datastructures.py,sha256=oq2Dz6zcoQx9ctMSSviZMAX_wvNTT9ytkSBtZjcg7bY,853
 starmallow/decorators.py,sha256=VGzfFYualOcplRK6L3Tu2GrCl3a5yrOgADqWMokqzcQ,4036
-starmallow/delimited_field.py,sha256=MKQnCp-B8q1R69G6aCgthtWVCISqkKBFpTSnwcfC_8A,4429
+starmallow/delimited_field.py,sha256=4a6ObLK4LBxayd6o5bh5i9bR2K0miOkFFdj8r2km-g8,4286
 starmallow/docs.py,sha256=tc077aDFAzHTjpnEpqS8BVMhVolaYFmrqQ2obd1Jsbg,6229
-starmallow/endpoint.py,sha256=JVJTglAkAydVKIsgKr4dR_X9gzso6OHr_d6xUhq1MNU,17794
+starmallow/endpoint.py,sha256=MtABY6fC_R009leoDyRHkxeSAK7bQ4xMsvYPh3vYKdE,17876
 starmallow/endpoints.py,sha256=2RuKhEX0EpEyWUdlKVfD0WXz_8zNQEduCoZ4UJkybZc,953
 starmallow/exception_handlers.py,sha256=gr2qLYWEtsIEH28n7OreEiiLVz6Y7b6osRyS9esJbBk,891
 starmallow/exceptions.py,sha256=arXkENa6dV626t_IDWZKqrh6laeV54PWbVIW0dafT2o,843
@@ -16,18 +16,18 @@ starmallow/fields.py,sha256=5zXP2JLyTpVnVhl23GYHY9W3Sc5Oc_kRvOWmI7WWNRM,1283
 starmallow/generics.py,sha256=CE_Wf0vIqkup0mirGa-PL5511DT-avaCkC1Jx4sMe_U,1102
 starmallow/params.py,sha256=EDnUNVNfRY7uv5D1rzfmIrWKJ85R2ku4l13w1QKG4E8,8720
 starmallow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-starmallow/request_resolver.py,sha256=o9OID0wOUCG1iUuvJVT6-ghzG61Pv08QiznFjzZZ8RE,11689
+starmallow/request_resolver.py,sha256=RYMtCgvEkwyWTF2N33mq-HEeAHysXegaHnEvV-sYuBw,11693
 starmallow/requests.py,sha256=o_yNhH9WJ35uAGuoXa5_gihevHeaveOvkP525dbwQSU,843
 starmallow/responses.py,sha256=H6Ze0R5JG9O8eaS4dffiAn3lI6Y9-hz3aDHdWKGk_nw,2023
 starmallow/routing.py,sha256=dK6ayN_Ruqz3ZGNQ3pFwqnguF7Vl0oIfD7e8OnnED_Y,45364
 starmallow/schema_generator.py,sha256=Y4o8v5OUgTZA2byTOcUKONimdF8JjiwD8FZLxCVOF0I,19210
 starmallow/serializers.py,sha256=Z-42L6is9klknpJ3r1DcGjB7t_txPfRvp-Rvj87_n70,12622
 starmallow/types.py,sha256=zcdq5iIHOVVe-KINzSRNuE0xFMBSA7KefUp-HPRdZEw,840
-starmallow/utils.py,sha256=CudZ2x7iWHr6xi7RT848aSIZuAfDUFzWVCxHuyKvk-E,14146
+starmallow/utils.py,sha256=zPio5mf4dWQ0U1ComtzLzsAv9T_iBxkz9Cf2pC8O6dY,14004
 starmallow/websockets.py,sha256=54ctFGgA4A3VFwpUFmlu8aVmHOo4R6x3O_-z5r2BsdI,2232
 starmallow/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 starmallow/ext/marshmallow/__init__.py,sha256=33jENGdfPq4-CDG0LOmN3KOGW1pXTy7a2oMwy4hrYzM,208
-starmallow/ext/marshmallow/openapi.py,sha256=SkaGp80qvQxDSatxygN3IIKXQ7GTa01rioY_uddTxEs,10164
+starmallow/ext/marshmallow/openapi.py,sha256=qpTDAFZLJug1hyvOG3FHWc0o7cYCDLjmzebw5dJ6zpQ,10179
 starmallow/middleware/__init__.py,sha256=NwjiXJbSSLxImnQ9t91c-Dy1jPrvHU_--POXIVOyHPw,81
 starmallow/middleware/asyncexitstack.py,sha256=wxugZgPg5yxuXxZjPm-_PMG7hAfOeo2lRLR07eaSWS8,1160
 starmallow/security/__init__.py,sha256=1rQFBIGnEbE51XDZSSi9NgPjXLScFq3RoLu4vk0KVYw,191
@@ -37,7 +37,7 @@ starmallow/security/http.py,sha256=wSbRomh9IYAi2nJ4ugFrx2JLg-m85DxWVaUMZt5PwIw,6
 starmallow/security/oauth2.py,sha256=G72-wJyvrGyHUbg9hbzf44RBN8zFalZYnHKpRC2I1po,10108
 starmallow/security/open_id_connect_url.py,sha256=9E-Zwnt-IR3jimOMkvIwnGHTuJMlGmjs7LCf1SGtKT8,1415
 starmallow/security/utils.py,sha256=7tziAa2Cwa7xhwM_NF4DSY3BHoqVaWgJ21VuV8LvhrY,253
-starmallow-0.9.1.dist-info/METADATA,sha256=fwkeplNEumkhIOM88v_4oWy5Lb0v1x3D2vicIk1VwhU,5611
-starmallow-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-starmallow-0.9.1.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
-starmallow-0.9.1.dist-info/RECORD,,
+starmallow-0.9.2.dist-info/METADATA,sha256=zoEqForKQacmHgXXeECDQ-iBTErzBdYc1gVEfap50jQ,5560
+starmallow-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+starmallow-0.9.2.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
+starmallow-0.9.2.dist-info/RECORD,,