part done

Author: rpanackal

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

@@ -8,6 +8,8 @@
 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;
@@ -96,4 +98,21 @@ public OpenAiAssistantMessage getMessage() {
 
     return new OpenAiAssistantMessage(new OpenAiMessageContent(contentItems), openAiToolCalls);
   }
+
+  public List<OpenAiToolMessage> executeTools() {
+    var toolMessages = new ArrayList<OpenAiToolMessage>();
+    for (var toolcall : getMessage().toolCalls()) {
+      if (toolcall instanceof OpenAiFunctionCall functionCall) {
+        if (functionCall.getName() == "weather") {
+          final WeatherMethod.Request arguments =
+              functionCall.getArgumentsAsObject(weatherFunction);
+          final WeatherMethod.Response currentWeather = WeatherMethod.getCurrentWeather(arguments);
+          toolMessages.add(currentWeather.toString(), functionCall.getId());
+        }
+      } else {
+        throw new IllegalArgumentException(
+            "Expected a function call, but got: %s".formatted(assistantMessage));
+      }
+    }
+  }
 }

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

@@ -58,7 +58,7 @@ public <T> T getArgumentsAsObject(@Nonnull final OpenAiFunctionTool tool)
         new TypeReference<T>() {
           @Override
           public Type getType() {
-            return tool.getRequestModel();
+            return tool.getFunction();
           }
         };
     return parseArguments(typeRef);

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

@@ -11,6 +11,7 @@
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionTool;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.FunctionObject;
 import java.util.Map;
+import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.AccessLevel;
@@ -32,13 +33,15 @@
 @With
 @Getter(AccessLevel.PACKAGE)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class OpenAiFunctionTool implements OpenAiTool {
+public class OpenAiFunctionTool<T, R> implements OpenAiTool {
 
   /** The name of the function. */
   @Nonnull String name;
 
   /** The model class for function request. */
-  @Nonnull Class<?> requestModel;
+  @Nonnull Function<T, R> function;
+
+  /** The model class for function response. */
 
   /** An optional description of the function. */
   @Nullable String description;
@@ -51,20 +54,20 @@ public class OpenAiFunctionTool implements OpenAiTool {
    * captures the request to the function.
    *
    * @param name the name of the function
-   * @param requestModel the model class for the function request
+   * @param function the model class for function request
    */
-  public <T> OpenAiFunctionTool(@Nonnull final String name, @Nonnull final Class<T> requestModel) {
-    this(name, requestModel, null, null);
+  public OpenAiFunctionTool(@Nonnull final String name, @Nonnull final Function<T, R> function) {
+    this(name, function, null, null);
   }
 
   ChatCompletionTool createChatCompletionTool() {
     final var objectMapper = new ObjectMapper();
     JsonSchema schema = null;
     try {
-      schema = new JsonSchemaGenerator(objectMapper).generateSchema(requestModel);
+      schema = new JsonSchemaGenerator(objectMapper).generateSchema(Class<T>.class);
     } catch (JsonMappingException e) {
       throw new IllegalArgumentException(
-          "Could not generate schema for " + requestModel.getTypeName(), e);
+          "Could not generate schema for " + function.getTypeName(), e);
     }
 
     schema.setId(null);

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

@@ -12,11 +12,9 @@
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiClient;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiEmbeddingRequest;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiEmbeddingResponse;
-import com.sap.ai.sdk.foundationmodels.openai.OpenAiFunctionCall;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiFunctionTool;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiImageItem;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiMessage;
-import com.sap.ai.sdk.foundationmodels.openai.OpenAiToolCall;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
@@ -97,7 +95,8 @@ public OpenAiChatCompletionResponse chatCompletionToolExecution(
 
     // 1. Define the function
     final var weatherFunction =
-        new OpenAiFunctionTool("weather", WeatherMethod.Request.class)
+        new OpenAiFunctionTool(
+                "weather", WeatherMethod.Request.class, WeatherMethod.Response.class)
             .withDescription("Get the weather for the given location");
 
     // 2. Assistant calls the function
@@ -106,16 +105,10 @@ public OpenAiChatCompletionResponse chatCompletionToolExecution(
     final OpenAiChatCompletionResponse response =
         OpenAiClient.forModel(GPT_4O_MINI).chatCompletion(request);
     final OpenAiAssistantMessage assistantMessage = response.getMessage();
-
+    
     // 3. Execute the function
-    final OpenAiToolCall toolCall = assistantMessage.toolCalls().get(0);
-    if (!(toolCall instanceof OpenAiFunctionCall functionCall)) {
-      throw new IllegalArgumentException(
-          "Expected a function call, but got: %s".formatted(assistantMessage));
-    }
-    final WeatherMethod.Request arguments = functionCall.getArgumentsAsObject(weatherFunction);
-    final WeatherMethod.Response currentWeather = WeatherMethod.getCurrentWeather(arguments);
-
+    
+   
     // 4. Send back the results, and the model will incorporate them into its final response.
     messages.add(assistantMessage);
     messages.add(OpenAiMessage.tool(currentWeather.toString(), functionCall.getId()));