muffin-rest 9.4.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

muffin_rest/handler.py

@@ -1,4 +1,5 @@
 """Base class for API REST Handlers."""
+
 import abc
 import inspect
 from typing import (
@@ -7,6 +8,7 @@ from typing import (
     Generic,
     Iterable,
     Literal,
+    Mapping,
     Optional,
     Sequence,
     Union,
@@ -97,8 +99,6 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         self.auth = await self.authorize(request)
 
         meta = self.meta
-        if meta.rate_limit:
-            await self.rate_limit(request)
 
         self.collection = await self.prepare_collection(request)
         resource = await self.prepare_resource(request)
@@ -142,11 +142,6 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
             raise APIError.UNAUTHORIZED()
         return auth
 
-    async def rate_limit(self, request: Request):
-        """Default rate limit method. Proxy rate limit to self.api."""
-        if not await self.meta.rate_limiter.check(f"{self.auth}"):
-            raise APIError.TOO_MANY_REQUESTS()
-
     # Prepare data
     # ------------
     @abc.abstractmethod
@@ -228,24 +223,30 @@ class RESTBase(Generic[TVResource], Handler, metaclass=RESTHandlerMeta):
         schema_options.setdefault("exclude", query.get("schema_exclude", ()))
         return self.meta.Schema(**schema_options)
 
+    async def load_data(self, request: Request):
+        """Load data from request and create/update a resource."""
+        try:
+            data = await request.data(raise_errors=True)
+        except (ValueError, TypeError) as err:
+            raise APIError.BAD_REQUEST(str(err)) from err
+
+        return data
+
     async def load(
         self, request: Request, resource: Optional[TVResource] = None, **schema_options
     ) -> TVData[TVResource]:
         """Load data from request and create/update a resource."""
         schema = self.get_schema(request, resource=resource, **schema_options)
-        return cast(
-            TVData[TVResource], await load_data(request, schema, partial=resource is not None)
-        )
+        data = cast(Union[Mapping, list], await self.load_data(request))
+        return cast(TVData[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]
-    ) -> list[TSchemaRes]:
-        ...
+    ) -> list[TSchemaRes]: ...
 
     @overload
-    async def dump(self, request, data: TVData, *, many: bool = False) -> TSchemaRes:
-        ...
+    async def dump(self, request, data: TVData, *, many: bool = False) -> TSchemaRes: ...
 
     async def dump(
         self,

muffin_rest/limits.py

@@ -1,11 +1,12 @@
 import abc
 from time import time
+from typing import Any
 
 
 class RateLimiter(abc.ABC):
     """Rate limiter."""
 
-    def __init__(self, limit: int, period: int, **opts):
+    def __init__(self, limit: int, *, period: int = 60, **opts):
         """Initialize the rate limiter.
 
         Args:
@@ -21,26 +22,29 @@ class RateLimiter(abc.ABC):
         raise NotImplementedError
 
 
-RATE_LIMITS = {}
-
-
 class MemoryRateLimiter(RateLimiter):
     """Memory rate limiter. Do not use in production."""
 
+    def __init__(self, limit: int, **opts):
+        super().__init__(limit, **opts)
+        self.storage: dict[Any, tuple[float, int]] = {}
+
     async def check(self, key: str) -> bool:
         """Check the request."""
         now = time()
-        if key not in RATE_LIMITS:
-            RATE_LIMITS[key] = (now, 1)
+        storage = self.storage
+
+        if key not in storage:
+            storage[key] = (now, 1)
             return True
 
-        last, count = RATE_LIMITS[key]
+        last, count = storage[key]
         if now - last > self.period:
-            RATE_LIMITS[key] = (now, 1)
+            storage[key] = (now, 1)
             return True
 
         if count < self.limit:
-            RATE_LIMITS[key] = (last, count + 1)
+            storage[key] = (last, count + 1)
             return True
 
         return False
@@ -51,7 +55,7 @@ class RedisRateLimiter(RateLimiter):
 
     # TODO: Asyncio lock
 
-    def __init__(self, limit: int, period: int, *, redis, **opts):
+    def __init__(self, limit: int, *, redis, **opts):
         """Initialize the rate limiter.
 
         Args:
@@ -59,7 +63,7 @@ class RedisRateLimiter(RateLimiter):
             period (int): The period of time in seconds.
             redis (aioredis.Redis): The Redis connection.
         """
-        super().__init__(limit, period)
+        super().__init__(limit, **opts)
         self.redis = redis
 
     async def check(self, key: str) -> bool:

muffin_rest/marshmallow.py

@@ -1,26 +1,20 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
-from typing import TYPE_CHECKING, Optional, Union, cast
+from typing import TYPE_CHECKING, Optional, Union
 
 from marshmallow import Schema, ValidationError
 
 from muffin_rest.errors import APIError
 
 if TYPE_CHECKING:
-    from asgi_tools import Request
+    from collections.abc import Mapping
 
 
-async def load_data(request: Request, schema: Optional[Schema] = None, **params):
-    try:
-        data = await request.data(raise_errors=True)
-    except (ValueError, TypeError) as err:
-        raise APIError.BAD_REQUEST(str(err)) from err
-
+async def load_data(data: Union[Mapping, list], schema: Optional[Schema] = None, **params):
     if schema is None:
         return data
 
     try:
-        return schema.load(cast(Union[Mapping, list], data), many=isinstance(data, list), **params)
+        return schema.load(data, many=isinstance(data, list), **params)
     except ValidationError as err:
         raise APIError.BAD_REQUEST("Bad request data", errors=err.messages) from err

muffin_rest/options.py

@@ -1,11 +1,9 @@
 """REST Options."""
 
-from typing import Any, ClassVar
+from typing import ClassVar
 
 import marshmallow as ma
 
-from muffin_rest.limits import MemoryRateLimiter, RateLimiter
-
 from .filters import Filters
 from .sorting import Sorting
 
@@ -53,14 +51,6 @@ class RESTOptions:
     schema_meta: ClassVar[dict] = {}
     schema_unknown: str = ma.EXCLUDE
 
-    # Rate Limiting
-    # -------------
-
-    rate_limit: int = 0
-    rate_limit_period: int = 60
-    rate_limit_cls: type[RateLimiter] = MemoryRateLimiter
-    rate_limit_cls_opts: ClassVar[dict[str, Any]] = {}
-
     def __init__(self, cls):
         """Inherit meta options."""
         for base in reversed(cls.mro()):
@@ -86,11 +76,6 @@ class RESTOptions:
         if not self.limit_max:
             self.limit_max = self.limit
 
-        if self.rate_limit:
-            self.rate_limiter = self.rate_limit_cls(
-                self.rate_limit, self.rate_limit_period, **self.rate_limit_cls_opts
-            )
-
     def setup_schema_meta(self, _):
         """Generate meta for schemas."""
         return type(

muffin_rest/peewee/utils.py

@@ -1,4 +1,5 @@
 """Support filters for Peewee ORM."""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
@@ -8,7 +9,7 @@ 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) -> Optional[Field]:
     """Get model field by name."""
     fields = handler.meta.model._meta.fields
     candidate = fields.get(name)

{muffin_rest-9.4.0.dist-info → muffin_rest-10.1.0.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: muffin-rest
-Version: 9.4.0
+Version: 10.1.0
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
-Home-page: https://github.com/klen/muffin-rest
 License: MIT
 Keywords: rest,api,muffin,asgi,asyncio,trio
 Author: Kirill Klenov
@@ -33,6 +32,7 @@ Requires-Dist: muffin-databases ; extra == "sqlalchemy"
 Requires-Dist: muffin-peewee-aio ; extra == "peewee"
 Requires-Dist: pyyaml ; extra == "yaml"
 Requires-Dist: sqlalchemy ; extra == "sqlalchemy"
+Project-URL: Homepage, https://github.com/klen/muffin-rest
 Project-URL: Repository, https://github.com/klen/muffin-rest
 Description-Content-Type: text/x-rst
 

{muffin_rest-9.4.0.dist-info → muffin_rest-10.1.0.dist-info}/RECORD

@@ -2,9 +2,9 @@ muffin_rest/__init__.py,sha256=NBZeOEJgQHtFFhVgd9d0fpApFRgU405sbm0cu1y1MOU,1242
 muffin_rest/api.py,sha256=zssoHjqTsa8UCAyxj6TxQVluYPX9Sigyiph6SRxBY6I,3870
 muffin_rest/errors.py,sha256=mxEBhNPo3pwpG2em6zaQonbfRgHFBJ3I8WunVYWDjvM,1163
 muffin_rest/filters.py,sha256=hc-fhBODwrgJM_CvXNtTVH6jIOkjLog8En0iKKYXAGU,5947
-muffin_rest/handler.py,sha256=3efL8-AbxR0oHEwySfWSyfRuxCWyJOwDaYAhUzg6f-0,10772
-muffin_rest/limits.py,sha256=pA5hnDQgrP-euDGjAoczlT_b7Dxzw5btQ-3okkHYKSA,1855
-muffin_rest/marshmallow.py,sha256=jWsZeMj3KslbGGgzEMo8-e5eeuGhmqFolL0mIEquylc,789
+muffin_rest/handler.py,sha256=xRKUMzR2zISva0SbXS-piQ3Xq3d1zu-rZg6H2K7Oy0I,10824
+muffin_rest/limits.py,sha256=Fnlu4Wj3B-BzpahLK-rDbd1GEd7CEQ3zxyOD0vee7GE,2007
+muffin_rest/marshmallow.py,sha256=UeHxZLtETlrheDAlMZn7Xv_7vWPxvJQo-sj05nql9gM,574
 muffin_rest/mongo/__init__.py,sha256=SiYSbX6ySJl43fw9aGREIs8ZsS8Qk_ieizoPOj4DjJc,4656
 muffin_rest/mongo/filters.py,sha256=yIxIDVqMn6SoDgVhCqiTxYetw0hoaf_3jIvX2Vnizok,964
 muffin_rest/mongo/schema.py,sha256=y4OEPQnlV_COTIIQ3cKmpqDpD2r18eAWn0rijQldWm0,1205
@@ -12,7 +12,7 @@ muffin_rest/mongo/sorting.py,sha256=iJBnaFwE7g_JMwpGpQkoqSqbQK9XULx1K3skiRRgLgY,
 muffin_rest/mongo/types.py,sha256=jaODScgwwYbzHis3DY4bPzU1ahiMJMSwquH5_Thi-Gg,200
 muffin_rest/mongo/utils.py,sha256=mNkLM-D6gqOA9YW2Qdw0DvE2N4LRmxLAiPMKH9WLttM,3958
 muffin_rest/openapi.py,sha256=0QU7qrfBjGl0vl378SJC5boZZI2ogddl45fS9WL4Axw,8751
-muffin_rest/options.py,sha256=reHbd2o-F6bKEKc8bznzj0TMY2vzjK6Yt1qOny7kt_w,2691
+muffin_rest/options.py,sha256=38y7AasyAghXNffxX-3xgqLbWDQ1RxAhg77ze7c0Mu0,2232
 muffin_rest/peewee/__init__.py,sha256=94DSj_ftT6fbPksHlBv40AH2HWaiZommUFOMN2jd9a4,129
 muffin_rest/peewee/filters.py,sha256=p813eJqyTkAhmS3C1P8rWFWb9Tl33OtADjgLctqKnns,2475
 muffin_rest/peewee/handler.py,sha256=Tk20ChTGkhzSF0K1-TFruPfXJyHfJE_fDKcQqGQeoAU,5297
@@ -21,7 +21,7 @@ muffin_rest/peewee/options.py,sha256=TimJtErC9e8B7BRiEkHiBZd71_bZbYr-FE2PIlQvfH0
 muffin_rest/peewee/schemas.py,sha256=w6jBziUp40mOOjkz_4RCXuY0x5ZDIe9Ob25k1FnZSfc,469
 muffin_rest/peewee/sorting.py,sha256=aTLL2zYeNfkamfbGuKkIClOsJktdZZZlzZKafccWxyQ,1977
 muffin_rest/peewee/types.py,sha256=cgCXhpGHkImKwudA1lulZHz5oJswHH168AiW5MhZRCM,155
-muffin_rest/peewee/utils.py,sha256=wXeneVE1IZl1ROnY28re73H62Y1_tEmoEQYzPhuOyBI,702
+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
@@ -33,7 +33,7 @@ muffin_rest/sqlalchemy/types.py,sha256=Exm-zAQCtPAwXvYcCTtPRqSa-wTEWRcH_v2YSsJkB
 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-9.4.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-9.4.0.dist-info/METADATA,sha256=7LF2JbYYQ4k9VusfwGZolZi9oY3rHNIIC3TQs03tUFM,4134
-muffin_rest-9.4.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-muffin_rest-9.4.0.dist-info/RECORD,,
+muffin_rest-10.1.0.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-10.1.0.dist-info/METADATA,sha256=eZeEf9-ojFMBHyyQLX1tkRurpNj1NMufQda6B1d6I7o,4147
+muffin_rest-10.1.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+muffin_rest-10.1.0.dist-info/RECORD,,

{muffin_rest-9.4.0.dist-info → muffin_rest-10.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any