limits 5.3.0__tar.gz → 5.5.0__tar.gz

{limits-5.3.0 → limits-5.5.0}/HISTORY.rst

@@ -3,6 +3,32 @@
 Changelog
 =========
 
+v5.5.0
+------
+Release Date: 2025-08-05
+
+* Compatibility
+
+  * Relax upper bound of ``packaging`` requirement
+  * Increase upper bound of ``coredis`` requirement
+  * Increase upper bound of ``redis`` requirement
+
+v5.4.0
+------
+Release Date: 2025-06-16
+
+* Feature
+
+  * Relax regular expression used in ``limits.parse`` and
+    ``limits.parse_many`` to capture any granularity instead of
+    just the hardcoded ones so that custom rate limits can
+    also be extracted using the utility functions.
+    `Issue 279 <https://github.com/alisaifee/limits/issues/279>`_
+
+* Compatibility
+
+  * Add redis 8.0 to CI
+
 v5.3.0
 ------
 Release Date: 2025-06-13
@@ -860,3 +886,5 @@ Release Date: 2015-01-08
 
 
 
+
+

{limits-5.3.0 → limits-5.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: limits
-Version: 5.3.0
+Version: 5.5.0
 Summary: Rate limiting utilities
 Home-page: https://limits.readthedocs.org
 Author: Ali-Akber Saifee
@@ -22,10 +22,10 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 License-File: LICENSE.txt
 Requires-Dist: deprecated>=1.2
-Requires-Dist: packaging<26,>=21
+Requires-Dist: packaging>=21
 Requires-Dist: typing_extensions
 Provides-Extra: redis
-Requires-Dist: redis!=4.5.2,!=4.5.3,<6.0.0,>3; extra == "redis"
+Requires-Dist: redis!=4.5.2,!=4.5.3,<7.0.0,>3; extra == "redis"
 Provides-Extra: rediscluster
 Requires-Dist: redis!=4.5.2,!=4.5.3,>=4.2.0; extra == "rediscluster"
 Provides-Extra: memcached
@@ -35,7 +35,7 @@ Requires-Dist: pymongo<5,>4.1; extra == "mongodb"
 Provides-Extra: valkey
 Requires-Dist: valkey>=6; extra == "valkey"
 Provides-Extra: async-redis
-Requires-Dist: coredis<5,>=3.4.0; extra == "async-redis"
+Requires-Dist: coredis<6,>=3.4.0; extra == "async-redis"
 Provides-Extra: async-memcached
 Requires-Dist: memcachio>=0.3; extra == "async-memcached"
 Provides-Extra: async-mongodb
@@ -43,12 +43,12 @@ Requires-Dist: motor<4,>=3; extra == "async-mongodb"
 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,<7.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: valkey>=6; extra == "all"
-Requires-Dist: coredis<5,>=3.4.0; extra == "all"
+Requires-Dist: coredis<6,>=3.4.0; extra == "all"
 Requires-Dist: memcachio>=0.3; extra == "all"
 Requires-Dist: motor<4,>=3; extra == "all"
 Requires-Dist: valkey>=6; extra == "all"

{limits-5.3.0 → limits-5.5.0}/limits/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-13T16:23:24-0700",
+ "date": "2025-08-05T10:27:25-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "311fe101b2d63c03e8c6a8f0ab363dd49f3e733b",
- "version": "5.3.0"
+ "full-revisionid": "a5d3f81d1ead51586a42b8c843884603cb19bb7f",
+ "version": "5.5.0"
 }
 '''  # END VERSION_JSON
 

{limits-5.3.0 → limits-5.5.0}/limits/aio/strategies.py

@@ -32,6 +32,8 @@ class RateLimiter(ABC):
         :param identifiers: variable list of strings to uniquely identify the
          limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
         raise NotImplementedError
 
@@ -44,6 +46,8 @@ class RateLimiter(ABC):
         :param identifiers: variable list of strings to uniquely identify the
          limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
         raise NotImplementedError
 
@@ -88,6 +92,8 @@ class MovingWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify the
          limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
 
         return await cast(MovingWindowSupport, self.storage).acquire_entry(
@@ -102,6 +108,8 @@ class MovingWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify the
          limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
         res = await cast(MovingWindowSupport, self.storage).get_moving_window(
             item.key_for(*identifiers),
@@ -144,6 +152,8 @@ class FixedWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify the
          limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
 
         return (
@@ -163,6 +173,8 @@ class FixedWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify the
          limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
 
         return (
@@ -225,6 +237,8 @@ class SlidingWindowCounterRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
         return await cast(
             SlidingWindowCounterSupport, self.storage
@@ -243,6 +257,8 @@ class SlidingWindowCounterRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
 
         previous_count, previous_expires_in, current_count, _ = await cast(

{limits-5.3.0 → limits-5.5.0}/limits/limits.py

@@ -91,7 +91,10 @@ class RateLimitItem(metaclass=RateLimitItemMeta):
 
         """
 
-        return granularity_string.lower() in cls.GRANULARITY.name
+        return granularity_string.lower() in {
+            cls.GRANULARITY.name,
+            f"{cls.GRANULARITY.name}s",  # allow plurals like days, hours etc.
+        }
 
     def get_expiry(self) -> int:
         """

{limits-5.3.0 → limits-5.5.0}/limits/strategies.py

@@ -32,6 +32,8 @@ class RateLimiter(metaclass=ABCMeta):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
         raise NotImplementedError
 
@@ -44,6 +46,8 @@ class RateLimiter(metaclass=ABCMeta):
         :param identifiers: variable list of strings to uniquely identify this
           instance of the limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
         raise NotImplementedError
 
@@ -86,7 +90,8 @@ class MovingWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The cost of this hit, default 1
-        :return: (reset time, remaining)
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
 
         return cast(MovingWindowSupport, self.storage).acquire_entry(
@@ -101,6 +106,8 @@ class MovingWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
 
         return (
@@ -142,6 +149,8 @@ class FixedWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
 
         return (
@@ -161,6 +170,8 @@ class FixedWindowRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
 
         return self.storage.get(item.key_for(*identifiers)) < item.amount - cost + 1
@@ -216,6 +227,8 @@ class SlidingWindowCounterRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The cost of this hit, default 1
+
+        :return: True if ``cost`` could be deducted from the rate limit without exceeding it
         """
         return cast(
             SlidingWindowCounterSupport, self.storage
@@ -234,6 +247,8 @@ class SlidingWindowCounterRateLimiter(RateLimiter):
         :param identifiers: variable list of strings to uniquely identify this
          instance of the limit
         :param cost: The expected cost to be consumed, default 1
+
+        :return: True if the rate limit is not depleted
         """
         previous_count, previous_expires_in, current_count, _ = cast(
             SlidingWindowCounterSupport, self.storage

{limits-5.3.0 → limits-5.5.0}/limits/util.py

@@ -22,8 +22,10 @@ SINGLE_EXPR = re.compile(
     r"""
     \s*([0-9]+)
     \s*(/|\s*per\s*)
-    \s*([0-9]+)
-    *\s*(hour|minute|second|day|month|year)s?\s*""",
+    \s*([0-9]+)?
+    \s*([a-z]+)
+    \s*
+    """,
     re.IGNORECASE | re.VERBOSE,
 )
 EXPR = re.compile(

{limits-5.3.0 → limits-5.5.0}/limits.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: limits
-Version: 5.3.0
+Version: 5.5.0
 Summary: Rate limiting utilities
 Home-page: https://limits.readthedocs.org
 Author: Ali-Akber Saifee
@@ -22,10 +22,10 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 License-File: LICENSE.txt
 Requires-Dist: deprecated>=1.2
-Requires-Dist: packaging<26,>=21
+Requires-Dist: packaging>=21
 Requires-Dist: typing_extensions
 Provides-Extra: redis
-Requires-Dist: redis!=4.5.2,!=4.5.3,<6.0.0,>3; extra == "redis"
+Requires-Dist: redis!=4.5.2,!=4.5.3,<7.0.0,>3; extra == "redis"
 Provides-Extra: rediscluster
 Requires-Dist: redis!=4.5.2,!=4.5.3,>=4.2.0; extra == "rediscluster"
 Provides-Extra: memcached
@@ -35,7 +35,7 @@ Requires-Dist: pymongo<5,>4.1; extra == "mongodb"
 Provides-Extra: valkey
 Requires-Dist: valkey>=6; extra == "valkey"
 Provides-Extra: async-redis
-Requires-Dist: coredis<5,>=3.4.0; extra == "async-redis"
+Requires-Dist: coredis<6,>=3.4.0; extra == "async-redis"
 Provides-Extra: async-memcached
 Requires-Dist: memcachio>=0.3; extra == "async-memcached"
 Provides-Extra: async-mongodb
@@ -43,12 +43,12 @@ Requires-Dist: motor<4,>=3; extra == "async-mongodb"
 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,<7.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: valkey>=6; extra == "all"
-Requires-Dist: coredis<5,>=3.4.0; extra == "all"
+Requires-Dist: coredis<6,>=3.4.0; extra == "all"
 Requires-Dist: memcachio>=0.3; extra == "all"
 Requires-Dist: motor<4,>=3; extra == "all"
 Requires-Dist: valkey>=6; extra == "all"

{limits-5.3.0 → limits-5.5.0}/limits.egg-info/requires.txt

@@ -1,14 +1,14 @@
 deprecated>=1.2
-packaging<26,>=21
+packaging>=21
 typing_extensions
 
 [all]
-redis!=4.5.2,!=4.5.3,<6.0.0,>3
+redis!=4.5.2,!=4.5.3,<7.0.0,>3
 redis!=4.5.2,!=4.5.3,>=4.2.0
 pymemcache<5.0.0,>3
 pymongo<5,>4.1
 valkey>=6
-coredis<5,>=3.4.0
+coredis<6,>=3.4.0
 memcachio>=0.3
 motor<4,>=3
 
@@ -19,7 +19,7 @@ memcachio>=0.3
 motor<4,>=3
 
 [async-redis]
-coredis<5,>=3.4.0
+coredis<6,>=3.4.0
 
 [async-valkey]
 valkey>=6
@@ -31,7 +31,7 @@ pymemcache<5.0.0,>3
 pymongo<5,>4.1
 
 [redis]
-redis!=4.5.2,!=4.5.3,<6.0.0,>3
+redis!=4.5.2,!=4.5.3,<7.0.0,>3
 
 [rediscluster]
 redis!=4.5.2,!=4.5.3,>=4.2.0

{limits-5.3.0 → limits-5.5.0}/requirements/docs.txt

@@ -1,11 +1,11 @@
 -r main.txt
-furo==2024.8.6
+furo==2025.7.19
 Sphinx>=4,<9
 sphinx-autobuild==2024.10.3
 sphinx-copybutton==0.5.2
 sphinx-design==0.6.1
 sphinx-inline-tabs==2023.4.21
-sphinxext-opengraph==0.10.0
+sphinxext-opengraph==0.11.0
 sphinx-paramlinks==0.6.0
 sphinxcontrib-programoutput==0.17
 

{limits-5.3.0 → limits-5.5.0}/requirements/main.txt

@@ -1,3 +1,3 @@
 deprecated>=1.2
-packaging>=21,<26
+packaging>=21
 typing_extensions

limits-5.5.0/requirements/storage/async-redis.txt

@@ -0,0 +1 @@
+coredis>=3.4.0,<6

limits-5.5.0/requirements/storage/redis.txt

@@ -0,0 +1 @@
+redis>3,!=4.5.2,!=4.5.3,<7.0.0

{limits-5.3.0 → limits-5.5.0}/tests/test_limits.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections import defaultdict
 
-from limits import limits
+from limits import RateLimitItemPerMinute, limits, parse, parse_many
 
 
 class TestLimits:
@@ -33,6 +33,7 @@ class TestLimits:
         assert item == self.FakeLimit(1, 1)
         assert item != self.FakeLimit(1, 2)
         assert item != self.FakeLimit(2, 1)
+        assert item != RateLimitItemPerMinute(1, 1)
         assert item != "someething else"
 
     def test_hashabilty(self):
@@ -44,3 +45,15 @@ class TestLimits:
         mapping[self.OtherFakeLimit(1, 2)] += 1
 
         assert len(mapping) == 3
+
+    def test_parse_custom_limit(self):
+        item = parse("1/fake")
+        assert item == self.FakeLimit(1, 1)
+        item = parse("5/10 fake")
+        assert item == self.FakeLimit(5, 10)
+        items = parse_many("1/fake,10/minute,10 per 10 fakes")
+        assert items == [
+            self.FakeLimit(1, 1),
+            RateLimitItemPerMinute(10, 1),
+            self.FakeLimit(10, 10),
+        ]

limits-5.3.0/requirements/storage/async-redis.txt

@@ -1 +0,0 @@
-coredis>=3.4.0,<5

limits-5.3.0/requirements/storage/redis.txt

@@ -1 +0,0 @@
-redis>3,!=4.5.2,!=4.5.3,<6.0.0