starmallow 0.3.9__py3-none-any.whl → 0.5.0__py3-none-any.whl

starmallow/__init__.py

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

starmallow/applications.py

@@ -251,6 +251,8 @@ 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,
         # OpenAPI summary
@@ -275,6 +277,8 @@ 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,
             summary=summary,
@@ -296,6 +300,8 @@ 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,
         # OpenAPI summary
@@ -319,6 +325,8 @@ 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,
             summary=summary,
@@ -356,6 +364,7 @@ class StarMallow(Starlette):
         callbacks: Optional[List[BaseRoute]] = None,
         deprecated: Optional[bool] = None,
         include_in_schema: bool = True,
+        default_request_class: Type[Request] = Default(Request),
         default_response_class: Type[Response] = Default(JSONResponse),
         generate_unique_id_function: Callable[[APIRoute], str] = Default(
             generate_unique_id,
@@ -369,6 +378,7 @@ class StarMallow(Starlette):
             callbacks=callbacks,
             deprecated=deprecated,
             include_in_schema=include_in_schema,
+            default_request_class=default_request_class,
             default_response_class=default_response_class,
             generate_unique_id_function=generate_unique_id_function,
         )
@@ -380,6 +390,8 @@ 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,
         # OpenAPI summary
@@ -402,6 +414,8 @@ 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,
             summary=summary,
@@ -422,6 +436,8 @@ 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,
         # OpenAPI summary
@@ -444,6 +460,8 @@ 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,
             summary=summary,
@@ -464,6 +482,8 @@ 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,
         # OpenAPI summary
@@ -486,6 +506,8 @@ 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,
             summary=summary,
@@ -506,6 +528,8 @@ 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,
         # OpenAPI summary
@@ -528,6 +552,8 @@ 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,
             summary=summary,
@@ -548,6 +574,8 @@ 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,
         # OpenAPI summary
@@ -570,6 +598,8 @@ 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,
             summary=summary,
@@ -590,6 +620,8 @@ 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,
         # OpenAPI summary
@@ -612,6 +644,8 @@ 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,
             summary=summary,
@@ -632,6 +666,8 @@ 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,
         # OpenAPI summary
@@ -654,6 +690,8 @@ 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,
             summary=summary,
@@ -674,6 +712,8 @@ 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,
         # OpenAPI summary
@@ -696,6 +736,8 @@ 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,
             summary=summary,

starmallow/decorators.py

@@ -1,7 +1,9 @@
 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
 
@@ -19,7 +21,9 @@ 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
     response_class: Type[Response] = JSONResponse
     # OpenAPI summary
@@ -38,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(
@@ -45,7 +50,9 @@ 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,
     response_class: Type[Response] = JSONResponse,
     # OpenAPI summary
@@ -62,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
@@ -72,7 +80,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -84,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/endpoint.py

@@ -245,6 +245,9 @@ class EndpointMixin:
         elif is_marshmallow_schema(model):
             return SchemaModel(model() if inspect.isclass(model) else model, **kwargs)
         elif is_marshmallow_field(model):
+            if inspect.isclass(model):
+                model = model()
+
             if model.load_default is not None and model.load_default != kwargs.get('load_default', ma.missing):
                 logger.warning(
                     f"'{parameter_name}' model and annotation have different 'load_default' values."

starmallow/requests.py

@@ -0,0 +1,36 @@
+from typing import Any
+
+from starlette.requests import Request
+
+try:
+    import ujson
+except ImportError:  # pragma: nocover
+    ujson = None  # type: ignore
+
+
+try:
+    import orjson
+except ImportError:  # pragma: nocover
+    orjson = None  # type: ignore
+
+
+class UJSONRequest(Request):
+
+    async def json(self) -> Any:
+        assert ujson is not None, "ujson must be installed to use UJSONRequest"
+
+        if not hasattr(self, "_json"):
+            body = await self.body()
+            self._json = ujson.loads(body)
+        return self._json
+
+
+class ORJSONRequest(Request):
+
+    async def json(self) -> Any:
+        assert orjson is not None, "orjson must be installed to use ORJSONRequest"
+
+        if not hasattr(self, "_json"):
+            body = await self.body()
+            self._json = orjson.loads(body)
+        return self._json

starmallow/routing.py

@@ -3,14 +3,34 @@ import functools
 import inspect
 import logging
 from enum import Enum, IntEnum
-from typing import Any, Callable, Coroutine, Dict, List, Optional, Set, Tuple, Type, Union
+from typing import (
+    Any,
+    Awaitable,
+    Callable,
+    Coroutine,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    Type,
+    Union,
+)
 
 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 BaseRoute, Match, compile_path, request_response
+from starlette.routing import (
+    BaseRoute,
+    Match,
+    compile_path,
+    is_async_callable,
+    wrap_app_handling_exceptions,
+)
 from starlette.status import WS_1008_POLICY_VIOLATION
 from starlette.types import ASGIApp, Receive, Scope, Send
 from starlette.websockets import WebSocket
@@ -57,6 +77,30 @@ async def run_endpoint_function(
         return await run_in_threadpool(endpoint_model.call, **kwargs)
 
 
+def request_response(
+    func: Callable[[Request], Union[Awaitable[Response], Response]],
+    request_class: Type[Request],
+) -> ASGIApp:
+    """
+    Takes a function or coroutine `func(request) -> response`,
+    and returns an ASGI application.
+    """
+
+    async def app(scope: Scope, receive: Receive, send: Send) -> None:
+        request = request_class(scope, receive, send)
+
+        async def app(scope: Scope, receive: Receive, send: Send) -> None:
+            if is_async_callable(func):
+                response = await func(request)
+            else:
+                response = await run_in_threadpool(func, request)
+            await response(scope, receive, send)
+
+        await wrap_app_handling_exceptions(app, request)(scope, receive, send)
+
+    return app
+
+
 def websocket_session(func: Callable) -> ASGIApp:
     """
     Takes a coroutine `func(session)`, and returns an ASGI application.
@@ -171,8 +215,12 @@ 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(
+            Request,
+        ),
         response_model: Optional[ma.Schema] = None,
         response_class: Union[Type[Response], DefaultPlaceholder] = Default(
             JSONResponse,
@@ -205,7 +253,7 @@ class APIRoute(routing.Route, EndpointMixin):
             endpoint_handler = endpoint_handler.func
         if inspect.isfunction(endpoint_handler) or inspect.ismethod(endpoint_handler):
             # Endpoint is function or method. Treat it as `func(request) -> response`.
-            self.app = request_response(endpoint)
+            self.app = request_response(endpoint, request_class)
             if methods is None:
                 methods = ["GET"]
         else:
@@ -226,7 +274,6 @@ class APIRoute(routing.Route, EndpointMixin):
         self.status_code = status_code
         self.deprecated = deprecated
         self.response_model = response_model
-        self.response_class = response_class
         self.summary = summary
         self.operation_id = operation_id
         self.callbacks = callbacks
@@ -234,6 +281,16 @@ class APIRoute(routing.Route, EndpointMixin):
         self.responses = responses or {}
         self.openapi_extra = openapi_extra
 
+        if isinstance(request_class, DefaultPlaceholder):
+            self.request_class: Request = request_class.value
+        else:
+            self.request_class = request_class
+
+        if isinstance(response_class, DefaultPlaceholder):
+            self.response_class: Response = response_class.value
+        else:
+            self.response_class = response_class
+
         self.generate_unique_id_function = generate_unique_id_function
         if isinstance(generate_unique_id_function, DefaultPlaceholder):
             current_generate_unique_id: Callable[
@@ -279,16 +336,23 @@ class APIRoute(routing.Route, EndpointMixin):
 
         self.endpoint_model = self.get_endpoint_model(
             self.path_format,
-            endpoint,
-            name=name,
+            self.endpoint,
+            name=self.name,
             methods=self.methods,
-            status_code=status_code,
-            response_model=response_model,
-            response_class=response_class,
+            status_code=self.status_code,
+            response_model=self.response_model,
+            response_class=self.response_class,
             route=self,
         )
 
-        self.app = request_response(get_request_handler(self.endpoint_model))
+        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):
@@ -297,6 +361,7 @@ class APIRouter(routing.Router):
         self,
         *args,
         tags: Optional[List[Union[str, Enum]]] = None,
+        default_request_class: Type[Request] = Default(Request),
         default_response_class: Type[Response] = Default(JSONResponse),
         deprecated: Optional[bool] = None,
         include_in_schema: bool = True,
@@ -306,11 +371,14 @@ 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
         self.default_response_class = default_response_class
         self.deprecated = deprecated
         self.include_in_schema = include_in_schema
@@ -318,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,
@@ -347,7 +417,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -364,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:
@@ -386,14 +460,17 @@ 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,
                     response_class=endpoint_options.response_class or response_class,
                     summary=endpoint_options.summary or summary,
@@ -410,14 +487,16 @@ 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,
                 response_class=response_class,
                 summary=summary,
@@ -441,7 +520,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -458,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(
@@ -467,7 +549,9 @@ 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,
                 response_class=response_class,
                 summary=summary,
@@ -479,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
@@ -517,6 +602,7 @@ class APIRouter(routing.Router):
         *,
         prefix: str = "",
         tags: Optional[List[Union[str, Enum]]] = None,
+        default_request_class: Type[Request] = Default(Request),
         default_response_class: Type[Response] = Default(JSONResponse),
         responses: Optional[Dict[Union[int, str], Dict[str, Any]]] = None,
         callbacks: Optional[List[BaseRoute]] = None,
@@ -543,6 +629,12 @@ class APIRouter(routing.Router):
         for route in router.routes:
             if isinstance(route, APIRoute):
                 combined_responses = {**responses, **route.responses}
+                use_request_class = get_value_or_default(
+                    route.request_class,
+                    router.default_request_class,
+                    default_request_class,
+                    self.default_request_class,
+                )
                 use_response_class = get_value_or_default(
                     route.response_class,
                     router.default_response_class,
@@ -565,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,
@@ -584,10 +684,12 @@ class APIRouter(routing.Router):
                         and self.include_in_schema
                         and include_in_schema
                     ),
+                    request_class=use_request_class,
                     response_class=use_response_class,
                     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 [])
@@ -619,7 +721,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -636,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,
@@ -643,7 +748,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -655,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(
@@ -664,7 +772,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -681,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,
@@ -688,7 +799,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -700,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(
@@ -709,7 +823,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -726,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,
@@ -733,7 +850,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -745,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(
@@ -754,7 +874,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -771,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,
@@ -778,7 +901,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -790,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(
@@ -799,7 +925,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -816,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,
@@ -823,7 +952,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -835,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(
@@ -844,7 +976,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -861,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,
@@ -868,7 +1003,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -880,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(
@@ -889,7 +1027,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -906,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,
@@ -913,7 +1054,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -925,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(
@@ -934,7 +1078,9 @@ 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,
         response_class: Type[Response] = JSONResponse,
         # OpenAPI summary
@@ -951,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,
@@ -958,7 +1105,9 @@ 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,
             response_class=response_class,
             summary=summary,
@@ -970,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-0.3.9.dist-info → starmallow-0.5.0.dist-info}/METADATA

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

{starmallow-0.3.9.dist-info → starmallow-0.5.0.dist-info}/RECORD

@@ -1,21 +1,22 @@
-starmallow/__init__.py,sha256=qxUolB3Gs6F-zlmlo45q_n51vgxqvj4J0kYDV9Rd2CE,322
-starmallow/applications.py,sha256=oZxxLof82QdfK44-q6wUHq9z8_sRGSEVzSQkNvfGKIg,29708
+starmallow/__init__.py,sha256=01Y6juyLnOP83a39nE_mBYK-sEnBIX2SceZ_W32qY9w,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=SBrzmKxzF2q7hNCW_V7j0UV461QERSh9OTtTdTFi6Kg,3597
+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=TFpNIqSvRbgI_NFKGzE6vq0bkqioBrVyprngzVR6J3w,15816
+starmallow/endpoint.py,sha256=YdEtRKF1Z-p_KXoqJJNP_9nEwOzvgxYoMI3Rly7ECrM,15888
 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/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=sy7wbWc20zDjxo5CIR4j1VXlyKsan6i8zPpql0RFrNw,39203
+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
@@ -33,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.3.9.dist-info/METADATA,sha256=SFjwx09PtLdQKW40bKWwSIuYobGkUGuav6EVvWBoxIk,5651
-starmallow-0.3.9.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
-starmallow-0.3.9.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
-starmallow-0.3.9.dist-info/RECORD,,
+starmallow-0.5.0.dist-info/METADATA,sha256=M7Y6uK8nmKdGATGmuX96mPkyvlAlww0xnASnYcddDkE,5651
+starmallow-0.5.0.dist-info/WHEEL,sha256=y1bSCq4r5i4nMmpXeUJMqs3ipKvkZObrIXSvJHm1qCI,87
+starmallow-0.5.0.dist-info/licenses/LICENSE.md,sha256=QelyGgOzch8CXzy6HrYwHh7nmj0rlWkDA0YzmZ3CPaY,1084
+starmallow-0.5.0.dist-info/RECORD,,