feat:任务大纲停止以及执行结果暂停继续逻辑完善
This commit is contained in:
@@ -112,7 +112,16 @@ def _call_with_custom_config(messages: list[dict], stream: bool, model_config: d
|
|||||||
timeout=180
|
timeout=180
|
||||||
|
|
||||||
)
|
)
|
||||||
|
# 检查响应是否有效
|
||||||
|
if not response.choices or len(response.choices) == 0:
|
||||||
|
raise Exception(f"API returned empty response for model {api_model}")
|
||||||
|
if not response.choices[0] or not response.choices[0].message:
|
||||||
|
raise Exception(f"API returned invalid response format for model {api_model}")
|
||||||
|
|
||||||
full_reply_content = response.choices[0].message.content
|
full_reply_content = response.choices[0].message.content
|
||||||
|
if full_reply_content is None:
|
||||||
|
raise Exception(f"API returned None content for model {api_model}")
|
||||||
|
|
||||||
print(colored(full_reply_content, "blue", "on_white"), end="")
|
print(colored(full_reply_content, "blue", "on_white"), end="")
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -138,15 +147,21 @@ async def _achat_completion_stream_custom(messages:list[dict], temp_async_client
|
|||||||
async for chunk in response:
|
async for chunk in response:
|
||||||
collected_chunks.append(chunk)
|
collected_chunks.append(chunk)
|
||||||
choices = chunk.choices
|
choices = chunk.choices
|
||||||
if len(choices) > 0:
|
if len(choices) > 0 and choices[0] is not None:
|
||||||
chunk_message = chunk.choices[0].delta
|
chunk_message = choices[0].delta
|
||||||
collected_messages.append(chunk_message)
|
if chunk_message is not None:
|
||||||
if chunk_message.content:
|
collected_messages.append(chunk_message)
|
||||||
print(colored(chunk_message.content, "blue", "on_white"), end="")
|
if chunk_message.content:
|
||||||
|
print(colored(chunk_message.content, "blue", "on_white"), end="")
|
||||||
print()
|
print()
|
||||||
full_reply_content = "".join(
|
full_reply_content = "".join(
|
||||||
[m.content or "" for m in collected_messages if m is not None]
|
[m.content or "" for m in collected_messages if m is not None]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 检查最终结果是否为空
|
||||||
|
if not full_reply_content or full_reply_content.strip() == "":
|
||||||
|
raise Exception(f"Stream API returned empty content for model {api_model}")
|
||||||
|
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
except httpx.RemoteProtocolError as e:
|
except httpx.RemoteProtocolError as e:
|
||||||
if attempt < max_retries - 1:
|
if attempt < max_retries - 1:
|
||||||
@@ -184,7 +199,16 @@ async def _achat_completion_stream_groq(messages: list[dict]) -> str:
|
|||||||
else:
|
else:
|
||||||
raise Exception("failed")
|
raise Exception("failed")
|
||||||
|
|
||||||
|
# 检查响应是否有效
|
||||||
|
if not response.choices or len(response.choices) == 0:
|
||||||
|
raise Exception("Groq API returned empty response")
|
||||||
|
if not response.choices[0] or not response.choices[0].message:
|
||||||
|
raise Exception("Groq API returned invalid response format")
|
||||||
|
|
||||||
full_reply_content = response.choices[0].message.content
|
full_reply_content = response.choices[0].message.content
|
||||||
|
if full_reply_content is None:
|
||||||
|
raise Exception("Groq API returned None content")
|
||||||
|
|
||||||
print(colored(full_reply_content, "blue", "on_white"), end="")
|
print(colored(full_reply_content, "blue", "on_white"), end="")
|
||||||
print()
|
print()
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
@@ -217,7 +241,16 @@ async def _achat_completion_stream_mixtral(messages: list[dict]) -> str:
|
|||||||
else:
|
else:
|
||||||
raise Exception("failed")
|
raise Exception("failed")
|
||||||
|
|
||||||
|
# 检查响应是否有效
|
||||||
|
if not stream.choices or len(stream.choices) == 0:
|
||||||
|
raise Exception("Mistral API returned empty response")
|
||||||
|
if not stream.choices[0] or not stream.choices[0].message:
|
||||||
|
raise Exception("Mistral API returned invalid response format")
|
||||||
|
|
||||||
full_reply_content = stream.choices[0].message.content
|
full_reply_content = stream.choices[0].message.content
|
||||||
|
if full_reply_content is None:
|
||||||
|
raise Exception("Mistral API returned None content")
|
||||||
|
|
||||||
print(colored(full_reply_content, "blue", "on_white"), end="")
|
print(colored(full_reply_content, "blue", "on_white"), end="")
|
||||||
print()
|
print()
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
@@ -240,19 +273,25 @@ async def _achat_completion_stream_gpt35(messages: list[dict]) -> str:
|
|||||||
async for chunk in response:
|
async for chunk in response:
|
||||||
collected_chunks.append(chunk) # save the event response
|
collected_chunks.append(chunk) # save the event response
|
||||||
choices = chunk.choices
|
choices = chunk.choices
|
||||||
if len(choices) > 0:
|
if len(choices) > 0 and choices[0] is not None:
|
||||||
chunk_message = chunk.choices[0].delta
|
chunk_message = choices[0].delta
|
||||||
collected_messages.append(chunk_message) # save the message
|
if chunk_message is not None:
|
||||||
if chunk_message.content:
|
collected_messages.append(chunk_message) # save the message
|
||||||
print(
|
if chunk_message.content:
|
||||||
colored(chunk_message.content, "blue", "on_white"),
|
print(
|
||||||
end="",
|
colored(chunk_message.content, "blue", "on_white"),
|
||||||
)
|
end="",
|
||||||
|
)
|
||||||
print()
|
print()
|
||||||
|
|
||||||
full_reply_content = "".join(
|
full_reply_content = "".join(
|
||||||
[m.content or "" for m in collected_messages if m is not None]
|
[m.content or "" for m in collected_messages if m is not None]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 检查最终结果是否为空
|
||||||
|
if not full_reply_content or full_reply_content.strip() == "":
|
||||||
|
raise Exception("Stream API (gpt-3.5) returned empty content")
|
||||||
|
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
|
|
||||||
|
|
||||||
@@ -275,7 +314,16 @@ def _achat_completion_json(messages: list[dict] ) -> str:
|
|||||||
else:
|
else:
|
||||||
raise Exception("failed")
|
raise Exception("failed")
|
||||||
|
|
||||||
|
# 检查响应是否有效
|
||||||
|
if not response.choices or len(response.choices) == 0:
|
||||||
|
raise Exception("OpenAI API returned empty response")
|
||||||
|
if not response.choices[0] or not response.choices[0].message:
|
||||||
|
raise Exception("OpenAI API returned invalid response format")
|
||||||
|
|
||||||
full_reply_content = response.choices[0].message.content
|
full_reply_content = response.choices[0].message.content
|
||||||
|
if full_reply_content is None:
|
||||||
|
raise Exception("OpenAI API returned None content")
|
||||||
|
|
||||||
print(colored(full_reply_content, "blue", "on_white"), end="")
|
print(colored(full_reply_content, "blue", "on_white"), end="")
|
||||||
print()
|
print()
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
@@ -294,19 +342,25 @@ async def _achat_completion_stream(messages: list[dict]) -> str:
|
|||||||
async for chunk in response:
|
async for chunk in response:
|
||||||
collected_chunks.append(chunk) # save the event response
|
collected_chunks.append(chunk) # save the event response
|
||||||
choices = chunk.choices
|
choices = chunk.choices
|
||||||
if len(choices) > 0:
|
if len(choices) > 0 and choices[0] is not None:
|
||||||
chunk_message = chunk.choices[0].delta
|
chunk_message = choices[0].delta
|
||||||
collected_messages.append(chunk_message) # save the message
|
if chunk_message is not None:
|
||||||
if chunk_message.content:
|
collected_messages.append(chunk_message) # save the message
|
||||||
print(
|
if chunk_message.content:
|
||||||
colored(chunk_message.content, "blue", "on_white"),
|
print(
|
||||||
end="",
|
colored(chunk_message.content, "blue", "on_white"),
|
||||||
)
|
end="",
|
||||||
|
)
|
||||||
print()
|
print()
|
||||||
|
|
||||||
full_reply_content = "".join(
|
full_reply_content = "".join(
|
||||||
[m.content or "" for m in collected_messages if m is not None]
|
[m.content or "" for m in collected_messages if m is not None]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 检查最终结果是否为空
|
||||||
|
if not full_reply_content or full_reply_content.strip() == "":
|
||||||
|
raise Exception("Stream API returned empty content")
|
||||||
|
|
||||||
return full_reply_content
|
return full_reply_content
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print_colored(f"OpenAI API error in _achat_completion_stream: {str(e)}", "red")
|
print_colored(f"OpenAI API error in _achat_completion_stream: {str(e)}", "red")
|
||||||
@@ -316,7 +370,17 @@ async def _achat_completion_stream(messages: list[dict]) -> str:
|
|||||||
def _chat_completion(messages: list[dict]) -> str:
|
def _chat_completion(messages: list[dict]) -> str:
|
||||||
try:
|
try:
|
||||||
rsp = client.chat.completions.create(**_cons_kwargs(messages))
|
rsp = client.chat.completions.create(**_cons_kwargs(messages))
|
||||||
|
|
||||||
|
# 检查响应是否有效
|
||||||
|
if not rsp.choices or len(rsp.choices) == 0:
|
||||||
|
raise Exception("OpenAI API returned empty response")
|
||||||
|
if not rsp.choices[0] or not rsp.choices[0].message:
|
||||||
|
raise Exception("OpenAI API returned invalid response format")
|
||||||
|
|
||||||
content = rsp.choices[0].message.content
|
content = rsp.choices[0].message.content
|
||||||
|
if content is None:
|
||||||
|
raise Exception("OpenAI API returned None content")
|
||||||
|
|
||||||
return content
|
return content
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print_colored(f"OpenAI API error in _chat_completion: {str(e)}", "red")
|
print_colored(f"OpenAI API error in _chat_completion: {str(e)}", "red")
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
"""
|
||||||
|
优化版执行计划 - 支持动态追加步骤
|
||||||
|
在执行过程中可以接收新的步骤并追加到执行队列
|
||||||
|
"""
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
@@ -6,22 +11,26 @@ import AgentCoord.RehearsalEngine_V2.Action as Action
|
|||||||
import AgentCoord.util as util
|
import AgentCoord.util as util
|
||||||
from termcolor import colored
|
from termcolor import colored
|
||||||
from AgentCoord.RehearsalEngine_V2.execution_state import execution_state_manager
|
from AgentCoord.RehearsalEngine_V2.execution_state import execution_state_manager
|
||||||
|
from AgentCoord.RehearsalEngine_V2.dynamic_execution_manager import dynamic_execution_manager
|
||||||
|
|
||||||
|
|
||||||
# ==================== 配置参数 ====================
|
# ==================== 配置参数 ====================
|
||||||
# 最大并发请求数(避免触发 OpenAI API 速率限制)
|
# 最大并发请求数
|
||||||
MAX_CONCURRENT_REQUESTS = 2
|
MAX_CONCURRENT_REQUESTS = 2
|
||||||
|
|
||||||
# 批次之间的延迟(秒)
|
# 批次之间的延迟
|
||||||
BATCH_DELAY = 1.0
|
BATCH_DELAY = 1.0
|
||||||
|
|
||||||
# 429 错误重试次数和延迟
|
# 429错误重试次数和延迟
|
||||||
MAX_RETRIES = 3
|
MAX_RETRIES = 3
|
||||||
RETRY_DELAY = 5.0 # 秒
|
RETRY_DELAY = 5.0
|
||||||
|
|
||||||
|
|
||||||
# ==================== 限流器 ====================
|
# ==================== 限流器 ====================
|
||||||
class RateLimiter:
|
class RateLimiter:
|
||||||
"""异步限流器,控制并发请求数量"""
|
"""
|
||||||
|
异步限流器,控制并发请求数量
|
||||||
|
"""
|
||||||
|
|
||||||
def __init__(self, max_concurrent: int = MAX_CONCURRENT_REQUESTS):
|
def __init__(self, max_concurrent: int = MAX_CONCURRENT_REQUESTS):
|
||||||
self.semaphore = asyncio.Semaphore(max_concurrent)
|
self.semaphore = asyncio.Semaphore(max_concurrent)
|
||||||
@@ -42,7 +51,12 @@ rate_limiter = RateLimiter()
|
|||||||
def build_action_dependency_graph(TaskProcess: List[Dict]) -> Dict[int, List[int]]:
|
def build_action_dependency_graph(TaskProcess: List[Dict]) -> Dict[int, List[int]]:
|
||||||
"""
|
"""
|
||||||
构建动作依赖图
|
构建动作依赖图
|
||||||
返回: {action_index: [dependent_action_indices]}
|
|
||||||
|
Args:
|
||||||
|
TaskProcess: 任务流程列表
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
依赖映射字典 {action_index: [dependent_action_indices]}
|
||||||
"""
|
"""
|
||||||
dependency_map = {i: [] for i in range(len(TaskProcess))}
|
dependency_map = {i: [] for i in range(len(TaskProcess))}
|
||||||
|
|
||||||
@@ -51,7 +65,7 @@ def build_action_dependency_graph(TaskProcess: List[Dict]) -> Dict[int, List[int
|
|||||||
if not important_inputs:
|
if not important_inputs:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# 检查是否依赖其他动作的 ActionResult
|
# 检查是否依赖其他动作的ActionResult
|
||||||
for j, prev_action in enumerate(TaskProcess):
|
for j, prev_action in enumerate(TaskProcess):
|
||||||
if i == j:
|
if i == j:
|
||||||
continue
|
continue
|
||||||
@@ -70,7 +84,13 @@ def build_action_dependency_graph(TaskProcess: List[Dict]) -> Dict[int, List[int
|
|||||||
def get_parallel_batches(TaskProcess: List[Dict], dependency_map: Dict[int, List[int]]) -> List[List[int]]:
|
def get_parallel_batches(TaskProcess: List[Dict], dependency_map: Dict[int, List[int]]) -> List[List[int]]:
|
||||||
"""
|
"""
|
||||||
将动作分为多个批次,每批内部可以并行执行
|
将动作分为多个批次,每批内部可以并行执行
|
||||||
返回: [[batch1_indices], [batch2_indices], ...]
|
|
||||||
|
Args:
|
||||||
|
TaskProcess: 任务流程列表
|
||||||
|
dependency_map: 依赖图
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
批次列表 [[batch1_indices], [batch2_indices], ...]
|
||||||
"""
|
"""
|
||||||
batches = []
|
batches = []
|
||||||
completed: Set[int] = set()
|
completed: Set[int] = set()
|
||||||
@@ -84,11 +104,11 @@ def get_parallel_batches(TaskProcess: List[Dict], dependency_map: Dict[int, List
|
|||||||
]
|
]
|
||||||
|
|
||||||
if not ready_to_run:
|
if not ready_to_run:
|
||||||
# 避免死循环(循环依赖情况)
|
# 避免死循环
|
||||||
remaining = [i for i in range(len(TaskProcess)) if i not in completed]
|
remaining = [i for i in range(len(TaskProcess)) if i not in completed]
|
||||||
if remaining:
|
if remaining:
|
||||||
print(colored(f"警告: 检测到循环依赖,强制串行执行: {remaining}", "yellow"))
|
print(colored(f"警告: 检测到循环依赖,强制串行执行: {remaining}", "yellow"))
|
||||||
ready_to_run = remaining[:1] # 每次只执行一个
|
ready_to_run = remaining[:1]
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
|
|
||||||
@@ -111,6 +131,20 @@ async def execute_single_action_async(
|
|||||||
) -> Dict:
|
) -> Dict:
|
||||||
"""
|
"""
|
||||||
异步执行单个动作
|
异步执行单个动作
|
||||||
|
|
||||||
|
Args:
|
||||||
|
ActionInfo: 动作信息
|
||||||
|
General_Goal: 总体目标
|
||||||
|
TaskDescription: 任务描述
|
||||||
|
OutputName: 输出对象名称
|
||||||
|
KeyObjects: 关键对象字典
|
||||||
|
ActionHistory: 动作历史
|
||||||
|
agentName: 智能体名称
|
||||||
|
AgentProfile_Dict: 智能体配置字典
|
||||||
|
InputName_List: 输入名称列表
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
动作执行结果
|
||||||
"""
|
"""
|
||||||
actionType = ActionInfo["ActionType"]
|
actionType = ActionInfo["ActionType"]
|
||||||
|
|
||||||
@@ -128,7 +162,7 @@ async def execute_single_action_async(
|
|||||||
KeyObjects=KeyObjects,
|
KeyObjects=KeyObjects,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 执行动作(在线程池中运行,避免阻塞事件循环)
|
# 在线程池中运行,避免阻塞事件循环
|
||||||
loop = asyncio.get_event_loop()
|
loop = asyncio.get_event_loop()
|
||||||
ActionInfo_with_Result = await loop.run_in_executor(
|
ActionInfo_with_Result = await loop.run_in_executor(
|
||||||
None,
|
None,
|
||||||
@@ -156,8 +190,18 @@ async def execute_step_async_streaming(
|
|||||||
total_steps: int
|
total_steps: int
|
||||||
) -> Generator[Dict, None, None]:
|
) -> Generator[Dict, None, None]:
|
||||||
"""
|
"""
|
||||||
异步执行单个步骤(支持流式返回)
|
异步执行单个步骤,支持流式返回
|
||||||
返回生成器,每完成一个动作就 yield 一次
|
|
||||||
|
Args:
|
||||||
|
stepDescrip: 步骤描述
|
||||||
|
General_Goal: 总体目标
|
||||||
|
AgentProfile_Dict: 智能体配置字典
|
||||||
|
KeyObjects: 关键对象字典
|
||||||
|
step_index: 步骤索引
|
||||||
|
total_steps: 总步骤数
|
||||||
|
|
||||||
|
Yields:
|
||||||
|
执行事件字典
|
||||||
"""
|
"""
|
||||||
# 准备步骤信息
|
# 准备步骤信息
|
||||||
StepName = (
|
StepName = (
|
||||||
@@ -213,7 +257,7 @@ async def execute_step_async_streaming(
|
|||||||
"content": None,
|
"content": None,
|
||||||
}
|
}
|
||||||
|
|
||||||
# 先返回步骤开始信息
|
# 返回步骤开始事件
|
||||||
yield {
|
yield {
|
||||||
"type": "step_start",
|
"type": "step_start",
|
||||||
"step_index": step_index,
|
"step_index": step_index,
|
||||||
@@ -238,10 +282,8 @@ async def execute_step_async_streaming(
|
|||||||
# 分批执行动作
|
# 分批执行动作
|
||||||
for batch_index, batch_indices in enumerate(batches):
|
for batch_index, batch_indices in enumerate(batches):
|
||||||
# 在每个批次执行前检查暂停状态
|
# 在每个批次执行前检查暂停状态
|
||||||
print(f"🔍 [DEBUG] 步骤 {StepName}: 批次 {batch_index+1}/{len(batches)} 执行前,检查暂停状态...")
|
|
||||||
should_continue = await execution_state_manager.async_check_pause()
|
should_continue = await execution_state_manager.async_check_pause()
|
||||||
if not should_continue:
|
if not should_continue:
|
||||||
# 用户请求停止,中断执行
|
|
||||||
util.print_colored("🛑 用户请求停止执行", "red")
|
util.print_colored("🛑 用户请求停止执行", "red")
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -277,7 +319,7 @@ async def execute_step_async_streaming(
|
|||||||
# 等待当前批次完成
|
# 等待当前批次完成
|
||||||
batch_results = await asyncio.gather(*tasks)
|
batch_results = await asyncio.gather(*tasks)
|
||||||
|
|
||||||
# 逐个返回结果(流式)
|
# 逐个返回结果
|
||||||
for i, result in enumerate(batch_results):
|
for i, result in enumerate(batch_results):
|
||||||
action_index_in_batch = batch_indices[i]
|
action_index_in_batch = batch_indices[i]
|
||||||
completed_actions += 1
|
completed_actions += 1
|
||||||
@@ -289,7 +331,7 @@ async def execute_step_async_streaming(
|
|||||||
|
|
||||||
ActionHistory.append(result)
|
ActionHistory.append(result)
|
||||||
|
|
||||||
# 立即返回该动作结果(流式)
|
# 立即返回该动作结果
|
||||||
yield {
|
yield {
|
||||||
"type": "action_complete",
|
"type": "action_complete",
|
||||||
"step_index": step_index,
|
"step_index": step_index,
|
||||||
@@ -318,19 +360,27 @@ async def execute_step_async_streaming(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def executePlan_streaming(
|
def executePlan_streaming_dynamic(
|
||||||
plan: Dict,
|
plan: Dict,
|
||||||
num_StepToRun: int,
|
num_StepToRun: int,
|
||||||
RehearsalLog: List,
|
RehearsalLog: List,
|
||||||
AgentProfile_Dict: Dict
|
AgentProfile_Dict: Dict,
|
||||||
|
existingKeyObjects: Dict = None,
|
||||||
|
execution_id: str = None
|
||||||
) -> Generator[str, None, None]:
|
) -> Generator[str, None, None]:
|
||||||
"""
|
"""
|
||||||
执行计划(流式返回版本,支持暂停/恢复)
|
动态执行计划,支持在执行过程中追加新步骤
|
||||||
返回生成器,每次返回 SSE 格式的字符串
|
|
||||||
|
|
||||||
使用方式:
|
Args:
|
||||||
for event in executePlan_streaming(...):
|
plan: 执行计划
|
||||||
yield event
|
num_StepToRun: 要运行的步骤数
|
||||||
|
RehearsalLog: 已执行的历史记录
|
||||||
|
AgentProfile_Dict: 智能体配置
|
||||||
|
existingKeyObjects: 已存在的KeyObjects
|
||||||
|
execution_id: 执行ID(用于动态追加步骤)
|
||||||
|
|
||||||
|
Yields:
|
||||||
|
SSE格式的事件字符串
|
||||||
"""
|
"""
|
||||||
# 初始化执行状态
|
# 初始化执行状态
|
||||||
general_goal = plan.get("General Goal", "")
|
general_goal = plan.get("General Goal", "")
|
||||||
@@ -339,7 +389,7 @@ def executePlan_streaming(
|
|||||||
print(colored(f"⏸️ 执行状态管理器已启动,支持暂停/恢复", "green"))
|
print(colored(f"⏸️ 执行状态管理器已启动,支持暂停/恢复", "green"))
|
||||||
|
|
||||||
# 准备执行
|
# 准备执行
|
||||||
KeyObjects = {}
|
KeyObjects = existingKeyObjects.copy() if existingKeyObjects else {}
|
||||||
finishedStep_index = -1
|
finishedStep_index = -1
|
||||||
|
|
||||||
for logNode in RehearsalLog:
|
for logNode in RehearsalLog:
|
||||||
@@ -348,6 +398,9 @@ def executePlan_streaming(
|
|||||||
if logNode["LogNodeType"] == "object":
|
if logNode["LogNodeType"] == "object":
|
||||||
KeyObjects[logNode["NodeId"]] = logNode["content"]
|
KeyObjects[logNode["NodeId"]] = logNode["content"]
|
||||||
|
|
||||||
|
if existingKeyObjects:
|
||||||
|
print(colored(f"📦 使用已存在的 KeyObjects: {list(existingKeyObjects.keys())}", "cyan"))
|
||||||
|
|
||||||
# 确定要运行的步骤范围
|
# 确定要运行的步骤范围
|
||||||
if num_StepToRun is None:
|
if num_StepToRun is None:
|
||||||
run_to = len(plan["Collaboration Process"])
|
run_to = len(plan["Collaboration Process"])
|
||||||
@@ -355,78 +408,173 @@ def executePlan_streaming(
|
|||||||
run_to = (finishedStep_index + 1) + num_StepToRun
|
run_to = (finishedStep_index + 1) + num_StepToRun
|
||||||
|
|
||||||
steps_to_run = plan["Collaboration Process"][(finishedStep_index + 1): run_to]
|
steps_to_run = plan["Collaboration Process"][(finishedStep_index + 1): run_to]
|
||||||
total_steps = len(steps_to_run)
|
|
||||||
|
|
||||||
print(colored(f"🚀 开始执行计划(流式推送),共 {total_steps} 个步骤", "cyan", attrs=["bold"]))
|
# 使用动态执行管理器
|
||||||
|
if execution_id:
|
||||||
|
# 初始化执行管理器,使用传入的execution_id
|
||||||
|
actual_execution_id = dynamic_execution_manager.start_execution(general_goal, steps_to_run, execution_id)
|
||||||
|
print(colored(f"🚀 开始执行计划(动态模式),共 {len(steps_to_run)} 个步骤,执行ID: {actual_execution_id}", "cyan"))
|
||||||
|
else:
|
||||||
|
print(colored(f"🚀 开始执行计划(流式推送),共 {len(steps_to_run)} 个步骤", "cyan"))
|
||||||
|
|
||||||
|
total_steps = len(steps_to_run)
|
||||||
|
|
||||||
# 使用队列实现流式推送
|
# 使用队列实现流式推送
|
||||||
async def produce_events(queue: asyncio.Queue):
|
async def produce_events(queue: asyncio.Queue):
|
||||||
"""异步生产者:每收到一个事件就放入队列"""
|
"""异步生产者"""
|
||||||
try:
|
try:
|
||||||
for step_index, stepDescrip in enumerate(steps_to_run):
|
step_index = 0
|
||||||
# 在每个步骤执行前检查暂停状态
|
|
||||||
should_continue = await execution_state_manager.async_check_pause()
|
|
||||||
if not should_continue:
|
|
||||||
# 用户请求停止,中断执行
|
|
||||||
print(colored("🛑 用户请求停止执行", "red"))
|
|
||||||
await queue.put({
|
|
||||||
"type": "error",
|
|
||||||
"message": "执行已被用户停止"
|
|
||||||
})
|
|
||||||
return
|
|
||||||
|
|
||||||
# 执行单个步骤(流式)
|
if execution_id:
|
||||||
async for event in execute_step_async_streaming(
|
# 动态模式:循环获取下一个步骤
|
||||||
stepDescrip,
|
# 等待新步骤的最大次数(避免无限等待)
|
||||||
plan["General Goal"],
|
max_empty_wait_cycles = 60 # 最多等待60次,每次等待1秒
|
||||||
AgentProfile_Dict,
|
empty_wait_count = 0
|
||||||
KeyObjects,
|
|
||||||
step_index,
|
while True:
|
||||||
total_steps
|
# 检查暂停状态
|
||||||
):
|
should_continue = await execution_state_manager.async_check_pause()
|
||||||
# 检查是否需要停止
|
if not should_continue:
|
||||||
if execution_state_manager.is_stopped():
|
print(colored("🛑 用户请求停止执行", "red"))
|
||||||
|
await queue.put({
|
||||||
|
"type": "error",
|
||||||
|
"message": "执行已被用户停止"
|
||||||
|
})
|
||||||
|
break
|
||||||
|
|
||||||
|
# 获取下一个步骤
|
||||||
|
stepDescrip = dynamic_execution_manager.get_next_step(execution_id)
|
||||||
|
|
||||||
|
if stepDescrip is None:
|
||||||
|
# 没有更多步骤了,检查是否应该继续等待
|
||||||
|
empty_wait_count += 1
|
||||||
|
|
||||||
|
# 获取执行信息
|
||||||
|
execution_info = dynamic_execution_manager.get_execution_info(execution_id)
|
||||||
|
|
||||||
|
if execution_info:
|
||||||
|
queue_total_steps = execution_info.get("total_steps", 0)
|
||||||
|
completed_steps = execution_info.get("completed_steps", 0)
|
||||||
|
|
||||||
|
# 如果没有步骤在队列中(queue_total_steps为0),立即退出
|
||||||
|
if queue_total_steps == 0:
|
||||||
|
print(colored(f"⚠️ 没有步骤在队列中,退出执行", "yellow"))
|
||||||
|
break
|
||||||
|
|
||||||
|
# 如果所有步骤都已完成,等待可能的新步骤
|
||||||
|
if completed_steps >= queue_total_steps:
|
||||||
|
if empty_wait_count >= max_empty_wait_cycles:
|
||||||
|
# 等待超时,退出执行
|
||||||
|
print(colored(f"✅ 所有步骤执行完成,等待超时", "green"))
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
# 等待新步骤追加
|
||||||
|
print(colored(f"⏳ 等待新步骤追加... ({empty_wait_count}/{max_empty_wait_cycles})", "cyan"))
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
# 还有步骤未完成,继续尝试获取
|
||||||
|
print(colored(f"⏳ 等待步骤就绪... ({completed_steps}/{queue_total_steps})", "cyan"))
|
||||||
|
await asyncio.sleep(0.5)
|
||||||
|
empty_wait_count = 0 # 重置等待计数
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
# 执行信息不存在,退出
|
||||||
|
print(colored(f"⚠️ 执行信息不存在,退出执行", "yellow"))
|
||||||
|
break
|
||||||
|
|
||||||
|
# 重置等待计数
|
||||||
|
empty_wait_count = 0
|
||||||
|
|
||||||
|
# 获取最新的总步骤数(用于显示)
|
||||||
|
execution_info = dynamic_execution_manager.get_execution_info(execution_id)
|
||||||
|
current_total_steps = execution_info.get("total_steps", total_steps) if execution_info else total_steps
|
||||||
|
|
||||||
|
# 执行步骤
|
||||||
|
async for event in execute_step_async_streaming(
|
||||||
|
stepDescrip,
|
||||||
|
plan["General Goal"],
|
||||||
|
AgentProfile_Dict,
|
||||||
|
KeyObjects,
|
||||||
|
step_index,
|
||||||
|
current_total_steps # 使用动态更新的总步骤数
|
||||||
|
):
|
||||||
|
if execution_state_manager.is_stopped():
|
||||||
|
await queue.put({
|
||||||
|
"type": "error",
|
||||||
|
"message": "执行已被用户停止"
|
||||||
|
})
|
||||||
|
return
|
||||||
|
|
||||||
|
await queue.put(event)
|
||||||
|
|
||||||
|
# 标记步骤完成
|
||||||
|
dynamic_execution_manager.mark_step_completed(execution_id)
|
||||||
|
|
||||||
|
# 更新KeyObjects
|
||||||
|
OutputName = stepDescrip.get("OutputObject", "")
|
||||||
|
if OutputName and OutputName in KeyObjects:
|
||||||
|
# 对象日志节点会在step_complete中发送
|
||||||
|
pass
|
||||||
|
|
||||||
|
step_index += 1
|
||||||
|
|
||||||
|
else:
|
||||||
|
# 非动态模式:按顺序执行所有步骤
|
||||||
|
for step_index, stepDescrip in enumerate(steps_to_run):
|
||||||
|
should_continue = await execution_state_manager.async_check_pause()
|
||||||
|
if not should_continue:
|
||||||
|
print(colored("🛑 用户请求停止执行", "red"))
|
||||||
await queue.put({
|
await queue.put({
|
||||||
"type": "error",
|
"type": "error",
|
||||||
"message": "执行已被用户停止"
|
"message": "执行已被用户停止"
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
|
|
||||||
await queue.put(event) # ← 立即放入队列
|
async for event in execute_step_async_streaming(
|
||||||
|
stepDescrip,
|
||||||
|
plan["General Goal"],
|
||||||
|
AgentProfile_Dict,
|
||||||
|
KeyObjects,
|
||||||
|
step_index,
|
||||||
|
total_steps
|
||||||
|
):
|
||||||
|
if execution_state_manager.is_stopped():
|
||||||
|
await queue.put({
|
||||||
|
"type": "error",
|
||||||
|
"message": "执行已被用户停止"
|
||||||
|
})
|
||||||
|
return
|
||||||
|
|
||||||
|
await queue.put(event)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
# 发送错误信息
|
|
||||||
await queue.put({
|
await queue.put({
|
||||||
"type": "error",
|
"type": "error",
|
||||||
"message": f"执行出错: {str(e)}"
|
"message": f"执行出错: {str(e)}"
|
||||||
})
|
})
|
||||||
finally:
|
finally:
|
||||||
await queue.put(None) # ← 发送完成信号
|
await queue.put(None)
|
||||||
|
|
||||||
# 运行异步任务并实时 yield
|
# 运行异步任务并实时yield
|
||||||
loop = asyncio.new_event_loop()
|
loop = asyncio.new_event_loop()
|
||||||
asyncio.set_event_loop(loop)
|
asyncio.set_event_loop(loop)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# 创建队列
|
|
||||||
queue = asyncio.Queue(maxsize=10)
|
queue = asyncio.Queue(maxsize=10)
|
||||||
|
|
||||||
# 启动异步生产者任务
|
|
||||||
producer_task = loop.create_task(produce_events(queue))
|
producer_task = loop.create_task(produce_events(queue))
|
||||||
|
|
||||||
# 同步消费者:从队列读取并 yield(使用 run_until_complete)
|
|
||||||
while True:
|
while True:
|
||||||
event = loop.run_until_complete(queue.get()) # ← 从队列获取事件
|
event = loop.run_until_complete(queue.get())
|
||||||
if event is None: # ← 收到完成信号
|
if event is None:
|
||||||
break
|
break
|
||||||
|
|
||||||
# 立即转换为 SSE 格式并发送
|
# 立即转换为SSE格式并发送
|
||||||
event_str = json.dumps(event, ensure_ascii=False)
|
event_str = json.dumps(event, ensure_ascii=False)
|
||||||
yield f"data: {event_str}\n\n" # ← 立即发送给前端
|
yield f"data: {event_str}\n\n"
|
||||||
|
|
||||||
# 等待生产者任务完成
|
|
||||||
loop.run_until_complete(producer_task)
|
loop.run_until_complete(producer_task)
|
||||||
|
|
||||||
# 如果不是被停止的,发送完成信号
|
|
||||||
if not execution_state_manager.is_stopped():
|
if not execution_state_manager.is_stopped():
|
||||||
complete_event = json.dumps({
|
complete_event = json.dumps({
|
||||||
"type": "execution_complete",
|
"type": "execution_complete",
|
||||||
@@ -435,10 +583,26 @@ def executePlan_streaming(
|
|||||||
yield f"data: {complete_event}\n\n"
|
yield f"data: {complete_event}\n\n"
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
# 清理任务
|
# 在关闭事件循环之前先清理执行记录
|
||||||
|
if execution_id:
|
||||||
|
# 清理执行记录
|
||||||
|
dynamic_execution_manager.cleanup(execution_id)
|
||||||
|
|
||||||
if 'producer_task' in locals():
|
if 'producer_task' in locals():
|
||||||
if not producer_task.done():
|
if not producer_task.done():
|
||||||
producer_task.cancel()
|
producer_task.cancel()
|
||||||
|
|
||||||
|
# 确保所有任务都完成后再关闭事件循环
|
||||||
|
try:
|
||||||
|
pending = asyncio.all_tasks(loop)
|
||||||
|
for task in pending:
|
||||||
|
task.cancel()
|
||||||
|
loop.run_until_complete(asyncio.gather(*pending, return_exceptions=True))
|
||||||
|
except Exception:
|
||||||
|
pass # 忽略清理过程中的错误
|
||||||
|
|
||||||
loop.close()
|
loop.close()
|
||||||
|
|
||||||
|
|
||||||
|
# 保留旧版本函数以保持兼容性
|
||||||
|
executePlan_streaming = executePlan_streaming_dynamic
|
||||||
|
|||||||
@@ -0,0 +1,241 @@
|
|||||||
|
"""
|
||||||
|
动态执行管理器
|
||||||
|
用于在任务执行过程中动态追加新步骤
|
||||||
|
"""
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
from typing import Dict, List, Optional, Any
|
||||||
|
from threading import Lock
|
||||||
|
|
||||||
|
|
||||||
|
class DynamicExecutionManager:
|
||||||
|
"""
|
||||||
|
动态执行管理器
|
||||||
|
管理正在执行的任务,支持动态追加新步骤
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
# 执行状态: goal -> execution_info
|
||||||
|
self._executions: Dict[str, Dict] = {}
|
||||||
|
|
||||||
|
# 线程锁
|
||||||
|
self._lock = Lock()
|
||||||
|
|
||||||
|
# 步骤队列: goal -> List[step]
|
||||||
|
self._step_queues: Dict[str, List] = {}
|
||||||
|
|
||||||
|
# 已执行的步骤索引: goal -> Set[step_index]
|
||||||
|
self._executed_steps: Dict[str, set] = {}
|
||||||
|
|
||||||
|
# 待执行的步骤索引: goal -> List[step_index]
|
||||||
|
self._pending_steps: Dict[str, List[int]] = {}
|
||||||
|
|
||||||
|
def start_execution(self, goal: str, initial_steps: List[Dict], execution_id: str = None) -> str:
|
||||||
|
"""
|
||||||
|
开始执行一个新的任务
|
||||||
|
|
||||||
|
Args:
|
||||||
|
goal: 任务目标
|
||||||
|
initial_steps: 初始步骤列表
|
||||||
|
execution_id: 执行ID,如果不提供则自动生成
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
执行ID
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
# 如果未提供execution_id,则生成一个
|
||||||
|
if execution_id is None:
|
||||||
|
execution_id = f"{goal}_{asyncio.get_event_loop().time()}"
|
||||||
|
|
||||||
|
self._executions[execution_id] = {
|
||||||
|
"goal": goal,
|
||||||
|
"status": "running",
|
||||||
|
"total_steps": len(initial_steps),
|
||||||
|
"completed_steps": 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# 初始化步骤队列
|
||||||
|
self._step_queues[execution_id] = initial_steps.copy()
|
||||||
|
|
||||||
|
# 初始化已执行步骤集合
|
||||||
|
self._executed_steps[execution_id] = set()
|
||||||
|
|
||||||
|
# 初始化待执行步骤索引
|
||||||
|
self._pending_steps[execution_id] = list(range(len(initial_steps)))
|
||||||
|
|
||||||
|
print(f"🚀 启动执行: {execution_id}")
|
||||||
|
print(f"📊 初始步骤数: {len(initial_steps)}")
|
||||||
|
print(f"📋 待执行步骤索引: {self._pending_steps[execution_id]}")
|
||||||
|
|
||||||
|
return execution_id
|
||||||
|
|
||||||
|
def add_steps(self, execution_id: str, new_steps: List[Dict]) -> int:
|
||||||
|
"""
|
||||||
|
向执行中追加新步骤
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
new_steps: 新步骤列表
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
追加的步骤数量
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id not in self._step_queues:
|
||||||
|
print(f"⚠️ 警告: 执行ID {execution_id} 不存在,无法追加步骤")
|
||||||
|
return 0
|
||||||
|
|
||||||
|
current_count = len(self._step_queues[execution_id])
|
||||||
|
|
||||||
|
# 追加新步骤到队列
|
||||||
|
self._step_queues[execution_id].extend(new_steps)
|
||||||
|
|
||||||
|
# 添加新步骤的索引到待执行列表
|
||||||
|
new_indices = list(range(current_count, current_count + len(new_steps)))
|
||||||
|
self._pending_steps[execution_id].extend(new_indices)
|
||||||
|
|
||||||
|
# 更新总步骤数
|
||||||
|
old_total = self._executions[execution_id]["total_steps"]
|
||||||
|
self._executions[execution_id]["total_steps"] = len(self._step_queues[execution_id])
|
||||||
|
new_total = self._executions[execution_id]["total_steps"]
|
||||||
|
|
||||||
|
print(f"➕ 追加了 {len(new_steps)} 个步骤到 {execution_id}")
|
||||||
|
print(f"📊 步骤总数: {old_total} -> {new_total}")
|
||||||
|
print(f"📋 待执行步骤索引: {self._pending_steps[execution_id]}")
|
||||||
|
|
||||||
|
return len(new_steps)
|
||||||
|
|
||||||
|
def get_next_step(self, execution_id: str) -> Optional[Dict]:
|
||||||
|
"""
|
||||||
|
获取下一个待执行的步骤
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
下一个步骤,如果没有则返回None
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id not in self._pending_steps:
|
||||||
|
print(f"⚠️ 警告: 执行ID {execution_id} 不存在")
|
||||||
|
return None
|
||||||
|
|
||||||
|
# 获取第一个待执行步骤的索引
|
||||||
|
if not self._pending_steps[execution_id]:
|
||||||
|
return None
|
||||||
|
|
||||||
|
step_index = self._pending_steps[execution_id].pop(0)
|
||||||
|
|
||||||
|
# 从队列中获取步骤
|
||||||
|
if step_index >= len(self._step_queues[execution_id]):
|
||||||
|
print(f"⚠️ 警告: 步骤索引 {step_index} 超出范围")
|
||||||
|
return None
|
||||||
|
|
||||||
|
step = self._step_queues[execution_id][step_index]
|
||||||
|
|
||||||
|
# 标记为已执行
|
||||||
|
self._executed_steps[execution_id].add(step_index)
|
||||||
|
|
||||||
|
step_name = step.get("StepName", "未知")
|
||||||
|
print(f"🎯 获取下一个步骤: {step_name} (索引: {step_index})")
|
||||||
|
print(f"📋 剩余待执行步骤: {len(self._pending_steps[execution_id])}")
|
||||||
|
|
||||||
|
return step
|
||||||
|
|
||||||
|
def mark_step_completed(self, execution_id: str):
|
||||||
|
"""
|
||||||
|
标记一个步骤完成
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id in self._executions:
|
||||||
|
self._executions[execution_id]["completed_steps"] += 1
|
||||||
|
completed = self._executions[execution_id]["completed_steps"]
|
||||||
|
total = self._executions[execution_id]["total_steps"]
|
||||||
|
print(f"📊 步骤完成进度: {completed}/{total}")
|
||||||
|
else:
|
||||||
|
print(f"⚠️ 警告: 执行ID {execution_id} 不存在")
|
||||||
|
|
||||||
|
def get_execution_info(self, execution_id: str) -> Optional[Dict]:
|
||||||
|
"""
|
||||||
|
获取执行信息
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
执行信息字典
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
return self._executions.get(execution_id)
|
||||||
|
|
||||||
|
def get_pending_count(self, execution_id: str) -> int:
|
||||||
|
"""
|
||||||
|
获取待执行步骤数量
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
待执行步骤数量
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id not in self._pending_steps:
|
||||||
|
return 0
|
||||||
|
return len(self._pending_steps[execution_id])
|
||||||
|
|
||||||
|
def has_more_steps(self, execution_id: str) -> bool:
|
||||||
|
"""
|
||||||
|
检查是否还有更多步骤待执行
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
是否还有待执行步骤
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id not in self._pending_steps:
|
||||||
|
return False
|
||||||
|
return len(self._pending_steps[execution_id]) > 0
|
||||||
|
|
||||||
|
def finish_execution(self, execution_id: str):
|
||||||
|
"""
|
||||||
|
完成执行
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id in self._executions:
|
||||||
|
self._executions[execution_id]["status"] = "completed"
|
||||||
|
|
||||||
|
def cancel_execution(self, execution_id: str):
|
||||||
|
"""
|
||||||
|
取消执行
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
if execution_id in self._executions:
|
||||||
|
self._executions[execution_id]["status"] = "cancelled"
|
||||||
|
|
||||||
|
def cleanup(self, execution_id: str):
|
||||||
|
"""
|
||||||
|
清理执行记录
|
||||||
|
|
||||||
|
Args:
|
||||||
|
execution_id: 执行ID
|
||||||
|
"""
|
||||||
|
with self._lock:
|
||||||
|
self._executions.pop(execution_id, None)
|
||||||
|
self._step_queues.pop(execution_id, None)
|
||||||
|
self._executed_steps.pop(execution_id, None)
|
||||||
|
self._pending_steps.pop(execution_id, None)
|
||||||
|
|
||||||
|
|
||||||
|
# 全局单例
|
||||||
|
dynamic_execution_manager = DynamicExecutionManager()
|
||||||
@@ -270,6 +270,12 @@ def Handle_executePlanOptimized():
|
|||||||
- 无依赖关系的动作并行执行
|
- 无依赖关系的动作并行执行
|
||||||
- 有依赖关系的动作串行执行
|
- 有依赖关系的动作串行执行
|
||||||
|
|
||||||
|
支持参数:
|
||||||
|
plan: 执行计划
|
||||||
|
num_StepToRun: 要运行的步骤数
|
||||||
|
RehearsalLog: 已执行的历史记录
|
||||||
|
existingKeyObjects: 已存在的KeyObjects(用于重新执行时传递中间结果)
|
||||||
|
|
||||||
前端使用 EventSource 接收
|
前端使用 EventSource 接收
|
||||||
"""
|
"""
|
||||||
incoming_data = request.get_json()
|
incoming_data = request.get_json()
|
||||||
@@ -281,6 +287,7 @@ def Handle_executePlanOptimized():
|
|||||||
num_StepToRun=incoming_data.get("num_StepToRun"),
|
num_StepToRun=incoming_data.get("num_StepToRun"),
|
||||||
RehearsalLog=incoming_data.get("RehearsalLog", []),
|
RehearsalLog=incoming_data.get("RehearsalLog", []),
|
||||||
AgentProfile_Dict=AgentProfile_Dict,
|
AgentProfile_Dict=AgentProfile_Dict,
|
||||||
|
existingKeyObjects=incoming_data.get("existingKeyObjects"),
|
||||||
):
|
):
|
||||||
yield chunk
|
yield chunk
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -405,7 +412,7 @@ def handle_ping():
|
|||||||
def handle_execute_plan_optimized_ws(data):
|
def handle_execute_plan_optimized_ws(data):
|
||||||
"""
|
"""
|
||||||
WebSocket版本:优化版流式执行计划
|
WebSocket版本:优化版流式执行计划
|
||||||
支持步骤级流式 + 动作级智能并行
|
支持步骤级流式 + 动作级智能并行 + 动态追加步骤
|
||||||
|
|
||||||
请求格式:
|
请求格式:
|
||||||
{
|
{
|
||||||
@@ -414,7 +421,8 @@ def handle_execute_plan_optimized_ws(data):
|
|||||||
"data": {
|
"data": {
|
||||||
"plan": {...},
|
"plan": {...},
|
||||||
"num_StepToRun": null,
|
"num_StepToRun": null,
|
||||||
"RehearsalLog": []
|
"RehearsalLog": [],
|
||||||
|
"enable_dynamic": true # 是否启用动态追加步骤
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
@@ -425,27 +433,66 @@ def handle_execute_plan_optimized_ws(data):
|
|||||||
plan = incoming_data.get("plan")
|
plan = incoming_data.get("plan")
|
||||||
num_StepToRun = incoming_data.get("num_StepToRun")
|
num_StepToRun = incoming_data.get("num_StepToRun")
|
||||||
RehearsalLog = incoming_data.get("RehearsalLog", [])
|
RehearsalLog = incoming_data.get("RehearsalLog", [])
|
||||||
|
enable_dynamic = incoming_data.get("enable_dynamic", False)
|
||||||
|
|
||||||
# 使用原有的流式执行函数
|
# 如果前端传入了execution_id,使用前端的;否则生成新的
|
||||||
for chunk in executePlan_streaming(
|
execution_id = incoming_data.get("execution_id")
|
||||||
plan=plan,
|
if not execution_id:
|
||||||
num_StepToRun=num_StepToRun,
|
import time
|
||||||
RehearsalLog=RehearsalLog,
|
execution_id = f"{plan.get('General Goal', '').replace(' ', '_')}_{int(time.time() * 1000)}"
|
||||||
AgentProfile_Dict=AgentProfile_Dict,
|
|
||||||
):
|
if enable_dynamic:
|
||||||
# 通过WebSocket推送进度
|
# 动态模式:使用executePlan_streaming_dynamic
|
||||||
|
from AgentCoord.RehearsalEngine_V2.ExecutePlan_Optimized import executePlan_streaming_dynamic
|
||||||
|
|
||||||
|
# 发送执行ID(确认使用的ID)
|
||||||
emit('progress', {
|
emit('progress', {
|
||||||
'id': request_id,
|
'id': request_id,
|
||||||
'status': 'streaming',
|
'status': 'execution_started',
|
||||||
'data': chunk.replace('data: ', '').replace('\n\n', '')
|
'execution_id': execution_id,
|
||||||
|
'message': '执行已启动,支持动态追加步骤'
|
||||||
})
|
})
|
||||||
|
|
||||||
# 发送完成信号
|
for chunk in executePlan_streaming_dynamic(
|
||||||
emit('progress', {
|
plan=plan,
|
||||||
'id': request_id,
|
num_StepToRun=num_StepToRun,
|
||||||
'status': 'complete',
|
RehearsalLog=RehearsalLog,
|
||||||
'data': None
|
AgentProfile_Dict=AgentProfile_Dict,
|
||||||
})
|
execution_id=execution_id
|
||||||
|
):
|
||||||
|
emit('progress', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'streaming',
|
||||||
|
'data': chunk.replace('data: ', '').replace('\n\n', '')
|
||||||
|
})
|
||||||
|
|
||||||
|
# 发送完成信号
|
||||||
|
emit('progress', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'complete',
|
||||||
|
'data': None
|
||||||
|
})
|
||||||
|
|
||||||
|
else:
|
||||||
|
# 非动态模式:使用原有方式
|
||||||
|
for chunk in executePlan_streaming(
|
||||||
|
plan=plan,
|
||||||
|
num_StepToRun=num_StepToRun,
|
||||||
|
RehearsalLog=RehearsalLog,
|
||||||
|
AgentProfile_Dict=AgentProfile_Dict,
|
||||||
|
):
|
||||||
|
emit('progress', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'streaming',
|
||||||
|
'data': chunk.replace('data: ', '').replace('\n\n', '')
|
||||||
|
})
|
||||||
|
|
||||||
|
# 发送完成信号
|
||||||
|
emit('progress', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'complete',
|
||||||
|
'data': None
|
||||||
|
})
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
# 发送错误信息
|
# 发送错误信息
|
||||||
@@ -456,6 +503,68 @@ def handle_execute_plan_optimized_ws(data):
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@socketio.on('add_steps_to_execution')
|
||||||
|
def handle_add_steps_to_execution(data):
|
||||||
|
"""
|
||||||
|
WebSocket版本:向正在执行的任务追加新步骤
|
||||||
|
|
||||||
|
请求格式:
|
||||||
|
{
|
||||||
|
"id": "request-id",
|
||||||
|
"action": "add_steps_to_execution",
|
||||||
|
"data": {
|
||||||
|
"execution_id": "execution_id",
|
||||||
|
"new_steps": [...]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
request_id = data.get('id')
|
||||||
|
incoming_data = data.get('data', {})
|
||||||
|
|
||||||
|
try:
|
||||||
|
from AgentCoord.RehearsalEngine_V2.dynamic_execution_manager import dynamic_execution_manager
|
||||||
|
|
||||||
|
execution_id = incoming_data.get('execution_id')
|
||||||
|
new_steps = incoming_data.get('new_steps', [])
|
||||||
|
|
||||||
|
if not execution_id:
|
||||||
|
emit('response', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'error',
|
||||||
|
'error': '缺少execution_id参数'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
|
||||||
|
# 追加新步骤到执行队列
|
||||||
|
added_count = dynamic_execution_manager.add_steps(execution_id, new_steps)
|
||||||
|
|
||||||
|
if added_count > 0:
|
||||||
|
print(f"✅ 成功追加 {added_count} 个步骤到执行队列: {execution_id}")
|
||||||
|
emit('response', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'success',
|
||||||
|
'data': {
|
||||||
|
'message': f'成功追加 {added_count} 个步骤',
|
||||||
|
'added_count': added_count
|
||||||
|
}
|
||||||
|
})
|
||||||
|
else:
|
||||||
|
print(f"⚠️ 无法追加步骤,执行ID不存在或已结束: {execution_id}")
|
||||||
|
emit('response', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'error',
|
||||||
|
'error': '执行ID不存在或已结束'
|
||||||
|
})
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"❌ 追加步骤失败: {str(e)}")
|
||||||
|
emit('response', {
|
||||||
|
'id': request_id,
|
||||||
|
'status': 'error',
|
||||||
|
'error': str(e)
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@socketio.on('generate_base_plan')
|
@socketio.on('generate_base_plan')
|
||||||
def handle_generate_base_plan_ws(data):
|
def handle_generate_base_plan_ws(data):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -167,10 +167,8 @@ class Api {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 优化版流式执行计划(阶段1+2:步骤级流式 + 动作级智能并行)
|
* 优化版流式执行计划(支持动态追加步骤)
|
||||||
* 无依赖关系的动作并行执行,有依赖关系的动作串行执行
|
* 步骤级流式 + 动作级智能并行 + 动态追加步骤
|
||||||
*
|
|
||||||
* 默认使用WebSocket,如果连接失败则降级到SSE
|
|
||||||
*/
|
*/
|
||||||
executePlanOptimized = (
|
executePlanOptimized = (
|
||||||
plan: IRawPlanResponse,
|
plan: IRawPlanResponse,
|
||||||
@@ -178,12 +176,19 @@ class Api {
|
|||||||
onError?: (error: Error) => void,
|
onError?: (error: Error) => void,
|
||||||
onComplete?: () => void,
|
onComplete?: () => void,
|
||||||
useWebSocket?: boolean,
|
useWebSocket?: boolean,
|
||||||
|
existingKeyObjects?: Record<string, any>,
|
||||||
|
enableDynamic?: boolean,
|
||||||
|
onExecutionStarted?: (executionId: string) => void,
|
||||||
|
executionId?: string,
|
||||||
) => {
|
) => {
|
||||||
const useWs = useWebSocket !== undefined ? useWebSocket : this.useWebSocketDefault
|
const useWs = useWebSocket !== undefined ? useWebSocket : this.useWebSocketDefault
|
||||||
|
|
||||||
const data = {
|
const data = {
|
||||||
RehearsalLog: [],
|
RehearsalLog: [],
|
||||||
num_StepToRun: null,
|
num_StepToRun: null,
|
||||||
|
existingKeyObjects: existingKeyObjects || {},
|
||||||
|
enable_dynamic: enableDynamic || false,
|
||||||
|
execution_id: executionId || null,
|
||||||
plan: {
|
plan: {
|
||||||
'Initial Input Object': plan['Initial Input Object'],
|
'Initial Input Object': plan['Initial Input Object'],
|
||||||
'General Goal': plan['General Goal'],
|
'General Goal': plan['General Goal'],
|
||||||
@@ -213,14 +218,26 @@ class Api {
|
|||||||
// onProgress
|
// onProgress
|
||||||
(progressData) => {
|
(progressData) => {
|
||||||
try {
|
try {
|
||||||
// progressData 应该已经是解析后的对象了
|
|
||||||
// 如果是字符串,说明后端发送的是 JSON 字符串,需要解析
|
|
||||||
let event: StreamingEvent
|
let event: StreamingEvent
|
||||||
|
|
||||||
|
// 处理不同类型的progress数据
|
||||||
if (typeof progressData === 'string') {
|
if (typeof progressData === 'string') {
|
||||||
event = JSON.parse(progressData)
|
event = JSON.parse(progressData)
|
||||||
} else {
|
} else {
|
||||||
event = progressData as StreamingEvent
|
event = progressData as StreamingEvent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 处理特殊事件类型
|
||||||
|
if (event && typeof event === 'object') {
|
||||||
|
// 检查是否是execution_started事件
|
||||||
|
if ('status' in event && event.status === 'execution_started') {
|
||||||
|
if ('execution_id' in event && onExecutionStarted) {
|
||||||
|
onExecutionStarted(event.execution_id as string)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
onMessage(event)
|
onMessage(event)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// Failed to parse WebSocket data
|
// Failed to parse WebSocket data
|
||||||
@@ -848,6 +865,39 @@ class Api {
|
|||||||
|
|
||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 向正在执行的任务追加新步骤
|
||||||
|
* @param executionId 执行ID
|
||||||
|
* @param newSteps 新步骤列表
|
||||||
|
* @returns 追加的步骤数量
|
||||||
|
*/
|
||||||
|
addStepsToExecution = async (executionId: string, newSteps: IRawStepTask[]): Promise<number> => {
|
||||||
|
if (!websocket.connected) {
|
||||||
|
throw new Error('WebSocket未连接')
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await websocket.send('add_steps_to_execution', {
|
||||||
|
execution_id: executionId,
|
||||||
|
new_steps: newSteps.map(step => ({
|
||||||
|
StepName: step.StepName,
|
||||||
|
TaskContent: step.TaskContent,
|
||||||
|
InputObject_List: step.InputObject_List,
|
||||||
|
OutputObject: step.OutputObject,
|
||||||
|
AgentSelection: step.AgentSelection,
|
||||||
|
Collaboration_Brief_frontEnd: step.Collaboration_Brief_frontEnd,
|
||||||
|
TaskProcess: step.TaskProcess.map(action => ({
|
||||||
|
ActionType: action.ActionType,
|
||||||
|
AgentName: action.AgentName,
|
||||||
|
Description: action.Description,
|
||||||
|
ID: action.ID,
|
||||||
|
ImportantInput: action.ImportantInput,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
}) as { added_count: number }
|
||||||
|
|
||||||
|
return response?.added_count || 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new Api()
|
export default new Api()
|
||||||
|
|||||||
260
frontend/src/components/Notification/Notification.vue
Normal file
260
frontend/src/components/Notification/Notification.vue
Normal file
@@ -0,0 +1,260 @@
|
|||||||
|
<template>
|
||||||
|
<teleport to="body">
|
||||||
|
<div class="notification-container">
|
||||||
|
<transition-group
|
||||||
|
name="notification"
|
||||||
|
tag="div"
|
||||||
|
class="notification-list"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-for="notification in notifications"
|
||||||
|
:key="notification.id"
|
||||||
|
:class="[
|
||||||
|
'notification-item',
|
||||||
|
`notification-${notification.type || 'info'}`
|
||||||
|
]"
|
||||||
|
:style="{ zIndex: notification.zIndex || 1000 }"
|
||||||
|
>
|
||||||
|
<div class="notification-content">
|
||||||
|
<div class="notification-icon">
|
||||||
|
<component :is="getIcon(notification.type)" />
|
||||||
|
</div>
|
||||||
|
<div class="notification-message">
|
||||||
|
<div class="notification-title">{{ notification.title }}</div>
|
||||||
|
<div v-if="notification.detailTitle" class="notification-detail-title">
|
||||||
|
{{ notification.detailTitle }}
|
||||||
|
</div>
|
||||||
|
<div v-if="notification.detailMessage" class="notification-detail-desc">
|
||||||
|
{{ notification.detailMessage }}
|
||||||
|
</div>
|
||||||
|
<div v-else-if="notification.message" class="notification-desc">
|
||||||
|
{{ notification.message }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="notification-close" @click="close(notification.id)">
|
||||||
|
<Close />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="notification.showProgress" class="notification-progress">
|
||||||
|
<div
|
||||||
|
class="progress-bar"
|
||||||
|
:style="{ width: `${notification.progress || 0}%` }"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</transition-group>
|
||||||
|
</div>
|
||||||
|
</teleport>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import {
|
||||||
|
Close,
|
||||||
|
SuccessFilled as IconSuccess,
|
||||||
|
WarningFilled as IconWarning,
|
||||||
|
CircleCloseFilled,
|
||||||
|
InfoFilled
|
||||||
|
} from '@element-plus/icons-vue'
|
||||||
|
import type { NotificationItem } from '@/composables/useNotification'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
notifications: NotificationItem[]
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
close: [id: string]
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const close = (id: string) => {
|
||||||
|
emit('close', id)
|
||||||
|
}
|
||||||
|
|
||||||
|
const getIcon = (type?: string) => {
|
||||||
|
switch (type) {
|
||||||
|
case 'success':
|
||||||
|
return IconSuccess
|
||||||
|
case 'warning':
|
||||||
|
return IconWarning
|
||||||
|
case 'error':
|
||||||
|
return IconWarning
|
||||||
|
default:
|
||||||
|
return InfoFilled
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.notification-container {
|
||||||
|
position: fixed;
|
||||||
|
top: 20px;
|
||||||
|
right: 20px;
|
||||||
|
z-index: 9999;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-item {
|
||||||
|
pointer-events: auto;
|
||||||
|
min-width: 300px;
|
||||||
|
max-width: 450px;
|
||||||
|
background: white;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
||||||
|
overflow: hidden;
|
||||||
|
border-left: 4px solid #409eff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-success {
|
||||||
|
border-left-color: #67c23a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-warning {
|
||||||
|
border-left-color: #e6a23c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-error {
|
||||||
|
border-left-color: #f56c6c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-content {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
padding: 12px 16px;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-icon {
|
||||||
|
flex-shrink: 0;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-icon .success {
|
||||||
|
color: #67c23a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-icon .warning {
|
||||||
|
color: #e6a23c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-icon .error {
|
||||||
|
color: #f56c6c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-icon .info {
|
||||||
|
color: #409eff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-message {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-title {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #303133;
|
||||||
|
margin-bottom: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-detail-title {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #409eff;
|
||||||
|
margin-top: 4px;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-detail-desc {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #909399;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-desc {
|
||||||
|
font-size: 13px;
|
||||||
|
color: #606266;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-close {
|
||||||
|
flex-shrink: 0;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
color: #909399;
|
||||||
|
transition: color 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-close:hover {
|
||||||
|
color: #606266;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-progress {
|
||||||
|
height: 2px;
|
||||||
|
background: #f0f2f5;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-bar {
|
||||||
|
height: 100%;
|
||||||
|
background: #409eff;
|
||||||
|
transition: width 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 进入动画 */
|
||||||
|
.notification-enter-active {
|
||||||
|
animation: slideInRight 0.3s ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 离开动画 */
|
||||||
|
.notification-leave-active {
|
||||||
|
animation: slideOutRight 0.3s ease-in;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideInRight {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateX(100%);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideOutRight {
|
||||||
|
from {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateX(0);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateX(100%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 列表项移动动画 */
|
||||||
|
.notification-move,
|
||||||
|
.notification-enter-active,
|
||||||
|
.notification-leave-active {
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification-leave-active {
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
154
frontend/src/composables/useNotification.ts
Normal file
154
frontend/src/composables/useNotification.ts
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
import { ref } from 'vue'
|
||||||
|
|
||||||
|
export interface NotificationItem {
|
||||||
|
id: string
|
||||||
|
title: string
|
||||||
|
message?: string
|
||||||
|
type?: 'success' | 'warning' | 'info' | 'error'
|
||||||
|
duration?: number
|
||||||
|
showProgress?: boolean
|
||||||
|
progress?: number
|
||||||
|
zIndex?: number
|
||||||
|
onClose?: () => void
|
||||||
|
// 详细进度信息
|
||||||
|
detailTitle?: string
|
||||||
|
detailMessage?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const notifications = ref<NotificationItem[]>([])
|
||||||
|
let notificationIdCounter = 0
|
||||||
|
let zIndexCounter = 1000
|
||||||
|
|
||||||
|
export function useNotification() {
|
||||||
|
const addNotification = (notification: Omit<NotificationItem, 'id' | 'zIndex'>) => {
|
||||||
|
const id = `notification-${notificationIdCounter++}`
|
||||||
|
const newNotification: NotificationItem = {
|
||||||
|
...notification,
|
||||||
|
id,
|
||||||
|
zIndex: ++zIndexCounter,
|
||||||
|
}
|
||||||
|
|
||||||
|
notifications.value.push(newNotification)
|
||||||
|
|
||||||
|
// 自动关闭
|
||||||
|
if (notification.duration && notification.duration > 0) {
|
||||||
|
setTimeout(() => {
|
||||||
|
removeNotification(id)
|
||||||
|
}, notification.duration)
|
||||||
|
}
|
||||||
|
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
const removeNotification = (id: string) => {
|
||||||
|
const index = notifications.value.findIndex((n) => n.id === id)
|
||||||
|
if (index !== -1) {
|
||||||
|
const notification = notifications.value[index]
|
||||||
|
notifications.value.splice(index, 1)
|
||||||
|
notification.onClose?.()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const success = (title: string, message?: string, options?: Partial<NotificationItem>) => {
|
||||||
|
return addNotification({
|
||||||
|
title,
|
||||||
|
message,
|
||||||
|
type: 'success',
|
||||||
|
duration: 3000,
|
||||||
|
...options,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const warning = (title: string, message?: string, options?: Partial<NotificationItem>) => {
|
||||||
|
return addNotification({
|
||||||
|
title,
|
||||||
|
message,
|
||||||
|
type: 'warning',
|
||||||
|
duration: 3000,
|
||||||
|
...options,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const info = (title: string, message?: string, options?: Partial<NotificationItem>) => {
|
||||||
|
return addNotification({
|
||||||
|
title,
|
||||||
|
message,
|
||||||
|
type: 'info',
|
||||||
|
duration: 3000,
|
||||||
|
...options,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const error = (title: string, message?: string, options?: Partial<NotificationItem>) => {
|
||||||
|
return addNotification({
|
||||||
|
title,
|
||||||
|
message,
|
||||||
|
type: 'error',
|
||||||
|
duration: 5000,
|
||||||
|
...options,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const progress = (
|
||||||
|
title: string,
|
||||||
|
current: number,
|
||||||
|
total: number,
|
||||||
|
options?: Partial<NotificationItem>,
|
||||||
|
) => {
|
||||||
|
const progressPercent = Math.round((current / total) * 100)
|
||||||
|
return addNotification({
|
||||||
|
title,
|
||||||
|
message: `${current}/${total}`,
|
||||||
|
type: 'info',
|
||||||
|
showProgress: true,
|
||||||
|
progress: progressPercent,
|
||||||
|
duration: 0, // 不自动关闭
|
||||||
|
...options,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateProgress = (id: string, current: number, total: number) => {
|
||||||
|
const notification = notifications.value.find((n) => n.id === id)
|
||||||
|
if (notification) {
|
||||||
|
notification.progress = Math.round((current / total) * 100)
|
||||||
|
notification.message = `${current}/${total}`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const updateProgressDetail = (
|
||||||
|
id: string,
|
||||||
|
detailTitle: string,
|
||||||
|
detailMessage: string,
|
||||||
|
current?: number,
|
||||||
|
total?: number
|
||||||
|
) => {
|
||||||
|
const notification = notifications.value.find((n) => n.id === id)
|
||||||
|
if (notification) {
|
||||||
|
notification.detailTitle = detailTitle
|
||||||
|
notification.detailMessage = detailMessage
|
||||||
|
if (current !== undefined && total !== undefined) {
|
||||||
|
notification.progress = Math.round((current / total) * 100)
|
||||||
|
notification.message = `${current}/${total}`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const clear = () => {
|
||||||
|
notifications.value.forEach((n) => n.onClose?.())
|
||||||
|
notifications.value = []
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
notifications,
|
||||||
|
addNotification,
|
||||||
|
removeNotification,
|
||||||
|
success,
|
||||||
|
warning,
|
||||||
|
info,
|
||||||
|
error,
|
||||||
|
progress,
|
||||||
|
updateProgress,
|
||||||
|
updateProgressDetail,
|
||||||
|
clear,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -107,6 +107,8 @@ async function handleStop() {
|
|||||||
// 无论后端是否成功停止,都重置状态
|
// 无论后端是否成功停止,都重置状态
|
||||||
isFillingSteps.value = false
|
isFillingSteps.value = false
|
||||||
currentStepAbortController.value = null
|
currentStepAbortController.value = null
|
||||||
|
// 标记用户已停止填充
|
||||||
|
agentsStore.setHasStoppedFilling(true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,6 +136,8 @@ async function handleSearch() {
|
|||||||
emit('search-start')
|
emit('search-start')
|
||||||
agentsStore.resetAgent()
|
agentsStore.resetAgent()
|
||||||
agentsStore.setAgentRawPlan({ loading: true })
|
agentsStore.setAgentRawPlan({ loading: true })
|
||||||
|
// 重置停止状态
|
||||||
|
agentsStore.setHasStoppedFilling(false)
|
||||||
|
|
||||||
// 获取大纲
|
// 获取大纲
|
||||||
const outlineData = await api.generateBasePlan({
|
const outlineData = await api.generateBasePlan({
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -9,6 +9,8 @@ import { Loading } from '@element-plus/icons-vue'
|
|||||||
import MultiLineTooltip from '@/components/MultiLineTooltip/index.vue'
|
import MultiLineTooltip from '@/components/MultiLineTooltip/index.vue'
|
||||||
import Bg from './Bg.vue'
|
import Bg from './Bg.vue'
|
||||||
import BranchButton from './components/BranchButton.vue'
|
import BranchButton from './components/BranchButton.vue'
|
||||||
|
import Notification from '@/components/Notification/Notification.vue'
|
||||||
|
import { useNotification } from '@/composables/useNotification'
|
||||||
|
|
||||||
// 判断计划是否就绪
|
// 判断计划是否就绪
|
||||||
const planReady = computed(() => {
|
const planReady = computed(() => {
|
||||||
@@ -57,6 +59,55 @@ const totalSteps = computed(() => {
|
|||||||
return agentsStore.agentRawPlan.data?.['Collaboration Process']?.length || 0
|
return agentsStore.agentRawPlan.data?.['Collaboration Process']?.length || 0
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Notification system
|
||||||
|
const { notifications, progress: showProgress, updateProgressDetail, removeNotification } = useNotification()
|
||||||
|
const fillingProgressNotificationId = ref<string | null>(null)
|
||||||
|
|
||||||
|
// 监听填充进度,显示通知
|
||||||
|
watch(
|
||||||
|
[isFillingDetails, completedSteps, totalSteps, () => agentsStore.hasStoppedFilling],
|
||||||
|
([filling, completed, total, hasStopped]) => {
|
||||||
|
// 如果用户已停止,关闭进度通知
|
||||||
|
if (hasStopped && fillingProgressNotificationId.value) {
|
||||||
|
removeNotification(fillingProgressNotificationId.value)
|
||||||
|
fillingProgressNotificationId.value = null
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (filling && total > 0) {
|
||||||
|
if (!fillingProgressNotificationId.value) {
|
||||||
|
// 创建进度通知
|
||||||
|
fillingProgressNotificationId.value = showProgress(
|
||||||
|
'生成协作流程',
|
||||||
|
completed,
|
||||||
|
total
|
||||||
|
)
|
||||||
|
updateProgressDetail(
|
||||||
|
fillingProgressNotificationId.value,
|
||||||
|
`${completed}/${total}`,
|
||||||
|
'正在分配智能体...',
|
||||||
|
completed,
|
||||||
|
total
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
// 更新进度通知
|
||||||
|
updateProgressDetail(
|
||||||
|
fillingProgressNotificationId.value,
|
||||||
|
`${completed}/${total}`,
|
||||||
|
'正在分配智能体...',
|
||||||
|
completed,
|
||||||
|
total
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} else if (fillingProgressNotificationId.value && !filling) {
|
||||||
|
// 填充完成,关闭进度通知
|
||||||
|
removeNotification(fillingProgressNotificationId.value)
|
||||||
|
fillingProgressNotificationId.value = null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
// 编辑状态管理
|
// 编辑状态管理
|
||||||
const editingTaskId = ref<string | null>(null)
|
const editingTaskId = ref<string | null>(null)
|
||||||
const editingContent = ref('')
|
const editingContent = ref('')
|
||||||
@@ -274,17 +325,16 @@ defineExpose({
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full flex flex-col">
|
<div class="h-full flex flex-col">
|
||||||
|
<!-- Notification 通知系统 -->
|
||||||
|
<Notification
|
||||||
|
:notifications="notifications"
|
||||||
|
@close="(id) => removeNotification(id)"
|
||||||
|
/>
|
||||||
|
|
||||||
<div class="text-[18px] font-bold mb-[18px] text-[var(--color-text-title-header)]">
|
<div class="text-[18px] font-bold mb-[18px] text-[var(--color-text-title-header)]">
|
||||||
任务大纲
|
任务大纲
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 加载详情提示 -->
|
|
||||||
<div v-if="isFillingDetails" class="detail-loading-hint">
|
|
||||||
<el-icon class="is-loading"><Loading /></el-icon>
|
|
||||||
<span>正在生成任务协作流程...</span>
|
|
||||||
<span class="progress">{{ completedSteps }}/{{ totalSteps }}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-loading="agentsStore.agentRawPlan.loading"
|
v-loading="agentsStore.agentRawPlan.loading"
|
||||||
class="flex-1 w-full overflow-y-auto relative"
|
class="flex-1 w-full overflow-y-auto relative"
|
||||||
@@ -426,7 +476,7 @@ defineExpose({
|
|||||||
|
|
||||||
<!-- 未填充智能体时显示Loading -->
|
<!-- 未填充智能体时显示Loading -->
|
||||||
<div
|
<div
|
||||||
v-if="!item.AgentSelection || item.AgentSelection.length === 0"
|
v-if="(!item.AgentSelection || item.AgentSelection.length === 0) && !agentsStore.hasStoppedFilling"
|
||||||
class="flex items-center gap-2 text-[var(--color-text-secondary)] text-[14px]"
|
class="flex items-center gap-2 text-[var(--color-text-secondary)] text-[14px]"
|
||||||
>
|
>
|
||||||
<el-icon class="is-loading" :size="20">
|
<el-icon class="is-loading" :size="20">
|
||||||
@@ -601,40 +651,6 @@ defineExpose({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加载详情提示样式
|
|
||||||
.detail-loading-hint {
|
|
||||||
position: fixed;
|
|
||||||
top: 80px;
|
|
||||||
right: 20px;
|
|
||||||
background: var(--el-bg-color);
|
|
||||||
border: 1px solid var(--el-border-color);
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 12px 16px;
|
|
||||||
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
z-index: 1000;
|
|
||||||
animation: slideInRight 0.3s ease-out;
|
|
||||||
|
|
||||||
.progress {
|
|
||||||
color: var(--el-color-primary);
|
|
||||||
font-weight: bold;
|
|
||||||
margin-left: 4px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes slideInRight {
|
|
||||||
from {
|
|
||||||
opacity: 0;
|
|
||||||
transform: translateX(20px);
|
|
||||||
}
|
|
||||||
to {
|
|
||||||
opacity: 1;
|
|
||||||
transform: translateX(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 输入框样式
|
// 输入框样式
|
||||||
:deep(.el-input__wrapper) {
|
:deep(.el-input__wrapper) {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
|
|||||||
@@ -359,6 +359,7 @@ export const useAgentsStore = defineStore('agents', () => {
|
|||||||
}
|
}
|
||||||
currentTask.value = undefined
|
currentTask.value = undefined
|
||||||
executePlan.value = []
|
executePlan.value = []
|
||||||
|
hasStoppedFilling.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// 额外的产物列表
|
// 额外的产物列表
|
||||||
@@ -415,6 +416,14 @@ export const useAgentsStore = defineStore('agents', () => {
|
|||||||
additionalOutputs.value = []
|
additionalOutputs.value = []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 标记是否用户已停止智能体分配过程
|
||||||
|
const hasStoppedFilling = ref(false)
|
||||||
|
|
||||||
|
// 设置停止状态
|
||||||
|
function setHasStoppedFilling(value: boolean) {
|
||||||
|
hasStoppedFilling.value = value
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
agents,
|
agents,
|
||||||
setAgents,
|
setAgents,
|
||||||
@@ -460,6 +469,9 @@ export const useAgentsStore = defineStore('agents', () => {
|
|||||||
addConfirmedAgentGroup,
|
addConfirmedAgentGroup,
|
||||||
clearConfirmedAgentGroups,
|
clearConfirmedAgentGroups,
|
||||||
clearAllConfirmedAgentGroups,
|
clearAllConfirmedAgentGroups,
|
||||||
|
// 停止填充状态
|
||||||
|
hasStoppedFilling,
|
||||||
|
setHasStoppedFilling,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user