Upload retry_middleware.py

retry_middleware.py

@@ -13,26 +13,41 @@ class RetryMiddleware(BaseHTTPMiddleware):
 
     async def should_retry_response(self, response_data):
         """检查响应是否需要重试"""
-        if isinstance(response_data, dict):
-            # 检查错误信息
-            error = response_data.get('error', '')
-            if isinstance(error, str) and 'content is not safe' in error.lower():
-                return True
-                
-            # 检查响应内容
-            choices = response_data.get('choices', [])
-            if choices:
-                content = choices[0].get('message', {}).get('content', '')
-                if 'content is not safe' in content.lower():
+        try:
+            if isinstance(response_data, dict):
+                # 检查错误信息
+                error = response_data.get('error', '')
+                if isinstance(error, str) and 'content is not safe' in error.lower():
                     return True
                     
-                # 检查是否有部分内容包含错误信息
-                if isinstance(content, str):
-                    lines = content.split('\n')
-                    for line in lines:
-                        if 'content is not safe' in line.lower():
-                            return True
-        return False
+                # 检查响应内容
+                choices = response_data.get('choices', [])
+                if choices:
+                    content = choices[0].get('message', {}).get('content', '')
+                    if not content or 'content is not safe' in content.lower():
+                        return True
+                        
+                    # 检查是否有部分内容包含错误信息
+                    if isinstance(content, str):
+                        lines = content.split('\n')
+                        for line in lines:
+                            if 'content is not safe' in line.lower():
+                                return True
+                                
+                # 检查是否是不需要的响应
+                if "I'm Claude" in str(response_data) or "Anthropic" in str(response_data):
+                    return True
+                if "Hello! How can I assist you today?" in str(response_data):
+                    return True
+                    
+                # 检查响应格式
+                if not choices or not choices[0].get('message', {}).get('content'):
+                    return True
+                    
+            return False
+        except Exception:
+            # 如果解析过程中出现任何错误，建议重试
+            return True
 
     async def dispatch(self, request: Request, call_next):
         # 只处理 /api/v1/chat/completions 路径的请求
@@ -42,6 +57,7 @@ class RetryMiddleware(BaseHTTPMiddleware):
         # 读取原始请求体
         body = await request.body()
         retry_count = 0
+        last_error = None
         
         while True:  # 无限循环，直到获得正确响应
             try:
@@ -65,7 +81,6 @@ class RetryMiddleware(BaseHTTPMiddleware):
                     # 检查响应是否需要重试
                     if await self.should_retry_response(response_data):
                         retry_count += 1
-                        logger.info(f"检测到内容安全问题，立即进行第 {retry_count + 1} 次重试...")
                         continue
                     else:
                         # 如果响应正常，直接返回
@@ -77,16 +92,12 @@ class RetryMiddleware(BaseHTTPMiddleware):
                         )
                         
                 except json.JSONDecodeError:
-                    # 如果响应不是JSON格式，直接返回
-                    return Response(
-                        content=response_body,
-                        status_code=response.status_code,
-                        headers=dict(response.headers),
-                        media_type=response.media_type
-                    )
+                    # JSON解析错误，需要重试
+                    retry_count += 1
+                    continue
                     
             except Exception as e:
-                logger.error(f"重试过程中发生错误: {str(e)}")
+                last_error = str(e)
                 retry_count += 1
                 continue