From 1963c42487b3980cb8513a2cc7669da0876c3037 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 12 十月 2024 19:50:14 +0800
Subject: [PATCH] websocket对话接口兼容ragflow流式对话
---
app/api/chat.py | 130 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 49 deletions(-)
diff --git a/app/api/chat.py b/app/api/chat.py
index c7aa2da..1fe7ad6 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -1,7 +1,7 @@
import json
import uuid
-from fastapi import WebSocket, WebSocketDisconnect, APIRouter, Request, Depends
+from fastapi import WebSocket, WebSocketDisconnect, APIRouter, Depends
import asyncio
import websockets
from sqlalchemy.orm import Session
@@ -9,7 +9,8 @@
from app.config.config import settings
from app.models.base_model import get_db
from app.models.user_model import UserModel
-from app.service.token import get_bisheng_token
+from app.service.ragflow import RagflowService
+from app.service.token import get_bisheng_token, get_ragflow_token
router = APIRouter()
@@ -27,66 +28,97 @@
await websocket.accept()
print(f"Client {agent_id} connected")
- token = get_bisheng_token(db, current_user.id)
-
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
+
if chat_id == "0":
chat_id = uuid.uuid4().hex
- # 杩炴帴鍒版湇鍔＄
- 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};"
- }
-
- async with websockets.connect(service_uri, extra_headers=headers) as service_websocket:
- client_websockets[chat_id] = websocket
-
+ client_websockets[chat_id] = websocket
+ if agent_id == settings.ragflow_agent_id:
+ ragflow_service = RagflowService(settings.ragflow_base_url)
+ token = get_ragflow_token(db, current_user.id)
try:
- # 澶勭悊瀹㈡埛绔彂鏉ョ殑娑堟伅
- async def forward_to_service():
+ async def forward_to_ragflow():
while True:
message = await websocket.receive_json()
print(f"Received from client {chat_id}: {message}")
- # 娣诲姞 'agent_id' 鍜� 'chat_id' 瀛楁
- message['flow_id'] = agent_id
- message['chat_id'] = chat_id
- msg = message["message"]
- del message["message"]
- message['inputs'] = {
- "data": {"chatId": chat_id, "id": agent_id, "type": "assistant"},
- "input": msg
- }
- await service_websocket.send(json.dumps(message))
- print(f"Forwarded to bisheng: {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}")
-
- # 鐩戝惉姣曟槆鍙戞潵鐨勬秷鎭苟杞彂缁欏鎴风
- 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}")
-
- # 鍚姩涓や釜浠诲姟锛屽垎鍒鐞嗗鎴风鍜屾湇鍔＄鐨勬秷鎭�
+ # 鍚姩浠诲姟澶勭悊瀹㈡埛绔秷鎭�
tasks = [
- asyncio.create_task(forward_to_service()),
- asyncio.create_task(forward_to_client())
+ asyncio.create_task(forward_to_ragflow())
]
-
- done, pending = await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
-
- # 鍙栨秷鏈畬鎴愮殑浠诲姟
- for task in pending:
- task.cancel()
- try:
- await task
- except asyncio.CancelledError:
- pass
-
+ await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
except WebSocketDisconnect:
print(f"Client {chat_id} disconnected")
finally:
del client_websockets[chat_id]
+
+ else:
+ 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};"}
+
+ async with websockets.connect(service_uri, extra_headers=headers) as service_websocket:
+
+ try:
+ # 澶勭悊瀹㈡埛绔彂鏉ョ殑娑堟伅
+ async def forward_to_service():
+ while True:
+ message = await websocket.receive_json()
+ print(f"Received from client {chat_id}: {message}")
+ # 娣诲姞 'agent_id' 鍜� 'chat_id' 瀛楁
+ message['flow_id'] = agent_id
+ message['chat_id'] = chat_id
+ msg = message["message"]
+ del message["message"]
+ message['inputs'] = {
+ "data": {"chatId": chat_id, "id": agent_id, "type": "assistant"},
+ "input": msg
+ }
+ await service_websocket.send(json.dumps(message))
+ print(f"Forwarded to bisheng: {message}")
+
+ # 鐩戝惉姣曟槆鍙戞潵鐨勬秷鎭苟杞彂缁欏鎴风
+ 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}")
+
+ # 鍚姩涓や釜浠诲姟锛屽垎鍒鐞嗗鎴风鍜屾湇鍔＄鐨勬秷鎭�
+ tasks = [
+ asyncio.create_task(forward_to_service()),
+ asyncio.create_task(forward_to_client())
+ ]
+ done, pending = await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
+
+ # 鍙栨秷鏈畬鎴愮殑浠诲姟
+ for task in pending:
+ task.cancel()
+ try:
+ await task
+ except asyncio.CancelledError:
+ pass
+
+ except WebSocketDisconnect:
+ print(f"Client {chat_id} disconnected")
+ finally:
+ del client_websockets[chat_id]
+
+
--
Gitblit v1.8.0