update

app.py

@@ -232,60 +232,71 @@ async def stream_openai_response(response, request_id: str, model: str, api_key,
     full_response = ""
     
     try:
-        # 将DeepSider响应流转换为OpenAI流格式
-        for line in response.iter_lines():
-            if not line:
-                continue
-                
-            if line.startswith(b'data: '):
+        # 修改1：使用iter_content替代iter_lines
+        buffer = bytearray()
+        for chunk in response.iter_content(chunk_size=None):
+            if chunk:
+                buffer.extend(chunk)
                 try:
-                    data = json.loads(line[6:].decode('utf-8'))
+                    text = buffer.decode('utf-8')
+                    lines = text.split('\n')
                     
-                    if data.get('code') == 202 and data.get('data', {}).get('type') == "chat":
-                        # 获取正文内容
-                        content = data.get('data', {}).get('content', '')
-                        if content:
-                            full_response += content
-                            
-                            # 生成OpenAI格式的流式响应
-                            chunk = {
-                                "id": f"chatcmpl-{request_id}",
-                                "object": "chat.completion.chunk",
-                                "created": timestamp,
-                                "model": model,
-                                "choices": [
-                                    {
-                                        "index": 0,
-                                        "delta": {
-                                            "content": content
-                                        },
-                                        "finish_reason": None
+                    for line in lines[:-1]:
+                        if line.startswith('data: '):
+                            # 修改2：增加异常捕获和日志
+                            try:
+                                data = json.loads(line[6:])
+                                # 修改3：增加调试日志
+                                logger.debug(f"Received data: {data}")
+                                
+                                if data.get('code') == 202 and data.get('data', {}).get('type') == "chat":
+                                    content = data.get('data', {}).get('content', '')
+                                    if content:
+                                        full_response += content
+                                        chunk = {
+                                            "id": f"chatcmpl-{request_id}",
+                                            "object": "chat.completion.chunk",
+                                            "created": timestamp,
+                                            "model": model,
+                                            "choices": [
+                                                {
+                                                    "index": 0,
+                                                    "delta": {
+                                                        "content": content
+                                                    },
+                                                    "finish_reason": None
+                                                }
+                                            ]
+                                        }
+                                        yield f"data: {json.dumps(chunk)}\n\n"
+                                        
+                                elif data.get('code') == 203:
+                                    # 生成完成信号
+                                    chunk = {
+                                        "id": f"chatcmpl-{request_id}",
+                                        "object": "chat.completion.chunk",
+                                        "created": timestamp,
+                                        "model": model,
+                                        "choices": [
+                                            {
+                                                "index": 0,
+                                                "delta": {},
+                                                "finish_reason": "stop"
+                                            }
+                                        ]
                                     }
-                                ]
-                            }
-                            yield f"data: {json.dumps(chunk)}\n\n"
-                    
-                    elif data.get('code') == 203:
-                        # 生成完成信号
-                        chunk = {
-                            "id": f"chatcmpl-{request_id}",
-                            "object": "chat.completion.chunk",
-                            "created": timestamp,
-                            "model": model,
-                            "choices": [
-                                {
-                                    "index": 0,
-                                    "delta": {},
-                                    "finish_reason": "stop"
-                                }
-                            ]
-                        }
-                        yield f"data: {json.dumps(chunk)}\n\n"
-                        yield "data: [DONE]\n\n"
-                        
-                except json.JSONDecodeError:
-                    logger.warning(f"无法解析响应: {line}")
+                                    yield f"data: {json.dumps(chunk)}\n\n"
+                                    yield "data: [DONE]\n\n"
+                                    
+                            except json.JSONDecodeError as e:
+                                logger.warning(f"JSON解析失败: {line}, 错误: {str(e)}")
+                                continue
+                                
+                    buffer = bytearray(lines[-1].encode('utf-8'))
                     
+                except UnicodeDecodeError:
+                    continue
+
     except Exception as e:
         logger.error(f"流式响应处理出错: {str(e)}")
         
@@ -370,16 +381,24 @@ async def create_chat_completion(
     current_token_index = (TOKEN_INDEX - 1) % len(tokens) if len(tokens) > 0 else 0
     
     try:
-        # 发送请求到DeepSider API
         response = requests.post(
             f"{DEEPSIDER_API_BASE}/chat/conversation",
             headers=headers,
             json=payload,
-            stream=True
+            stream=True,
+            timeout=30  # 新增超时设置
         )
         
-        # 检查响应状态
+        # 新增调试日志
+        logger.info(f"请求头: {headers}")
+        logger.info(f"请求体: {payload}")
+        logger.info(f"响应状态码: {response.status_code}")
+        
         if response.status_code != 200:
+            # 新增详细错误日志
+            logger.error(f"DeepSider API错误响应头: {response.headers}")
+            logger.error(f"错误响应体: {response.text}")
+            
             error_msg = f"DeepSider API请求失败: {response.status_code}"
             try:
                 error_data = response.json()
@@ -419,11 +438,13 @@ async def create_chat_completion(
             # 返回OpenAI格式的完整响应
             return await generate_openai_response(full_response, request_id, chat_request.model)
             
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.exception("处理请求时出错")
-        raise HTTPException(status_code=500, detail=f"内部服务器错误: {str(e)}")
+    except requests.exTimeout as e:
+        logger.error(f"请求超时: {str(e)}")
+        raise HTTPException(status_code=504, detail="上游服务响应超时")
+        
+    except requests.RequestException as e:
+        logger.error(f"网络请求异常: {str(e)}")
+        raise HTTPException(status_code=502, detail="网关错误")
 
 @app.get("/admin/balance")
 async def get_account_balance():