Qubx 1.1.3.dev12__tar.gz → 1.1.3.dev13__tar.gz

{qubx-1.1.3.dev12 → qubx-1.1.3.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Qubx
-Version: 1.1.3.dev12
+Version: 1.1.3.dev13
 Summary: Qubx - Quantitative Trading Framework
 Project-URL: homepage, https://xlydian.com
 Project-URL: repository, https://github.com/xLydianSoftware/Qubx

{qubx-1.1.3.dev12 → qubx-1.1.3.dev13}/src/qubx/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.3.dev12'
-__version_tuple__ = version_tuple = (1, 1, 3, 'dev12')
+__version__ = version = '1.1.3.dev13'
+__version_tuple__ = version_tuple = (1, 1, 3, 'dev13')
 
 __commit_id__ = commit_id = None

{qubx-1.1.3.dev12 → qubx-1.1.3.dev13}/src/qubx/rate_limiting/backend.py

@@ -33,11 +33,16 @@ class IRateLimitBackend(ABC):
         """
 
     @abstractmethod
-    async def get_remaining(self, key: str) -> float | None:
+    async def get_remaining(self, key: str, capacity: float = 0, refill_rate: float = 0) -> float | None:
         """Get remaining tokens for a key (non-blocking).
 
+        Args:
+            key: Bucket identifier
+            capacity: Pool capacity (for computing refill on read)
+            refill_rate: Tokens per second (for computing refill on read)
+
         Returns:
-            Token count, or None if key doesn't exist
+            Token count (with refill applied), or None if key doesn't exist
         """
 
     @abstractmethod
@@ -70,7 +75,7 @@ class InMemoryBackend(IRateLimitBackend):
         await limiter.acquire(weight)
         return time.monotonic() - start
 
-    async def get_remaining(self, key: str) -> float | None:
+    async def get_remaining(self, key: str, capacity: float = 0, refill_rate: float = 0) -> float | None:
         limiter = self._limiters.get(key)
         if limiter is None:
             return None

{qubx-1.1.3.dev12 → qubx-1.1.3.dev13}/src/qubx/rate_limiting/engine.py

@@ -333,7 +333,7 @@ class ExchangeRateLimiter:
             remaining = self._quota_remaining.get(pool_name, 0)
         else:
             key = self._key_for(pool)
-            remaining = await self._backend.get_remaining(key)
+            remaining = await self._backend.get_remaining(key, pool.capacity, pool.refill_rate)
             if remaining is None:
                 remaining = pool.capacity
 

{qubx-1.1.3.dev12 → qubx-1.1.3.dev13}/src/qubx/rate_limiting/redis_backend.py

@@ -51,11 +51,21 @@ end
 
 _LUA_GET_REMAINING = """
 local key = KEYS[1]
-local now = tonumber(ARGV[1])
+local capacity = tonumber(ARGV[1])
+local refill_rate = tonumber(ARGV[2])
+local now = tonumber(ARGV[3])
 
 local tokens = tonumber(redis.call('HGET', key, 'tokens'))
 if tokens == nil then return -1 end
 
+-- Compute refilled value (same logic as acquire)
+if refill_rate > 0 then
+    local last_refill = tonumber(redis.call('HGET', key, 'last_refill') or now)
+    local elapsed = now - last_refill
+    local tokens_to_add = elapsed * refill_rate
+    tokens = math.min(capacity, tokens + tokens_to_add)
+end
+
 -- Refresh TTL on read (keeps keys alive while bot is running)
 redis.call('EXPIRE', key, 600)
 
@@ -107,11 +117,11 @@ class RedisBackend(IRateLimitBackend):
             await __import__("asyncio").sleep(wait_s)
             now = time.time()
 
-    async def get_remaining(self, key: str) -> float | None:
+    async def get_remaining(self, key: str, capacity: float = 0, refill_rate: float = 0) -> float | None:
         now = time.time()
         result = await self._get_remaining_script(
             keys=[key],
-            args=[now],
+            args=[capacity, refill_rate, now],
         )
         result = float(result)
         if result < 0: