Merge pull request #123 from SuanmoSuanyangTechnology/feature/agent-tool_xjn
fix(multi agent and mcp tool)
This commit is contained in:
@@ -96,10 +96,7 @@ class SimpleMCPClient:
|
|||||||
"""初始化 SSE MCP 会话 - 参考 Dify 实现"""
|
"""初始化 SSE MCP 会话 - 参考 Dify 实现"""
|
||||||
try:
|
try:
|
||||||
# 建立 SSE 连接
|
# 建立 SSE 连接
|
||||||
response = await self._session.get(
|
response = await self._session.get(self.server_url)
|
||||||
self.server_url,
|
|
||||||
headers={"Accept": "text/event-stream"}
|
|
||||||
)
|
|
||||||
|
|
||||||
if response.status != 200:
|
if response.status != 200:
|
||||||
error_text = await response.text()
|
error_text = await response.text()
|
||||||
|
|||||||
@@ -245,7 +245,8 @@ class DraftRunService:
|
|||||||
storage_type: Optional[str] = None,
|
storage_type: Optional[str] = None,
|
||||||
user_rag_memory_id: Optional[str] = None,
|
user_rag_memory_id: Optional[str] = None,
|
||||||
web_search: bool = True,
|
web_search: bool = True,
|
||||||
memory: bool = True
|
memory: bool = True,
|
||||||
|
sub_agent: bool = False
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
"""执行试运行(使用 LangChain Agent)
|
"""执行试运行(使用 LangChain Agent)
|
||||||
|
|
||||||
@@ -435,7 +436,7 @@ class DraftRunService:
|
|||||||
elapsed_time = time.time() - start_time
|
elapsed_time = time.time() - start_time
|
||||||
|
|
||||||
# 8. 保存会话消息
|
# 8. 保存会话消息
|
||||||
if agent_config.memory and agent_config.memory.get("enabled"):
|
if not sub_agent and agent_config.memory and agent_config.memory.get("enabled"):
|
||||||
await self._save_conversation_message(
|
await self._save_conversation_message(
|
||||||
conversation_id=conversation_id,
|
conversation_id=conversation_id,
|
||||||
user_message=message,
|
user_message=message,
|
||||||
|
|||||||
@@ -1327,7 +1327,8 @@ class MultiAgentOrchestrator:
|
|||||||
web_search=web_search,
|
web_search=web_search,
|
||||||
memory=memory,
|
memory=memory,
|
||||||
storage_type=storage_type,
|
storage_type=storage_type,
|
||||||
user_rag_memory_id=user_rag_memory_id
|
user_rag_memory_id=user_rag_memory_id,
|
||||||
|
sub_agent=True
|
||||||
)
|
)
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|||||||
Reference in New Issue
Block a user