limits 3.3.1__py3-none-any.whl → 3.5.0__py3-none-any.whl

limits/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-03-22T15:09:18-0700",
+ "date": "2023-05-16T15:04:57-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "6ddfa53a1f4aff34642e487607fa071b673a40ef",
- "version": "3.3.1"
+ "full-revisionid": "d61ade38645d742e4614dd1c1c0283d6ace40bf0",
+ "version": "3.5.0"
 }
 '''  # END VERSION_JSON
 

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/aio/strategies.py

@@ -2,7 +2,6 @@
 Asynchronous rate limiting strategies
 """
 
-import weakref
 from abc import ABC, abstractmethod
 from typing import cast
 
@@ -15,7 +14,7 @@ from .storage import MovingWindowSupport, Storage
 class RateLimiter(ABC):
     def __init__(self, storage: StorageTypes):
         assert isinstance(storage, Storage)
-        self.storage: Storage = weakref.proxy(storage)
+        self.storage: Storage = storage
 
     @abstractmethod
     async def hit(self, item: RateLimitItem, *identifiers: str, cost: int = 1) -> bool:

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/storage/memory.py

@@ -7,7 +7,7 @@ from limits.storage.base import MovingWindowSupport, Storage
 from limits.typing import Dict, List, Optional, Tuple
 
 
-class LockableEntry(threading._RLock):
+class LockableEntry(threading._RLock):  # type: ignore
     def __init__(self, expiry: float) -> None:
         self.atime = time.time()
         self.expiry = self.atime + expiry

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/strategies.py

@@ -2,7 +2,6 @@
 Rate limiting strategies
 """
 
-import weakref
 from abc import ABCMeta, abstractmethod
 from typing import Dict, Type, Union, cast
 
@@ -14,7 +13,7 @@ from .util import WindowStats
 class RateLimiter(metaclass=ABCMeta):
     def __init__(self, storage: StorageTypes):
         assert isinstance(storage, Storage)
-        self.storage: Storage = weakref.proxy(storage)
+        self.storage: Storage = storage
 
     @abstractmethod
     def hit(self, item: RateLimitItem, *identifiers: str, cost: int = 1) -> bool:

{limits-3.3.1.dist-info → limits-3.5.0.dist-info}/METADATA

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

{limits-3.3.1.dist-info → limits-3.5.0.dist-info}/RECORD

@@ -1,38 +1,37 @@
 limits/__init__.py,sha256=j_yVhgN9pdz8o5rQjVwdJTBSq8F-CTzof9kkiYgjRbw,728
-limits/_version.py,sha256=e_K66W5uXJiAuk7fwDi5QpUGkuokyZ32nTQVKOndcIA,497
+limits/_version.py,sha256=pRgzWhjWD3Hv3aQNYQ7qUpaxhRxo3wRSGt5p6uMLXpk,497
 limits/errors.py,sha256=sUolBUfTFLQSzo6dfE2E9j_0K7_8Nr9_Hx-v5C4D0EU,416
 limits/limits.py,sha256=lwQnA5wegkW_AXtplOH3tLuQ1LByMX9hqHJquYVYdTs,4943
 limits/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-limits/strategies.py,sha256=P0ZukQIJb-KA7_gTpNRwez4a7kF-mZSjE0GCgVjM5Zk,6720
+limits/strategies.py,sha256=7pr2V34KdOEfxnYOf882Cl2qKY-KK6HwKjdYo_IsD4c,6690
 limits/typing.py,sha256=EhzmTl0x-RHsc_TRmP9vJooxV94nMisw3vnUtkB2NBI,2962
 limits/util.py,sha256=LRsn6i3KmQE33Ea4FTf4IxD9SMtwiKVXN5iDxTEuOuc,5743
 limits/version.py,sha256=YwkF3dtq1KGzvmL3iVGctA8NNtGlK_0arrzZkZGVjUs,47
 limits/aio/__init__.py,sha256=IOetunwQy1c5GefzitK8lewbTzHGiE-kmE9NlqSdr3U,82
-limits/aio/strategies.py,sha256=7s_0VEVCjybKSzNxl4VeKo2QCTK0Q94VcRZk2mOiUrc,6515
+limits/aio/strategies.py,sha256=REaQ-lqgqkN5wrFZ26AZ3sCHO8oZBL_mWhI6nMRaBz8,6485
 limits/aio/storage/__init__.py,sha256=CbtuSlVl1jPyN_vsEI_ApWblDblVaL46xcZ2M_oM0V8,595
 limits/aio/storage/base.py,sha256=gsy_91lvm53AoAKi1plaegcEOSZXK3OiMP0mxA6lPAw,2941
 limits/aio/storage/etcd.py,sha256=iGGuKHN5cCW9r4nLeiZ4TnoU1pfSXXLZhS2YOWznryw,4568
 limits/aio/storage/memcached.py,sha256=aR7f5NY-mXtFFjphbaxoL7z1cAHZuRYjpGUVOktoI4A,4296
 limits/aio/storage/memory.py,sha256=A506i0vncBmsaL9GGAqepQkPAXyc-HxmJ8gS8kJtqpE,5597
 limits/aio/storage/mongodb.py,sha256=s_eUawyITOT7nPHeI_fgMVmDhm9XxhoQ_bmYD2aXius,9057
-limits/aio/storage/redis.py,sha256=PCLPvogKNhtK89LWiG8-l_k7luVgDh5gBKFkxIsQlZ4,14858
-limits/resources/redis/lua_scripts/acquire_moving_window.lua,sha256=-YmVj_MHE5N6WazXmkAw4j-CtAOWk4XroTXloXSdHrA,527
+limits/aio/storage/redis.py,sha256=eBfTtk5w0s8IQKWUBeqbVFrKFr5xTIcRC7eim7uoYnA,14630
+limits/resources/redis/lua_scripts/acquire_moving_window.lua,sha256=5CFJX7D6T6RG5SFr6eVZ6zepmI1EkGWmKeVEO4QNrWo,483
 limits/resources/redis/lua_scripts/clear_keys.lua,sha256=zU0cVfLGmapRQF9x9u0GclapM_IB2pJLszNzVQ1QRK4,184
-limits/resources/redis/lua_scripts/gcra_consume.lua,sha256=bqTDE6_7LYqvqJCSo7mmJ_tGedL9CyWMwwBNXFuHdMk,1251
 limits/resources/redis/lua_scripts/incr_expire.lua,sha256=Uq9NcrrcDI-F87TDAJexoSJn2SDgeXIUEYozCp9S3oA,195
 limits/resources/redis/lua_scripts/moving_window.lua,sha256=ir0SkuRVnrqkVSFNIuedTV_KW6zG70Z56u6-_FpR_20,352
 limits/storage/__init__.py,sha256=8i1-SoTEV_XGAMYDepcLra7do-Tx4rUPbPrUQVVJgTw,2518
 limits/storage/base.py,sha256=-JV-zAkss7pOETZyPYjo8ZZqTMGs-DPqgz_gcfArXfs,2818
 limits/storage/etcd.py,sha256=SlDHRItliRaR2j5Rf_v_oQ57ITpmNMYQJSamM3SbwCA,4258
 limits/storage/memcached.py,sha256=qMvRIEtRRzZXSgcZSUTBgUlBDeNOpIr_gDTV2r5SPak,6005
-limits/storage/memory.py,sha256=mwNOkPyXnTAUdxOnXVf7yqDqry-G_IwpI0jkrQ6tfo0,5286
+limits/storage/memory.py,sha256=plPsyLB26QN9I6jQq00fra-cdh8xoDAgaoM-kWuECtk,5302
 limits/storage/mongodb.py,sha256=ZdFr2-MTtdPcOZE5XKd-XxNmbl9dHLZbU2PmqmH9CA4,7942
 limits/storage/redis.py,sha256=nysRkOIK9pKTC1p0mBpIu5wHjmihLsFbwOx8nfFMpaI,7560
 limits/storage/redis_cluster.py,sha256=8578Slo-cwh5GdbuUDhYjQfBsWTwJyGoQ1d_mxVfcIM,5342
-limits/storage/redis_sentinel.py,sha256=fbTHyxeNsnGG4ll3hMDejE2C2DqWPpKwE3JklUY9pHA,3835
+limits/storage/redis_sentinel.py,sha256=AxbtYZQXCNL-4yu7dQ8i6MhwO2PNLMRLHe3JcHkMKvA,3647
 limits/storage/registry.py,sha256=xcBcxuu6srqmoS4WqDpkCXnRLB19ctH98v21P8S9kS8,708
-limits-3.3.1.dist-info/LICENSE.txt,sha256=T6i7kq7F5gIPfcno9FCxU5Hcwm22Bjq0uHZV3ElcjsQ,1061
-limits-3.3.1.dist-info/METADATA,sha256=vVYvd4iWIg9KVeRwoWm6badxSFTWa7ZOgjD9WN3l87o,7486
-limits-3.3.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-limits-3.3.1.dist-info/top_level.txt,sha256=C7g5ahldPoU2s6iWTaJayUrbGmPK1d6e9t5Nn0vQ2jM,7
-limits-3.3.1.dist-info/RECORD,,
+limits-3.5.0.dist-info/LICENSE.txt,sha256=T6i7kq7F5gIPfcno9FCxU5Hcwm22Bjq0uHZV3ElcjsQ,1061
+limits-3.5.0.dist-info/METADATA,sha256=jQV7tH4J9f2a2hoVe96tDgetCi4npIq5Hq8Fhn0oFi8,7486
+limits-3.5.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+limits-3.5.0.dist-info/top_level.txt,sha256=C7g5ahldPoU2s6iWTaJayUrbGmPK1d6e9t5Nn0vQ2jM,7
+limits-3.5.0.dist-info/RECORD,,

limits/resources/redis/lua_scripts/gcra_consume.lua

@@ -1,50 +0,0 @@
-local rate_limit_key = KEYS[1]
-local burst          = ARGV[1]
-local rate           = ARGV[2]
-local period         = ARGV[3]
-local cost           = ARGV[4]
-
-local emission_interval = period / rate
-local increment         = emission_interval * cost
-local burst_offset      = emission_interval * burst
-
-local tat = redis.call("GET", rate_limit_key)
-
-local time = redis.call("TIME")
-local now = tonumber(time[1]) + tonumber(time[2])/1000000.0
-
-if not tat then
-  tat = now
-else
-  tat = tonumber(tat)
-end
-
-tat = math.max(tat, now)
-
-local new_tat = tat + increment
-local allow_at = new_tat - burst_offset
-local diff = now - allow_at
-
-local consumed = 0
-local retry_in = 0
-local reset_in
-
-local remaining = math.floor(diff / emission_interval) -- poor man's round
-if remaining < 0 then
-  consumed = 0
-  remaining = math.floor((now - (tat - burst_offset)) / emission_interval)
-  reset_in = math.ceil(tat - now)
-  retry_in = math.ceil(diff * -1)
-elseif remaining == 0 and increment <= 0 then
-  consumed = 1
-  remaining = 0
-  reset_in = math.ceil(tat - now)
-else
-  consumed = 1
-  reset_in = math.ceil(new_tat - now)
-  if increment > 0 then
-    redis.call("SET", rate_limit_key, new_tat, "PX", reset_in)
-  end
-end
-
-return {consumed, remaining, retry_in, reset_in}