CI

Author: rpanackal

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiChatCompletionResponse.java

@@ -4,12 +4,10 @@
 import static lombok.AccessLevel.NONE;
 import static lombok.AccessLevel.PACKAGE;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CompletionUsage;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionResponse;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.CreateChatCompletionResponseChoicesInner;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nonnull;
@@ -98,6 +96,4 @@ public OpenAiAssistantMessage getMessage() {
 
     return new OpenAiAssistantMessage(new OpenAiMessageContent(contentItems), openAiToolCalls);
   }
-
-  
 }

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiTool.java

@@ -18,14 +18,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 /**
  * Represents an OpenAI function tool that can be used to define a function call in an OpenAI Chat
  * Completion request. This tool generates a JSON schema based on the provided class representing
  * the function's request structure.
  *
+ * @param <I> the type of the input argument for the function
  * @see <a href="https://platform.openai.com/docs/guides/gpt/function-calling"/>OpenAI Function
  * @since 1.7.0
  */
@@ -43,13 +43,13 @@ public class OpenAiTool<I> {
   @Nonnull Class<I> requestClass;
 
   /** An optional description of the function. */
-  @Setter @Nullable String description;
+  @Nullable String description;
 
   /** An optional flag indicating whether the function parameters should be treated strictly. */
-  @Setter @Nullable Boolean strict;
+  @Nullable Boolean strict;
 
   /** The function to be called. */
-  @Setter @Nullable Function<I, ?> function;
+  @Nullable Function<I, ?> function;
 
   /**
    * Constructs an {@code OpenAiFunctionTool} with the specified name and a model class that
@@ -70,11 +70,6 @@ Object execute(@Nonnull final I argument) {
     return getFunction().apply(argument);
   }
 
-  public OpenAiTool<I> setCallback(Function<I, ?> function) {
-    this.function = function;
-    return this;
-  }
-
   ChatCompletionTool createChatCompletionTool() {
     final var objectMapper = new ObjectMapper();
     JsonSchema schema = null;

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiToolExecutor.java

@@ -31,7 +31,7 @@ public class OpenAiToolExecutor {
    */
   @Nonnull
   public static List<OpenAiToolMessage> executeTools(
-      List<OpenAiTool<?>> tools, List<OpenAiToolCall> toolCalls) {
+      @Nonnull final List<OpenAiTool<?>> tools, @Nonnull final List<OpenAiToolCall> toolCalls) {
 
     final var toolMap = tools.stream().collect(Collectors.toMap(OpenAiTool::getName, tool -> tool));
 
@@ -41,15 +41,17 @@ public static List<OpenAiToolMessage> executeTools(
         .filter(functionCall -> toolMap.containsKey(functionCall.getName()))
         .map(
             functionCall -> {
-              var tool = toolMap.get(functionCall.getName());
-              var result = executeFunction(tool, functionCall);
+              final var tool = toolMap.get(functionCall.getName());
+              final var result = executeFunction(tool, functionCall);
               return OpenAiMessage.tool(serializeObject(result), functionCall.getId());
             })
         .toList();
   }
 
-  private static <I> Object executeFunction(OpenAiTool<I> tool, OpenAiFunctionCall toolCall) {
-    I arguments = toolCall.getArgumentsAsObject(tool);
+  @Nonnull
+  private static <I> Object executeFunction(
+      @Nonnull final OpenAiTool<I> tool, @Nonnull final OpenAiFunctionCall toolCall) {
+    final I arguments = toolCall.getArgumentsAsObject(tool);
     return tool.execute(arguments);
   }
 

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiChatCompletionRequestTest.java

@@ -145,14 +145,12 @@ record DummyRequest(String param1, int param2) {}
     assertThat(toolA.getFunction().getParameters())
         .isEqualTo(
             Map.of(
-                "id", "urn:jsonschema:com:sap:ai:sdk:foundationmodels:openai:OpenAiTool:1",
+                "id",
+                    "urn:jsonschema:com:sap:ai:sdk:foundationmodels:openai:OpenAiChatCompletionRequestTest:1DummyRequest",
                 "properties",
                     Map.of(
-                        "type",
-                        Map.of(
-                            "id", "urn:jsonschema:java:lang:reflect:Type",
-                            "properties", Map.of("typeName", Map.of("type", "string")),
-                            "type", "object")),
+                        "param1", Map.of("type", "string"),
+                        "param2", Map.of("type", "integer")),
                 "type", "object"));
   }
 }

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OpenAiServiceV2.java

@@ -103,7 +103,7 @@ public OpenAiChatCompletionResponse chatCompletionToolExecution(
         List.of(
             new OpenAiTool<>("weather", WeatherMethod.Request.class)
                 .setDescription("Get the weather for the given location")
-                .setCallback(WeatherMethod::getCurrentWeather));
+                .setFunction(WeatherMethod::getCurrentWeather));
 
     // 2. Assistant calls the function
     final var request = new OpenAiChatCompletionRequest(messages).withOpenAiTools(tools);