muffin-rest 12.0.1__py3-none-any.whl → 12.0.3__py3-none-any.whl

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/options.py

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

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/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.dist-info → muffin_rest-12.0.3.dist-info}/METADATA

@@ -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.dist-info → muffin_rest-12.0.3.dist-info}/RECORD

@@ -5,17 +5,17 @@ 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/__init__.py,sha256=xKwIJtDhQFZBmLUWZrZox9ootK3S4UVy0EZ14oF0L20,4662
 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=VO1d7nzKSxPw9QidNiyNSfMDX46ZCK0a-iFbJyzNXEE,2227
+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/handler.py,sha256=MhRYQokaEt-NIrMdFiJLcZwp4h0A5LKCwHOb36vm5m0,5402
 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
@@ -26,14 +26,14 @@ 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=pZt_3t8I4uU8WssrksdEn8LXS0ytKT4NHioTpFqKDiw,6312
+muffin_rest/sqlalchemy/__init__.py,sha256=GMtnX3C5H9okEYjkaTHXd6Wna8F1Y6YAr1upT-cFOiM,6335
 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.1.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-12.0.1.dist-info/METADATA,sha256=dXgMCxDzBPevm7z9iHGm7okdhQCIRX-R8RGCHUwdjWo,4912
-muffin_rest-12.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-muffin_rest-12.0.1.dist-info/RECORD,,
+muffin_rest-12.0.3.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-12.0.3.dist-info/METADATA,sha256=T3T6CJgnSSKsPNuRdmtGt5rOxG1X88KXopVorg7SldQ,4912
+muffin_rest-12.0.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+muffin_rest-12.0.3.dist-info/RECORD,,