将reference发送给前端，并修改合并脚本。

xuyonghao

2024-11-07 bd3d8532cf25adfe955fb1666a6a44d27aa1cb8e

 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")

@@ -38,7 +39,7 @@
        return

    if agent_type == AgentType.RAGFLOW:
        ragflow_service = RagflowService(settings.ragflow_base_url)
        ragflow_service = RagflowService(settings.fwr_base_url)
        token = get_ragflow_token(db, current_user.id)
        try:
            async def forward_to_ragflow():
@@ -46,11 +47,12 @@
                    message = await websocket.receive_json()
                    print(f"Received from client {chat_id}: {message}")
                    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["message"], chat_id, True)
                                                                             message, chat_id, True)
                            if len(chat_history) == 0:
                                result = {"message": "内部错误：创建会话失败", "type": "close"}
                                await websocket.send_json(result)
@@ -59,11 +61,11 @@
                        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}")
                            if rag_response[:5] == "data:":
                                # 如果是，则截取掉前5个字符，并去除首尾空白符
                                text = rag_response[5:].strip()
@@ -77,29 +79,45 @@
                                    result = {"message": "", "type": "close"}
                                elif data is None:  # 发生错误
                                    answer = json_data.get("retmsg", json_data.get("retcode"))
                                    result = {"message": "内部错误：" + answer, "type": "stream"}
                                    result = {"message": "内部错误：" + answer, "type": "message"}
                                else:  # 正常输出
                                    answer = data.get("answer", "")
                                    result = {"message": answer, "type": "stream"}
                                    reference = data.get("reference", "")
                                    result = {"message": answer, "type": "message", "reference": reference }
                                await websocket.send_json(result)
                            except json.JSONDecodeError:
                                result = {"message": text, "type": "stream"}
                                print(f"Error decode ragflow response: {text}")
                                pass

                        except Exception as e2:
                            result = {"message": f"内部错误： {e2}", "type": "close"}
                            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}")
                            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)
        service_uri = f"{settings.bisheng_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
        service_uri = f"{settings.sgb_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:
@@ -152,9 +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)