muffin-rest 13.0.1__py3-none-any.whl → 13.0.3__py3-none-any.whl

muffin_rest/limits.py

@@ -1,4 +1,5 @@
 import abc
+from asyncio import Lock
 from time import time
 from typing import Any
 
@@ -13,13 +14,19 @@ class RateLimiter(abc.ABC):
             limit (int): The limit of requests.
             period (int): The period of time in seconds.
         """
+        self.lock = Lock()
         self.limit = limit
         self.period = period
 
-    @abc.abstractmethod
     async def check(self, key: str) -> bool:
         """Check the request."""
-        raise NotImplementedError
+        async with self.lock:
+            return await self._check(key)
+
+    @abc.abstractmethod
+    async def _check(self, key: str) -> bool:
+        """Check the request."""
+        raise NotImplementedError("Subclasses must implement this method.")
 
 
 class MemoryRateLimiter(RateLimiter):
@@ -29,7 +36,7 @@ class MemoryRateLimiter(RateLimiter):
         super().__init__(limit, **opts)
         self.storage: dict[Any, tuple[float, int]] = {}
 
-    async def check(self, key: str) -> bool:
+    async def _check(self, key: str) -> bool:
         """Check the request."""
         now = time()
         storage = self.storage
@@ -53,8 +60,6 @@ class MemoryRateLimiter(RateLimiter):
 class RedisRateLimiter(RateLimiter):
     """Redis rate limiter."""
 
-    # TODO: Asyncio lock
-
     def __init__(self, limit: int, *, redis, **opts):
         """Initialize the rate limiter.
 
@@ -66,12 +71,10 @@ class RedisRateLimiter(RateLimiter):
         super().__init__(limit, **opts)
         self.redis = redis
 
-    async def check(self, key: str) -> bool:
+    async def _check(self, key: str) -> bool:
         """Check the request."""
-        value = await self.redis.get(key)
-        if value is None:
-            await self.redis.setex(key, self.period, 1)
-            return True
+        current = await self.redis.incr(key)
+        if current == 1:
+            await self.redis.expire(key, self.period)
 
-        await self.redis.incr(key)
-        return int(value) < self.limit
+        return current <= self.limit

{muffin_rest-13.0.1.dist-info → muffin_rest-13.0.3.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: muffin-rest
-Version: 13.0.1
+Version: 13.0.3
 Summary: The package provides enhanced support for writing REST APIs with Muffin framework
 License: MIT
+License-File: LICENSE
 Keywords: rest,api,muffin,asgi,asyncio,trio
 Author: Kirill Klenov
 Author-email: horneds@gmail.com
@@ -18,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Provides-Extra: peewee
 Provides-Extra: sqlalchemy

{muffin_rest-13.0.1.dist-info → muffin_rest-13.0.3.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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=97nkx5rGB2CE_7oPG4UOLVw7b4UcGbubkSt1m_LrHhk,10762
-muffin_rest/limits.py,sha256=Fnlu4Wj3B-BzpahLK-rDbd1GEd7CEQ3zxyOD0vee7GE,2007
+muffin_rest/limits.py,sha256=X6qwuQPUdKJiPRgiKLY2NquXZlrpbx7BYHH3njw9ros,2168
 muffin_rest/marshmallow.py,sha256=-MyMKiaMTfiWw4y-4adpfoQd05HV1vEKqSXJh8eD3xg,548
 muffin_rest/mongo/__init__.py,sha256=dck5zDEv0P3v_2CdlPI7Nbg8xay-EIzy9Y0yksEZkxw,4665
 muffin_rest/mongo/filters.py,sha256=yIxIDVqMn6SoDgVhCqiTxYetw0hoaf_3jIvX2Vnizok,964
@@ -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=5NY9gPTIptv6U2Qab2xMXlS_jZuTuR0bquFFwWRURcA,510
 muffin_rest/utils.py,sha256=c08E4HJ4SLYC-91GKPEbsyKTZ4sZbTN4qDqJbNg_HTE,2076
-muffin_rest-13.0.1.dist-info/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
-muffin_rest-13.0.1.dist-info/METADATA,sha256=314stUC6_wkJlpM9Ms8IJqiodDBH3eojfuQwq6mvH_8,4912
-muffin_rest-13.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-muffin_rest-13.0.1.dist-info/RECORD,,
+muffin_rest-13.0.3.dist-info/METADATA,sha256=sk-98taZjJD1AJ5dcMGLAlSnlLj5EIJZsYzHuxfv5-o,4985
+muffin_rest-13.0.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+muffin_rest-13.0.3.dist-info/licenses/LICENSE,sha256=xHPkOZhjyKBMOwXpWn9IB_BVLjrrMxv2M9slKkHj2hM,1082
+muffin_rest-13.0.3.dist-info/RECORD,,

{muffin_rest-13.0.1.dist-info → muffin_rest-13.0.3.dist-info}/WHEEL

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