Improve tests

Author: Jonas-Isr

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationConvenienceUnitTest.java

@@ -0,0 +1,40 @@
+package com.sap.ai.sdk.orchestration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class OrchestrationConvenienceUnitTest {
+
+  @Test
+  void testMessageConstructionText() {
+    var userMessageTwoTexts = Message.user("Text 1", "Text 2");
+    var userMessageTwoTextsAndText = Message.user("Text 1").andText("Text 2");
+    var userMessageTwoTextsAnd = Message.user("Text 1").and(MessageContent.text("Text 2"));
+    var userMessageTwoTextsContent = Message.user(MessageContent.text("Text 1", "Text 2"));
+    assertThat(userMessageTwoTexts).isEqualTo(userMessageTwoTextsAndText);
+    assertThat(userMessageTwoTextsAndText).isEqualTo(userMessageTwoTextsAnd);
+    assertThat(userMessageTwoTextsAnd).isEqualTo(userMessageTwoTextsContent);
+
+    var systemMessageTwoTexts = Message.system("Text 1", "Text 2");
+    var systemMessageTwoTextsAndText = Message.system("Text 1").andText("Text 2");
+    var systemMessageTwoTextsAnd = Message.system("Text 1").and(MessageContent.text("Text 2"));
+    var systemMessageTwoTextsContent = Message.system(MessageContent.text("Text 1", "Text 2"));
+    assertThat(systemMessageTwoTexts).isEqualTo(systemMessageTwoTextsAndText);
+    assertThat(systemMessageTwoTextsAndText).isEqualTo(systemMessageTwoTextsAnd);
+    assertThat(systemMessageTwoTextsAnd).isEqualTo(systemMessageTwoTextsContent);
+  }
+
+  @Test
+  void testMessageConstructionImage() {
+    var userMessageWithImageAndImage = Message.user("Text 1").andImage("url");
+    var userMessageWithImageAnd = Message.user("Text 1").and(MessageContent.image("url"));
+    assertThat(userMessageWithImageAndImage).isEqualTo(userMessageWithImageAnd);
+
+    var userMessageWithImageDetailAndImage =
+        Message.user("Text 1").andImage("url", ImageItem.DetailLevel.low);
+    var userMessageWithImageDetailAnd =
+        Message.user("Text 1").and(MessageContent.image("url", ImageItem.DetailLevel.low));
+    assertThat(userMessageWithImageDetailAndImage).isEqualTo(userMessageWithImageDetailAnd);
+  }
+}

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java

@@ -683,15 +683,7 @@ void testMultiMessage() throws IOException {
         post("/completion")
             .willReturn(aResponse().withStatus(SC_OK).withBodyFile("multiMessageResponse.json")));
 
-    OrchestrationAiModel customGpt4o =
-        GPT_4O_MINI
-            .withParam(MAX_TOKENS, 50)
-            .withParam(TEMPERATURE, 0.1)
-            .withParam(FREQUENCY_PENALTY, 0)
-            .withParam(PRESENCE_PENALTY, 0)
-            .withParam(TOP_P, 1)
-            .withParam(N, 1);
-    var llmWithImageSupportConfig = new OrchestrationModuleConfig().withLlmConfig(customGpt4o);
+    var llmWithImageSupportConfig = new OrchestrationModuleConfig().withLlmConfig(GPT_4O_MINI);
 
     var messageWithTwoTexts =
         Message.system("Please answer in exactly two sentences.")
@@ -787,33 +779,4 @@ void testMultiMessage() throws IOException {
               .withRequestBody(equalToJson(requestBody)));
     }
   }
-
-  @Test
-  void testMessageConstruction() {
-    var userMessageTwoTexts = Message.user("Text 1", "Text 2");
-    var userMessageTwoTextsAddText = Message.user("Text 1").andText("Text 2");
-    var userMessageTwoTextsAdd = Message.user("Text 1").and(MessageContent.text("Text 2"));
-    var userMessageTwoTextsContent = Message.user(MessageContent.text("Text 1", "Text 2"));
-    assertThat(userMessageTwoTexts).isEqualTo(userMessageTwoTextsAddText);
-    assertThat(userMessageTwoTextsAddText).isEqualTo(userMessageTwoTextsAdd);
-    assertThat(userMessageTwoTextsAdd).isEqualTo(userMessageTwoTextsContent);
-
-    var userMessageWithImageAddImage = Message.user("Text 1").andImage("url");
-    var userMessageWithImageAdd = Message.user("Text 1").and(MessageContent.image("url"));
-    assertThat(userMessageWithImageAddImage).isEqualTo(userMessageWithImageAdd);
-
-    var userMessageWithImageDetailAddImage =
-        Message.user("Text 1").andImage("url", ImageItem.DetailLevel.low);
-    var userMessageWithImageDetailAdd =
-        Message.user("Text 1").and(MessageContent.image("url", ImageItem.DetailLevel.low));
-    assertThat(userMessageWithImageDetailAddImage).isEqualTo(userMessageWithImageDetailAdd);
-
-    var systemMessageTwoTexts = Message.system("Text 1", "Text 2");
-    var systemMessageTwoTextsAddText = Message.system("Text 1").andText("Text 2");
-    var systemMessageTwoTextsAdd = Message.system("Text 1").and(MessageContent.text("Text 2"));
-    var systemMessageTwoTextsContent = Message.system(MessageContent.text("Text 1", "Text 2"));
-    assertThat(systemMessageTwoTexts).isEqualTo(systemMessageTwoTextsAddText);
-    assertThat(systemMessageTwoTextsAddText).isEqualTo(systemMessageTwoTextsAdd);
-    assertThat(systemMessageTwoTextsAdd).isEqualTo(systemMessageTwoTextsContent);
-  }
 }

orchestration/src/test/resources/multiMessageRequest.json

@@ -3,14 +3,7 @@
     "module_configurations" : {
       "llm_module_config" : {
         "model_name" : "gpt-4o-mini",
-        "model_params" : {
-          "max_tokens" : 50,
-          "temperature" : 0.1,
-          "frequency_penalty" : 0,
-          "presence_penalty" : 0,
-          "top_p" : 1,
-          "n" : 1
-        },
+        "model_params" : { },
         "model_version" : "latest"
       },
       "templating_module_config" : {

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

@@ -2,12 +2,7 @@
 
 import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GEMINI_1_5_FLASH;
 import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GPT_4O_MINI;
-import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.FREQUENCY_PENALTY;
-import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.MAX_TOKENS;
-import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.N;
-import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.PRESENCE_PENALTY;
 import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.TEMPERATURE;
-import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.Parameter.TOP_P;
 
 import com.sap.ai.sdk.core.AiCoreService;
 import com.sap.ai.sdk.orchestration.AzureContentFilter;
@@ -18,7 +13,6 @@
 import com.sap.ai.sdk.orchestration.LlamaGuardFilter;
 import com.sap.ai.sdk.orchestration.Message;
 import com.sap.ai.sdk.orchestration.MessageContent;
-import com.sap.ai.sdk.orchestration.OrchestrationAiModel;
 import com.sap.ai.sdk.orchestration.OrchestrationChatResponse;
 import com.sap.ai.sdk.orchestration.OrchestrationClient;
 import com.sap.ai.sdk.orchestration.OrchestrationClientException;
@@ -69,16 +63,8 @@ public OrchestrationChatResponse completion(@Nonnull final String famousPhrase)
    */
   @Nonnull
   public OrchestrationChatResponse imageInput(@Nonnull final String pathToImage) {
-    final OrchestrationAiModel customGpt4o =
-        GPT_4O_MINI
-            .withParam(MAX_TOKENS, 50)
-            .withParam(TEMPERATURE, 0.1)
-            .withParam(FREQUENCY_PENALTY, 0)
-            .withParam(PRESENCE_PENALTY, 0)
-            .withParam(TOP_P, 1)
-            .withParam(N, 1);
     final var llmWithImageSupportConfig =
-        new OrchestrationModuleConfig().withLlmConfig(customGpt4o);
+        new OrchestrationModuleConfig().withLlmConfig(GPT_4O_MINI);
 
     final var multiMessage =
         Message.user("What is in this image?").andImage(pathToImage, ImageItem.DetailLevel.low);