muffin-rest 11.0.3__py3-none-any.whl → 12.0.2__py3-none-any.whl

muffin_rest/api.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import dataclasses as dc
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union, overload
+from typing import TYPE_CHECKING, Any, Callable, overload
 
 from http_router import Router
 from muffin.utils import TV, to_awaitable
@@ -27,11 +27,11 @@ class API:
 
     def __init__(
         self,
-        app: Optional[muffin.Application] = None,
+        app: muffin.Application | None = None,
         prefix: str = "",
         *,
         openapi: bool = True,
-        servers: Optional[list] = None,
+        servers: list | None = None,
         **openapi_info,
     ):
         """Post initialize the API if we have an application already."""
@@ -66,8 +66,8 @@ class API:
         app: muffin.Application,
         *,
         prefix: str = "",
-        openapi: Optional[bool] = None,
-        servers: Optional[list] = None,
+        openapi: bool | None = None,
+        servers: list | None = None,
         **openapi_info,
     ):
         """Initialize the API."""
@@ -100,16 +100,12 @@ class API:
         self.router.route("/openapi.json")(openapi_json)
 
     @overload
-    def route(self, obj: str, *paths: str, **params) -> Callable[[TV], TV]:
-        ...
+    def route(self, obj: str, *paths: str, **params) -> Callable[[TV], TV]: ...
 
     @overload
-    def route(self, obj: TVHandler, *paths: str, **params) -> TVHandler:
-        ...
+    def route(self, obj: TVHandler, *paths: str, **params) -> TVHandler: ...
 
-    def route(
-        self, obj: Union[str, TVHandler], *paths: str, **params
-    ) -> Union[Callable[[TV], TV], TVHandler]:
+    def route(self, obj: str | TVHandler, *paths: str, **params) -> Callable[[TV], TV] | TVHandler:
         """Route an endpoint by the API."""
         from .handler import RESTBase
 

muffin_rest/errors.py

@@ -1,9 +1,10 @@
 """Helpers to raise API errors as JSON responses."""
+
 from __future__ import annotations
 
 import json
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from muffin import ResponseError
 
@@ -16,7 +17,7 @@ class APIError(ResponseError):
 
     def __init__(
         self,
-        content: Optional[TJSON] = None,
+        content: TJSON | None = None,
         *,
         status_code: int = HTTPStatus.BAD_REQUEST.value,
         **json_data,

muffin_rest/handler.py

@@ -9,9 +9,7 @@ from typing import (
     Iterable,
     Literal,
     Mapping,
-    Optional,
     Sequence,
-    Union,
     cast,
     overload,
 )
@@ -31,7 +29,7 @@ from muffin_rest.types import TSchemaRes
 
 from .errors import HandlerNotBindedError
 from .options import RESTOptions
-from .types import TVCollection, TVData, TVResource
+from .types import TVCollection, TVResource
 
 
 class RESTHandlerMeta(HandlerMeta):
@@ -58,22 +56,22 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
     meta: RESTOptions
     meta_class: type[RESTOptions] = RESTOptions
-    _api: Optional[API] = None
+    _api: API | None = None
 
-    filters: Optional[dict[str, Any]] = None
-    sorting: Optional[dict[str, Any]] = None
+    filters: dict[str, Any] | None = None
+    sorting: dict[str, Any] | None = None
 
     class Meta:
         """Tune the handler."""
 
         # Resource filters
-        filters: Sequence[Union[str, tuple[str, str], Filter]] = ()
+        filters: Sequence[str | tuple[str, str] | Filter] = ()
 
         # Define allowed resource sorting params
-        sorting: Sequence[Union[str, tuple[str, dict], Sort]] = ()
+        sorting: Sequence[str | tuple[str, dict] | Sort] = ()
 
         # Serialize/Deserialize Schema class
-        Schema: Optional[type[ma.Schema]] = None
+        Schema: type[ma.Schema] | None = None
 
     @classmethod
     def __route__(cls, router, *paths, **params):
@@ -84,9 +82,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
         else:
             router.bind(cls, f"/{ cls.meta.name }", methods=methods, **params)
-            router.bind(
-                cls, f"/{ cls.meta.name }/{{{ cls.meta.name_id }}}", methods=methods, **params
-            )
+            router.bind(cls, f"/{ cls.meta.name }/{{pk}}", methods=methods, **params)
 
         for _, method in inspect.getmembers(cls, lambda m: hasattr(m, "__route__")):
             paths, methods = method.__route__
@@ -94,7 +90,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
         return cls
 
-    async def __call__(self, request: Request, *, method_name: Optional[str] = None, **_) -> Any:
+    async def __call__(self, request: Request, *, method_name: str | None = None, **_) -> Any:
         """Dispatch the given request by HTTP method."""
         self.auth = await self.authorize(request)
 
@@ -151,7 +147,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
     async def prepare_resource(self, request: Request) -> Any:
         """Load a resource."""
-        return request["path_params"].get(self.meta.name_id)
+        return request["path_params"].get("pk")
 
     async def filter(self, request: Request, collection: TVCollection) -> tuple[TVCollection, Any]:
         """Filter the collection."""
@@ -190,7 +186,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
     @abc.abstractmethod
     async def paginate(
         self, request: Request, *, limit: int = 0, offset: int = 0
-    ) -> tuple[Any, Optional[int]]:
+    ) -> tuple[Any, int | None]:
         """Paginate the results."""
         raise NotImplementedError
 
@@ -215,7 +211,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
     # Parse data
     # -----------
     def get_schema(
-        self, request: Request, *, resource: Optional[TVResource] = None, **schema_options
+        self, request: Request, *, resource: TVResource | None = None, **schema_options
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
         query = request.url.query
@@ -232,36 +228,37 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
         return data
 
-    async def load(
-        self, request: Request, resource: Optional[TVResource] = None, **schema_options
-    ) -> TVData[TVResource]:
+    async def load(self, request: Request, resource: TVResource | None = None, **schema_options):
         """Load data from request and create/update a resource."""
         schema = self.get_schema(request, resource=resource, **schema_options)
-        data = cast("Union[Mapping, list]", await self.load_data(request))
+        data = cast("Mapping | list", await self.load_data(request))
         return cast(
-            "TVData[TVResource]", await load_data(data, schema, partial=resource is not None)
+            "TVResource | list[TVResource]",
+            await load_data(data, schema, partial=resource is not None),
         )
 
     @overload
     async def dump(  # type: ignore[misc]
-        self, request, data: TVData, *, many: Literal[True]
+        self, request, data: TVResource | Iterable[TVResource], *, many: Literal[True]
     ) -> list[TSchemaRes]: ...
 
     @overload
-    async def dump(self, request, data: TVData, *, many: bool = False) -> TSchemaRes: ...
+    async def dump(
+        self, request, data: TVResource | Iterable[TVResource], *, many: bool = False
+    ) -> TSchemaRes: ...
 
     async def dump(
         self,
         request: Request,
-        data: Union[TVResource, Iterable[TVResource]],
+        data: TVResource | Iterable[TVResource],
         *,
         many: bool = False,
-    ) -> Union[TSchemaRes, list[TSchemaRes]]:
+    ) -> TSchemaRes | list[TSchemaRes]:
         """Serialize the given response."""
         schema = self.get_schema(request)
         return schema.dump(data, many=many)
 
-    async def get(self, request: Request, *, resource: Optional[TVResource] = None) -> ResponseJSON:
+    async def get(self, request: Request, *, resource: TVResource | None = None) -> ResponseJSON:
         """Get a resource or a collection of resources.
 
         Specify a path param to load a resource.
@@ -273,9 +270,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         )
         return ResponseJSON(res)  # type: ignore[type-var]
 
-    async def post(
-        self, request: Request, *, resource: Optional[TVResource] = None
-    ) -> ResponseJSON:
+    async def post(self, request: Request, *, resource: TVResource | None = None) -> ResponseJSON:
         """Create a resource.
 
         The method accepts a single resource's data or a list of resources to create.
@@ -290,14 +285,14 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         res = await self.dump(request, data, many=many)
         return ResponseJSON(res)
 
-    async def put(self, request: Request, *, resource: Optional[TVResource] = None) -> ResponseJSON:
+    async def put(self, request: Request, *, resource: TVResource | None = None) -> ResponseJSON:
         """Update a resource."""
         if resource is None:
             raise APIError.NOT_FOUND()
 
         return await self.post(request, resource=resource)
 
-    async def delete(self, request: Request, resource: Optional[TVResource] = None):
+    async def delete(self, request: Request, resource: TVResource | None = None):
         """Delete a resource."""
         if resource is None:
             raise APIError.NOT_FOUND()

muffin_rest/marshmallow.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from marshmallow import Schema, ValidationError
 
@@ -10,7 +10,7 @@ if TYPE_CHECKING:
     from collections.abc import Mapping
 
 
-async def load_data(data: Union[Mapping, list], schema: Optional[Schema] = None, **params):
+async def load_data(data: Mapping | list, schema: Schema | None = None, **params):
     if schema is None:
         return data
 

muffin_rest/mongo/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, cast
+from typing import TYPE_CHECKING, cast
 
 import bson
 from bson.errors import InvalidId
@@ -29,7 +29,7 @@ class MongoRESTOptions(RESTOptions):
     sorting_cls: type[MongoSorting] = MongoSorting
     schema_base: type[MongoSchema] = MongoSchema
 
-    aggregate: Optional[list] = None  # Support aggregation. Set to pipeline.
+    aggregate: list | None = None  # Support aggregation. Set to pipeline.
     collection_id: str = "_id"
     collection: motor.AsyncIOMotorCollection
 
@@ -58,7 +58,7 @@ class MongoRESTHandler(RESTHandler[TVResource]):
 
     async def paginate(
         self, _: Request, *, limit: int = 0, offset: int = 0
-    ) -> tuple[motor.AsyncIOMotorCursor, Optional[int]]:
+    ) -> tuple[motor.AsyncIOMotorCursor, int | None]:
         """Paginate collection."""
         if self.meta.aggregate:
             pipeline_all = [*self.meta.aggregate, {"$skip": offset}, {"$limit": limit}]
@@ -76,7 +76,7 @@ class MongoRESTHandler(RESTHandler[TVResource]):
             total = await self.collection.count()
         return self.collection.skip(offset).limit(limit), total
 
-    async def get(self, request, *, resource: Optional[TVResource] = None):
+    async def get(self, request, *, resource: TVResource | None = None):
         """Get resource or collection of resources."""
         if resource:
             return await self.dump(request, resource)
@@ -84,9 +84,9 @@ class MongoRESTHandler(RESTHandler[TVResource]):
         docs = await self.collection.to_list(None)
         return await self.dump(request, docs, many=True)
 
-    async def prepare_resource(self, request: Request) -> Optional[TVResource]:
+    async def prepare_resource(self, request: Request) -> TVResource | None:
         """Load a resource."""
-        pk = request["path_params"].get(self.meta.name_id)
+        pk = request["path_params"].get("pk")
         if not pk:
             return None
 
@@ -98,7 +98,7 @@ class MongoRESTHandler(RESTHandler[TVResource]):
             raise APIError.NOT_FOUND() from exc
 
     def get_schema(
-        self, request: Request, resource: Optional[TVResource] = None, **schema_options
+        self, request: Request, resource: TVResource | None = None, **schema_options
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
         return super().get_schema(request, instance=resource, **schema_options)
@@ -116,7 +116,7 @@ class MongoRESTHandler(RESTHandler[TVResource]):
 
         return resource
 
-    async def delete(self, request: Request, resource: Optional[TVResource] = None):
+    async def delete(self, request: Request, resource: TVResource | None = None):
         """Remove the given resource(s)."""
         meta = self.meta
         oids = (

muffin_rest/mongo/utils.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Awaitable, Union
+from typing import TYPE_CHECKING, Awaitable
 
 if TYPE_CHECKING:
     from motor import motor_asyncio as motor
@@ -58,7 +58,7 @@ class MongoChain:
 
     def find(
         self,
-        query: Union[list, dict, None] = None,
+        query: list | dict | None = None,
         projection=None,
     ) -> MongoChain:
         """Store filters in self."""
@@ -68,7 +68,7 @@ class MongoChain:
 
     def find_one(
         self,
-        query: Union[list, dict, None] = None,
+        query: list | dict | None = None,
         projection=None,
     ) -> Awaitable:
         """Apply filters and return cursor."""

muffin_rest/openapi.py

@@ -199,9 +199,7 @@ class OpenAPIMixin:
         schema_ref = {"$ref": f"#/components/schemas/{ meta.Schema.__name__ }"}
         for method in route_to_methods(route):
             operations[method] = {"tags": [tags[cls]]}
-            is_resource_route = isinstance(route, DynamicRoute) and route.params.get(
-                meta.name_id,
-            )
+            is_resource_route = isinstance(route, DynamicRoute) and route.params.get("pk")
 
             if method == "get" and not is_resource_route:
                 operations[method]["parameters"] = []

muffin_rest/options.py

@@ -12,7 +12,6 @@ class RESTOptions:
     """Handler Options."""
 
     name: str = ""
-    name_id: str = "id"
     base_property: str = "name"
 
     # Pagination

muffin_rest/peewee/filters.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import operator
 from functools import reduce
-from typing import TYPE_CHECKING, ClassVar, Union, cast
+from typing import TYPE_CHECKING, ClassVar, cast
 
 from peewee import ColumnBase, Field, ModelSelect
 
@@ -54,7 +54,7 @@ class PWFilters(Filters):
 
     MUTATE_CLASS: type[PWFilter] = PWFilter
 
-    def convert(self, obj: Union[str, Field, PWFilter], **meta):
+    def convert(self, obj: str | Field | PWFilter, **meta):
         """Convert params to filters."""
 
         handler = cast("PWRESTHandler", self.handler)

muffin_rest/peewee/handler.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Union, cast, overload
+from typing import TYPE_CHECKING, Any, cast, overload
 
 import marshmallow as ma
 from apispec.ext.marshmallow import MarshmallowPlugin
@@ -34,7 +34,7 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
 
     if TYPE_CHECKING:
         resource: TVModel
-        collection: Union[AIOModelSelect, pw.ModelSelect]
+        collection: AIOModelSelect | pw.ModelSelect
 
     meta: PWRESTOptions
     meta_class: type[PWRESTOptions] = PWRESTOptions
@@ -56,9 +56,9 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
         """Initialize Peeewee QuerySet for a binded to the resource model."""
         return self.meta.model.select()
 
-    async def prepare_resource(self, request: Request) -> Optional[TVModel]:
+    async def prepare_resource(self, request: Request) -> TVModel | None:
         """Load a resource."""
-        pk = request["path_params"].get(self.meta.name_id)
+        pk = request["path_params"].get("pk")
         if not pk:
             return None
 
@@ -101,7 +101,7 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
 
         return self.collection.offset(offset).limit(limit), count
 
-    async def get(self, request, *, resource: Optional[TVModel] = None) -> Any:
+    async def get(self, request, *, resource: TVModel | None = None) -> Any:
         """Get resource or collection of resources."""
         if resource:
             return await self.dump(request, resource)
@@ -120,7 +120,7 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
 
         return resource
 
-    async def remove(self, request: Request, resource: Optional[TVModel] = None):
+    async def remove(self, request: Request, resource: TVModel | None = None):
         """Remove the given resource."""
         meta = self.meta
         if resource:
@@ -147,11 +147,11 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
 
         return resource.get_id() if resource else [r.get_id() for r in resources]
 
-    async def delete(self, request: Request, resource: Optional[TVModel] = None):  # type: ignore[override]
+    async def delete(self, request: Request, resource: TVModel | None = None):  # type: ignore[override]
         return await self.remove(request, resource)
 
     def get_schema(
-        self, request: Request, *, resource: Optional[TVModel] = None, **schema_options
+        self, request: Request, *, resource: TVModel | None = None, **schema_options
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
         return super().get_schema(request, instance=resource, **schema_options)

muffin_rest/peewee/openapi.py

@@ -22,7 +22,7 @@ class PeeweeOpenAPIMixin(OpenAPIMixin):
     def openapi(cls, route: Route, spec: APISpec, tags: dict) -> dict:
         """Get openapi specs for the endpoint."""
         operations = super(PeeweeOpenAPIMixin, cls).openapi(route, spec, tags)
-        is_resource_route = getattr(route, "params", {}).get(cls.meta.name_id)
+        is_resource_route = getattr(route, "params", {}).get("pk")
         if not is_resource_route and "delete" in operations:
             operations["delete"].setdefault("parameters", [])
             operations["delete"]["requestBody"] = {

muffin_rest/peewee/sorting.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union, cast
+from typing import TYPE_CHECKING, cast
 
 from peewee import Field
 
@@ -35,7 +35,7 @@ class PWSorting(Sorting):
         """Prepare collection for sorting."""
         return collection.order_by()
 
-    def convert(self, obj: Union[str, Field, PWSort], **meta):
+    def convert(self, obj: str | Field | PWSort, **meta):
         """Prepare sorters."""
 
         if isinstance(obj, PWSort):

muffin_rest/peewee/utils.py

@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 from warnings import warn
 
 if TYPE_CHECKING:
     from peewee import Field
 
 
-def get_model_field_by_name(handler, name: str, *, stacklevel=5) -> Optional[Field]:
+def get_model_field_by_name(handler, name: str, *, stacklevel=5) -> Field | None:
     """Get model field by name."""
     fields = handler.meta.model._meta.fields
     candidate = fields.get(name)

muffin_rest/sqlalchemy/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import marshmallow as ma
 import sqlalchemy as sa
@@ -18,7 +18,6 @@ if TYPE_CHECKING:
     from muffin import Request
     from muffin_databases import Plugin as Database
 
-    from muffin_rest.types import TVData
 
 from .types import TVResource
 
@@ -101,7 +100,7 @@ class SARESTOptions(RESTOptions):
                     "unknown": self.schema_unknown,
                     "table": self.table,
                     "include_fk": True,
-                    "dump_only": (self.name_id,),
+                    "dump_only": (self.table_pk.name,),
                 },
                 **self.schema_meta,
             ),
@@ -125,7 +124,7 @@ class SARESTHandler(RESTHandler[TVResource]):
         *,
         limit: int = 0,
         offset: int = 0,
-    ) -> tuple[sa.sql.Select, Optional[int]]:
+    ) -> tuple[sa.sql.Select, int | None]:
         """Paginate the collection."""
         sqs = self.collection.order_by(None).subquery()
         qs = sa.select(sa.func.count()).select_from(sqs)
@@ -134,7 +133,7 @@ class SARESTHandler(RESTHandler[TVResource]):
             total = await self.meta.database.fetch_val(qs)
         return self.collection.offset(offset).limit(limit), total
 
-    async def get(self, request, *, resource: Optional[TVResource] = None) -> Any:
+    async def get(self, request, *, resource: TVResource | None = None) -> Any:
         """Get resource or collection of resources."""
         if resource:
             return await self.dump(request, resource)
@@ -142,9 +141,9 @@ class SARESTHandler(RESTHandler[TVResource]):
         rows = await self.meta.database.fetch_all(self.collection)
         return await self.dump(request, rows, many=True)
 
-    async def prepare_resource(self, request: Request) -> Optional[TVResource]:
+    async def prepare_resource(self, request: Request) -> TVResource | None:
         """Load a resource."""
-        pk = request["path_params"].get(self.meta.name_id)
+        pk = request["path_params"].get("pk")
         if not pk:
             return None
 
@@ -155,12 +154,12 @@ class SARESTHandler(RESTHandler[TVResource]):
         return cast("TVResource", dict(resource))
 
     def get_schema(
-        self, request: Request, *, resource: Optional[TVResource] = None, **schema_options
+        self, request: Request, *, resource: TVResource | None = None, **schema_options
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
         return super().get_schema(request, instance=resource, **schema_options)
 
-    async def save(self, _: Request, resource: TVData[TVResource], *, update=False):
+    async def save(self, request: Request, resource: TVResource, *, update=False):
         """Save the given resource."""
         meta = self.meta
         insert_query = meta.table.insert()
@@ -174,7 +173,7 @@ class SARESTHandler(RESTHandler[TVResource]):
 
         return resource
 
-    async def remove(self, request: Request, resource: Optional[TVResource] = None):
+    async def remove(self, request: Request, resource: TVResource | None = None):
         """Remove the given resource."""
         table_pk = cast("sa.Column", self.meta.table_pk)
         pks = [resource[table_pk.name]] if resource else await request.data()

muffin_rest/sqlalchemy/filters.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, ClassVar, Union, cast
+from typing import TYPE_CHECKING, Any, ClassVar, cast
 
 from sqlalchemy import Column
 
@@ -50,7 +50,7 @@ class SAFilters(Filters):
 
     MUTATE_CLASS = SAFilter
 
-    def convert(self, obj: Union[str, Column, SAFilter], **meta):
+    def convert(self, obj: str | Column | SAFilter, **meta):
         """Convert params to filters."""
 
         handler = cast("SARESTHandler", self.handler)

muffin_rest/sqlalchemy/sorting.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union, cast
+from typing import TYPE_CHECKING, cast
 
 from sqlalchemy import Column
 
@@ -36,7 +36,7 @@ class SASorting(Sorting):
 
     MUTATE_CLASS = SASort
 
-    def convert(self, obj: Union[str, Column, SASort], **meta):
+    def convert(self, obj: str | Column | SASort, **meta):
         """Prepare sorters."""
 
         if isinstance(obj, SASort):

muffin_rest/types.py

@@ -4,7 +4,6 @@ from typing import (
     Awaitable,
     Callable,
     TypeVar,
-    Union,
 )
 
 if TYPE_CHECKING:
@@ -14,7 +13,6 @@ from muffin import Request
 
 TVCollection = TypeVar("TVCollection", bound=Any)
 TVResource = TypeVar("TVResource", bound=Any)
-TVData = Union[TVResource, list[TVResource]]
 TAuth = Callable[[Request], Awaitable]
 TVAuth = TypeVar("TVAuth", bound=TAuth)
 TVHandler = TypeVar("TVHandler", bound=type["RESTBase"])

{muffin_rest-11.0.3.dist-info → muffin_rest-12.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: muffin-rest
-Version: 11.0.3
+Version: 12.0.2
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 License: MIT
 Keywords: rest,api,muffin,asgi,asyncio,trio

muffin_rest-12.0.2.dist-info/RECORD

@@ -0,0 +1,39 @@
+muffin_rest/__init__.py,sha256=JnwsHQNDmJpOqETeIjjPheG891T5WQ0JBaiEV72Wcmg,1242
+muffin_rest/api.py,sha256=bdbXMPiZi5yXf7_u3XB_gaGDHZKzDPqnnFnrwHoO1Rs,3799
+muffin_rest/errors.py,sha256=Todg7CrCE1ufOsyyARI2Bv-RqNPH4Rl1p-Tkpq7VYrA,1151
+muffin_rest/filters.py,sha256=nWlwDLuId-mmP3tgZjp1joYCVx0k9ekV42fPIMMKphM,5920
+muffin_rest/handler.py,sha256=qpG4ioIagdYqGFOrlT7pBx-0czgS2ZI3AvqKXz9EzcA,10762
+muffin_rest/limits.py,sha256=Fnlu4Wj3B-BzpahLK-rDbd1GEd7CEQ3zxyOD0vee7GE,2007
+muffin_rest/marshmallow.py,sha256=-MyMKiaMTfiWw4y-4adpfoQd05HV1vEKqSXJh8eD3xg,548
+muffin_rest/mongo/__init__.py,sha256=oPfTF_cG4LD1TDm-RoyxhSS1pVDXConCKQf9rz2QlZM,4644
+muffin_rest/mongo/filters.py,sha256=yIxIDVqMn6SoDgVhCqiTxYetw0hoaf_3jIvX2Vnizok,964
+muffin_rest/mongo/schema.py,sha256=y4OEPQnlV_COTIIQ3cKmpqDpD2r18eAWn0rijQldWm0,1205
+muffin_rest/mongo/sorting.py,sha256=iJBnaFwE7g_JMwpGpQkoqSqbQK9XULx1K3skiRRgLgY,870
+muffin_rest/mongo/types.py,sha256=jaODScgwwYbzHis3DY4bPzU1ahiMJMSwquH5_Thi-Gg,200
+muffin_rest/mongo/utils.py,sha256=jirD2Hxk28Wadpq_F08t40dYBygq6W1_0cD3261kCgo,3949
+muffin_rest/openapi.py,sha256=VrkyZr_T0ykAQsvkFQ_yarZ-Zs55AmAGf4aNLsUdjGA,8715
+muffin_rest/options.py,sha256=Mzv0mq6YylL6cNtad9JhEhkmA4RgmDsu-On2hn5VEiw,2208
+muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
+muffin_rest/peewee/filters.py,sha256=8CqleDEn4vVQvBLXEaGOjM2N7sY117EQ4GThPhlDPE8,2494
+muffin_rest/peewee/handler.py,sha256=qu-ma1zhMGvzVbqpBEdSkify2UbffT58SLjWUoT_1ws,5418
+muffin_rest/peewee/openapi.py,sha256=ktgsmB9wFNvcTbTaDkMQFLdQxk3osDFW5LkUSFVjcQo,1093
+muffin_rest/peewee/options.py,sha256=TimJtErC9e8B7BRiEkHiBZd71_bZbYr-FE2PIlQvfH0,1455
+muffin_rest/peewee/schemas.py,sha256=hQG2UKR7gEMsz0n75L3tvkVzUX3baXMJ94emgIc1Scw,439
+muffin_rest/peewee/sorting.py,sha256=aBtQkj3iSo6XjBZ8evJuprIkhv1nHFi7wFb0an6Dn34,1963
+muffin_rest/peewee/types.py,sha256=cgCXhpGHkImKwudA1lulZHz5oJswHH168AiW5MhZRCM,155
+muffin_rest/peewee/utils.py,sha256=8wTSKmjeD3qtF5NFHX1wkBn4jiXFvCzNEK9WW7r_JmI,693
+muffin_rest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+muffin_rest/redoc.html,sha256=GtuHIMvTuSi8Ro6bgI-G8VB94AljMyfjcZseqtBmGCY,559
+muffin_rest/schemas.py,sha256=BW3dF82C6Q6STs4tZjej1x8Ii1rI3EZUJZR4mNNKmu4,875
+muffin_rest/sorting.py,sha256=nu4SGW5uxLETJIywE-1UTCCya9QAvYWcq-P8dPWQixI,2822
+muffin_rest/sqlalchemy/__init__.py,sha256=yTDmK93rCxNUeJKuKkr9JvklUXFO0BIj2uc532NZvBM,6323
+muffin_rest/sqlalchemy/filters.py,sha256=Lf1nPOQjDT7Nv1HAwowfWYTHWCrIMpw-4aWwoaNVlVU,2475
+muffin_rest/sqlalchemy/sorting.py,sha256=qmzP18ongriCGs2Ok_OllEybqWgppU-Kakg0JL1DM_M,1690
+muffin_rest/sqlalchemy/types.py,sha256=Exm-zAQCtPAwXvYcCTtPRqSa-wTEWRcH_v2YSsJkB6s,198
+muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
+muffin_rest/types.py,sha256=5NY9gPTIptv6U2Qab2xMXlS_jZuTuR0bquFFwWRURcA,510
+muffin_rest/utils.py,sha256=c08E4HJ4SLYC-91GKPEbsyKTZ4sZbTN4qDqJbNg_HTE,2076
+muffin_rest-12.0.2.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-12.0.2.dist-info/METADATA,sha256=IgPneGVrSh5ADttBAGlNenSsgHmwITIIWeZmzRnLgDE,4912
+muffin_rest-12.0.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+muffin_rest-12.0.2.dist-info/RECORD,,

muffin_rest-11.0.3.dist-info/RECORD

@@ -1,39 +0,0 @@
-muffin_rest/__init__.py,sha256=JnwsHQNDmJpOqETeIjjPheG891T5WQ0JBaiEV72Wcmg,1242
-muffin_rest/api.py,sha256=zssoHjqTsa8UCAyxj6TxQVluYPX9Sigyiph6SRxBY6I,3870
-muffin_rest/errors.py,sha256=mxEBhNPo3pwpG2em6zaQonbfRgHFBJ3I8WunVYWDjvM,1163
-muffin_rest/filters.py,sha256=nWlwDLuId-mmP3tgZjp1joYCVx0k9ekV42fPIMMKphM,5920
-muffin_rest/handler.py,sha256=lgZ0KVnzVye8eMZ4qPuo-cSCvg8Vh_fFfTw5g7pJNio,10878
-muffin_rest/limits.py,sha256=Fnlu4Wj3B-BzpahLK-rDbd1GEd7CEQ3zxyOD0vee7GE,2007
-muffin_rest/marshmallow.py,sha256=UeHxZLtETlrheDAlMZn7Xv_7vWPxvJQo-sj05nql9gM,574
-muffin_rest/mongo/__init__.py,sha256=AVOM6ydkEZ4CAOefOlpNnDx0dlD65LdhAkLh_VR8Qf4,4685
-muffin_rest/mongo/filters.py,sha256=yIxIDVqMn6SoDgVhCqiTxYetw0hoaf_3jIvX2Vnizok,964
-muffin_rest/mongo/schema.py,sha256=y4OEPQnlV_COTIIQ3cKmpqDpD2r18eAWn0rijQldWm0,1205
-muffin_rest/mongo/sorting.py,sha256=iJBnaFwE7g_JMwpGpQkoqSqbQK9XULx1K3skiRRgLgY,870
-muffin_rest/mongo/types.py,sha256=jaODScgwwYbzHis3DY4bPzU1ahiMJMSwquH5_Thi-Gg,200
-muffin_rest/mongo/utils.py,sha256=_6J-FYfU2OIjgFLF9JHRr98vHLzW4ACeL62pBXiuF_M,3966
-muffin_rest/openapi.py,sha256=kpynUbNmK78L-2xTbn13FBgmPWLPGMKF_yejVGfHLwg,8754
-muffin_rest/options.py,sha256=38y7AasyAghXNffxX-3xgqLbWDQ1RxAhg77ze7c0Mu0,2232
-muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
-muffin_rest/peewee/filters.py,sha256=BL6Zd8TI7wc7ZacZJTPVmTPfsKk6v8Z634HA5t798c0,2506
-muffin_rest/peewee/handler.py,sha256=qiJNZRj-7wHO9Fdkt8uV_lPmWJtBvjZQL-I6z5_BvXQ,5469
-muffin_rest/peewee/openapi.py,sha256=lDnLnoXi33p0YeFVwRgaVrndyrG2XL93RH-BzbxinOY,1105
-muffin_rest/peewee/options.py,sha256=TimJtErC9e8B7BRiEkHiBZd71_bZbYr-FE2PIlQvfH0,1455
-muffin_rest/peewee/schemas.py,sha256=hQG2UKR7gEMsz0n75L3tvkVzUX3baXMJ94emgIc1Scw,439
-muffin_rest/peewee/sorting.py,sha256=3IQzA1UfMRXl6NAp1yUyTv9-pNSkObtwI1-oZdbetQc,1975
-muffin_rest/peewee/types.py,sha256=cgCXhpGHkImKwudA1lulZHz5oJswHH168AiW5MhZRCM,155
-muffin_rest/peewee/utils.py,sha256=wrDcEEeCMzK4GdMSBi7BX0XpBPRZ6pF_EHwDsZPgL1s,706
-muffin_rest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-muffin_rest/redoc.html,sha256=GtuHIMvTuSi8Ro6bgI-G8VB94AljMyfjcZseqtBmGCY,559
-muffin_rest/schemas.py,sha256=BW3dF82C6Q6STs4tZjej1x8Ii1rI3EZUJZR4mNNKmu4,875
-muffin_rest/sorting.py,sha256=nu4SGW5uxLETJIywE-1UTCCya9QAvYWcq-P8dPWQixI,2822
-muffin_rest/sqlalchemy/__init__.py,sha256=pO6flB9vg3neaEZLp2hFBte2M0ImrssG1gQLjuuqg_4,6398
-muffin_rest/sqlalchemy/filters.py,sha256=hmjvxsJF0ddePgrLZ1DPmQ8vd5QwPTTlza3xOZZHquk,2487
-muffin_rest/sqlalchemy/sorting.py,sha256=OcuNdgd2__AWXJhlfykqIyTOqAKpyZ3WrK_acNT_t6c,1702
-muffin_rest/sqlalchemy/types.py,sha256=Exm-zAQCtPAwXvYcCTtPRqSa-wTEWRcH_v2YSsJkB6s,198
-muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
-muffin_rest/types.py,sha256=m27-g6BI7qdSWGym4fWALBJa2ZpWR0_m0nlrDx7iTCo,566
-muffin_rest/utils.py,sha256=c08E4HJ4SLYC-91GKPEbsyKTZ4sZbTN4qDqJbNg_HTE,2076
-muffin_rest-11.0.3.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-11.0.3.dist-info/METADATA,sha256=AOTpoLl7eDiaxX86rrwNlfeEFP6t6tDsAW02FBxzgMU,4912
-muffin_rest-11.0.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-muffin_rest-11.0.3.dist-info/RECORD,,