muffin-rest 6.0.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

muffin_rest/handler.py

@@ -53,7 +53,6 @@ class RESTHandlerMeta(HandlerMeta):
 
 
 class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
-
     """Load/save resources."""
 
     auth: Any
@@ -207,20 +206,20 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
 
     # Parse data
     # -----------
-    async def get_schema(self, request: Request, **_) -> ma.Schema:
+    def get_schema(
+        self, request: Request, *, resource: Optional[TVResource] = None, **options
+    ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
-        assert self.meta.Schema, "RESTHandler.meta.Schema is required."
         query = request.url.query
-        return self.meta.Schema(
-            only=query.get("schema_only"),
-            exclude=query.get("schema_exclude", ()),
-        )
+        options.setdefault("only", query.get("schema_only"))
+        options.setdefault("exclude", query.get("schema_exclude", ()))
+        return self.meta.Schema(**options)
 
     async def load(
         self, request: Request, resource: Optional[TVResource] = None
     ) -> TVData[TVResource]:
         """Load data from request and create/update a resource."""
-        schema = await self.get_schema(request, resource=resource)
+        schema = self.get_schema(request, resource=resource)
         return cast(
             TVData[TVResource], await load_data(request, schema, partial=resource is not None)
         )
@@ -244,8 +243,7 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         **dump_schema_opts,
     ) -> Union[TSchemaRes, List[TSchemaRes]]:
         """Serialize the given response."""
-        resource = data if not many else None
-        schema = await self.get_schema(request, resource=resource)
+        schema = self.get_schema(request)
         return schema.dump(data, many=many, **dump_schema_opts)
 
     async def get(self, request: Request, *, resource: Optional[TVResource] = None) -> ResponseJSON:

muffin_rest/mongo/__init__.py

@@ -94,26 +94,18 @@ class MongoRESTHandler(RESTHandler[TVResource]):
         except InvalidId as exc:
             raise APIError.NOT_FOUND() from exc
 
-    async def get_schema(
-        self, request: Request, resource: Optional[TVResource] = None, **_
+    def get_schema(
+        self, request: Request, resource: Optional[TVResource] = None, **options
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
-        return self.meta.Schema(
-            instance=resource,
-            only=request.url.query.get("schema_only"),
-            exclude=request.url.query.get("schema_exclude", ()),
-        )
-
-    async def save(
-        self, _: Request, resource: TVResource, *, update=False
-    ) -> TVResource:
+        return super().get_schema(request, instance=resource, **options)
+
+    async def save(self, _: Request, resource: TVResource, *, update=False) -> TVResource:
         """Save the given resource."""
         meta = self.meta
         collection_id = meta.collection_id
         if update:
-            await self.collection.replace_one(
-                {collection_id: resource[collection_id]}, resource
-            )
+            await self.collection.replace_one({collection_id: resource[collection_id]}, resource)
 
         else:
             updated = await meta.collection.insert_one(resource)
@@ -124,11 +116,7 @@ class MongoRESTHandler(RESTHandler[TVResource]):
     async def delete(self, request: Request, resource: Optional[TVResource] = None):
         """Remove the given resource(s)."""
         meta = self.meta
-        oids = (
-            [resource[meta.collection_id]]
-            if resource
-            else cast(List[str], await request.data())
-        )
+        oids = [resource[meta.collection_id]] if resource else cast(List[str], await request.data())
         if not oids:
             raise APIError.NOT_FOUND()
 

muffin_rest/peewee/handler.py

@@ -152,15 +152,11 @@ class PWRESTBase(RESTBase[TVModel], PeeweeOpenAPIMixin):
     async def delete(self, request: Request, resource: Optional[TVModel] = None):
         return await self.remove(request, resource)
 
-    async def get_schema(
-        self, request: Request, resource: Optional[TVModel] = None, **_
+    def get_schema(
+        self, request: Request, *, resource: Optional[TVModel] = None, **options
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
-        return self.meta.Schema(
-            instance=resource,
-            only=request.url.query.get("schema_only"),
-            exclude=request.url.query.get("schema_exclude", ()),
-        )
+        return super().get_schema(request, instance=resource, **options)
 
 
 class PWRESTHandler(PWRESTBase[TVModel], PeeweeOpenAPIMixin):

muffin_rest/sqlalchemy/__init__.py

@@ -35,9 +35,7 @@ class SQLAlchemyAutoSchema(BaseSQLAlchemyAutoSchema):
 
         https://github.com/encode/databases/issues/72
         """
-        cols_to_fields = {
-            f.attribute or f.name: f for f in self.declared_fields.values()
-        }
+        cols_to_fields = {f.attribute or f.name: f for f in self.declared_fields.values()}
         if not partial:
             for column in self.opts.table.columns:
                 field = cols_to_fields.get(column.name)
@@ -155,19 +153,15 @@ class SARESTHandler(RESTHandler[TVResource]):
             raise APIError.NOT_FOUND("Resource not found")
         return cast(TVResource, dict(resource))
 
-    async def get_schema(
+    def get_schema(
         self,
         request: Request,
         *,
         resource: Optional[TVResource] = None,
-        **_,
+        **options,
     ) -> ma.Schema:
         """Initialize marshmallow schema for serialization/deserialization."""
-        return self.meta.Schema(
-            instance=resource,
-            only=request.url.query.get("schema_only"),
-            exclude=request.url.query.get("schema_exclude", ()),
-        )
+        return super().get_schema(request, instance=resource, **options)
 
     async def save(self, _: Request, resource: TVData[TVResource], *, update=False):
         """Save the given resource."""
@@ -175,15 +169,11 @@ class SARESTHandler(RESTHandler[TVResource]):
         insert_query = meta.table.insert()
         table_pk = cast(sa.Column, meta.table_pk)
         if update:
-            update_query = self.meta.table.update().where(
-                table_pk == resource[table_pk.name]
-            )
+            update_query = self.meta.table.update().where(table_pk == resource[table_pk.name])
             await meta.database.execute(update_query, resource)
 
         else:
-            resource[table_pk.name] = await meta.database.execute(
-                insert_query, resource
-            )
+            resource[table_pk.name] = await meta.database.execute(insert_query, resource)
 
         return resource
 

{muffin_rest-6.0.1.dist-info → muffin_rest-7.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin-rest
-Version: 6.0.1
+Version: 7.0.0
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 Home-page: https://github.com/klen/muffin-rest
 License: MIT

{muffin_rest-6.0.1.dist-info → muffin_rest-7.0.0.dist-info}/RECORD

@@ -2,9 +2,9 @@ muffin_rest/__init__.py,sha256=NBZeOEJgQHtFFhVgd9d0fpApFRgU405sbm0cu1y1MOU,1242
 muffin_rest/api.py,sha256=gCqRb5PgKEMkE84Y0ZnJw_laVRmVWZRxzBqBv0ns6w8,3882
 muffin_rest/errors.py,sha256=TIXSADZYSwx70dOVPRAzuNwGLfpLuzZZ1ugMZMwIGDo,1169
 muffin_rest/filters.py,sha256=7oO_K5s51Q8FANb_-emKKms_9LBbrHdrS1_zp7Kqcgo,5607
-muffin_rest/handler.py,sha256=_G7hRCrrH4tQRt2S97BvRAQBiewEZx2FmboeS9p9XQY,10080
+muffin_rest/handler.py,sha256=6xgqFPuMXHxKcTXBl48TvzjMKBP-Bhp1AKCp8WZ1ams,10022
 muffin_rest/marshmallow.py,sha256=hHPLTLdaSz5jTLWBqyHeOwo2xfBv7aMIuJFD_trHRuE,715
-muffin_rest/mongo/__init__.py,sha256=5MPiQi4gxfYKj8E2OvpCRMPSqooXfQ8f_peEhrLi-XQ,4805
+muffin_rest/mongo/__init__.py,sha256=uqshETgrSLY0YuHeCVXANXLpmPLXUs_2pBXA5JgteE8,4592
 muffin_rest/mongo/filters.py,sha256=y2FleM_BqkICKGq3PmM_StOgKlE7RoSxt2NdQfCvnOE,921
 muffin_rest/mongo/schema.py,sha256=y4OEPQnlV_COTIIQ3cKmpqDpD2r18eAWn0rijQldWm0,1205
 muffin_rest/mongo/sorting.py,sha256=iJBnaFwE7g_JMwpGpQkoqSqbQK9XULx1K3skiRRgLgY,870
@@ -14,7 +14,7 @@ muffin_rest/openapi.py,sha256=XNhU4EffbKvFKr1HMCqFM-ZrukPqLyZwm3aJe2dNs40,8770
 muffin_rest/options.py,sha256=PcrGY1qq3exgOdeJp8tYYC2V83c5vVMQrARgUkxrNTM,1927
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
 muffin_rest/peewee/filters.py,sha256=ziqpD7uH9vzx_yHKUpOYmduNmM8w-8b7CtRaSoCqECU,2382
-muffin_rest/peewee/handler.py,sha256=y7FnayK2lTDMYG2lnrgBEDBUuXd3ZEAd4VXQXuNxWCM,5378
+muffin_rest/peewee/handler.py,sha256=oUkPFfNQT2vg5duptwFBldQZjHY_W3DFHQKoyhOLTk0,5260
 muffin_rest/peewee/openapi.py,sha256=ZZuh7nJVuK9cTJqtOJ_XASe9iJgter-xIjj9YJ8xszI,1111
 muffin_rest/peewee/options.py,sha256=02E8yOXHaHl0smKV8qI6er7YS3IcuroDPl7GR_YuLjo,1489
 muffin_rest/peewee/schemas.py,sha256=6xaNxKFpdXjoiPFI9yc0tBN7B535A2IFLRE9x6unrZM,1215
@@ -24,14 +24,14 @@ muffin_rest/peewee/utils.py,sha256=wXeneVE1IZl1ROnY28re73H62Y1_tEmoEQYzPhuOyBI,7
 muffin_rest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 muffin_rest/redoc.html,sha256=GtuHIMvTuSi8Ro6bgI-G8VB94AljMyfjcZseqtBmGCY,559
 muffin_rest/sorting.py,sha256=x-3UE9MMV7RzmNDTIgsM1RDVd42mPeq03LbkaaKuM4g,2803
-muffin_rest/sqlalchemy/__init__.py,sha256=dx2Ew9D2Wuub-_RaKvEan4wrWF1hXmE7Wboxz03lq7k,6514
+muffin_rest/sqlalchemy/__init__.py,sha256=Kjov2jNe2nNW30oEwGrJwR8hhmjTqyQFHGHLhTIJTt4,6311
 muffin_rest/sqlalchemy/filters.py,sha256=bTT7ndx_d0YaDSviDfpzwN9T46dQrV9WbeG8YH9KVBg,2466
 muffin_rest/sqlalchemy/sorting.py,sha256=YlFKpIet4TUy7fJ2UBLC8b9lAOwY66QBpPDDApbyh8M,1643
 muffin_rest/sqlalchemy/types.py,sha256=JnIw44XJ2ClWzOv-mTUrvFw1JPxAlvdX_jf7r4zau-s,204
 muffin_rest/swagger.html,sha256=2uGLu_KpkYf925KnDKHBJmV9pm6OHn5C3BWScESsUS8,1736
 muffin_rest/types.py,sha256=vy55ShzMcvs9zXjFpdjWlagv09dMrcmxb2-U4hTL3NM,521
 muffin_rest/utils.py,sha256=-nf6WCGFlVoOcBT-n6eiIpbZSmPY8ynm2UlMelgmn8o,2059
-muffin_rest-6.0.1.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-6.0.1.dist-info/METADATA,sha256=pxKktMsZVfelB4dG2ib9CSHE191q4g9yuvwxHh8FWMM,4126
-muffin_rest-6.0.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-muffin_rest-6.0.1.dist-info/RECORD,,
+muffin_rest-7.0.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-7.0.0.dist-info/METADATA,sha256=SkWzF-CDKJxm7UJV_IoIO4VQ1S_T1EqWs1Mf7QQDd60,4126
+muffin_rest-7.0.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+muffin_rest-7.0.0.dist-info/RECORD,,