From 80978b3aec0e7f7a89d3ad671a9c0869c187be7c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 17 十月 2024 14:19:18 +0800
Subject: [PATCH] 解决知识问题不响应问题，解决解析错误问题
---
app/service/ragflow.py | 4 +++-
app/api/chat.py | 30 +++++++++++++++++-------------
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index fa53467..7381aab 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -47,33 +47,37 @@
print(f"Received from client {chat_id}: {message}")
chat_history = message.get('chatHistory', [])
if len(chat_history) == 0:
- chat_history = await ragflow_service.get_session_history(token, agent_id)
+ chat_history = await ragflow_service.get_session_history(token, chat_id)
if len(chat_history) == 0:
chat_history = await ragflow_service.set_session(token, agent_id,
message["message"], chat_id, True)
if len(chat_history) == 0:
result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
await websocket.send_json(result)
+ await websocket.close()
return
async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
try:
print(f"Received from ragflow: {rag_response}")
if rag_response[:5] == "data:":
# 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
- json_str = rag_response[5:].strip()
+ text = rag_response[5:].strip()
else:
# 鍚﹀垯锛屼繚鎸佸師鏍�
- json_str = rag_response
- json_data = json.loads(json_str)
- data = json_data.get("data")
- if data is True: # 瀹屾垚杈撳嚭
- result = {"message": "", "type": "close"}
- elif data is None: # 鍙戠敓閿欒
- answer = json_data.get("retmsg", json_data.get("retcode"))
- result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "stream"}
- else: # 姝ｅ父杈撳嚭
- answer = data.get("answer", "")
- result = {"message": answer, "type": "stream"}
+ text = rag_response
+ try:
+ json_data = json.loads(text)
+ data = json_data.get("data")
+ if data is True: # 瀹屾垚杈撳嚭
+ result = {"message": "", "type": "close"}
+ elif data is None: # 鍙戠敓閿欒
+ answer = json_data.get("retmsg", json_data.get("retcode"))
+ result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "stream"}
+ else: # 姝ｅ父杈撳嚭
+ answer = data.get("answer", "")
+ result = {"message": answer, "type": "stream"}
+ except json.JSONDecodeError:
+ result = {"message": text, "type": "stream"}
await websocket.send_json(result)
print(f"Forwarded to client {chat_id}: {result}")
except Exception as e:
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index b5c5dd1..d41a4da 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -56,8 +56,10 @@
"conversation_id": chat_id,
"messages": chat_history
}
+
+ print(data)
target_url = f"{self.base_url}/v1/conversation/completion"
- async with httpx.AsyncClient() as client:
+ async with httpx.AsyncClient(timeout=10.0) as client:
headers = {
'Content-Type': 'application/json',
'Authorization': token
--
Gitblit v1.8.0