limits 3.4.0__tar.gz → 3.5.0__tar.gz

{limits-3.4.0 → limits-3.5.0}/HISTORY.rst

@@ -3,6 +3,15 @@
 Changelog
 =========
 
+v3.5.0
+------
+Release Date: 2023-05-16
+
+* Bug Fix
+
+  * Handle ``cost`` > 8000 when using redis
+  * Remove arbitrary default timeout for redis+sentinel
+
 v3.4.0
 ------
 Release Date: 2023-04-17
@@ -599,5 +608,6 @@ Release Date: 2015-01-08
 
 
 
+
 
 

{limits-3.4.0 → limits-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: limits
-Version: 3.4.0
+Version: 3.5.0
 Summary: Rate limiting utilities
 Home-page: https://limits.readthedocs.org
 Author: Ali-Akber Saifee

{limits-3.4.0 → limits-3.5.0}/limits/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-04-17T05:34:51-0700",
+ "date": "2023-05-16T15:04:57-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "708c0d7f8bbad85f7ff09555517d9718df362e03",
- "version": "3.4.0"
+ "full-revisionid": "d61ade38645d742e4614dd1c1c0283d6ace40bf0",
+ "version": "3.5.0"
 }
 '''  # END VERSION_JSON
 

{limits-3.4.0 → limits-3.5.0}/limits/aio/storage/redis.py

@@ -349,11 +349,6 @@ class RedisSentinelStorage(RedisStorage):
     STORAGE_SCHEME = ["async+redis+sentinel"]
     """The storage scheme for redis accessed via a redis sentinel installation"""
 
-    DEFAULT_OPTIONS: Dict[str, Union[float, str, bool]] = {
-        "stream_timeout": 0.2,
-    }
-    "Default options passed to :class:`~coredis.sentinel.Sentinel`"
-
     DEPENDENCIES = {"coredis.sentinel": Version("3.4.0")}
 
     def __init__(
@@ -402,8 +397,6 @@ class RedisSentinelStorage(RedisStorage):
         if self.service_name is None:
             raise ConfigurationError("'service_name' not provided")
 
-        connection_options.setdefault("stream_timeout", 0.2)
-
         super(RedisStorage, self).__init__()
 
         self.dependency = self.dependencies["coredis.sentinel"].module

{limits-3.4.0 → limits-3.5.0}/limits/resources/redis/lua_scripts/acquire_moving_window.lua

@@ -9,15 +9,14 @@ end
 
 local entry = redis.call('lindex', KEYS[1], limit - amount)
 
-
 if entry and tonumber(entry) >= timestamp - expiry then
     return false
 end
-local entries= {}
-for i=1, amount do
-    entries[i] = timestamp
+
+for i = 1, amount do
+    redis.call('lpush', KEYS[1], timestamp)
 end
-redis.call('lpush', KEYS[1], unpack(entries))
+
 redis.call('ltrim', KEYS[1], 0, limit - 1)
 redis.call('expire', KEYS[1], expiry)
 

{limits-3.4.0 → limits-3.5.0}/limits/storage/redis_sentinel.py

@@ -21,11 +21,6 @@ class RedisSentinelStorage(RedisStorage):
     STORAGE_SCHEME = ["redis+sentinel"]
     """The storage scheme for redis accessed via a redis sentinel installation"""
 
-    DEFAULT_OPTIONS: Dict[str, Union[float, str, bool]] = {
-        "socket_timeout": 0.2,
-    }
-    "Default options passed to :class:`~redis.sentinel.Sentinel`"
-
     DEPENDENCIES = {"redis.sentinel": Version("3.0")}
 
     def __init__(
@@ -79,7 +74,7 @@ class RedisSentinelStorage(RedisStorage):
         self.sentinel: "redis.sentinel.Sentinel" = sentinel_dep.Sentinel(
             sentinel_configuration,
             sentinel_kwargs={**parsed_auth, **sentinel_options},
-            **{**self.DEFAULT_OPTIONS, **parsed_auth, **options}
+            **{**parsed_auth, **options}
         )
         self.storage = self.sentinel.master_for(self.service_name)
         self.storage_slave = self.sentinel.slave_for(self.service_name)

{limits-3.4.0 → limits-3.5.0}/limits.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: limits
-Version: 3.4.0
+Version: 3.5.0
 Summary: Rate limiting utilities
 Home-page: https://limits.readthedocs.org
 Author: Ali-Akber Saifee

{limits-3.4.0 → limits-3.5.0}/requirements/docs.txt

@@ -4,7 +4,7 @@ Sphinx>=5
 sphinx-copybutton==0.5.2
 sphinx-autobuild==2021.3.14
 sphinxext-opengraph==0.8.2
-sphinx-inline-tabs==2022.1.2b11
+sphinx-inline-tabs==2023.4.21
 sphinx-paramlinks==0.5.4
 sphinxcontrib-programoutput==0.17
 

{limits-3.4.0 → limits-3.5.0}/tests/test_strategy.py

@@ -134,6 +134,16 @@ class TestWindow:
         limiter.clear(five_per_min)
         assert limiter.hit(five_per_min)
 
+    @moving_window_storage
+    def test_moving_window_huge_cost_sync(self, uri, args, fixture):
+        storage = storage_from_string(uri, **args)
+        limiter = MovingWindowRateLimiter(storage)
+        many_per_min = RateLimitItemPerMinute(1_000_000)
+        limiter.hit(many_per_min, cost=1_000_000)
+        assert not limiter.hit(many_per_min, cost=2)
+        limiter.clear(many_per_min)
+        assert limiter.hit(many_per_min)
+
     @pytest.mark.memcached
     def test_moving_window_memcached(self, memcached):
         storage = MemcachedStorage("memcached://localhost:22122")