From 53471a68e429a8062d0a878c6b170517347eee0e Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期四, 07 十一月 2024 15:43:51 +0800
Subject: [PATCH] fix reference为对象
---
app/api/chat.py | 111 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 33 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 828b7e8..b54db51 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -23,20 +23,23 @@
chat_id: str,
current_user: UserModel = Depends(get_current_user_websocket),
db: Session = Depends(get_db)):
+ tasks = []
await websocket.accept()
print(f"Client {agent_id} connected")
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)
+ ragflow_service = RagflowService(settings.fwr_base_url)
token = get_ragflow_token(db, current_user.id)
try:
async def forward_to_ragflow():
@@ -44,49 +47,77 @@
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.set_session(token, agent_id, message["message"], chat_id, True)
+ chat_history = await ragflow_service.get_session_history(token, chat_id)
if len(chat_history) == 0:
- result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
- await websocket.send_json(result)
- continue
+ chat_history = await ragflow_service.set_session(token, agent_id,
+ message, chat_id, True)
+ if len(chat_history) == 0:
+ result = {"message": "鍐呴儴閿欒锛氬垱寤轰細璇濆け璐�", "type": "close"}
+ await websocket.send_json(result)
+ await websocket.close()
+ return
+ 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涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
- 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": "message"}
+ else: # 姝ｅ父杈撳嚭
+ answer = data.get("answer", "")
+ 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
+
+ except Exception as e2:
+ result = {"message": f"鍐呴儴閿欒锛� {e2}", "type": "close"}
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}")
+ print(f"Error process message of ragflow: {e2}")
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
asyncio.create_task(forward_to_ragflow())
]
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
- except WebSocketDisconnect:
- print(f"Client {chat_id} disconnected")
+ except WebSocketDisconnect as e1:
+ print(f"Client {chat_id} disconnected: {e1}")
+ await websocket.close()
+ except Exception as e:
+ print(f"Exception occurred: {e}")
+
+ finally:
+ print("Cleaning up resources of ragflow")
+ # 鍙栨秷鎵�鏈変换鍔�
+ for task in tasks:
+ if not task.done():
+ task.cancel()
+ try:
+ await task
+ except asyncio.CancelledError:
+ pass
elif agent_type == AgentType.BISHENG:
token = get_bisheng_token(db, current_user.id)
- service_uri = f"{settings.bisheng_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
+ service_uri = f"{settings.sgb_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
headers = {'cookie': f"access_token_cookie={token};"}
async with websockets.connect(service_uri, extra_headers=headers) as service_websocket:
@@ -139,9 +170,23 @@
except asyncio.CancelledError:
pass
- except WebSocketDisconnect:
- print(f"Client {chat_id} disconnected")
+ except WebSocketDisconnect as e:
+ print(f"WebSocket connection closed with code {e.code}: {e.reason}")
+ await websocket.close()
+ await service_websocket.close()
+ except Exception as e:
+ print(f"Exception occurred: {e}")
+
+ finally:
+ print("Cleaning up resources of bisheng")
+ # 鍙栨秷鎵�鏈変换鍔�
+ for task in tasks:
+ if not task.done():
+ task.cancel()
+ try:
+ await task
+ except asyncio.CancelledError:
+ pass
else:
ret = {"message": "Agent not found", "type": "close"}
- return websocket.send_json(ret)
-
+ await websocket.send_json(ret)
--
Gitblit v1.8.0