Merge pull request #276 from johnoliver/fix-java-types

Fix java types
microsoft · Dec 5, 2024 · 7655593 · 7655593
2 parents cf3d8cf + f59e19c
commit 7655593
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.4.2
+
+- Fix bug effecting using native Java methods with OpenAI tool calling
+
 # 1.4.1
 
 - Add Otel Telemetry on function invocations

diff --git a/...in/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIFunction.java b/...in/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIFunction.java
@@ -189,21 +189,30 @@ private static String getSchemaForFunctionParameter(@Nullable InputVariable para
 
     private static String getJavaTypeToOpenAiFunctionType(String javaType) {
         switch (javaType.toLowerCase(Locale.ROOT)) {
+            case "java.lang.boolean":
             case "boolean":
                 return "boolean";
+            case "java.lang.integer":
             case "integer":
             case "int":
+            case "java.lang.long":
             case "long":
+            case "java.lang.short":
             case "short":
+            case "java.lang.byte":
             case "byte":
                 return "integer";
+            case "java.lang.double":
             case "double":
+            case "java.lang.float":
             case "float":
                 return "number";
+            case "java.lang.string":
             case "string":
                 return "string";
             case "array":
                 return "array";
+            case "java.lang.void":
             case "void":
                 return "null";
             default:

diff --git a/semantickernel-api/src/main/java/com/microsoft/semantickernel/hooks/KernelHook.java b/semantickernel-api/src/main/java/com/microsoft/semantickernel/hooks/KernelHook.java
@@ -115,8 +115,11 @@ static ChatCompletionsOptions cloneOptionsWithMessages(
                 .setN(options.getN())
                 .setResponseFormat(options.getResponseFormat())
                 .setSeed(options.getSeed())
-                .setStream(options.isStream())
-                .setToolChoice(options.getToolChoice());
+                .setStream(options.isStream());
+
+            if (options.getToolChoice() != null) {
+                newOptions.setToolChoice(options.getToolChoice());
+            }
 
             if (options.getFunctionCall() != null) {
                 newOptions = newOptions.setFunctionCall(options.getFunctionCall());