From 50f9b062456bd595d4fee86e7c90e0cac8904960 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 07 十一月 2024 18:22:48 +0800
Subject: [PATCH] 用户组接口

---
 app/api/report.py |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/api/report.py b/app/api/report.py
index 1bc08dc..232c4b0 100644
--- a/app/api/report.py
+++ b/app/api/report.py
@@ -65,8 +65,8 @@
                     files = data.get("files", [])
                     steps = data.get("intermediate_steps", "")
                     msg = data.get("message", "")
+
                     if len(files) != 0 or (steps and last_message == "step") or msg or data["type"] == "close":
-                        last_message = "step" if steps else "message"
                         if data["type"] == "close":
                             t = "close"
                         else:
@@ -75,6 +75,8 @@
                         result = {"step_message": steps, "message": msg, "type": t, "files": files}
                         await websocket.send_json(result)
                         print(f"Forwarded to client, {chat_id}: {result}")
+
+                    last_message = "message" if msg else "step"
 
             # 鍚姩涓や釜浠诲姟锛屽垎鍒鐞嗗鎴风鍜屾湇鍔$鐨勬秷鎭�
             tasks = [
@@ -91,8 +93,22 @@
                 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 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)

--
Gitblit v1.8.0