Merge remote-tracking branch 'origin/master'

zhangxiao

2024-10-16 30311881800e4840a13f13dd702b093543b2082e

 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 = {}


# 中间层WebSocket 服务器，接收客户端的连接
@@ -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:
@@ -47,17 +44,25 @@
                    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"]):
                        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}")

                        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"}
                            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())
@@ -65,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};"}
@@ -80,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
@@ -97,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 = [
@@ -118,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)