zhangqian
2024-10-15 244c884d0a7c54c4a37de18c1c2c8ff15a506ff7
app/api/chat.py
@@ -51,15 +51,21 @@
                            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:
                            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"}
                            else:
                                result = {"message": "", "type": "close"}
                            await websocket.send_json(result)
                            print(f"Forwarded to client {chat_id}: {result}")
                        except Exception as e:
                            print(f"Error forwarding message to ragflow: {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())
@@ -82,7 +88,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
@@ -99,9 +105,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 = [
@@ -122,5 +135,3 @@
                print(f"Client {chat_id} disconnected")
            finally:
                del client_websockets[chat_id]