starmallow 0.4.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

starmallow/__init__.py

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

starmallow/applications.py

@@ -251,6 +251,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -276,6 +277,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -298,6 +300,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -322,6 +325,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -386,6 +390,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -409,6 +414,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -430,6 +436,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -453,6 +460,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -474,6 +482,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -497,6 +506,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -518,6 +528,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -541,6 +552,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -562,6 +574,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -585,6 +598,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -606,6 +620,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -629,6 +644,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -650,6 +666,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -673,6 +690,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,
@@ -694,6 +712,7 @@ class StarMallow(Starlette):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
         response_class: Type[Response] = JSONResponse,
@@ -717,6 +736,7 @@ class StarMallow(Starlette):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             request_class=request_class,
             response_model=response_model,
             response_class=response_class,

starmallow/decorators.py

@@ -1,7 +1,8 @@
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Type, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Sequence, Type, Union
 
+from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import Response
 from starlette.routing import BaseRoute
@@ -20,6 +21,7 @@ class EndpointOptions:
     name: str = None
     include_in_schema: bool = True
     status_code: Optional[int] = None
+    middleware: Sequence[Middleware] | None = None
     deprecated: Optional[bool] = None
     request_class: Type[Request] = Request
     response_model: Optional[Type[Any]] = None
@@ -40,6 +42,7 @@ class EndpointOptions:
     tags: Optional[List[Union[str, Enum]]] = None
     # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
     openapi_extra: Optional[Dict[str, Any]] = None
+    route_class: Optional[Type["APIRoute"]] = None
 
 
 def route(
@@ -47,6 +50,7 @@ def route(
     name: str = None,
     include_in_schema: bool = True,
     status_code: Optional[int] = None,
+    middleware: Sequence[Middleware] | None = None,
     deprecated: Optional[bool] = None,
     request_class: Type[Request] = Default(Request),
     response_model: Optional[Type[Any]] = None,
@@ -65,6 +69,7 @@ def route(
     tags: Optional[List[Union[str, Enum]]] = None,
     # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
     openapi_extra: Optional[Dict[str, Any]] = None,
+    route_class: Optional[Type["APIRoute"]] = None,
 ) -> Callable[[DecoratedCallable], DecoratedCallable]:
     '''
         Intended to be used with APIHTTPEndpoint to override options on a per method basis
@@ -75,6 +80,7 @@ def route(
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -88,6 +94,7 @@ def route(
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
         return func
     return decorator

starmallow/params.py

@@ -159,6 +159,7 @@ class Header(Param):
             title=title,
         )
 
+
 class Cookie(Param):
     in_ = ParamType.cookie
 

starmallow/routing.py

@@ -11,6 +11,7 @@ from typing import (
     Dict,
     List,
     Optional,
+    Sequence,
     Set,
     Tuple,
     Type,
@@ -20,6 +21,7 @@ from typing import (
 import marshmallow as ma
 from starlette import routing
 from starlette.concurrency import run_in_threadpool
+from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import Response
 from starlette.routing import (
@@ -213,6 +215,7 @@ class APIRoute(routing.Route, EndpointMixin):
         name: Optional[str] = None,
         methods: Optional[Union[Set[str], List[str]]] = None,
         include_in_schema: bool = True,
+        middleware: Sequence[Middleware] | None = None,
         status_code: Optional[int] = None,
         deprecated: Optional[bool] = None,
         request_class: Union[Type[Request], DefaultPlaceholder] = Default(
@@ -342,7 +345,14 @@ class APIRoute(routing.Route, EndpointMixin):
             route=self,
         )
 
-        self.app = request_response(get_request_handler(self.endpoint_model), self.request_class)
+        self.middleware = middleware  # Store for include_router
+        self.app = request_response(self.get_route_handler(), self.request_class)
+        if middleware is not None:
+            for cls, args, kwargs in reversed(middleware):
+                self.app = cls(app=self.app, *args, **kwargs)  # noqa: B026
+
+    def get_route_handler(self):
+        return get_request_handler(self.endpoint_model)
 
 
 class APIRouter(routing.Router):
@@ -361,9 +371,11 @@ class APIRouter(routing.Router):
             generate_unique_id,
         ),
         prefix: str = "",
+        route_class: Optional[Type[APIRoute]] = APIRoute,
+        middleware: Sequence[Middleware] | None = None,
         **kwargs,
     ) -> None:
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, middleware=middleware, **kwargs)
 
         self.tags: List[Union[str, Enum]] = tags or []
         self.default_request_class = default_request_class
@@ -374,6 +386,8 @@ class APIRouter(routing.Router):
         self.callbacks = callbacks or []
         self.generate_unique_id_function = generate_unique_id_function
         self.prefix = prefix
+        self.route_class = route_class
+        self.middleware = middleware
 
     def route(
         self,
@@ -403,6 +417,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -421,7 +436,9 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ) -> None:
+        route_class = route_class or self.route_class
 
         current_tags = self.tags.copy()
         if tags:
@@ -443,13 +460,15 @@ class APIRouter(routing.Router):
                 if endpoint_options.tags:
                     method_tags.extend(endpoint_options.tags)
 
-                route = APIRoute(
+                endpoint_route_class = endpoint_options.route_class or route_class
+                route = endpoint_route_class(
                     self.prefix + path,
                     endpoint_function,
                     methods=[method],
                     name=endpoint_options.name or name,
                     include_in_schema=endpoint_options.include_in_schema and include_in_schema and self.include_in_schema,
                     status_code=endpoint_options.status_code or status_code,
+                    middleware=endpoint_options.middleware or middleware,
                     deprecated=endpoint_options.deprecated or deprecated or self.deprecated,
                     request_class=endpoint_options.request_class or request_class,
                     response_model=endpoint_options.response_model or response_model,
@@ -468,13 +487,14 @@ class APIRouter(routing.Router):
                 self.routes.append(route)
 
         else:
-            route = APIRoute(
+            route = route_class(
                 self.prefix + path,
                 endpoint,
                 methods=methods,
                 name=name,
                 include_in_schema=include_in_schema and self.include_in_schema,
                 status_code=status_code,
+                middleware=middleware,
                 deprecated=deprecated or self.deprecated,
                 request_class=request_class,
                 response_model=response_model,
@@ -500,6 +520,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -518,6 +539,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ) -> Callable[[DecoratedCallable], DecoratedCallable]:
         def decorator(func: DecoratedCallable) -> DecoratedCallable:
             self.add_api_route(
@@ -527,6 +549,7 @@ class APIRouter(routing.Router):
                 name=name,
                 include_in_schema=include_in_schema,
                 status_code=status_code,
+                middleware=middleware,
                 deprecated=deprecated,
                 request_class=request_class,
                 response_model=response_model,
@@ -540,6 +563,7 @@ class APIRouter(routing.Router):
                 generate_unique_id_function=generate_unique_id_function,
                 openapi_extra=openapi_extra,
                 tags=tags,
+                route_class=route_class,
             )
             return func
         return decorator
@@ -633,11 +657,19 @@ class APIRouter(routing.Router):
                     generate_unique_id_function,
                     self.generate_unique_id_function,
                 )
+
+                middleware = []
+                if router.middleware:
+                    middleware.extend(router.middleware)
+                if route.middleware:
+                    middleware.extend(route.middleware)
+
                 self.add_api_route(
                     prefix + route.path,
                     route.endpoint,
                     response_model=route.response_model,
                     status_code=route.status_code,
+                    middleware=middleware,
                     tags=current_tags,
                     summary=route.summary,
                     description=route.description,
@@ -657,6 +689,7 @@ class APIRouter(routing.Router):
                     name=route.name,
                     openapi_extra=route.openapi_extra,
                     generate_unique_id_function=current_generate_unique_id,
+                    route_class=route.__class__,
                 )
             elif isinstance(route, routing.Route):
                 methods = list(route.methods or [])
@@ -688,6 +721,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -706,6 +740,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -713,6 +748,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -726,6 +762,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def put(
@@ -735,6 +772,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -753,6 +791,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -760,6 +799,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -773,6 +813,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def post(
@@ -782,6 +823,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -800,6 +842,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -807,6 +850,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -820,6 +864,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def delete(
@@ -829,6 +874,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -847,6 +893,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -854,6 +901,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -867,6 +915,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def options(
@@ -876,6 +925,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -894,6 +944,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -901,6 +952,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -914,6 +966,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def head(
@@ -923,6 +976,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -941,6 +995,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -948,6 +1003,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -961,6 +1017,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def patch(
@@ -970,6 +1027,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -988,6 +1046,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -995,6 +1054,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -1008,6 +1068,7 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )
 
     def trace(
@@ -1017,6 +1078,7 @@ class APIRouter(routing.Router):
         name: str = None,
         include_in_schema: bool = True,
         status_code: Optional[int] = None,
+        middleware: Sequence[Middleware] | None = None,
         deprecated: Optional[bool] = None,
         request_class: Type[Request] = Default(Request),
         response_model: Optional[Type[Any]] = None,
@@ -1035,6 +1097,7 @@ class APIRouter(routing.Router):
         tags: Optional[List[Union[str, Enum]]] = None,
         # Will be deeply merged with the automatically generated OpenAPI schema for the path operation.
         openapi_extra: Optional[Dict[str, Any]] = None,
+        route_class: Optional[Type[APIRoute]] = None,
     ):
         return self.api_route(
             path,
@@ -1042,6 +1105,7 @@ class APIRouter(routing.Router):
             name=name,
             include_in_schema=include_in_schema,
             status_code=status_code,
+            middleware=middleware,
             deprecated=deprecated,
             request_class=request_class,
             response_model=response_model,
@@ -1055,4 +1119,5 @@ class APIRouter(routing.Router):
             generate_unique_id_function=generate_unique_id_function,
             openapi_extra=openapi_extra,
             tags=tags,
+            route_class=route_class,
         )

starmallow/utils.py

@@ -9,7 +9,7 @@ from contextlib import AsyncExitStack, asynccontextmanager, contextmanager
 from dataclasses import is_dataclass
 from decimal import Decimal
 from enum import Enum
-from types import NoneType
+from types import NoneType, UnionType
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -191,7 +191,7 @@ def is_body_allowed_for_status_code(status_code: int | str | None) -> bool:
 
 
 def is_optional(field):
-    return get_origin(field) is Union and type(None) in get_args(field)
+    return get_origin(field) in (Union, UnionType) and type(None) in get_args(field)
 
 
 def get_path_param_names(path: str) -> Set[str]:

{starmallow-0.4.0.dist-info → starmallow-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: starmallow
-Version: 0.4.0
+Version: 0.5.1
 Summary: StarMallow framework
 Project-URL: Homepage, https://github.com/mvanderlee/starmallow
 Author-email: Michiel Vanderlee <jmt.vanderlee@gmail.com>

{starmallow-0.4.0.dist-info → starmallow-0.5.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-starmallow/__init__.py,sha256=fE4KZucjP-MqtKdZJkyPl8VpJdp0A1h_jNbSkHuJF8c,322
-starmallow/applications.py,sha256=7tRWNi-Vqsurb-bvQUuSeTVX0_9HIqSFzRdMwQUb7Sk,30810
+starmallow/__init__.py,sha256=bazGj9TH8fId8pbGpljym-YfomnpPBSyM_RWlxhCitg,322
+starmallow/applications.py,sha256=mSL4YDozP8n6v22g4NX7EAMXmGhzzhtjtZd68YHcFvw,31720
 starmallow/concurrency.py,sha256=MVRjo4Vqss_yqhaoeVt3xb7rLaSuAq_q9uYgTwbsojE,1375
 starmallow/constants.py,sha256=u0h8cJKhJY0oIZqzr7wpEZG2bPLrw5FroMnn3d8KBNQ,129
 starmallow/dataclasses.py,sha256=ap9DInvQjH2AyI4MAAnbDEuNnbPb94PigaNmEb7AQU8,2658
 starmallow/datastructures.py,sha256=iH_KJuJ6kBCWEsnHFLdA3iyb6ZxhfdMHYrJlhiEZtDU,839
-starmallow/decorators.py,sha256=7635d-JxCbEIqlAloekenGO2ucBSD16Q7zc4v6IQGPU,3773
+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=YdEtRKF1Z-p_KXoqJJNP_9nEwOzvgxYoMI3Rly7ECrM,15888
@@ -12,15 +12,15 @@ starmallow/endpoints.py,sha256=UrwVZCxbmWI20iNtJ0oXxo4d3-y12TjsOGs_jnStTiU,939
 starmallow/exception_handlers.py,sha256=gr2qLYWEtsIEH28n7OreEiiLVz6Y7b6osRyS9esJbBk,891
 starmallow/exceptions.py,sha256=vabtPJkTmtCdC8_2OPBE8Osz0v0KxaSOX6IWf1jgNkc,872
 starmallow/fields.py,sha256=arrTabCYoJFZcoY69EZTBH3YUg7CUSr3-zYLiAjYLTM,1238
-starmallow/params.py,sha256=-f6ut1p_w_I8lyEgRciJxUtHmoVXKAD2Ug4KuRjPlJA,8661
+starmallow/params.py,sha256=MJzUzUs6GEyrbpDZ1r8To8vR-QwpopdxDStq802o5Ug,8662
 starmallow/request_resolver.py,sha256=kT7B0BWSqBP_9Jl865Ya_Op9I3W4FyfBxXjvtucWT_0,10785
 starmallow/requests.py,sha256=o_yNhH9WJ35uAGuoXa5_gihevHeaveOvkP525dbwQSU,843
 starmallow/responses.py,sha256=k2pf_m21ykf_FECdODUz400pMucMJJf_Zm8TXFujvaU,2012
-starmallow/routing.py,sha256=8oXJb-3EixI3iYEY2q0r31x8NZnB56RKKIEfhtjjTpQ,42157
+starmallow/routing.py,sha256=Uxnlkl4eIs56TZ8VAgNmlh-K89ku1Xu_ROR5S8x-rkg,45128
 starmallow/schema_generator.py,sha256=BKtXVQoNFWoAIEtiRNylWls_7nyFIshy3_myooogjoI,17806
 starmallow/serializers.py,sha256=rBEKMNgONgz_bai12uDvAEMCI_aEFGsqMSeIoWtlrOI,12514
 starmallow/types.py,sha256=8GXWjvzXQhF5NMHf14fbid6uErxVd1Xk_w2I4FoUgZ4,717
-starmallow/utils.py,sha256=AkVesTbYnshaXZqdgpc09TpZF07LIUeCOwOlvCaQrAI,11412
+starmallow/utils.py,sha256=Ab6F2yOiy65gVGC2C4mNyKiPTPdsRyH5eVAv7Q_dGbw,11436
 starmallow/websockets.py,sha256=yIz3LzTBMNclpEoG7oTMbQwxbcdKNU6M8XcqZMyBTuA,2223
 starmallow/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 starmallow/ext/marshmallow/__init__.py,sha256=33jENGdfPq4-CDG0LOmN3KOGW1pXTy7a2oMwy4hrYzM,208
@@ -34,7 +34,7 @@ starmallow/security/http.py,sha256=cpGjM1kFDq3i_bOY96kMkf4cspBUxFkkET9lTK3NA-0,6
 starmallow/security/oauth2.py,sha256=1nv1580PY4cwgu5gzpQCf2MfMNv2Cfv05753AUHPOhQ,10005
 starmallow/security/open_id_connect_url.py,sha256=IPsL2YzWc2mPwJbrUn6oFRTi7uRAG6mR62CGwmzBs1k,1399
 starmallow/security/utils.py,sha256=bd8T0YM7UQD5ATKucr1bNtAvz_Y3__dVNAv5UebiPvc,293
-starmallow-0.4.0.dist-info/METADATA,sha256=jPVSz2HCZ8VpNCrkbR2ZPV_ia-WHWodk73LdQUF3jkU,5651
-starmallow-0.4.0.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
-starmallow-0.4.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
-starmallow-0.4.0.dist-info/RECORD,,
+starmallow-0.5.1.dist-info/METADATA,sha256=bg0HNEKMvq6nDZyRW8MOILAsTtXmOmzWwaFM2q2J3cE,5651
+starmallow-0.5.1.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
+starmallow-0.5.1.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
+starmallow-0.5.1.dist-info/RECORD,,