limits 3.4.0__py3-none-any.whl → 3.6.0__py3-none-any.whl

limits/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-04-17T05:34:51-0700",
+ "date": "2023-08-31T07:36:32-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "708c0d7f8bbad85f7ff09555517d9718df362e03",
- "version": "3.4.0"
+ "full-revisionid": "ada96bb4afc9729b4aac2552209a78428a27c313",
+ "version": "3.6.0"
 }
 '''  # END VERSION_JSON
 

limits/aio/storage/mongodb.py

@@ -30,7 +30,6 @@ class MongoDBStorage(Storage, MovingWindowSupport):
 
     DEFAULT_OPTIONS: Dict[str, Union[float, str, bool]] = {
         "serverSelectionTimeoutMS": 1000,
-        "socketTimeoutMS": 1000,
         "connectTimeoutMS": 1000,
     }
     "Default options passed to :class:`~motor.motor_asyncio.AsyncIOMotorClient`"

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

@@ -26,7 +26,6 @@ class MongoDBStorage(Storage, MovingWindowSupport):
     STORAGE_SCHEME = ["mongodb", "mongodb+srv"]
     DEFAULT_OPTIONS: Dict[str, Union[int, str, bool]] = {
         "serverSelectionTimeoutMS": 1000,
-        "socketTimeoutMS": 1000,
         "connectTimeoutMS": 1000,
     }
     "Default options passed to :class:`~pymongo.mongo_client.MongoClient`"

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.dist-info → limits-3.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: limits
-Version: 3.4.0
+Version: 3.6.0
 Summary: Rate limiting utilities
 Home-page: https://limits.readthedocs.org
 Author: Ali-Akber Saifee
@@ -14,7 +14,6 @@ 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.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -22,41 +21,40 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.7
 License-File: LICENSE.txt
-Requires-Dist: deprecated (>=1.2)
-Requires-Dist: importlib-resources (>=1.3)
-Requires-Dist: setuptools
-Requires-Dist: packaging (<24,>=21)
+Requires-Dist: deprecated >=1.2
+Requires-Dist: importlib-resources >=1.3
+Requires-Dist: packaging <24,>=21
 Requires-Dist: typing-extensions
 Provides-Extra: all
-Requires-Dist: redis (!=4.5.2,!=4.5.3,<5.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: 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: motor (<4,>=3) ; extra == 'all'
+Requires-Dist: coredis <5,>=3.4.0 ; extra == 'all'
+Requires-Dist: motor <4,>=3 ; extra == 'all'
 Requires-Dist: aetcd ; extra == 'all'
-Requires-Dist: emcache (>=0.6.1) ; (python_version < "3.11") and extra == 'all'
-Requires-Dist: coredis (<5,>=3.4.0) ; (python_version > "3.7") and extra == 'all'
-Requires-Dist: emcache (>=1) ; (python_version >= "3.11") and extra == 'all'
+Requires-Dist: emcache >=0.6.1 ; (python_version < "3.11") and extra == 'all'
+Requires-Dist: emcache >=1 ; (python_version >= "3.11") and extra == 'all'
 Provides-Extra: async-etcd
 Requires-Dist: aetcd ; extra == 'async-etcd'
 Provides-Extra: async-memcached
-Requires-Dist: emcache (>=0.6.1) ; (python_version < "3.11") and extra == 'async-memcached'
-Requires-Dist: emcache (>=1) ; (python_version >= "3.11") and extra == 'async-memcached'
+Requires-Dist: emcache >=0.6.1 ; (python_version < "3.11") and extra == 'async-memcached'
+Requires-Dist: emcache >=1 ; (python_version >= "3.11") and extra == 'async-memcached'
 Provides-Extra: async-mongodb
-Requires-Dist: motor (<4,>=3) ; extra == 'async-mongodb'
+Requires-Dist: motor <4,>=3 ; extra == 'async-mongodb'
 Provides-Extra: async-redis
-Requires-Dist: coredis (<5,>=3.4.0) ; (python_version > "3.7") and extra == 'async-redis'
+Requires-Dist: coredis <5,>=3.4.0 ; extra == 'async-redis'
 Provides-Extra: etcd
 Requires-Dist: etcd3 ; extra == 'etcd'
 Provides-Extra: memcached
-Requires-Dist: pymemcache (<5.0.0,>3) ; extra == 'memcached'
+Requires-Dist: pymemcache <5.0.0,>3 ; extra == 'memcached'
 Provides-Extra: mongodb
-Requires-Dist: pymongo (<5,>4.1) ; extra == 'mongodb'
+Requires-Dist: pymongo <5,>4.1 ; extra == 'mongodb'
 Provides-Extra: redis
-Requires-Dist: redis (!=4.5.2,!=4.5.3,<5.0.0,>3) ; extra == 'redis'
+Requires-Dist: redis !=4.5.2,!=4.5.3,<6.0.0,>3 ; extra == 'redis'
 Provides-Extra: rediscluster
-Requires-Dist: redis (!=4.5.2,!=4.5.3,>=4.2.0) ; extra == 'rediscluster'
+Requires-Dist: redis !=4.5.2,!=4.5.3,>=4.2.0 ; extra == 'rediscluster'
 
 .. |ci| image:: https://github.com/alisaifee/limits/workflows/CI/badge.svg?branch=master
     :target: https://github.com/alisaifee/limits/actions?query=branch%3Amaster+workflow%3ACI

{limits-3.4.0.dist-info → limits-3.6.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 limits/__init__.py,sha256=j_yVhgN9pdz8o5rQjVwdJTBSq8F-CTzof9kkiYgjRbw,728
-limits/_version.py,sha256=i_CrWuFPD570n-OBHIVqQAf2x9MimaS2ubLEMYD7cyc,497
+limits/_version.py,sha256=5KtTqbQ9xQXrC3mRk9avjH69WNCQc8PltKm5xQRBCj4,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
@@ -14,9 +14,9 @@ limits/aio/storage/base.py,sha256=gsy_91lvm53AoAKi1plaegcEOSZXK3OiMP0mxA6lPAw,29
 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/mongodb.py,sha256=79D6HU3vGLmY1WDvtoaKItRHly7L__mZpu7XEmOgBnY,9024
+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/incr_expire.lua,sha256=Uq9NcrrcDI-F87TDAJexoSJn2SDgeXIUEYozCp9S3oA,195
 limits/resources/redis/lua_scripts/moving_window.lua,sha256=ir0SkuRVnrqkVSFNIuedTV_KW6zG70Z56u6-_FpR_20,352
@@ -25,13 +25,13 @@ 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=plPsyLB26QN9I6jQq00fra-cdh8xoDAgaoM-kWuECtk,5302
-limits/storage/mongodb.py,sha256=ZdFr2-MTtdPcOZE5XKd-XxNmbl9dHLZbU2PmqmH9CA4,7942
+limits/storage/mongodb.py,sha256=Z4_Og2Ys6uwQT_D4dUDdDAEndBY7UfCh_LiHgZf8IUk,7909
 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.4.0.dist-info/LICENSE.txt,sha256=T6i7kq7F5gIPfcno9FCxU5Hcwm22Bjq0uHZV3ElcjsQ,1061
-limits-3.4.0.dist-info/METADATA,sha256=mjhfU40iP1TxeuFFJ9pqxZzUhstTlm-Vr-pILEUFaEk,7486
-limits-3.4.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-limits-3.4.0.dist-info/top_level.txt,sha256=C7g5ahldPoU2s6iWTaJayUrbGmPK1d6e9t5Nn0vQ2jM,7
-limits-3.4.0.dist-info/RECORD,,
+limits-3.6.0.dist-info/LICENSE.txt,sha256=T6i7kq7F5gIPfcno9FCxU5Hcwm22Bjq0uHZV3ElcjsQ,1061
+limits-3.6.0.dist-info/METADATA,sha256=YXO0qBkd4XtBcXu5OvH7d_VUubzVMEPY1hxQSNIZjrY,7314
+limits-3.6.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+limits-3.6.0.dist-info/top_level.txt,sha256=C7g5ahldPoU2s6iWTaJayUrbGmPK1d6e9t5Nn0vQ2jM,7
+limits-3.6.0.dist-info/RECORD,,

{limits-3.4.0.dist-info → limits-3.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any