Update app.py

app.py

@@ -228,16 +228,60 @@ async def stream_openai_response(response, request_id: str, model: str, api_key,
                 
             if line.startswith(b'data: '):
                 try:
-                    data = json.loads(line[6:].decode('utf-8'))
-                    
-                    if data.get('code') == 202 and data.get('data', {}).get('type') == "chat":
-                        # 获取正文内容
-                        content = data.get('data', {}).get('content', '')
-                        if content:
-                            full_response += content
-                            
-                            # 生成OpenAI格式的流式响应
+                    data_text = line[6:].decode('utf-8')
+                    # 检查是否为有效JSON
+                    if data_text.strip():
+                        data = json.loads(data_text)
+                        
+                        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
+                                        }
+                                    ]
+                                }
+                                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"
+                        
+                        # 添加对错误代码的处理
+                        elif data.get('code') != 0:
+                            error_msg = data.get('message', 'Unknown error')
+                            logger.error(f"API返回错误: {error_msg}")
+                            
+                            # 返回错误信息给客户端
+                            error_chunk = {
                                 "id": f"chatcmpl-{request_id}",
                                 "object": "chat.completion.chunk",
                                 "created": timestamp,
@@ -246,34 +290,41 @@ async def stream_openai_response(response, request_id: str, model: str, api_key,
                                     {
                                         "index": 0,
                                         "delta": {
-                                            "content": content
+                                            "content": f"\n\n[API返回错误: {error_msg}]"
                                         },
-                                        "finish_reason": None
+                                        "finish_reason": "stop"
                                     }
                                 ]
                             }
-                            yield f"data: {json.dumps(chunk)}\n\n"
+                            yield f"data: {json.dumps(error_chunk)}\n\n"
+                            yield "data: [DONE]\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}")
+                except json.JSONDecodeError as e:
+                    logger.warning(f"无法解析响应: {line} - 错误: {str(e)}")
+                except Exception as e:
+                    logger.warning(f"处理数据时出错: {str(e)} - 数据: {line}")
+                    
+        # 检查是否没有收到任何内容
+        if not full_response:
+            logger.warning("未收到任何响应内容")
+            # 发送一个提示消息
+            empty_chunk = {
+                "id": f"chatcmpl-{request_id}",
+                "object": "chat.completion.chunk",
+                "created": timestamp,
+                "model": model,
+                "choices": [
+                    {
+                        "index": 0,
+                        "delta": {
+                            "content": "[未收到API响应。请检查您的token是否有效或是否有足够的配额。]"
+                        },
+                        "finish_reason": "stop"
+                    }
+                ]
+            }
+            yield f"data: {json.dumps(empty_chunk)}\n\n"
+            yield "data: [DONE]\n\n"
                     
     except Exception as e:
         logger.error(f"流式响应处理出错: {str(e)}")
@@ -306,7 +357,16 @@ async def stream_openai_response(response, request_id: str, model: str, api_key,
 # 路由定义
 @app.get("/")
 async def root():
-    return {"message": "OpenAI API Proxy服务已启动 连接至DeepSider API"}
+    """返回简单的HTML页面，展示使用说明"""
+    return {
+        "message": "OpenAI API Proxy服务已启动 连接至DeepSider API",
+        "usage": {
+            "模型列表": "GET /v1/models",
+            "聊天完成": "POST /v1/chat/completions",
+            "账户余额": "GET /admin/balance (需要X-Admin-Key头)"
+        },
+        "说明": "请在Authorization头中使用Bearer token格式，支持使用英文逗号分隔多个token实现轮询"
+    }
 
 @app.get("/v1/models")
 async def list_models(api_key: str = Depends(verify_api_key)):
@@ -359,6 +419,9 @@ async def create_chat_completion(
     current_token_index = (TOKEN_INDEX - 1) % len(tokens) if len(tokens) > 0 else 0
     
     try:
+        # 记录请求信息
+        logger.info(f"发送请求到DeepSider API - 模型: {deepsider_model}, Token索引: {current_token_index}")
+        
         # 发送请求到DeepSider API
         response = requests.post(
             f"{DEEPSIDER_API_BASE}/chat/conversation",
@@ -389,21 +452,39 @@ async def create_chat_completion(
         else:
             # 收集完整响应
             full_response = ""
+            has_error = False
+            error_message = ""
+            
             for line in response.iter_lines():
                 if not line:
                     continue
                     
                 if line.startswith(b'data: '):
                     try:
-                        data = json.loads(line[6:].decode('utf-8'))
-                        
-                        if data.get('code') == 202 and data.get('data', {}).get('type') == "chat":
-                            content = data.get('data', {}).get('content', '')
-                            if content:
-                                full_response += content
+                        data_text = line[6:].decode('utf-8')
+                        if data_text.strip():
+                            data = json.loads(data_text)
+                            
+                            if data.get('code') == 202 and data.get('data', {}).get('type') == "chat":
+                                content = data.get('data', {}).get('content', '')
+                                if content:
+                                    full_response += content
+                            elif data.get('code') != 0 and data.get('code') != 203:
+                                has_error = True
+                                error_message = data.get('message', 'Unknown error')
+                                logger.error(f"API返回错误: {error_message}")
                                 
-                    except json.JSONDecodeError:
-                        pass
+                    except json.JSONDecodeError as e:
+                        logger.warning(f"无法解析响应: {line} - 错误: {str(e)}")
+                    except Exception as e:
+                        logger.warning(f"处理数据时出错: {str(e)} - 数据: {line}")
+            
+            # 检查是否没有收到任何内容
+            if not full_response and not has_error:
+                logger.warning("未收到任何响应内容")
+                full_response = "[未收到API响应。请检查您的token是否有效或是否有足够的配额。]"
+            elif has_error:
+                full_response = f"[API返回错误: {error_message}]"
             
             # 返回OpenAI格式的完整响应
             return await generate_openai_response(full_response, request_id, chat_request.model)
@@ -459,7 +540,17 @@ async def not_found_handler(request, exc):
             "type": "not_found_error",
             "code": "not_found"
         }
-    }, 404
+    }
+
+@app.exception_handler(500)
+async def server_error_handler(request, exc):
+    return {
+        "error": {
+            "message": f"服务器内部错误: {str(exc)}",
+            "type": "server_error",
+            "code": "internal_server_error"
+        }
+    }
 
 # 启动事件
 @app.on_event("startup")
@@ -467,6 +558,9 @@ async def startup_event():
     """服务启动时初始化"""
     logger.info(f"OpenAI API代理服务已启动，可以接受请求")
     logger.info(f"支持多token轮询，请在Authorization头中使用英文逗号分隔多个token")
+    logger.info(f"服务地址: http://127.0.0.1:7860")
+    logger.info(f"OpenAI API格式请求示例: POST http://127.0.0.1:7860/v1/chat/completions")
+    logger.info(f"可用模型查询: GET http://127.0.0.1:7860/v1/models")
 
 # 主程序
 if __name__ == "__main__":