From fb37a87e565fe998becb322ff9d344d3b7aa8e14 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 16 十月 2024 14:40:44 +0800
Subject: [PATCH] 智能体获取会话id接口
---
app/api/chat.py | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index 9bd22b9..80005f7 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -7,15 +7,13 @@
from sqlalchemy.orm import Session
from app.api import get_current_user_websocket
from app.config.config import settings
+from app.models.agent_model import AgentModel, AgentType
from app.models.base_model import get_db
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
from app.service.token import get_bisheng_token, get_ragflow_token
router = APIRouter()
-
-# 瀛樺偍瀹㈡埛绔� WebSocket 杩炴帴
-client_websockets = {}
# 涓棿灞俉ebSocket 鏈嶅姟鍣紝鎺ユ敹瀹㈡埛绔殑杩炴帴
@@ -28,17 +26,16 @@
await websocket.accept()
print(f"Client {agent_id} connected")
- if agent_id == "0":
- agent_id = settings.bisheng_agent_id
- elif agent_id == "1":
- agent_id = settings.ragflow_agent_id
- chat_id = settings.ragflow_chat_id
+ 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)
+ 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)
- if chat_id == "0":
- chat_id = uuid.uuid4().hex
-
- client_websockets[chat_id] = websocket
- if agent_id == settings.ragflow_agent_id:
+ if agent_type == AgentType.RAGFLOW:
ragflow_service = RagflowService(settings.ragflow_base_url)
token = get_ragflow_token(db, current_user.id)
try:
@@ -65,7 +62,7 @@
except Exception as e:
result = {"message": f"鍐呴儴閿欒锛� {e}", "type": "close"}
await websocket.send_json(result)
- print(f"Error forwarding message to ragflow: {e}")
+ print(f"Error process message of ragflow: {e}")
# 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
asyncio.create_task(forward_to_ragflow())
@@ -73,10 +70,8 @@
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
except WebSocketDisconnect:
print(f"Client {chat_id} disconnected")
- finally:
- del client_websockets[chat_id]
- else:
+ 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}"
headers = {'cookie': f"access_token_cookie={token};"}
@@ -88,7 +83,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
@@ -105,9 +100,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 = [
@@ -126,7 +128,7 @@
except WebSocketDisconnect:
print(f"Client {chat_id} disconnected")
- finally:
- del client_websockets[chat_id]
-
+ else:
+ ret = {"message": "Agent not found", "type": "close"}
+ return websocket.send_json(ret)
--
Gitblit v1.8.0