Resolving Reviewed Issues.

Author: n-o-u-r-h-a-n

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/generated/model/ChatCompletionRequestAssistantMessage.java

@@ -99,8 +99,6 @@ public static RoleEnum fromValue(@Nonnull final String value) {
   @JsonProperty("name")
   private String name;
 
-  // this should not be serialized if empty
-  @JsonInclude(JsonInclude.Include.NON_EMPTY)
   @JsonProperty("tool_calls")
   private List<ChatCompletionMessageToolCall> toolCalls = new ArrayList<>();
 

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

@@ -11,17 +11,16 @@
 import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.Getter;
-import lombok.val;
+
+import lombok.*;
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.model.ModelOptionsUtils;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.tool.ToolCallback;
 
 /** OpenAI Chat Options for configuring tool callbacks and execution settings. */
 @Data
+@NoArgsConstructor
 public class OpenAiChatOptions implements ToolCallingChatOptions {
 
   @Nonnull private OpenAiChatCompletionConfig config;
@@ -52,13 +51,12 @@ public Boolean getInternalToolExecutionEnabled() {
 
   private static ChatCompletionTool toOpenAiTool(final ToolCallback toolCallback) {
     val toolDef = toolCallback.getToolDefinition();
-    return new ChatCompletionTool()
-        .type(TypeEnum.FUNCTION)
-        .function(
-            new FunctionObject()
-                .name(toolDef.name())
-                .description(toolDef.description())
-                .parameters(ModelOptionsUtils.jsonToMap(toolDef.inputSchema())));
+    val functionobject =
+        new FunctionObject()
+            .name(toolDef.name())
+            .description(toolDef.description())
+            .parameters(ModelOptionsUtils.jsonToMap(toolDef.inputSchema()));
+    return new ChatCompletionTool().type(TypeEnum.FUNCTION).function(functionobject);
   }
 
   @Override
@@ -117,7 +115,7 @@ public Double getTopP() {
   @Override
   @Nonnull
   public <T extends ChatOptions> T copy() {
-    final OpenAiChatOptions copy = new OpenAiChatOptions(new OpenAiChatCompletionConfig());
+    final OpenAiChatOptions copy = new OpenAiChatOptions();
     copy.setToolCallbacks(this.toolCallbacks);
     copy.setInternalToolExecutionEnabled(this.internalToolExecutionEnabled);
     copy.setTools(this.tools);

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

@@ -1,6 +1,5 @@
 package com.sap.ai.sdk.app.services;
 
-import com.sap.ai.sdk.foundationmodels.openai.OpenAiChatCompletionConfig;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiClient;
 import com.sap.ai.sdk.foundationmodels.openai.OpenAiModel;
 import com.sap.ai.sdk.foundationmodels.openai.spring.OpenAiChatModel;
@@ -54,7 +53,7 @@ public EmbeddingResponse embedStrings() {
    */
   @Nonnull
   public ChatResponse completion() {
-    val options = new OpenAiChatOptions(new OpenAiChatCompletionConfig());
+    val options = new OpenAiChatOptions();
     val prompt = new Prompt("What is the capital of France?", options);
     return chatClient.call(prompt);
   }
@@ -66,7 +65,7 @@ public ChatResponse completion() {
    */
   @Nonnull
   public ChatResponse streamChatCompletion() {
-    val options = new OpenAiChatOptions(new OpenAiChatCompletionConfig());
+    val options = new OpenAiChatOptions();
     val prompt =
         new Prompt("Can you give me the first 100 numbers of the Fibonacci sequence?", options);
     return chatClient.call(prompt);
@@ -82,7 +81,7 @@ public ChatResponse streamChatCompletion() {
    */
   @Nonnull
   public ChatResponse toolCalling(final boolean internalToolExecutionEnabled) {
-    val options = new OpenAiChatOptions(new OpenAiChatCompletionConfig());
+    val options = new OpenAiChatOptions();
     options.setToolCallbacks(List.of(ToolCallbacks.from(new WeatherMethod())));
     options.setInternalToolExecutionEnabled(internalToolExecutionEnabled);
 
@@ -101,14 +100,8 @@ public ChatResponse ChatMemory() {
     val memory = MessageWindowChatMemory.builder().chatMemoryRepository(repository).build();
     val advisor = MessageChatMemoryAdvisor.builder(memory).build();
     val cl = ChatClient.builder(chatClient).defaultAdvisors(advisor).build();
-    val prompt1 =
-        new Prompt(
-            "What is the capital of France?",
-            new OpenAiChatOptions(new OpenAiChatCompletionConfig()));
-    val prompt2 =
-        new Prompt(
-            "And what is the typical food there?",
-            new OpenAiChatOptions(new OpenAiChatCompletionConfig()));
+    val prompt1 = new Prompt("What is the capital of France?", new OpenAiChatOptions());
+    val prompt2 = new Prompt("And what is the typical food there?", new OpenAiChatOptions());
 
     cl.prompt(prompt1).call().content();
     return Objects.requireNonNull(