From 4d924ed03fb1f518353fb31ce3c1dab4eefc0a95 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 14 十月 2024 14:52:23 +0800
Subject: [PATCH] 毕昇消息过滤
---
app/api/chat.py | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 1fe7ad6..7667736 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -47,17 +47,25 @@
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"]):
- print(f"Received from ragflow: {rag_response}")
- json_str = rag_response[5:].strip()
- json_data = json.loads(json_str)
- if json_data.get("data") is not True:
- answer = json_data.get("data", {}).get("answer", "")
- result = {"message": answer, "type": "stream"}
- else:
- result = {"message": "", "type": "close"}
- await websocket.send_json(result)
- print(f"Forwarded to client {chat_id}: {result}")
-
+ try:
+ print(f"Received from ragflow: {rag_response}")
+ json_str = rag_response[5:].strip()
+ 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 = json_data.get("data", {}).get("answer", "")
+ result = {"message": answer, "type": "stream"}
+ await websocket.send_json(result)
+ print(f"Forwarded to client {chat_id}: {result}")
+ 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())
@@ -80,7 +88,7 @@
async def forward_to_service():
while True:
message = await websocket.receive_json()
- print(f"Received from client {chat_id}: {message}")
+ print(f"Received from client, {chat_id}: {message}")
# 娣诲姞 'agent_id' 鍜� 'chat_id' 瀛楁
message['flow_id'] = agent_id
message['chat_id'] = chat_id
@@ -97,9 +105,16 @@
async def forward_to_client():
while True:
message = await service_websocket.recv()
- print(f"Received from service S: {message}")
- await websocket.send_text(message)
- print(f"Forwarded to client {chat_id}: {message}")
+ print(f"Received from bisheng: {message}")
+ data = json.loads(message)
+ if data["type"] == "close" or data["type"] == "stream" or data["type"] == "end_cover":
+ if data["type"] == "close":
+ t = "close"
+ else:
+ t = "stream"
+ result = {"message": data["message"], "type": t}
+ await websocket.send_json(result)
+ print(f"Forwarded to client, {chat_id}: {result}")
# 鍚姩涓や釜浠诲姟锛屽垎鍒鐞嗗鎴风鍜屾湇鍔＄鐨勬秷鎭�
tasks = [
--
Gitblit v1.8.0