From 39bade10a3d7bc89fa5f37c9a0130ac7d5051719 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 13 二月 2025 13:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway into develop_2.1
---
app/api/v2/chat.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/api/v2/chat.py b/app/api/v2/chat.py
index b8ec8c7..bf1b10c 100644
--- a/app/api/v2/chat.py
+++ b/app/api/v2/chat.py
@@ -19,21 +19,21 @@
chat_info = await get_chat_info(db, chatId)
if not chat_info:
- error_msg = json.dumps({"message": smart_message_error, "error": "**ERROR**: parameter exception", "status": http_400})
+ error_msg = json.dumps({"message": smart_message_error, "error": "\n**ERROR**: parameter exception", "status": http_400})
return StreamingResponse(f"data: {error_msg}\n\n",
media_type="text/event-stream")
session_id = dialog.sessionId
if chat_info.mode == dialog_chat:
if not dialog.query:
error_msg = json.dumps(
- {"message": smart_message_error, "error": "**ERROR**: question cannot be empty.", "status": http_400})
+ {"message": smart_message_error, "error": "\n**ERROR**: question cannot be empty.", "status": http_400})
return StreamingResponse(f"data: {error_msg}\n\n",
media_type="text/event-stream")
if not session_id:
session = await service_chat_sessions(db, chatId, dialog.query)
if not session or session.get("code") != 0:
error_msg = json.dumps(
- {"message": smart_message_error, "error": "**ERROR**: chat agent error", "status": http_500})
+ {"message": smart_message_error, "error": "\n**ERROR**: chat agent error", "status": http_500})
return StreamingResponse(f"data: {error_msg}\n\n",
media_type="text/event-stream")
session_id = session.get("data", {}).get("id")
@@ -47,7 +47,7 @@
return StreamingResponse(service_chat_basic(db, chatId, dialog.question, dialog_chat.sessionId, 1),
media_type="text/event-stream")
else:
- error_msg = json.dumps({"message": smart_message_error, "error": "**ERROR**: chat agent error", "status": http_500})
+ error_msg = json.dumps({"message": smart_message_error, "error": "\n**ERROR**: chat agent error", "status": http_500})
return StreamingResponse(f"data: {error_msg}\n\n",
media_type="text/event-stream")
@@ -58,7 +58,8 @@
data = await service_chat_parameters(db, chatId, 1)
if not data:
status_code = http_400
- return Response(json.dumps(data), media_type="application/json", status_code=status_code)
+ data = "{}"
+ return Response(data, media_type="application/json", status_code=status_code)
# @chat_router_v2.get("/{chatId}/parameters")
# async def api_chat_parameters(chatId:str, db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
--
Gitblit v1.8.0