🐛 The intelligent generation agent cannot recognize the selected tool

Phinease · web-flow · commit 7ce348f7206c · 2025-11-20T21:12:00.000+08:00
diff --git a/backend/apps/prompt_app.py b/backend/apps/prompt_app.py
@@ -27,7 +27,9 @@ async def generate_and_save_system_prompt_api(
             task_description=prompt_request.task_description,
             user_id=user_id,
             tenant_id=tenant_id,
-            language=language
+            language=language,
+            tool_ids=prompt_request.tool_ids,
+            sub_agent_ids=prompt_request.sub_agent_ids
         ), media_type="text/event-stream")
     except Exception as e:
         logger.exception(f"Error occurred while generating system prompt: {e}")
diff --git a/backend/consts/model.py b/backend/consts/model.py
@@ -193,6 +193,8 @@ class GeneratePromptRequest(BaseModel):
     task_description: str
     agent_id: int
     model_id: int
+    tool_ids: Optional[List[int]] = None  # Optional: tool IDs from frontend (takes precedence over database query)
+    sub_agent_ids: Optional[List[int]] = None  # Optional: sub-agent IDs from frontend (takes precedence over database query)
 
 
 class GenerateTitleRequest(BaseModel):
diff --git a/backend/services/prompt_service.py b/backend/services/prompt_service.py
@@ -2,17 +2,17 @@
 import logging
 import queue
 import threading
+from typing import Optional, List
 
 from jinja2 import StrictUndefined, Template
 from smolagents import OpenAIServerModel
 
-from consts.const import LANGUAGE, MODEL_CONFIG_MAPPING, MESSAGE_ROLE, THINK_END_PATTERN, THINK_START_PATTERN
+from consts.const import LANGUAGE, MESSAGE_ROLE, THINK_END_PATTERN, THINK_START_PATTERN
 from consts.model import AgentInfoRequest
-from database.agent_db import update_agent, query_sub_agents_id_list, search_agent_info_by_agent_id
+from database.agent_db import update_agent, search_agent_info_by_agent_id
 from database.model_management_db import get_model_by_model_id
 from database.tool_db import query_tools_by_ids
-from services.agent_service import get_enable_tool_id_by_agent_id
-from utils.config_utils import tenant_config_manager, get_model_name_from_config
+from utils.config_utils import get_model_name_from_config
 from utils.prompt_template_utils import get_prompt_generate_prompt_template
 
 # Configure logging
@@ -34,7 +34,7 @@ def _process_thinking_tokens(new_token: str, is_thinking: bool, token_join: list
     """
     # Handle thinking mode
     if is_thinking:
-        return not (THINK_END_PATTERN in new_token)
+        return THINK_END_PATTERN not in new_token
 
     # Handle start of thinking
     if THINK_START_PATTERN in new_token:
@@ -98,14 +98,16 @@ def call_llm_for_system_prompt(model_id: int, user_prompt: str, system_prompt: s
         raise e
 
 
-def gen_system_prompt_streamable(agent_id: int, model_id: int, task_description: str, user_id: str, tenant_id: str, language: str):
+def gen_system_prompt_streamable(agent_id: int, model_id: int, task_description: str, user_id: str, tenant_id: str, language: str, tool_ids: Optional[List[int]] = None, sub_agent_ids: Optional[List[int]] = None):
     for system_prompt in generate_and_save_system_prompt_impl(
         agent_id=agent_id,
         model_id=model_id,
         task_description=task_description,
         user_id=user_id,
         tenant_id=tenant_id,
-        language=language
+        language=language,
+        tool_ids=tool_ids,
+        sub_agent_ids=sub_agent_ids
     ):
         # SSE format, each message ends with \n\n
         yield f"data: {json.dumps({'success': True, 'data': system_prompt}, ensure_ascii=False)}\n\n"
@@ -116,17 +118,35 @@ def generate_and_save_system_prompt_impl(agent_id: int,
                                          task_description: str,
                                          user_id: str,
                                          tenant_id: str,
-                                         language: str):
-    # Get description of tool and agent
-    # In create mode (agent_id=0), return empty lists
-    if agent_id == 0:
+                                         language: str,
+                                         tool_ids: Optional[List[int]] = None,
+                                         sub_agent_ids: Optional[List[int]] = None):
+    # Get description of tool and agent from frontend-provided IDs
+    # Frontend always provides tool_ids and sub_agent_ids (could be empty arrays)
+
+    # Handle tool IDs
+    if tool_ids and len(tool_ids) > 0:
+        tool_info_list = query_tools_by_ids(tool_ids)
+        logger.debug(f"Using frontend-provided tool IDs: {tool_ids}")
+    else:
         tool_info_list = []
+        logger.debug("No tools selected (empty tool_ids list)")
+
+    # Handle sub-agent IDs
+    if sub_agent_ids and len(sub_agent_ids) > 0:
         sub_agent_info_list = []
+        for sub_agent_id in sub_agent_ids:
+            try:
+                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)
+            except Exception as e:
+                logger.warning(
+                    f"Failed to get sub-agent info for agent_id {sub_agent_id}: {str(e)}")
+        logger.debug(f"Using frontend-provided sub-agent IDs: {sub_agent_ids}")
     else:
-        tool_info_list = get_enabled_tool_description_for_generate_prompt(
-            tenant_id=tenant_id, agent_id=agent_id)
-        sub_agent_info_list = get_enabled_sub_agent_description_for_generate_prompt(
-            tenant_id=tenant_id, agent_id=agent_id)
+        sub_agent_info_list = []
+        logger.debug("No sub-agents selected (empty sub_agent_ids list)")
 
     # 1. Real-time streaming push
     final_results = {"duty": "", "constraint": "", "few_shots": "", "agent_var_name": "", "agent_display_name": "",
@@ -292,27 +312,3 @@ def join_info_for_generate_system_prompt(prompt_for_generate, sub_agent_info_lis
         "assistant_description": assistant_description
     })
     return content
-
-
-def get_enabled_tool_description_for_generate_prompt(agent_id: int, tenant_id: str):
-    # Get tool information
-    logger.info("Fetching tool instances")
-    tool_id_list = get_enable_tool_id_by_agent_id(
-        agent_id=agent_id, tenant_id=tenant_id)
-    tool_info_list = query_tools_by_ids(tool_id_list)
-    return tool_info_list
-
-
-def get_enabled_sub_agent_description_for_generate_prompt(agent_id: int, tenant_id: str):
-    logger.info("Fetching sub-agents information")
-
-    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_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
diff --git a/frontend/app/[locale]/agents/AgentConfiguration.tsx b/frontend/app/[locale]/agents/AgentConfiguration.tsx
@@ -161,12 +161,25 @@ export default forwardRef<AgentConfigHandle, AgentConfigProps>(function AgentCon
       const currentAgentName = agentName;
       const currentAgentDisplayName = agentDisplayName;
 
+      // Extract tool IDs from selected tools (convert string IDs to numbers)
+      // Always pass tool_ids array (empty array means no tools selected, undefined means use database)
+      // In edit mode, we want to use current selection, so pass the array even if empty
+      const toolIds = selectedTools.map((tool) => Number(tool.id));
+      
+      // Get sub-agent IDs from enabledAgentIds
+      // Always pass sub_agent_ids array (empty array means no sub-agents selected, undefined means use database)
+      // In edit mode, we want to use current selection, so pass the array even if empty
+      const subAgentIds = [...enabledAgentIds];
+
       // Call backend API to generate agent prompt
+      // Pass tool_ids and sub_agent_ids to use frontend selection instead of database query
       await generatePromptStream(
         {
           agent_id: agentIdToUse,
           task_description: businessLogic,
           model_id: selectedModel?.id?.toString() || "",
+          tool_ids: toolIds,
+          sub_agent_ids: subAgentIds,
         },
         (data) => {
           // Process streaming response data
diff --git a/frontend/app/[locale]/agents/components/tool/ToolConfigModal.tsx b/frontend/app/[locale]/agents/components/tool/ToolConfigModal.tsx
@@ -65,69 +65,59 @@ export default function ToolConfigModal({
 
   // load tool config
   useEffect(() => {
+    const buildDefaultParams = () =>
+      (tool?.initParams || []).map((param) => ({
+        ...param,
+        value: param.value,
+      }));
+
     const loadToolConfig = async () => {
-      if (tool && mainAgentId) {
-        setIsLoading(true);
-        try {
-          const result = await searchToolConfig(parseInt(tool.id), mainAgentId);
-          if (result.success) {
-            if (result.data?.params) {
-              // use backend returned config content
-              const savedParams = tool.initParams.map((param) => {
-                // if backend returned config has this param value, use backend returned value
-                // otherwise use param default value
-                const savedValue = result.data.params[param.name];
-                return {
-                  ...param,
-                  value: savedValue !== undefined ? savedValue : param.value,
-                };
-              });
-              setCurrentParams(savedParams);
-            } else {
-              // if backend returned params is null, means no saved config, use default config
-              setCurrentParams(
-                tool.initParams.map((param) => ({
-                  ...param,
-                  value: param.value, // use default value
-                }))
-              );
-            }
-          } else {
-            message.error(result.message || t("toolConfig.message.loadError"));
-            // when load failed, use default config
-            setCurrentParams(
-              tool.initParams.map((param) => ({
+      if (!tool) {
+        setCurrentParams([]);
+        return;
+      }
+
+      // In creation mode we do not have an agent ID yet, so use the tool's default params.
+      if (!mainAgentId) {
+        setCurrentParams(buildDefaultParams());
+        return;
+      }
+
+      setIsLoading(true);
+      try {
+        const result = await searchToolConfig(parseInt(tool.id), mainAgentId);
+        if (result.success) {
+          if (result.data?.params) {
+            const savedParams = tool.initParams.map((param) => {
+              const savedValue = result.data.params[param.name];
+              return {
                 ...param,
-                value: param.value,
-              }))
-            );
+                value: savedValue !== undefined ? savedValue : param.value,
+              };
+            });
+            setCurrentParams(savedParams);
+          } else {
+            setCurrentParams(buildDefaultParams());
           }
-        } catch (error) {
-          log.error(t("toolConfig.message.loadError"), error);
-          message.error(t("toolConfig.message.loadErrorUseDefault"));
-          // when error occurs, use default config
-          setCurrentParams(
-            tool.initParams.map((param) => ({
-              ...param,
-              value: param.value,
-            }))
-          );
-        } finally {
-          setIsLoading(false);
+        } else {
+          message.error(result.message || t("toolConfig.message.loadError"));
+          setCurrentParams(buildDefaultParams());
         }
-      } else {
-        // if there is no tool or mainAgentId, clear params
-        setCurrentParams([]);
+      } catch (error) {
+        log.error(t("toolConfig.message.loadError"), error);
+        message.error(t("toolConfig.message.loadErrorUseDefault"));
+        setCurrentParams(buildDefaultParams());
+      } finally {
+        setIsLoading(false);
       }
     };
 
     if (isOpen && tool) {
       loadToolConfig();
     } else {
-      // when modal is closed, clear params
       setCurrentParams([]);
     }
-  }, [isOpen, tool, mainAgentId, t]);
+  }, [isOpen, tool, mainAgentId, t, message]);
 
   // check required fields
   const checkRequiredFields = () => {
diff --git a/frontend/types/agentConfig.ts b/frontend/types/agentConfig.ts
@@ -323,6 +323,8 @@ export interface GeneratePromptParams {
   agent_id: number;
   task_description: string;
   model_id: string;
+  tool_ids?: number[]; // Optional: tool IDs selected in frontend (takes precedence over database query)
+  sub_agent_ids?: number[]; // Optional: sub-agent IDs selected in frontend (takes precedence over database query)
 }
 
 /**
diff --git a/test/backend/services/test_prompt_service.py b/test/backend/services/test_prompt_service.py

Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,8 @@ export interface GeneratePromptParams {`
`323`	`323`	`agent_id: number;`
`324`	`324`	`task_description: string;`
`325`	`325`	`model_id: string;`
	`326`	`+ tool_ids?: number[]; // Optional: tool IDs selected in frontend (takes precedence over database query)`
	`327`	`+ sub_agent_ids?: number[]; // Optional: sub-agent IDs selected in frontend (takes precedence over database query)`
`326`	`328`	`}`
`327`	`329`
`328`	`330`	`/**`