add fill for selected tools

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/AgentUtils.java

@@ -383,6 +383,17 @@ public static String getToolName(MLToolSpec toolSpec) {
         return toolSpec.getName() != null ? toolSpec.getName() : toolSpec.getType();
     }
 
+    public static void fillSelectTool(Map<String, String> params)
+    {
+        if (params.containsKey(SELECTED_TOOLS))
+        {
+            String selectedTools = params.get(SELECTED_TOOLS);
+            StringSubstitutor substitutor = new StringSubstitutor(params, "${parameters.", "}");
+            selectedTools = substitutor.replace(selectedTools);
+            params.put(SELECTED_TOOLS, selectedTools);
+        }
+    }
+
     public static List<MLToolSpec> getMlToolSpecs(MLAgent mlAgent, Map<String, String> params) {
         String selectedToolsStr = params.get(SELECTED_TOOLS);
         List<MLToolSpec> toolSpecs = mlAgent.getTools();

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/MLChatAgentRunner.java

@@ -8,21 +8,7 @@
 import static org.opensearch.ml.common.conversation.ActionConstants.ADDITIONAL_INFO_FIELD;
 import static org.opensearch.ml.common.conversation.ActionConstants.AI_RESPONSE_FIELD;
 import static org.opensearch.ml.common.utils.StringUtils.gson;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.DISABLE_TRACE;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.PROMPT_CHAT_HISTORY_PREFIX;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.PROMPT_PREFIX;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.PROMPT_SUFFIX;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.RESPONSE_FORMAT_INSTRUCTION;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.TOOL_RESPONSE;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.VERBOSE;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.constructToolParams;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.createTools;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.getMessageHistoryLimit;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.getMlToolSpecs;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.getToolName;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.getToolNames;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.outputToOutputString;
-import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.parseLLMOutput;
+import static org.opensearch.ml.engine.algorithms.agent.AgentUtils.*;
 import static org.opensearch.ml.engine.algorithms.agent.PromptTemplate.CHAT_HISTORY_PREFIX;
 
 import java.security.PrivilegedActionException;
@@ -170,6 +156,7 @@ public void run(MLAgent mlAgent, Map<String, String> params, ActionListener<Obje
     }
 
     private void runAgent(MLAgent mlAgent, Map<String, String> params, ActionListener<Object> listener, Memory memory, String sessionId) {
+        fillSelectTool(params);
         List<MLToolSpec> toolSpecs = getMlToolSpecs(mlAgent, params);
         Map<String, Tool> tools = new HashMap<>();
         Map<String, MLToolSpec> toolSpecMap = new HashMap<>();