limits 4.1__py3-none-any.whl → 4.3__py3-none-any.whl

limits/__init__.py

@@ -2,6 +2,8 @@
 Rate limiting with commonly used storage backends
 """
 
+from __future__ import annotations
+
 from . import _version, aio, storage, strategies
 from .limits import (
     RateLimitItem,
@@ -16,18 +18,18 @@ from .util import WindowStats, parse, parse_many
 
 __all__ = [
     "RateLimitItem",
-    "RateLimitItemPerYear",
-    "RateLimitItemPerMonth",
     "RateLimitItemPerDay",
     "RateLimitItemPerHour",
     "RateLimitItemPerMinute",
+    "RateLimitItemPerMonth",
     "RateLimitItemPerSecond",
+    "RateLimitItemPerYear",
+    "WindowStats",
     "aio",
-    "storage",
-    "strategies",
     "parse",
     "parse_many",
-    "WindowStats",
+    "storage",
+    "strategies",
 ]
 
-__version__ = _version.get_versions()["version"]  # type: ignore
+__version__ = _version.get_versions()["version"]

limits/_version.py

@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.22) from
+# This file was generated by 'versioneer.py' (0.29) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-03-07T12:07:00-0800",
+ "date": "2025-03-14T16:19:10-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "aff8ca13e30c9d754690a2931498f023d35dc62f",
- "version": "4.1"
+ "full-revisionid": "0bcebd7b69d035e3df82779a50fb2d1e901b9ef9",
+ "version": "4.3"
 }
 '''  # END VERSION_JSON
 

limits/aio/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from . import storage, strategies
 
 __all__ = [

limits/aio/storage/__init__.py

@@ -3,6 +3,8 @@ Implementations of storage backends to be used with
 :class:`limits.aio.strategies.RateLimiter` strategies
 """
 
+from __future__ import annotations
+
 from .base import MovingWindowSupport, SlidingWindowCounterSupport, Storage
 from .etcd import EtcdStorage
 from .memcached import MemcachedStorage
@@ -11,14 +13,14 @@ from .mongodb import MongoDBStorage
 from .redis import RedisClusterStorage, RedisSentinelStorage, RedisStorage
 
 __all__ = [
-    "Storage",
-    "MovingWindowSupport",
-    "SlidingWindowCounterSupport",
     "EtcdStorage",
     "MemcachedStorage",
     "MemoryStorage",
     "MongoDBStorage",
-    "RedisStorage",
+    "MovingWindowSupport",
     "RedisClusterStorage",
     "RedisSentinelStorage",
+    "RedisStorage",
+    "SlidingWindowCounterSupport",
+    "Storage",
 ]

limits/aio/storage/base.py

@@ -11,11 +11,8 @@ from limits.typing import (
     Any,
     Awaitable,
     Callable,
-    Optional,
     P,
     R,
-    Type,
-    Union,
     cast,
 )
 from limits.util import LazyDependency
@@ -43,7 +40,7 @@ class Storage(LazyDependency, metaclass=StorageRegistry):
     Base class to extend when implementing an async storage backend.
     """
 
-    STORAGE_SCHEME: Optional[list[str]]
+    STORAGE_SCHEME: list[str] | None
     """The storage schemes to register against this implementation"""
 
     def __init_subclass__(cls, **kwargs: Any) -> None:  # type:ignore[explicit-any]
@@ -61,9 +58,9 @@ class Storage(LazyDependency, metaclass=StorageRegistry):
 
     def __init__(
         self,
-        uri: Optional[str] = None,
+        uri: str | None = None,
         wrap_exceptions: bool = False,
-        **options: Union[float, str, bool],
+        **options: float | str | bool,
     ) -> None:
         """
         :param wrap_exceptions: Whether to wrap storage exceptions in
@@ -74,7 +71,7 @@ class Storage(LazyDependency, metaclass=StorageRegistry):
 
     @property
     @abstractmethod
-    def base_exceptions(self) -> Union[Type[Exception], tuple[Type[Exception], ...]]:
+    def base_exceptions(self) -> type[Exception] | tuple[type[Exception], ...]:
         raise NotImplementedError
 
     @abstractmethod
@@ -114,7 +111,7 @@ class Storage(LazyDependency, metaclass=StorageRegistry):
         raise NotImplementedError
 
     @abstractmethod
-    async def reset(self) -> Optional[int]:
+    async def reset(self) -> int | None:
         """
         reset storage to clear limits
         """

limits/aio/storage/etcd.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 import asyncio
 import time
 import urllib.parse
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from limits.aio.storage.base import Storage
 from limits.errors import ConcurrentUpdateError
@@ -44,7 +46,7 @@ class EtcdStorage(Storage):
         """
         parsed = urllib.parse.urlparse(uri)
         self.lib = self.dependencies["aetcd"].module
-        self.storage: "aetcd.Client" = self.lib.Client(
+        self.storage: aetcd.Client = self.lib.Client(
             host=parsed.hostname, port=parsed.port, **options
         )
         self.max_retries = max_retries
@@ -53,7 +55,7 @@ class EtcdStorage(Storage):
     @property
     def base_exceptions(
         self,
-    ) -> Union[type[Exception], tuple[type[Exception], ...]]:  # pragma: no cover
+    ) -> type[Exception] | tuple[type[Exception], ...]:  # pragma: no cover
         return self.lib.ClientError  # type: ignore[no-any-return]
 
     def prefixed_key(self, key: str) -> bytes:
@@ -134,7 +136,7 @@ class EtcdStorage(Storage):
         except:  # noqa
             return False
 
-    async def reset(self) -> Optional[int]:
+    async def reset(self) -> int | None:
         return (await self.storage.delete_prefix(f"{self.PREFIX}/".encode())).deleted
 
     async def clear(self, key: str) -> None:

limits/aio/storage/memcached.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 import urllib.parse
 from collections.abc import Iterable
@@ -7,7 +9,7 @@ from deprecated.sphinx import versionadded
 
 from limits.aio.storage.base import SlidingWindowCounterSupport, Storage
 from limits.storage.base import TimestampedSlidingWindow
-from limits.typing import EmcacheClientP, ItemP, Optional, Type, Union
+from limits.typing import EmcacheClientP, ItemP
 
 
 @versionadded(version="2.1")
@@ -27,7 +29,7 @@ class MemcachedStorage(Storage, SlidingWindowCounterSupport, TimestampedSlidingW
         self,
         uri: str,
         wrap_exceptions: bool = False,
-        **options: Union[float, str, bool],
+        **options: float | str | bool,
     ) -> None:
         """
         :param uri: memcached location of the form
@@ -54,7 +56,7 @@ class MemcachedStorage(Storage, SlidingWindowCounterSupport, TimestampedSlidingW
     @property
     def base_exceptions(
         self,
-    ) -> Union[Type[Exception], tuple[Type[Exception], ...]]:  # pragma: no cover
+    ) -> type[Exception] | tuple[type[Exception], ...]:  # pragma: no cover
         return (
             self.dependency.ClusterNoAvailableNodes,
             self.dependency.CommandError,
@@ -204,7 +206,7 @@ class MemcachedStorage(Storage, SlidingWindowCounterSupport, TimestampedSlidingW
         except:  # noqa
             return False
 
-    async def reset(self) -> Optional[int]:
+    async def reset(self) -> int | None:
         raise NotImplementedError
 
     async def acquire_sliding_window_entry(

limits/aio/storage/memory.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 import time
 from collections import Counter, defaultdict
@@ -12,14 +14,12 @@ from limits.aio.storage.base import (
     Storage,
 )
 from limits.storage.base import TimestampedSlidingWindow
-from limits.typing import Optional, Type, Union
 
 
-class LockableEntry(asyncio.Lock):
+class Entry:
     def __init__(self, expiry: int) -> None:
         self.atime = time.time()
         self.expiry = self.atime + expiry
-        super().__init__()
 
 
 @versionadded(version="2.1")
@@ -39,27 +39,36 @@ class MemoryStorage(
     """
 
     def __init__(
-        self, uri: Optional[str] = None, wrap_exceptions: bool = False, **_: str
+        self, uri: str | None = None, wrap_exceptions: bool = False, **_: str
     ) -> None:
         self.storage: limits.typing.Counter[str] = Counter()
         self.locks: defaultdict[str, asyncio.Lock] = defaultdict(asyncio.Lock)
         self.expirations: dict[str, float] = {}
-        self.events: dict[str, list[LockableEntry]] = {}
-        self.timer: Optional[asyncio.Task[None]] = None
+        self.events: dict[str, list[Entry]] = {}
+        self.timer: asyncio.Task[None] | None = None
         super().__init__(uri, wrap_exceptions=wrap_exceptions, **_)
 
-    @property
-    def base_exceptions(
-        self,
-    ) -> Union[Type[Exception], tuple[Type[Exception], ...]]:  # pragma: no cover
-        return ValueError
+    def __getstate__(self) -> dict[str, limits.typing.Any]:  # type: ignore[explicit-any]
+        state = self.__dict__.copy()
+        del state["timer"]
+        del state["locks"]
+        return state
+
+    def __setstate__(self, state: dict[str, limits.typing.Any]) -> None:  # type: ignore[explicit-any]
+        self.__dict__.update(state)
+        self.timer = None
+        self.locks = defaultdict(asyncio.Lock)
+        asyncio.ensure_future(self.__schedule_expiry())
 
     async def __expire_events(self) -> None:
         for key in self.events.keys():
-            for event in list(self.events[key]):
-                async with event:
+            async with self.locks[key]:
+                for event in list(self.events[key]):
                     if event.expiry <= time.time() and event in self.events[key]:
                         self.events[key].remove(event)
+                if not self.events.get(key, None):
+                    self.events.pop(key, None)
+                    self.locks.pop(key, None)
 
         for key in list(self.expirations.keys()):
             if self.expirations[key] <= time.time():
@@ -71,6 +80,12 @@ class MemoryStorage(
         if not self.timer or self.timer.done():
             self.timer = asyncio.create_task(self.__expire_events())
 
+    @property
+    def base_exceptions(
+        self,
+    ) -> type[Exception] | tuple[type[Exception], ...]:  # pragma: no cover
+        return ValueError
+
     async def incr(
         self, key: str, expiry: float, elastic_expiry: bool = False, amount: int = 1
     ) -> int:
@@ -138,18 +153,19 @@ class MemoryStorage(
         if amount > limit:
             return False
 
-        self.events.setdefault(key, [])
         await self.__schedule_expiry()
-        timestamp = time.time()
-        try:
-            entry: Optional[LockableEntry] = self.events[key][limit - amount]
-        except IndexError:
-            entry = None
-
-        if entry and entry.atime >= timestamp - expiry:
-            return False
-        else:
-            self.events[key][:0] = [LockableEntry(expiry) for _ in range(amount)]
+        async with self.locks[key]:
+            self.events.setdefault(key, [])
+            timestamp = time.time()
+            try:
+                entry: Entry | None = self.events[key][limit - amount]
+            except IndexError:
+                entry = None
+
+            if entry and entry.atime >= timestamp - expiry:
+                return False
+            else:
+                self.events[key][:0] = [Entry(expiry) for _ in range(amount)]
 
             return True
 
@@ -170,7 +186,7 @@ class MemoryStorage(
         timestamp = time.time()
 
         return (
-            len([k for k in self.events[key] if k.atime >= timestamp - expiry])
+            len([k for k in self.events.get(key, []) if k.atime >= timestamp - expiry])
             if self.events.get(key)
             else 0
         )
@@ -262,7 +278,7 @@ class MemoryStorage(
 
         return True
 
-    async def reset(self) -> Optional[int]:
+    async def reset(self) -> int | None:
         num_items = max(len(self.storage), len(self.events))
         self.storage.clear()
         self.expirations.clear()

limits/aio/storage/mongodb.py

@@ -12,11 +12,8 @@ from limits.aio.storage.base import (
     Storage,
 )
 from limits.typing import (
-    Optional,
     ParamSpec,
-    Type,
     TypeVar,
-    Union,
     cast,
 )
 from limits.util import get_dependency
@@ -51,7 +48,7 @@ class MongoDBStorage(Storage, MovingWindowSupport, SlidingWindowCounterSupport):
         counter_collection_name: str = "counters",
         window_collection_name: str = "windows",
         wrap_exceptions: bool = False,
-        **options: Union[float, str, bool],
+        **options: float | str | bool,
     ) -> None:
         """
         :param uri: uri of the form ``async+mongodb://[user:password]@host:port?...``,
@@ -94,7 +91,7 @@ class MongoDBStorage(Storage, MovingWindowSupport, SlidingWindowCounterSupport):
     @property
     def base_exceptions(
         self,
-    ) -> Union[Type[Exception], tuple[Type[Exception], ...]]:  # pragma: no cover
+    ) -> type[Exception] | tuple[type[Exception], ...]:  # pragma: no cover
         return self.lib_errors.PyMongoError  # type: ignore
 
     @property
@@ -113,7 +110,7 @@ class MongoDBStorage(Storage, MovingWindowSupport, SlidingWindowCounterSupport):
             )
         self.__indices_created = True
 
-    async def reset(self) -> Optional[int]:
+    async def reset(self) -> int | None:
         """
         Delete all rate limit keys in the rate limit collections (counters, windows)
         """
@@ -294,7 +291,7 @@ class MongoDBStorage(Storage, MovingWindowSupport, SlidingWindowCounterSupport):
         try:
             updates: dict[
                 str,
-                dict[str, Union[datetime.datetime, dict[str, Union[list[float], int]]]],
+                dict[str, datetime.datetime | dict[str, list[float] | int]],
             ] = {
                 "$push": {
                     "entries": {