From 3fc9f4f33cf90610c71a1de7b00db0f82b988e98 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 16 十月 2024 23:22:53 +0800
Subject: [PATCH] 文档上传&获取报告生成变量&报告生成接口
---
app/api/chat.py | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 80005f7..458581a 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -29,11 +29,13 @@
agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
if not agent:
ret = {"message": "Agent not found", "type": "close"}
- return websocket.send_json(ret)
+ await websocket.send_json(ret)
+ return
agent_type = agent.agent_type
if chat_id == "" or chat_id == "0":
ret = {"message": "Chat ID not found", "type": "close"}
- return websocket.send_json(ret)
+ await websocket.send_json(ret)
+ return
if agent_type == AgentType.RAGFLOW:
ragflow_service = RagflowService(settings.ragflow_base_url)
@@ -43,10 +45,22 @@
while True:
message = await websocket.receive_json()
print(f"Received from client {chat_id}: {message}")
- async for rag_response in ragflow_service.chat(token, chat_id, message["chatHistory"]):
+ chat_history = message.get('chatHistory', [])
+ 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)
+ async for rag_response in ragflow_service.chat(token, chat_id, chat_history):
try:
print(f"Received from ragflow: {rag_response}")
- json_str = rag_response[5:].strip()
+ if rag_response[:5] == "data:":
+ # 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
+ json_str = rag_response[5:].strip()
+ else:
+ # 鍚﹀垯锛屼繚鎸佸師鏍�
+ json_str = rag_response
json_data = json.loads(json_str)
data = json_data.get("data")
if data is True: # 瀹屾垚杈撳嚭
@@ -55,7 +69,7 @@
answer = json_data.get("retmsg", json_data.get("retcode"))
result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "stream"}
else: # 姝ｅ父杈撳嚭
- answer = json_data.get("data", {}).get("answer", "")
+ answer = data.get("answer", "")
result = {"message": answer, "type": "stream"}
await websocket.send_json(result)
print(f"Forwarded to client {chat_id}: {result}")
@@ -130,5 +144,5 @@
print(f"Client {chat_id} disconnected")
else:
ret = {"message": "Agent not found", "type": "close"}
- return websocket.send_json(ret)
+ await websocket.send_json(ret)
--
Gitblit v1.8.0