function calling bug fix (#3692)

jngz-es · web-flow · commit 23f625d30006 · 2025-03-28T14:33:09.000-07:00
Signed-off-by: Jing Zhang &lt;jngz@amazon.com&gt;
diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/BedrockConverseDeepseekR1FunctionCalling.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/BedrockConverseDeepseekR1FunctionCalling.java
@@ -53,9 +53,9 @@ public List<Map<String, String>> handle(ModelTensorOutput tmpModelTensorOutput,
             return output;
         }
         for (Object call : toolCalls) {
-            String toolName = JsonPath.read(call, parameters.get(NAME));
-            String toolInput = StringUtils.toJson(JsonPath.read(call, parameters.get(INPUT)));
-            String toolCallId = JsonPath.read(call, parameters.get(ID_PATH));
+            String toolName = JsonPath.read(call, NAME);
+            String toolInput = StringUtils.toJson(JsonPath.read(call, INPUT));
+            String toolCallId = JsonPath.read(call, ID_PATH);
             output.add(Map.of("tool_name", toolName, "tool_input", toolInput, "tool_call_id", toolCallId));
         }
         return output;
diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/BedrockConverseFunctionCalling.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/BedrockConverseFunctionCalling.java
@@ -53,9 +53,9 @@ public List<Map<String, String>> handle(ModelTensorOutput tmpModelTensorOutput,
             return output;
         }
         for (Object call : toolCalls) {
-            String toolName = JsonPath.read(call, parameters.get(NAME));
-            String toolInput = StringUtils.toJson(JsonPath.read(call, parameters.get(INPUT)));
-            String toolCallId = JsonPath.read(call, parameters.get(ID_PATH));
+            String toolName = JsonPath.read(call, NAME);
+            String toolInput = StringUtils.toJson(JsonPath.read(call, INPUT));
+            String toolCallId = JsonPath.read(call, ID_PATH);
             output.add(Map.of("tool_name", toolName, "tool_input", toolInput, "tool_call_id", toolCallId));
         }
         return output;
diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/FunctionCallingFactory.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/FunctionCallingFactory.java
@@ -10,7 +10,7 @@
 import org.opensearch.ml.common.exception.MLException;
 
 public class FunctionCallingFactory {
-    public FunctionCalling create(String llmInterface) {
+    public static FunctionCalling create(String llmInterface) {
         if (StringUtils.isBlank(llmInterface)) {
             return null;
         }
@@ -21,7 +21,7 @@ public FunctionCalling create(String llmInterface) {
             case LLM_INTERFACE_OPENAI_V1_CHAT_COMPLETIONS:
                 return new OpenaiV1ChatCompletionsFunctionCalling();
             case LLM_INTERFACE_BEDROCK_CONVERSE_DEEPSEEK_R1:
-                return null;
+                return new BedrockConverseDeepseekR1FunctionCalling();
             default:
                 throw new MLException(String.format("Unsupported llm interface: {}.", llmInterface));
         }
diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/OpenaiV1ChatCompletionsFunctionCalling.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/function_calling/OpenaiV1ChatCompletionsFunctionCalling.java
@@ -49,9 +49,9 @@ public List<Map<String, String>> handle(ModelTensorOutput tmpModelTensorOutput,
             return output;
         }
         for (Object call : toolCalls) {
-            String toolName = JsonPath.read(call, parameters.get(NAME));
-            String toolInput = StringUtils.toJson(JsonPath.read(call, parameters.get(INPUT)));
-            String toolCallId = JsonPath.read(call, parameters.get(ID_PATH));
+            String toolName = JsonPath.read(call, NAME);
+            String toolInput = StringUtils.toJson(JsonPath.read(call, INPUT));
+            String toolCallId = JsonPath.read(call, ID_PATH);
             output.add(Map.of("tool_name", toolName, "tool_input", toolInput, "tool_call_id", toolCallId));
         }
         return output;

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,9 @@ public List<Map<String, String>> handle(ModelTensorOutput tmpModelTensorOutput,`
`53`	`53`	`return output;`
`54`	`54`	`}`
`55`	`55`	`for (Object call : toolCalls) {`
`56`		`- String toolName = JsonPath.read(call, parameters.get(NAME));`
`57`		`- String toolInput = StringUtils.toJson(JsonPath.read(call, parameters.get(INPUT)));`
`58`		`- String toolCallId = JsonPath.read(call, parameters.get(ID_PATH));`
	`56`	`+ String toolName = JsonPath.read(call, NAME);`
	`57`	`+ String toolInput = StringUtils.toJson(JsonPath.read(call, INPUT));`
	`58`	`+ String toolCallId = JsonPath.read(call, ID_PATH);`
`59`	`59`	`output.add(Map.of("tool_name", toolName, "tool_input", toolInput, "tool_call_id", toolCallId));`
`60`	`60`	`}`
`61`	`61`	`return output;`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ public List<Map<String, String>> handle(ModelTensorOutput tmpModelTensorOutput,`
`49`	`49`	`return output;`
`50`	`50`	`}`
`51`	`51`	`for (Object call : toolCalls) {`
`52`		`- String toolName = JsonPath.read(call, parameters.get(NAME));`
`53`		`- String toolInput = StringUtils.toJson(JsonPath.read(call, parameters.get(INPUT)));`
`54`		`- String toolCallId = JsonPath.read(call, parameters.get(ID_PATH));`
	`52`	`+ String toolName = JsonPath.read(call, NAME);`
	`53`	`+ String toolInput = StringUtils.toJson(JsonPath.read(call, INPUT));`
	`54`	`+ String toolCallId = JsonPath.read(call, ID_PATH);`
`55`	`55`	`output.add(Map.of("tool_name", toolName, "tool_input", toolInput, "tool_call_id", toolCallId));`
`56`	`56`	`}`
`57`	`57`	`return output;`