limits 4.2__tar.gz → 4.4__tar.gz

{limits-4.2 → limits-4.4}/CLASSIFIERS

@@ -5,7 +5,6 @@ Operating System :: MacOS
 Operating System :: POSIX :: Linux
 Operating System :: OS Independent
 Topic :: Software Development :: Libraries :: Python Modules
-Programming Language :: Python :: 3.9
 Programming Language :: Python :: 3.10
 Programming Language :: Python :: 3.11
 Programming Language :: Python :: 3.12

{limits-4.2 → limits-4.4}/HISTORY.rst

@@ -3,6 +3,29 @@
 Changelog
 =========
 
+v4.4
+----
+Release Date: 2025-03-14
+
+* Compatibility
+
+  * Deprecate support for ``etcd``
+
+v4.3
+----
+Release Date: 2025-03-14
+
+* Feature
+
+  * Add support for ``valkey://`` schemas and using ``valkey-py``
+    dependency
+
+* Compatibility
+
+  * Drop support for python 3.9
+  * Improve typing to use python 3.10+ features
+
+
 v4.2
 ----
 Release Date: 2025-03-11
@@ -791,6 +814,8 @@ Release Date: 2015-01-08
 
 
 
+
+
 
 
 

{limits-4.2 → limits-4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: limits
-Version: 4.2
+Version: 4.4
 Summary: Rate limiting utilities
 Home-page: https://limits.readthedocs.org
 Author: Ali-Akber Saifee
@@ -14,13 +14,12 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Programming Language :: Python :: 3.9
 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 :: Implementation :: PyPy
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE.txt
 Requires-Dist: deprecated>=1.2
 Requires-Dist: packaging<25,>=21
@@ -35,6 +34,8 @@ Provides-Extra: mongodb
 Requires-Dist: pymongo<5,>4.1; extra == "mongodb"
 Provides-Extra: etcd
 Requires-Dist: etcd3; extra == "etcd"
+Provides-Extra: valkey
+Requires-Dist: valkey>=6; extra == "valkey"
 Provides-Extra: async-redis
 Requires-Dist: coredis<5,>=3.4.0; extra == "async-redis"
 Provides-Extra: async-memcached
@@ -44,17 +45,21 @@ Provides-Extra: async-mongodb
 Requires-Dist: motor<4,>=3; extra == "async-mongodb"
 Provides-Extra: async-etcd
 Requires-Dist: aetcd; extra == "async-etcd"
+Provides-Extra: async-valkey
+Requires-Dist: valkey>=6; extra == "async-valkey"
 Provides-Extra: all
 Requires-Dist: redis!=4.5.2,!=4.5.3,<6.0.0,>3; extra == "all"
 Requires-Dist: redis!=4.5.2,!=4.5.3,>=4.2.0; extra == "all"
 Requires-Dist: pymemcache<5.0.0,>3; extra == "all"
 Requires-Dist: pymongo<5,>4.1; extra == "all"
 Requires-Dist: etcd3; extra == "all"
+Requires-Dist: valkey>=6; extra == "all"
 Requires-Dist: coredis<5,>=3.4.0; extra == "all"
 Requires-Dist: emcache>=0.6.1; python_version < "3.11" and extra == "all"
 Requires-Dist: emcache>=1; (python_version >= "3.11" and python_version < "3.13.0") and extra == "all"
 Requires-Dist: motor<4,>=3; extra == "all"
 Requires-Dist: aetcd; extra == "all"
+Requires-Dist: valkey>=6; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -126,7 +131,7 @@ Moving Window
 
 This strategy adds each request’s timestamp to a log if the ``nth`` oldest entry (where ``n``
 is the limit) is either not present or is older than the duration of the window (for example with a rate limit of
-``10 requests per minute`` if there are either less than 10 entries or the 10th oldest entry is atleast
+``10 requests per minute`` if there are either less than 10 entries or the 10th oldest entry is at least
 60 seconds old). Upon adding a new entry to the log "expired" entries are truncated.
 
 For example, with a rate limit of 10 requests per minute:

{limits-4.2 → limits-4.4}/README.rst

@@ -57,7 +57,7 @@ Moving Window
 
 This strategy adds each request’s timestamp to a log if the ``nth`` oldest entry (where ``n``
 is the limit) is either not present or is older than the duration of the window (for example with a rate limit of
-``10 requests per minute`` if there are either less than 10 entries or the 10th oldest entry is atleast
+``10 requests per minute`` if there are either less than 10 entries or the 10th oldest entry is at least
 60 seconds old). Upon adding a new entry to the log "expired" entries are truncated.
 
 For example, with a rate limit of 10 requests per minute:

{limits-4.2 → limits-4.4}/doc/source/conf.py

@@ -81,4 +81,5 @@ intersphinx_mapping = {
     "pymongo": ("https://pymongo.readthedocs.io/en/stable/", None),
     "python-etcd3": ("https://python-etcd3.readthedocs.io/en/latest/", None),
     "aetcd": ("https://aetcd.readthedocs.io/en/latest/", None),
+    "valkey-py": ("https://valkey-py.readthedocs.io/en/latest/", None),
 }

{limits-4.2 → limits-4.4}/doc/source/index.rst

@@ -55,12 +55,12 @@ To get started
 
 .. code:: console
 
-   $ git clone git://github.com/alisaifee/limits.git
+   $ git clone https://github.com/alisaifee/limits.git
    $ cd limits
    $ pip install -r requirements/dev.txt
 
 Since `limits` integrates with various backend storages, local development and running tests
-requires a a working `docker & docker-compose installation <https://docs.docker.com/compose/gettingstarted/>`_.
+requires a working `docker & docker-compose installation <https://docs.docker.com/compose/gettingstarted/>`_.
 
 Running the tests will start the relevant containers automatically - but will leave them running
 so as to not incur the overhead of starting up on each test run. To run the tests:

{limits-4.2 → limits-4.4}/doc/source/installation.rst

@@ -58,6 +58,16 @@ Install the package with pip:
 
    .. literalinclude:: ../../requirements/storage/etcd.txt
 
+.. tab:: Valkey
+
+   .. code:: console
+
+      $ pip install limits[valkey]
+
+   Includes:
+
+   .. literalinclude:: ../../requirements/storage/valkey.txt
+
 More details around the specifics of each storage backend can be
 found in :ref:`storage`
 
@@ -114,3 +124,15 @@ along with the package using the following extras:
    Includes:
 
    .. literalinclude:: ../../requirements/storage/async-etcd.txt
+
+.. tab:: Valkey
+
+   .. code:: console
+
+      $ pip install limits[async-valkey]
+
+   Includes:
+
+   .. literalinclude:: ../../requirements/storage/async-valkey.txt
+
+

{limits-4.2 → limits-4.4}/doc/source/storage.rst

@@ -38,15 +38,15 @@ the results in `github <https://github.com/alisaifee/limits/actions/workflows/co
 
    `Redis <https://redis.io>`_
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SERVER_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
    Redis with SSL
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SERVER_SSL_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SERVER_SSL_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
    `Redis Sentinel <https://redis.io/topics/sentinel>`_
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SENTINEL_SERVER_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SENTINEL_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
 .. tab:: Redis Cluster
 
@@ -65,7 +65,7 @@ the results in `github <https://github.com/alisaifee/limits/actions/workflows/co
 
    `Redis cluster <https://redis.io/topics/cluster-tutorial>`_
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SERVER_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_REDIS_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
 .. tab:: Memcached
 
@@ -79,7 +79,7 @@ the results in `github <https://github.com/alisaifee/limits/actions/workflows/co
 
    `Memcached <https://memcached.org/>`_
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_MEMCACHED_SERVER_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_MEMCACHED_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
 .. tab:: MongoDB
 
@@ -93,7 +93,7 @@ the results in `github <https://github.com/alisaifee/limits/actions/workflows/co
 
    `MongoDB <https://www.mongodb.com/>`_
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_MONGODB_SERVER_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_MONGODB_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
 .. tab:: Etcd
 
@@ -107,8 +107,21 @@ the results in `github <https://github.com/alisaifee/limits/actions/workflows/co
 
    `Etcd <https://www.etcd.io/>`_
 
-   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_ETCD_SERVER_VERSION=[\d\.]+' | cut -d = -f 2"
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_ETCD_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
+.. tab:: Valkey
+
+   Dependency versions:
+
+   .. literalinclude:: ../../requirements/storage/valkey.txt
+
+   Dependency versions (async):
+
+   .. literalinclude:: ../../requirements/storage/async-valkey.txt
+
+   `Valkey <https://www.valkey.io/>`_
+
+   .. program-output:: bash -c "cat ../../.github/workflows/compatibility.yml | grep -o -P 'LIMITS_VALKEY_SERVER_VERSION=[\d\.]+' | cut -d = -f 2 | sort --version-sort | uniq"
 
 Storage scheme
 ==============
@@ -162,7 +175,7 @@ If the redis server is listening over a unix domain socket you can use :code:`re
 or :code:`redis+unix:///path/to/socket?db=n` (for database `n`).
 
 If the database is password protected the password can be provided in the url, for example
-:code:`redis://:foobared@localhost:6379` or :code:`redis+unix://:foobered/path/to/socket` if using a UDS..
+:code:`redis://:foobared@localhost:6379` or :code:`redis+unix://:foobered/path/to/socket` if using a UDS.
 
 For scenarios where a redis connection pool is already available and can be reused, it can be provided
 in :paramref:`~limits.storage.storage_from_string.options`, for example::
@@ -172,6 +185,12 @@ in :paramref:`~limits.storage.storage_from_string.options`, for example::
 
 Depends on: :pypi:`redis`
 
+
+.. versionadded:: 4.3
+
+   If the database ``uri`` scheme uses ``valkey`` instead of ``redis`` the implementation
+   used will be from :pypi:`valkey` instead of :pypi:`redis`.
+
 Redis+SSL Storage
 -----------------
 
@@ -185,7 +204,7 @@ Depends on: :pypi:`redis`
 Redis+Sentinel Storage
 ----------------------
 
-Requires the location(s) of the redis sentinal instances and the `service-name`
+Requires the location(s) of the redis sentinel instances and the `service-name`
 that is monitored by the sentinels.
 :code:`redis+sentinel://localhost:26379/my-redis-service`
 or :code:`redis+sentinel://localhost:26379,localhost:26380/my-redis-service`.
@@ -197,7 +216,7 @@ When authentication details are provided in the url they will be used for both t
 and as connection arguments for the underlying redis nodes managed by the sentinel.
 
 If you need fine grained control it is recommended to use the additional :paramref:`~limits.storage.storage_from_string.options`
-arguments. More details can be found in the API documentation for :class:`~limits.storage.RedisSentinelStorage` (or the aysnc version: :class:`~limits.aio.storage.RedisSentinelStorage`).
+arguments. More details can be found in the API documentation for :class:`~limits.storage.RedisSentinelStorage` (or the async version: :class:`~limits.aio.storage.RedisSentinelStorage`).
 
 Depends on: :pypi:`redis`
 

{limits-4.2 → limits-4.4}/doc/source/strategies.rst

@@ -57,7 +57,7 @@ Moving Window
 
 This strategy adds each request’s timestamp to a log if the ``nth`` oldest entry (where ``n``
 is the limit) is either not present or is older than the duration of the window (for example with a rate limit of
-``10 requests per minute`` if there are either less than 10 entries or the 10th oldest entry is atleast
+``10 requests per minute`` if there are either less than 10 entries or the 10th oldest entry is at least
 60 seconds old). Upon adding a new entry to the log "expired" entries are truncated.
 
 For example, with a rate limit of 10 requests per minute:

{limits-4.2 → limits-4.4}/limits/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-03-11T11:27:52-0700",
+ "date": "2025-03-14T18:16:10-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "ef5c0911dd6e0c1a412b3f467d0d1503a2fa24ce",
- "version": "4.2"
+ "full-revisionid": "53df3264a638d5259ea9ce3b021affceb263f52d",
+ "version": "4.4"
 }
 '''  # END VERSION_JSON
 

{limits-4.2 → limits-4.4}/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-4.2 → limits-4.4}/limits/aio/storage/etcd.py

@@ -3,7 +3,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 deprecated import deprecated
 
 from limits.aio.storage.base import Storage
 from limits.errors import ConcurrentUpdateError
@@ -12,6 +14,7 @@ if TYPE_CHECKING:
     import aetcd
 
 
+@deprecated(version="4.4")
 class EtcdStorage(Storage):
     """
     Rate limit storage with etcd as backend.
@@ -46,7 +49,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
@@ -55,7 +58,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:
@@ -136,7 +139,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-4.2 → limits-4.4}/limits/aio/storage/memcached.py

@@ -9,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")
@@ -29,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
@@ -56,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,
@@ -206,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-4.2 → limits-4.4}/limits/aio/storage/memory.py

@@ -14,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")
@@ -41,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():
@@ -73,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:
@@ -140,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
 
@@ -172,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
         )
@@ -264,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-4.2 → limits-4.4}/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": {