From 72a8a0a1ad6b79b8e9fb2facef121f9b5d584666 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期六, 08 二月 2025 10:56:30 +0800
Subject: [PATCH] 报表合并历史记录功能

---
 app/api/chat.py |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/api/chat.py b/app/api/chat.py
index 571ebad..5914353 100644
--- a/app/api/chat.py
+++ b/app/api/chat.py
@@ -577,7 +577,8 @@
 
                                                         message = answer.get("title", "")
 
-                                                    result = {"message": message, "type": "system"}
+
+                                                    result = {"message": message, "type": "system", "workflow":{"node_data": workflow_list}}
                                             elif data.get("event") == "node_finished":
                                                 workflow_list.append({
                                                     "title": data.get("data", {}).get("title", ""),
@@ -588,6 +589,18 @@
                                                     "elapsed_time":data.get("data", {}).get("elapsed_time", 0),
                                                     "error":data.get("data", {}).get("error", ""),
                                                 })
+                                                answer = data.get("data", "")
+                                                if isinstance(answer, str):
+                                                    logger.error("----------------鏈煡鏁版嵁--------------------")
+                                                    logger.error(data)
+                                                    continue
+                                                elif isinstance(answer, dict):
+
+                                                    message = answer.get("title", "")
+                                                    if answer.get("status") == "failed":
+                                                        message = answer.get("error", "")
+                                                        result = {"message": message, "type": "system", "workflow":{"node_data": workflow_list}}
+
                                             elif data.get("event") == "workflow_finished":
                                                 answer = data.get("data", "")
                                                 if isinstance(answer, str):
@@ -618,7 +631,7 @@
                                                         "error": answer.get("error", ""),
                                                         "elapsed_time": answer.get("elapsed_time", 0)
                                                     }
-                                                    result = {"message": message, "type": "message", "download_url": download_url}
+                                                    result = {"message": message, "type": "message", "download_url": download_url, "workflow":workflow_dict}
                                                     try:
                                                         SessionService(db).update_session(chat_id,
                                                                                           message={"role": "assistant",
@@ -630,7 +643,7 @@
                                                                                               "conversation_id"))
                                                         node_list = []
                                                     except Exception as e:
-                                                        logger.error("淇濆瓨dcd ify鐨勪細璇濆紓甯革紒")
+                                                        logger.error("淇濆瓨dify鐨勪細璇濆紓甯革紒")
                                                         logger.error(e)
                                                     try:
                                                         await websocket.send_json(result)
@@ -700,7 +713,7 @@
 
                                                         message = answer.get("title", "")
 
-                                                    result = {"message": message, "type": "system"}
+                                                    result = {"message": message, "type": "system", "workflow":{"node_data": workflow_list}}
                                             elif data.get("event") == "node_finished":
                                                 workflow_list.append({
                                                     "title": data.get("data", {}).get("title", ""),
@@ -711,6 +724,18 @@
                                                     "elapsed_time":data.get("data", {}).get("elapsed_time", 0),
                                                     "error":data.get("data", {}).get("error", ""),
                                                 })
+
+                                                answer = data.get("data", "")
+                                                if isinstance(answer, str):
+                                                    logger.error("----------------鏈煡鏁版嵁--------------------")
+                                                    logger.error(data)
+                                                    continue
+                                                elif isinstance(answer, dict):
+
+                                                    message = answer.get("title", "")
+                                                    if answer.get("status") == "failed":
+                                                        message = answer.get("error", "")
+                                                    result = {"message": message, "type": "system", "workflow":{"node_data": workflow_list}}
                                             elif data.get("event") == "message":
                                                 answer_str = data.get("answer", "")
                                                 # try:
@@ -720,7 +745,7 @@
                                                 #     print(e)
                                                 #     continue
                                                 result = {"message": answer_str, "type": "message",
-                                                          "download_url": ""}
+                                                          "download_url": "", "workflow": {"node_data": workflow_list}}
 
                                                 # try:
                                                 #     await websocket.send_json(result)

--
Gitblit v1.8.0