adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop' into feature/20251219_xjn

Browse Source
This commit is contained in:
谢俊男
2026-01-04 19:04:30 +08:00
parent a8c5368d49 4674d4d291
commit 6babd0b531
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/app/services/multi_agent_orchestrator.py
View File

@@ -890,13 +890,13 @@ class MultiAgentOrchestrator:
) )
# 发送整合后的结果 # 发送整合后的结果
yield self._format_sse_event("merge_complete", { yield self._format_sse_event("message", {
"content": final_response "content": final_response
}) })
except Exception as e: except Exception as e:
logger.error(f"Master Agent 整合失败，降级到 smart 模式: {str(e)}") logger.error(f"Master Agent 整合失败，降级到 smart 模式: {str(e)}")
final_response = self._smart_merge_results(results, collaboration_strategy) final_response = self._smart_merge_results(results, collaboration_strategy)
yield self._format_sse_event("merge_complete", { yield self._format_sse_event("message", {
"content": final_response "content": final_response
}) })
else: else:
@@ -912,7 +912,7 @@ class MultiAgentOrchestrator:
# 只有在需要时才发送整合结果 # 只有在需要时才发送整合结果
if final_response and final_response != "": if final_response and final_response != "":
yield self._format_sse_event("merge_complete", { yield self._format_sse_event("message", {
"content": final_response "content": final_response
}) })