From c1768114de381e37e272e9faf7db8e95a93ff381 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 11 十一月 2024 16:37:12 +0800
Subject: [PATCH] role group user..
---
app/api/chat.py | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 7bb7d8a..b54db51 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -23,6 +23,7 @@
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")
@@ -81,24 +82,38 @@
result = {"message": "鍐呴儴閿欒锛�" + answer, "type": "message"}
else: # 姝ｅ父杈撳嚭
answer = data.get("answer", "")
- result = {"message": answer, "type": "message"}
+ 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 e:
- result = {"message": f"鍐呴儴閿欒锛� {e}", "type": "close"}
+ except Exception as e2:
+ result = {"message": f"鍐呴儴閿欒锛� {e2}", "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)
@@ -155,8 +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"}
await websocket.send_json(ret)
--
Gitblit v1.8.0