From 33f6340b94a5bfbeda120b075c8121eca6ffd989 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 10:14:52 +0800
Subject: [PATCH] 暂时注释未使用的影响内容
---
app/api/chat.py | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index fdcb92a..fe86fb5 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -11,7 +11,7 @@
from app.models.base_model import get_db
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
-from app.service.token import get_bisheng_token, get_ragflow_token
+from app.service.service_token import get_bisheng_token, get_ragflow_token
router = APIRouter()
@@ -53,6 +53,7 @@
if len(chat_history) == 0:
chat_history = await ragflow_service.set_session(token, agent_id,
message, chat_id, True)
+ print("chat_history------------------------", chat_history)
if len(chat_history) == 0:
result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
await websocket.send_json(result)
@@ -64,6 +65,7 @@
"doc_ids": message.get("doc_ids", []),
"role": "user"
})
+ complete_response = ""
async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
try:
if rag_response[:5] == "data:":
@@ -72,8 +74,9 @@
else:
# 鍚﹀垯锛屼繚鎸佸師鏍�
text = rag_response
+ complete_response += text
try:
- json_data = json.loads(text)
+ json_data = json.loads(complete_response)
data = json_data.get("data")
if data is True: # 瀹屾垚杈撳嚭
result = {"message": "", "type": "close"}
@@ -82,13 +85,13 @@
result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "message"}
else: # 姝ｅ父杈撳嚭
answer = data.get("answer", "")
- reference = data.get("reference", "")
- result = {"message": answer, "type": "message", "reference": reference }
+ reference = data.get("reference", {})
+ result = {"message": answer, "type": "message", "reference": reference}
await websocket.send_json(result)
- except json.JSONDecodeError:
- print(f"Error decode ragflow response: {text}")
- pass
-
+ complete_response = ""
+ except json.JSONDecodeError as e:
+ print(f"Error decoding JSON: {e}")
+ print(f"Response text: {text}")
except Exception as e2:
result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
await websocket.send_json(result)
--
Gitblit v1.8.0