From 3cee1dd5768ae10d3834afd3294850af7d626633 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 18 十月 2024 10:17:57 +0800
Subject: [PATCH] fix
---
app/api/chat.py | 85 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index d5ab09d..1e9218c 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,18 @@
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"}
+ 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"}
+ await websocket.send_json(ret)
+ return
- 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:
@@ -46,26 +45,53 @@
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', [])
+ message["role"] = "user"
+ if len(chat_history) == 0:
+ chat_history = await ragflow_service.get_session_history(token, chat_id)
+ if len(chat_history) == 0:
+ 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}")
- 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"}
+ if rag_response[:5] == "data:":
+ # 濡傛灉鏄紝鍒欐埅鍙栨帀鍓�5涓瓧绗︼紝骞跺幓闄ら灏剧┖鐧界
+ text = rag_response[5:].strip()
+ else:
+ # 鍚﹀垯锛屼繚鎸佸師鏍�
+ 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": "stream"}
+ else: # 姝ｅ父杈撳嚭
+ answer = data.get("answer", "")
+ result = {"message": answer, "type": "stream"}
+ except json.JSONDecodeError:
+ result = {"message": text, "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())
@@ -73,10 +99,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};"}
@@ -133,5 +157,6 @@
except WebSocketDisconnect:
print(f"Client {chat_id} disconnected")
- finally:
- del client_websockets[chat_id]
+ else:
+ ret = {"message": "Agent not found", "type": "close"}
+ await websocket.send_json(ret)
--
Gitblit v1.8.0