zhangqian
2024-10-29 a625a4731c0f8d1ca57b164580bc44c37d98d533
app/api/chat.py
@@ -38,7 +38,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():
@@ -65,7 +65,6 @@
                            })
                    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()
@@ -79,14 +78,15 @@
                                    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"}
                                    result = {"message": answer, "type": "message"}
                                await websocket.send_json(result)
                            except json.JSONDecodeError:
                                result = {"message": text, "type": "stream"}
                            await websocket.send_json(result)
                            print(f"Forwarded to client {chat_id}: {result}")
                                print(f"Error decode ragflow response: {text}")
                                pass
                        except Exception as e:
                            result = {"message": f"内部错误: {e}", "type": "close"}
                            await websocket.send_json(result)
@@ -102,7 +102,7 @@
    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: