Move NewOpenAiService to test

- Use Old OpenAiService
- Adapt tests

Author: rpanackal

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java

@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sap.ai.sdk.app.services.NewOpenAiService;
-import com.sap.ai.sdk.foundationmodels.openai.generated.model.CompletionUsage;
+import com.sap.ai.sdk.app.services.OpenAiService;
+import com.sap.ai.sdk.foundationmodels.openai.model.OpenAiUsage;
 import com.sap.cloud.sdk.cloudplatform.thread.ThreadContextExecutors;
 import java.io.IOException;
 import java.util.Arrays;
@@ -26,7 +26,7 @@
 @RestController
 @SuppressWarnings("unused")
 public class OpenAiController {
-  @Autowired private NewOpenAiService service;
+  @Autowired private OpenAiService service;
   private static final ObjectMapper MAPPER =
       new ObjectMapper().setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
 
@@ -48,19 +48,19 @@ ResponseEntity<ResponseBodyEmitter> streamChatCompletionDeltas() {
     final var message = "Can you give me the first 100 numbers of the Fibonacci sequence?";
     final var stream = service.streamChatCompletionDeltas(message);
     final var emitter = new ResponseBodyEmitter();
+    final var totalUsage = new AtomicReference<OpenAiUsage>();
     final Runnable consumeStream =
         () -> {
-          final var totalOutput = new AtomicReference<CompletionUsage>();
-          // try-with-resources ensures the stream is closed
           try (stream) {
             stream.forEach(
                 delta -> {
-                  final var usage = delta.getCompletionUsage(MAPPER);
-                  totalOutput.compareAndExchange(null, usage);
+                  // Instead of getCompletionUsage(MAPPER), we now use getUsage()
+                  final var usage = delta.getUsage();
+                  totalUsage.compareAndExchange(null, usage);
                   send(emitter, delta.getDeltaContent());
                 });
           } finally {
-            send(emitter, "\n\n-----Total Output-----\n\n" + totalOutput);
+            send(emitter, "\n\n-----Total Usage-----\n\n" + totalUsage.get());
             emitter.complete();
           }
         };

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

@@ -88,18 +88,19 @@ public OpenAiChatCompletionOutput chatCompletionImage(@Nonnull final String link
   /**
    * Chat request to OpenAI with a tool.
    *
-   * @param prompt The prompt to send to the assistant
+   * @param months The number of months to be inferred in the tool
    * @return the assistant message response
    */
   @Nonnull
-  public OpenAiChatCompletionOutput chatCompletionTools(@Nonnull final String prompt) {
+  public OpenAiChatCompletionOutput chatCompletionTools(final int months) {
     final var question =
-        "A pair of rabbits is placed in a field. Each month, every pair produces one new pair, starting from the second month. How many rabbits will there be after 12 months?";
+        "A pair of rabbits is placed in a field. Each month, every pair produces one new pair, starting from the second month. How many rabbits will there be after %s months?"
+            .formatted(months);
     final var par = Map.of("type", "object", "properties", Map.of("N", Map.of("type", "integer")));
     final var function =
         new OpenAiChatCompletionFunction()
             .setName("fibonacci")
-            .setDescription(prompt)
+            .setDescription("Calculate the Fibonacci number for given sequence index.")
             .setParameters(par);
     final var tool = new OpenAiChatCompletionTool().setType(FUNCTION).setFunction(function);
     final var request =

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OpenAiTest.java

@@ -75,8 +75,7 @@ void streamChatCompletion() {
 
   @Test
   void chatCompletionTools() {
-    final var completion =
-        service.chatCompletionTools("Calculate the Fibonacci number for given sequence index.");
+    final var completion = service.chatCompletionTools(12);
 
     final var message = completion.getChoices().get(0).getMessage();
     assertThat(message.getRole()).isEqualTo("assistant");

…i/sdk/app/services/NewOpenAiService.java …i/sdk/app/services/NewOpenAiService.javasample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/NewOpenAiService.java renamed to sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/services/NewOpenAiService.java sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/NewOpenAiService.java renamed to sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/services/NewOpenAiService.java

@@ -140,8 +140,7 @@ public OpenAiChatCompletionResponse chatCompletionTools(final int months) {
                 "A pair of rabbits is placed in a field. Each month, every pair produces one new pair, starting from the second month. How many rabbits will there be after %s months?"
                     .formatted(months))
             .withTools(List.of(tool))
-            .withToolChoice(toolChoice)
-            .withLogprobs(true);
+            .withToolChoice(toolChoice);
 
     return OpenAiClient.forModel(GPT_35_TURBO).chatCompletion(request);
   }