🐛 fix agent/run interface can't call multi-level agent.

Author: Phinease

backend/agents/create_agent_info.py

@@ -8,8 +8,8 @@
 from services.remote_mcp_service import get_remote_mcp_server_list
 from utils.auth_utils import get_current_user_id
 
-from database.agent_db import search_agent_info_by_agent_id, search_tools_for_sub_agent, query_sub_agents, \
-    query_or_create_main_agent_id
+from database.agent_db import search_agent_info_by_agent_id, search_tools_for_sub_agent, \
+    query_or_create_main_agent_id, query_sub_agents_id_list
 from services.elasticsearch_service import ElasticSearchService, elastic_core, get_embedding_model
 from services.tenant_config_service import get_selected_knowledge_list
 from utils.prompt_template_utils import get_prompt_template_path
@@ -41,13 +41,11 @@ async def create_agent_config(agent_id, tenant_id, user_id, language: str = 'zh'
     agent_info = search_agent_info_by_agent_id(agent_id=agent_id, tenant_id=tenant_id)
 
     # create sub agent
-    sub_agents_info = query_sub_agents(agent_id, tenant_id)
+    sub_agent_id_list = query_sub_agents_id_list(main_agent_id=agent_id, tenant_id=tenant_id)
     managed_agents = []
-    for sub_agent_info in sub_agents_info:
-        if not sub_agent_info.get("enabled"):
-            continue
+    for sub_agent_id in sub_agent_id_list:
         sub_agent_config = await create_agent_config(
-            agent_id=sub_agent_info["agent_id"],
+            agent_id=sub_agent_id,
             tenant_id=tenant_id,
             user_id=user_id,
             language=language)

backend/database/agent_db.py

@@ -60,27 +60,6 @@ def query_or_create_main_agent_id(tenant_id: str, user_id: str) -> int:
         else:
             return main_agent.agent_id
 
-def query_sub_agents(main_agent_id: int, tenant_id: str):
-    """
-    Query the TenantAgent list based on the optional tenant_id.
-    Filter out records with delete_flag set to 'Y'.
-
-    :param main_agent_id: Optional main agent ID for filtering
-    :param tenant_id: Optional tenant ID for filtering
-    :return: List of TenantAgent objects that meet the criteria
-    """
-    with get_db_session() as session:
-        query = session.query(AgentInfo).filter(AgentInfo.delete_flag != 'Y',
-                                                AgentInfo.parent_agent_id == main_agent_id,
-                                                AgentInfo.name.isnot(None),
-                                                AgentInfo.description.isnot(None),
-                                                AgentInfo.model_name.isnot(None),
-                                                AgentInfo.tenant_id == tenant_id)
-        
-        # Order by create_time desc
-        agents = query.order_by(AgentInfo.create_time.desc()).all()
-        return [as_dict(agent) for agent in agents]
-
 
 def query_sub_agents_id_list(main_agent_id: int, tenant_id: str):
     """

backend/main_service.py

@@ -6,7 +6,6 @@
 from dotenv import load_dotenv
 load_dotenv()
 
-from services.agent_service import import_default_agents_to_pg
 from apps.base_app import app
 from utils.logging_utils import configure_logging, configure_elasticsearch_logging
 
@@ -17,5 +16,4 @@
 
 if __name__ == "__main__":
     # Scan agents and update to database
-    import_default_agents_to_pg()
     uvicorn.run(app, host="0.0.0.0", port=5010, log_level="info")

backend/prompts/manager_system_prompt_template.yaml

@@ -95,6 +95,14 @@ system_prompt: |-
 
 managed_agent:
   task: |-
+      你是一个名为'{{name}}'的助手。
+      你的管理者给你提交了这个任务。
+      ---
+      任务：
+      {{task}}
+      ---
+      你正在帮助你的管理者解决一个更大的任务：所以确保不要提供一行答案，而是提供尽可能多的信息，让他们清楚地理解答案。
+      即使你的任务解决不成功，也请返回尽可能多的上下文，这样你的管理者可以根据这个反馈采取行动。
 
   report: |-
       {{final_answer}}

backend/prompts/manager_system_prompt_template_en.yaml

@@ -95,6 +95,14 @@ system_prompt: |-
 
 managed_agent:
   task: |-
+      You are an assistant named '{{name}}'.
+      Your manager has submitted this task to you.
+      ---
+      Task:
+      {{task}}
+      ---
+      You are helping your manager solve a larger task: so make sure not to provide a one-line answer, but provide as much information as possible so they can clearly understand the answer.
+      Even if your task solution is unsuccessful, please return as much context as possible so your manager can take action based on this feedback.
 
   report: |-
       {{final_answer}} 

backend/services/agent_service.py

@@ -8,7 +8,7 @@
 from agents.create_agent_info import create_tool_config_list
 from consts.model import AgentInfoRequest, ExportAndImportAgentInfo, ExportAndImportDataFormat, ToolInstanceInfoRequest
 from database.agent_db import create_agent, query_all_enabled_tool_instances, \
-    query_or_create_main_agent_id, query_sub_agents, search_blank_sub_agent_by_main_agent_id, \
+     search_blank_sub_agent_by_main_agent_id, \
     search_tools_for_sub_agent, search_agent_info_by_agent_id, update_agent, delete_agent_by_id, query_all_tools, \
     create_or_update_tool_by_tool_info, check_tool_is_available, query_all_agent_info_by_tenant_id, \
     query_sub_agents_id_list, insert_related_agent, delete_all_related_agent
@@ -39,21 +39,6 @@ def get_creating_sub_agent_id_service(tenant_id: str, user_id: str = None) -> in
         return create_agent(agent_info={"enabled": False}, tenant_id=tenant_id, user_id=user_id)["agent_id"]
 
 
-def query_sub_agents_api(main_agent_id: int, tenant_id: str = None, user_id: str = None):
-    sub_agents = query_sub_agents(main_agent_id, tenant_id)
-
-    for sub_agent in sub_agents:
-        # search the tools used by each sub agent, here use the tools configured by admin, not use user_id
-        tool_info = search_tools_for_sub_agent(agent_id=sub_agent["agent_id"], tenant_id=tenant_id)
-        sub_agent["tools"] = tool_info
-
-        tool_id_list = [tool["tool_id"] for tool in tool_info]
-        if all(check_tool_is_available(tool_id_list)):
-            sub_agent["is_available"] = True
-        else:
-            sub_agent["is_available"] = False
-    return sub_agents
-
 def get_agent_info_impl(agent_id: int, tenant_id: str):
     try:    
         agent_info = search_agent_info_by_agent_id(agent_id, tenant_id)
@@ -282,22 +267,6 @@ async def import_agent_by_agent_id(import_agent_info: ExportAndImportAgentInfo,
         create_or_update_tool_by_tool_info(tool_info=tool, tenant_id=tenant_id, user_id=user_id)
     return new_agent_id
 
-def search_sub_agents(authorization: str = Header(None)):
-    user_id, tenant_id = get_current_user_id(authorization)
-    logger.info(f"user_id: {user_id}, tenant_id: {tenant_id}")
-    try:
-        main_agent_id = query_or_create_main_agent_id(tenant_id=tenant_id, user_id=user_id)
-    except Exception as e:
-        logger.error(f"Failed to get main agent id: {str(e)}")
-        raise ValueError(f"Failed to get main agent id: {str(e)}")
-
-    try:
-        sub_agent_list = query_sub_agents(main_agent_id, tenant_id)
-    except Exception as e:
-        logger.error(f"Failed to get sub agent list: {str(e)}")
-        raise ValueError(f"Failed to get sub agent list: {str(e)}")
-
-    return main_agent_id, sub_agent_list
 
 def load_default_agents_json_file(default_agent_path):
     # load all json files in the folder
@@ -312,34 +281,6 @@ def load_default_agents_json_file(default_agent_path):
             all_json_files.append(export_agent_info)
     return all_json_files
 
-def import_default_agents_to_pg():
-    try:
-        main_agent_id, sub_agent_list = search_sub_agents()
-        sub_agent_name_list = [sub_agent["name"] for sub_agent in sub_agent_list]
-
-        try:
-            default_agents = load_default_agents_json_file(default_agent_path = "backend/agents/default_agents/")
-        except Exception as e:
-            logger.error(f"Failed to load default agents: {str(e)}")
-            raise ValueError(f"Failed to load default agents: {str(e)}")
-
-        for agent in default_agents:
-            if agent.name in sub_agent_name_list:
-                continue
-            else:
-                try:
-                    # Create ExportAndImportDataFormat structure for import_agent_impl
-                    agent_data = ExportAndImportDataFormat(
-                        agent_id=main_agent_id,
-                        agent_info={str(main_agent_id): agent}
-                    )
-                    import_agent_impl(agent_info=agent_data)
-                except Exception as e:
-                    logger.error(f"agent name: {agent.name}, error: {str(e)}")
-                    raise ValueError(f"agent name: {agent.name}, error: {str(e)}")
-    except Exception as e:
-        logger.error(f"Failed to import default agents: {str(e)}")
-        raise ValueError(f"Failed to import default agents: {str(e)}")
 
 def list_all_agent_info_impl(tenant_id: str, user_id: str) -> list[dict]:
     """

backend/services/prompt_service.py

@@ -7,8 +7,8 @@
 from smolagents import OpenAIServerModel
 
 from consts.model import AgentInfoRequest
-from database.agent_db import query_sub_agents, update_agent, \
-    query_tools_by_ids
+from database.agent_db import update_agent, \
+    query_tools_by_ids, query_sub_agents_id_list, search_agent_info_by_agent_id
 from services.agent_service import get_enable_tool_id_by_agent_id
 from utils.prompt_template_utils import get_prompt_generate_config_path
 from utils.config_utils import tenant_config_manager, get_model_name_from_config
@@ -216,14 +216,14 @@ def get_enabled_tool_description_for_generate_prompt(agent_id: int, tenant_id: s
 
 def get_enabled_sub_agent_description_for_generate_prompt(agent_id: int, tenant_id: str, user_id: str = None):
     logger.info("Fetching sub-agents information")
-    sub_agent_raw_info_list = query_sub_agents(main_agent_id=agent_id, tenant_id=tenant_id)
-    logger.info(f"Found {len(sub_agent_raw_info_list)} sub-agents")
+
+    sub_agent_id_list = query_sub_agents_id_list(main_agent_id=agent_id, tenant_id=tenant_id)
 
     sub_agent_info_list = []
-    for sub_agent_raw_info in sub_agent_raw_info_list:
-        if not sub_agent_raw_info["enabled"]:
-            continue
-        sub_agent_info_list.append(sub_agent_raw_info)
+    for sub_agent_id in sub_agent_id_list:
+        sub_agent_info = search_agent_info_by_agent_id(agent_id=sub_agent_id, tenant_id=tenant_id)
+
+        sub_agent_info_list.append(sub_agent_info)
     return sub_agent_info_list