merge

zhaoqingang

2024-11-15 ea813e602be860cb96cce8ea1a15f9e849392eea

 app/api/report.py

@@ -57,21 +57,29 @@

            # 监听毕昇发来的消息并转发给客户端
            async def forward_to_client():
                last_message = "step"
                while True:
                    message = await service_websocket.recv()
                    print(f"Received from bisheng: {message}")
                    data = json.loads(message)
                    files = data.get("files", [])
                    steps = data.get("intermediate_steps", "")
                    if len(files) != 0 or steps != "" or data["type"] == "close":
                    msg = data.get("message", "")
                    category = data.get("category", "")

                    if len(files) != 0 or (msg and category != "answer") or data["type"] == "close":
                        if data["type"] == "close":
                            t = "close"
                        else:
                            t = "stream"
                        process_files(files, agent_id)
                        result = {"step_message": steps, "type": t, "files": files}
                        result = {"message": msg, "type": t, "files": files}
                        await websocket.send_json(result)
                        print(f"Forwarded to client, {chat_id}: {result}")
                    elif steps and last_message == "step":
                        result = {"step_message": steps, "type": "stream", "files": files}
                        await websocket.send_json(result)

                    last_message = "message" if msg else "step"

            # 启动两个任务，分别处理客户端和服务端的消息
            tasks = [
@@ -85,11 +93,26 @@
                task.cancel()
                try:
                    await task
                except asyncio.CancelledError:
                except asyncio.CancelledError as e:
                    print(f"asyncio CancelledError: {e}")
                    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 report")
            # 取消所有任务
            for task in tasks:
                if not task.done():
                    task.cancel()
                    try:
                        await task
                    except asyncio.CancelledError:
                        pass


@router.get("/variables/list", response_model=ResponseList)