qrpa 1.0.39__tar.gz → 1.0.41__tar.gz

{qrpa-1.0.39 → qrpa-1.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.39
+Version: 1.0.41
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.0.39 → qrpa-1.0.41}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.0.39"
+version = "1.0.41"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.0.39 → qrpa-1.0.41}/qrpa/feishu_client.py

@@ -3,19 +3,29 @@ import requests
 import json
 import time
 import base64, os
+import threading
 from urllib.parse import urlparse
 from typing import Optional, Dict, List, Any
+from collections import deque
 
 from .fun_base import log
 
 class FeishuClient:
-    def __init__(self, app_id: str, app_secret: str):
+    def __init__(self, app_id: str, app_secret: str, max_requests_per_second: int = 90, skip_token_refresh: bool = False):
         self.app_id = app_id
         self.app_secret = app_secret
         self.base_url = "https://open.feishu.cn/open-apis"
         self.tenant_access_token = None
         self.token_expire_time = 0
-        self._refresh_token()
+        
+        # 速率限制相关参数
+        self.max_requests_per_second = max_requests_per_second
+        self.request_times = deque()  # 存储请求时间戳
+        self.rate_limit_lock = threading.Lock()  # 保证线程安全
+        
+        # 只有在不跳过token刷新时才获取token
+        if not skip_token_refresh:
+            self._refresh_token()
 
     def _refresh_token(self):
         url = f"{self.base_url}/auth/v3/tenant_access_token/internal"
@@ -41,8 +51,72 @@ class FeishuClient:
     def _ensure_valid_token(self):
         if not self.tenant_access_token or time.time() > self.token_expire_time:
             self._refresh_token()
+    
+    def _wait_for_rate_limit(self):
+        """
+        实现请求频率限制，确保不超过90次/秒
+        使用滑动窗口算法控制请求频率
+        """
+        with self.rate_limit_lock:
+            current_time = time.time()
+            
+            # 清理1秒前的请求记录
+            while self.request_times and current_time - self.request_times[0] > 1.0:
+                self.request_times.popleft()
+            
+            # 如果当前秒内请求数已达到限制，则等待
+            if len(self.request_times) >= self.max_requests_per_second:
+                # 计算需要等待的时间
+                oldest_request_time = self.request_times[0]
+                wait_time = 1.0 - (current_time - oldest_request_time)
+                if wait_time > 0:
+                    log(f"请求频率限制: 等待 {wait_time:.3f} 秒")
+                    time.sleep(wait_time)
+                    # 重新获取当前时间并清理过期记录
+                    current_time = time.time()
+                    while self.request_times and current_time - self.request_times[0] > 1.0:
+                        self.request_times.popleft()
+            
+            # 记录当前请求时间
+            self.request_times.append(current_time)
+    
+    def get_current_request_rate(self):
+        """
+        获取当前的请求频率 (最近1秒内的请求数)
+        
+        Returns:
+            int: 最近1秒内的请求数
+        """
+        with self.rate_limit_lock:
+            current_time = time.time()
+            # 清理1秒前的请求记录
+            while self.request_times and current_time - self.request_times[0] > 1.0:
+                self.request_times.popleft()
+            return len(self.request_times)
+    
+    def set_rate_limit(self, max_requests_per_second: int):
+        """
+        动态设置请求频率限制
+        
+        Args:
+            max_requests_per_second: 每秒最大请求数
+        """
+        with self.rate_limit_lock:
+            self.max_requests_per_second = max_requests_per_second
+            log(f"请求频率限制已更新为: {max_requests_per_second} 次/秒")
+    
+    def reset_rate_limit_counter(self):
+        """
+        重置频率限制计数器
+        """
+        with self.rate_limit_lock:
+            self.request_times.clear()
+            log("频率限制计数器已重置")
 
     def _make_request(self, method: str, url: str, **kwargs):
+        # 在发送请求前进行速率限制检查
+        self._wait_for_rate_limit()
+        
         self._ensure_valid_token()
 
         headers = kwargs.get('headers', {})

{qrpa-1.0.39 → qrpa-1.0.41}/qrpa/fun_web.py

@@ -5,7 +5,6 @@ from playwright.sync_api import Page
 from .fun_base import log, send_exception
 from .time_utils import get_current_datetime
 
-
 def fetch(page: Page, url: str, params: Optional[Union[dict, list, str]] = None, headers: Optional[dict] = None, config:
 Optional[dict] = None) -> dict:
     """
@@ -23,6 +22,7 @@ Optional[dict] = None) -> dict:
         raise ValueError("headers 参数必须是 dict 或 None")
 
     try:
+        page.wait_for_load_state('load')
         response = page.evaluate("""
             async ({ url, params, extraHeaders }) => {
                 try {
@@ -64,7 +64,6 @@ Optional[dict] = None) -> dict:
         raise send_exception()
         # return {"error": "fetch error", "message": str(e)}
 
-
 def fetch_via_iframe(page: Page, target_domain: str, url: str, params: Optional[Union[dict, list, str]] = None, config:
 Optional[dict] = None) -> dict:
     """
@@ -126,9 +125,8 @@ Optional[dict] = None) -> dict:
 
         return response
     except Exception as e:
-       raise send_exception()
-       # return {"error": "iframe_exception", "message": str(e)}
-
+        raise send_exception()
+        # return {"error": "iframe_exception", "message": str(e)}
 
 # 找到一个页面里面所有的iframe
 def find_all_iframe(page: Page):
@@ -137,7 +135,6 @@ def find_all_iframe(page: Page):
         log("找到 iframe:", frame.url)
     return [frame.url for frame in frames]
 
-
 # 全屏幕截图
 def full_screen_shot(web_page: Page, config):
     # 设置页面的视口大小为一个较大的值，确保截图高清

{qrpa-1.0.39 → qrpa-1.0.41}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.39
+Version: 1.0.41
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>