muffin-rest 12.0.1__tar.gz → 12.0.3__tar.gz

{muffin_rest-12.0.1 → muffin_rest-12.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: muffin-rest
-Version: 12.0.1
+Version: 12.0.3
 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.1 → muffin_rest-12.0.3}/muffin_rest/mongo/__init__.py

@@ -52,12 +52,12 @@ class MongoRESTHandler(RESTHandler[TVResource]):
     meta: MongoRESTOptions
     meta_class: type[MongoRESTOptions] = MongoRESTOptions
 
-    async def prepare_collection(self, _: Request) -> MongoChain:
+    async def prepare_collection(self, request: Request) -> MongoChain:
         """Initialize Peeewee QuerySet for a binded to the resource model."""
         return MongoChain(self.meta.collection)
 
     async def paginate(
-        self, _: Request, *, limit: int = 0, offset: int = 0
+        self, request: Request, *, limit: int = 0, offset: int = 0
     ) -> tuple[motor.AsyncIOMotorCursor, int | None]:
         """Paginate collection."""
         if self.meta.aggregate:
@@ -103,7 +103,7 @@ class MongoRESTHandler(RESTHandler[TVResource]):
         """Initialize marshmallow schema for serialization/deserialization."""
         return super().get_schema(request, instance=resource, **schema_options)
 
-    async def save(self, _: Request, resource: TVResource, *, update=False) -> TVResource:
+    async def save(self, request: Request, resource: TVResource, *, update=False) -> TVResource:
         """Save the given resource."""
         meta = self.meta
         collection_id = meta.collection_id

{muffin_rest-12.0.1 → muffin_rest-12.0.3}/muffin_rest/options.py

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

{muffin_rest-12.0.1 → muffin_rest-12.0.3}/muffin_rest/peewee/handler.py

@@ -42,17 +42,17 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
     @overload
     async def prepare_collection(
         self: PWRESTBase[TVAIOModel],
-        _: Request,
+        request: Request,
     ) -> AIOModelSelect[TVAIOModel]: ...
 
     @overload
     async def prepare_collection(
         self: PWRESTBase[pw.Model],
-        _: Request,
+        request: Request,
     ) -> pw.ModelSelect: ...
 
     # NOTE: there is not a default sorting for peewee (conflict with muffin-admin)
-    async def prepare_collection(self, _: Request):  # type: ignore[override]
+    async def prepare_collection(self, request: Request):
         """Initialize Peeewee QuerySet for a binded to the resource model."""
         return self.meta.model.select()
 
@@ -78,15 +78,15 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
 
     @overload
     async def paginate(
-        self: PWRESTBase[TVAIOModel], _: Request, *, limit: int = 0, offset: int = 0
+        self: PWRESTBase[TVAIOModel], request: Request, *, limit: int = 0, offset: int = 0
     ) -> tuple[AIOModelSelect[TVAIOModel], int | None]: ...
 
     @overload
     async def paginate(
-        self: PWRESTBase[pw.Model], _: Request, *, limit: int = 0, offset: int = 0
+        self: PWRESTBase[pw.Model], request: Request, *, limit: int = 0, offset: int = 0
     ) -> tuple[pw.ModelSelect, int | None]: ...
 
-    async def paginate(self, _: Request, *, limit: int = 0, offset: int = 0):  # type: ignore[override]
+    async def paginate(self, request: Request, *, limit: int = 0, offset: int = 0):
         """Paginate the collection."""
         if self.meta.limit_total:
             cqs = cast("pw.ModelSelect", self.collection.order_by())

{muffin_rest-12.0.1 → muffin_rest-12.0.3}/muffin_rest/sqlalchemy/__init__.py

@@ -100,7 +100,7 @@ class SARESTOptions(RESTOptions):
                     "unknown": self.schema_unknown,
                     "table": self.table,
                     "include_fk": True,
-                    "dump_only": (self.pk,),
+                    "dump_only": (self.table_pk.name,),
                 },
                 **self.schema_meta,
             ),
@@ -114,13 +114,13 @@ class SARESTHandler(RESTHandler[TVResource]):
     meta_class: type[SARESTOptions] = SARESTOptions
     collection: sa.sql.Select
 
-    async def prepare_collection(self, _: Request) -> sa.sql.Select:
+    async def prepare_collection(self, request: Request) -> sa.sql.Select:
         """Initialize Peeewee QuerySet for a binded to the resource model."""
         return self.meta.table.select()
 
     async def paginate(
         self,
-        _: Request,
+        request: Request,
         *,
         limit: int = 0,
         offset: int = 0,

{muffin_rest-12.0.1 → muffin_rest-12.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin-rest"
-version = "12.0.1"
+version = "12.0.3"
 description = "The package provides enhanced support for writing REST APIs with Muffin framework"
 readme = "README.md"
 homepage = "https://github.com/klen/muffin-rest"