Upload 3 files

dify_api_client.py

@@ -18,6 +18,7 @@ import logging
 import configparser
 from typing import Dict, Any, Optional, Union
 from datetime import datetime
+from tenacity import retry, stop_after_attempt, wait_exponential, retry_if_exception_type
 
 
 # 配置日志
@@ -126,9 +127,14 @@ class DifyAPIClient:
             print(f"读取文件时出错: {str(e)}")
             sys.exit(1)
     
+    @retry(
+        stop=stop_after_attempt(3),  # 最多重试3次
+        wait=wait_exponential(multiplier=1, min=2, max=10),  # 指数退避策略
+        retry=retry_if_exception_type((requests.exceptions.Timeout, requests.exceptions.ConnectionError))
+    )
     def send_request_blocking(self, content: str, conversation_id: str = None, user: str = "user") -> Dict[str, Any]:
         """
-        发送阻塞模式请求
+        发送阻塞模式请求，带有自动重试机制
         
         Args:
             content: 请求内容
@@ -158,7 +164,8 @@ class DifyAPIClient:
         logging.debug(f"请求负载: {json.dumps(payload, ensure_ascii=False)}")
         
         try:
-            response = requests.post(url, headers=self.headers, json=payload)
+            # 设置更长的超时时间：60秒连接超时，120秒读取超时
+            response = requests.post(url, headers=self.headers, json=payload, timeout=(60, 120))
             response.raise_for_status()
             response_data = response.json()
             logging.info("API请求成功")
@@ -169,12 +176,12 @@ class DifyAPIClient:
             if hasattr(response, 'text'):
                 logging.error(f"API响应内容: {response.text}")
             raise Exception(f"HTTP错误: {e}")
-        except requests.exceptions.ConnectionError:
-            logging.error("连接错误: 无法连接到API服务器")
-            raise Exception("连接错误: 无法连接到API服务器")
-        except requests.exceptions.Timeout:
-            logging.error("超时错误: API请求超时")
-            raise Exception("超时错误: API请求超时")
+        except requests.exceptions.ConnectionError as e:
+            logging.error(f"连接错误: 无法连接到API服务器: {e}")
+            raise  # 重新抛出异常以触发重试
+        except requests.exceptions.Timeout as e:
+            logging.error(f"超时错误: API请求超时: {e}")
+            raise  # 重新抛出异常以触发重试
         except requests.exceptions.RequestException as e:
             logging.error(f"请求错误: {str(e)}", exc_info=True)
             raise Exception(f"请求错误: {e}")
@@ -187,9 +194,14 @@ class DifyAPIClient:
             logging.error(f"未知错误: {str(e)}", exc_info=True)
             raise Exception(f"发送请求时发生未知错误: {str(e)}")
     
+    @retry(
+        stop=stop_after_attempt(3),  # 最多重试3次
+        wait=wait_exponential(multiplier=1, min=2, max=10),  # 指数退避策略
+        retry=retry_if_exception_type((httpx.TimeoutException, httpx.ConnectError))
+    )
     async def send_request_blocking_async(self, content: str, conversation_id: str = None, user: str = "user") -> Dict[str, Any]:
         """
-        异步发送阻塞模式请求
+        异步发送阻塞模式请求，带有自动重试机制
         
         Args:
             content: 请求内容
@@ -219,7 +231,9 @@ class DifyAPIClient:
         logging.debug(f"请求负载: {json.dumps(payload, ensure_ascii=False)}")
         
         try:
-            async with httpx.AsyncClient() as client:
+            # 设置更长的超时时间：60秒连接超时，120秒读取超时
+            timeout = httpx.Timeout(60.0, read=120.0)
+            async with httpx.AsyncClient(timeout=timeout) as client:
                 response = await client.post(url, headers=self.headers, json=payload)
                 response.raise_for_status()
                 response_data = response.json()
@@ -231,12 +245,12 @@ class DifyAPIClient:
             if hasattr(e.response, 'text'):
                 logging.error(f"API响应内容: {e.response.text}")
             raise Exception(f"HTTP错误: {e}")
-        except httpx.ConnectError:
-            logging.error("连接错误: 无法连接到API服务器")
-            raise Exception("连接错误: 无法连接到API服务器")
-        except httpx.TimeoutException:
-            logging.error("超时错误: API请求超时")
-            raise Exception("超时错误: API请求超时")
+        except httpx.ConnectError as e:
+            logging.error(f"连接错误: 无法连接到API服务器: {e}")
+            raise  # 重新抛出异常以触发重试
+        except httpx.TimeoutException as e:
+            logging.error(f"超时错误: API请求超时: {e}")
+            raise  # 重新抛出异常以触发重试
         except httpx.RequestError as e:
             logging.error(f"请求错误: {str(e)}", exc_info=True)
             raise Exception(f"请求错误: {e}")
@@ -279,8 +293,8 @@ class DifyAPIClient:
         logging.debug(f"请求负载: {json.dumps(payload, ensure_ascii=False)}")
         
         try:
-            # 使用流式请求
-            response = requests.post(url, headers=self.headers, json=payload, stream=True)
+            # 使用流式请求，设置更长的超时时间：60秒连接超时，300秒读取超时（流式响应可能需要更长时间）
+            response = requests.post(url, headers=self.headers, json=payload, stream=True, timeout=(60, 300))
             response.raise_for_status()
             
             # 创建SSE客户端

requirements.txt

@@ -5,4 +5,5 @@ uvicorn>=0.21.0
 python-multipart>=0.0.6
 pydantic>=1.10.7
 httpx>=0.24.0
-aiofiles>=0.8.0 
+aiofiles>=0.8.0
+tenacity>=8.0.0