From 25bf0a51088fa0d0acdc39c6096cc45d699f63a1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 13 二月 2025 10:53:23 +0800
Subject: [PATCH] merge master
---
app/api/agent.py | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 88cd114..fd31c96 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -192,8 +192,6 @@
for i in session.log_to_json().get("message", []):
if i.get("role") == "user":
tmp_data["question"]=i.get("content")
- if i.get("download_url") is not None:
- tmp_data["download_url"] = i.get("download_url")
elif i.get("role") == "assistant":
if isinstance(i.get("content"), dict):
@@ -235,6 +233,7 @@
tmp_data["question"] = i.get("content")
elif i.get("role") == "assistant":
if isinstance(i.get("content"), dict):
+ content = i.get("content", {})
tmp_data["answer"] = i.get("content", {}).get("answer")
if "file_name" in i.get("content", {}):
tmp_data["files"] = [{"file_name": i.get("content", {}).get("file_name"),
@@ -244,6 +243,36 @@
if "download_url" in i.get("content", {}):
tmp_data["download_url"] = i.get("content", {}).get("download_url")
+ if "node_list" in content:
+ node_dict = {
+ "node_data": [],
+ # {"title": "鍘婚櫎鍐椾綑", # 鑺傜偣鍚嶇О "status": "succeeded", # 鑺傜偣鐘舵��"created_at": 1735817337, # 寮�濮嬫椂闂�"finished_at": 1735817337, # 缁撴潫鏃堕棿"error": "" # 閿欒鏃ュ織}
+ "total_tokens": 0, # 鑺辫垂token鏁�
+ "created_at": 0, # 寮�濮嬫椂闂�
+ "finished_at": 0, # 缁撴潫鏃堕棿
+ "elapsed_time": 0, # 缁撴潫鏃堕棿
+ "status": "succeeded", # 宸ヤ綔娴佺姸鎬�
+ "error": "", # 閿欒鏃ュ織
+ }
+ for node in content["node_list"]:
+ if node.get("event") == "node_finished":
+ node_dict["node_data"].append({
+ "title": node.get("data", {}).get("title", ""),
+ "status": node.get("data", {}).get("status", ""),
+ "created_at": node.get("data", {}).get("created_at", 0),
+ "finished_at": node.get("data", {}).get("finished_at", 0),
+ "node_type": node.get("data", {}).get("node_type", 0),
+ "elapsed_time": node.get("data", {}).get("elapsed_time", 0),
+ "error": node.get("data", {}).get("error", ""),
+ })
+ elif node.get("event") == "workflow_finished":
+ node_dict["total_tokens"] = node.get("data", {}).get("total_tokens", 0)
+ node_dict["created_at"] = node.get("data", {}).get("created_at", 0)
+ node_dict["finished_at"] = node.get("data", {}).get("finished_at", 0)
+ node_dict["status"] = node.get("data", {}).get("status", "")
+ node_dict["error"] = node.get("data", {}).get("error", "")
+ node_dict["elapsed_time"] = node.get("data", {}).get("elapsed_time", 0)
+ tmp_data["workflow"] = node_dict
else:
tmp_data["answer"] = i.get("content")
data.append(tmp_data)
--
Gitblit v1.8.0