mdbq 4.0.99__py3-none-any.whl → 4.0.101__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.99'
+VERSION = '4.0.101'

mdbq/auth/rate_limiter.py

@@ -260,8 +260,10 @@ class AdvancedRateLimiter:
             window_start = current_time - rule.window
             
             if key not in self.storage:
-                self.storage[key]['requests'] = deque()
+                self.storage[key] = {'requests': deque(), 'last_access': current_time}
             
+            # 更新最后访问时间
+            self.storage[key]['last_access'] = current_time
             requests = self.storage[key]['requests']
             
             # 清理过期请求
@@ -286,9 +288,12 @@ class AdvancedRateLimiter:
             if key not in self.storage:
                 self.storage[key] = {
                     'tokens': rule.requests,
-                    'last_refill': current_time
+                    'last_refill': current_time,
+                    'last_access': current_time
                 }
             
+            # 更新最后访问时间
+            self.storage[key]['last_access'] = current_time
             bucket = self.storage[key]
             
             # 计算需要添加的令牌数
@@ -313,8 +318,10 @@ class AdvancedRateLimiter:
         
         with self.locks[key]:
             if key not in self.storage:
-                self.storage[key] = {'count': 0, 'window_start': window_start}
+                self.storage[key] = {'count': 0, 'window_start': window_start, 'last_access': current_time}
             
+            # 更新最后访问时间
+            self.storage[key]['last_access'] = current_time
             data = self.storage[key]
             
             # 检查是否是新窗口
@@ -373,6 +380,7 @@ class AdvancedRateLimiter:
                 violations['count'] = 1
             
             violations['last_time'] = current_time
+            violations['last_access'] = current_time
             self.storage[violation_key] = violations
             
             # 连续违规超过阈值，进行阻断
@@ -487,12 +495,16 @@ class RateLimitDecorators:
                     if isinstance(response, tuple) and len(response) >= 2:
                         response_data, status_code = response[0], response[1]
                         if hasattr(response_data, 'headers'):
-                            rule = self.limiter.rules.get(api_type, {}).get(user_level)
-                            if rule:
-                                response_data.headers['X-RateLimit-Limit'] = str(rule.requests)
-                                response_data.headers['X-RateLimit-Remaining'] = str(remaining)
-                                response_data.headers['X-RateLimit-Reset'] = str(int(time.time() + rule.window))
-                                response_data.headers['X-RateLimit-Policy'] = f"{api_type}:{user_level.value}"
+                            try:
+                                rule = self.limiter.rules.get(api_type, {}).get(user_level)
+                                if rule and hasattr(rule, 'requests') and hasattr(rule, 'window'):
+                                    response_data.headers['X-RateLimit-Limit'] = str(rule.requests)
+                                    response_data.headers['X-RateLimit-Remaining'] = str(remaining)
+                                    response_data.headers['X-RateLimit-Reset'] = str(int(time.time() + rule.window))
+                                    response_data.headers['X-RateLimit-Policy'] = f"{api_type}:{user_level.value}"
+                            except (AttributeError, KeyError, TypeError):
+                                # 忽略头部设置错误，不影响主要功能
+                                pass
                     
                     return response
                     

{mdbq-4.0.99.dist-info → mdbq-4.0.101.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.0.99
+Version: 4.0.101
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.99.dist-info → mdbq-4.0.101.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=3pgeM4FRzKH3kfbXDpPMNe-aq2Qy0ytSAFcNGAwqiMk,18
+mdbq/__version__.py,sha256=rfICcxlmzUQJ5Hzr7UgjXor-iFyT_ckRGGFJPHSOmSM,19
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=cUL9oWzzFSuJgvqeo4ognl8NiMvaIWNgJMaG7ZCLvnA,79391
-mdbq/auth/rate_limiter.py,sha256=e7K8pMQlZ1vm1N-c0HBH8tbAwzcmXSRiAl81JNZ369g,26192
+mdbq/auth/rate_limiter.py,sha256=TAMayHQxDPCEc4eGcsMnCCCYQ6LWxkoCcUd7XsTGu9I,26960
 mdbq/js/__init__.py,sha256=hpMi3_ZKwIWkzc0LnKL-SY9AS-7PYFHq0izYTgEvxjc,30
 mdbq/js/jc.py,sha256=FOc6HOOTJwnoZLZmgmaE1SQo9rUnVhXmefhKMD2MlDA,13229
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
@@ -33,7 +33,7 @@ mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.99.dist-info/METADATA,sha256=H_Sa_C5vsfH6M3ynHCuTXb5XpJ-yXXssIweqINggiqU,364
-mdbq-4.0.99.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.99.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.99.dist-info/RECORD,,
+mdbq-4.0.101.dist-info/METADATA,sha256=TOyDrSssNPs9yZd59NXESLL6pXYOVHQGmFzJ1HtT8hw,365
+mdbq-4.0.101.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.0.101.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.101.dist-info/RECORD,,