From 84e62e4041f66ba3bb70b1113be62acee5353cc0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 21 十月 2024 17:41:28 +0800
Subject: [PATCH] 获取第三方token接口
---
app/api/chat.py | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 97babf6..2fdbd44 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -46,11 +46,12 @@
message = await websocket.receive_json()
print(f"Received from client {chat_id}: {message}")
chat_history = message.get('chatHistory', [])
+ message["role"] = "user"
if len(chat_history) == 0:
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)
+ message, chat_id, True)
if len(chat_history) == 0:
result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
await websocket.send_json(result)
@@ -59,11 +60,11 @@
else:
chat_history.append({
"content": message["message"],
+ "doc_ids": message.get("doc_ids", []),
"role": "user"
})
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涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
text = rag_response[5:].strip()
@@ -77,18 +78,20 @@
result = {"message": "", "type": "close"}
elif data is None: # 鍙戠敓閿欒
answer = json_data.get("retmsg", json_data.get("retcode"))
- result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "stream"}
+ result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "message"}
else: # 姝ｅ父杈撳嚭
answer = data.get("answer", "")
- result = {"message": answer, "type": "stream"}
+ result = {"message": answer, "type": "message"}
+ await websocket.send_json(result)
except json.JSONDecodeError:
- result = {"message": text, "type": "stream"}
- await websocket.send_json(result)
- print(f"Forwarded to client {chat_id}: {result}")
+ print(f"Error decode ragflow response: {text}")
+ pass
+
except Exception as e:
result = {"message": f"鍐呴儴閿欒锛� {e}", "type": "close"}
await websocket.send_json(result)
print(f"Error process message of ragflow: {e}")
+
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
asyncio.create_task(forward_to_ragflow())
@@ -157,4 +160,3 @@
else:
ret = {"message": "Agent not found", "type": "close"}
await websocket.send_json(ret)
-
--
Gitblit v1.8.0