review

Author: CharlesDuboisSAP

orchestration/src/main/java/com/sap/ai/sdk/orchestration/AssistantMessage.java

@@ -66,11 +66,10 @@ public AssistantMessage(@Nonnull final List<MessageToolCall> toolCalls) {
   @Nonnull
   @Override
   public ChatMessage createChatMessage() {
-    if (toolCalls() != null) {
+    if (toolCalls != null) {
       return AssistantChatMessage.create().role(ASSISTANT).toolCalls(toolCalls);
     }
-    if (this.content().items().size() == 1
-        && this.content().items().get(0) instanceof TextItem textItem) {
+    if (content.items().size() == 1 && content.items().get(0) instanceof TextItem textItem) {
       return AssistantChatMessage.create()
           .role(ASSISTANT)
           .content(ChatMessageContent.create(textItem.text()));

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationTemplate.java

@@ -17,6 +17,7 @@
 import com.sap.ai.sdk.orchestration.model.TemplatingModuleConfig;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +44,7 @@
 @Beta
 public class OrchestrationTemplate extends TemplateConfig {
 
-  /** Please use {@link #withTemplateMessages(List)} instead. */
+  /** Please use {@link #withMessages(Message...)} instead. */
   @JsonProperty("template")
   @Nullable
   @With(onMethod_ = {@Deprecated})
@@ -52,7 +53,7 @@ public class OrchestrationTemplate extends TemplateConfig {
   @JsonIgnore
   @Nullable
   @With(AccessLevel.PRIVATE)
-  List<Message> messages;
+  List<Message> templateMessages;
 
   @JsonProperty("defaults")
   @Nullable
@@ -74,9 +75,10 @@ public class OrchestrationTemplate extends TemplateConfig {
    * @return The updated template.
    */
   @Nonnull
-  public OrchestrationTemplate withTemplateMessages(@Nonnull final List<Message> messages) {
-    return this.withMessages(messages)
-        .withTemplate(messages.stream().map(Message::createChatMessage).toList());
+  public OrchestrationTemplate withMessages(@Nonnull final Message... messages) {
+    val messageList = Arrays.asList(messages);
+    return this.withTemplateMessages(messageList)
+        .withTemplate(messageList.stream().map(Message::createChatMessage).toList());
   }
 
   /**

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

@@ -128,7 +128,7 @@ void testConfigWithResponseSchema() {
 
   @Test
   void testTemplateConstruction() {
-    List<Message> templateMessages = List.of(Message.user("message"));
+    Message templateMessages = Message.user("message");
     List<ChatMessage> templateMessagesLowLevel =
         List.of(
             UserChatMessage.create().content(UserChatMessageContent.create("message")).role(USER));
@@ -140,7 +140,7 @@ void testTemplateConstruction() {
                 .function(FunctionObject.create().name("func")));
     var template =
         TemplateConfig.create()
-            .withTemplateMessages(templateMessages)
+            .withMessages(templateMessages)
             .withDefaults(defaults)
             .withTools(tools)
             .withJsonResponse();
@@ -206,10 +206,9 @@ void testTemplateFromLocalFileWithJsonSchemaAndTools() throws IOException {
             false);
     var expectedTemplateWithJsonSchemaTools =
         OrchestrationTemplate.create()
-            .withTemplateMessages(
-                List.of(
-                    Message.system("You are a language translator."),
-                    Message.user("Whats {{ ?word }} in {{ ?language }}?")))
+            .withMessages(
+                Message.system("You are a language translator."),
+                Message.user("Whats {{ ?word }} in {{ ?language }}?"))
             .withDefaults(Map.of("word", "apple"))
             .withJsonSchemaResponse(
                 ResponseJsonSchema.fromMap(schema, "translation-schema")
@@ -267,10 +266,9 @@ void testTemplateFromLocalFileWithJsonObject() throws IOException {
     var templateWithJsonObject = TemplateConfig.create().fromYaml(promptTemplateWithJsonObject);
     var expectedTemplateWithJsonObject =
         OrchestrationTemplate.create()
-            .withTemplateMessages(
-                List.of(
-                    Message.system("You are a language translator."),
-                    Message.user("Whats {{ ?word }} in {{ ?language }}?")))
+            .withMessages(
+                Message.system("You are a language translator."),
+                Message.user("Whats {{ ?word }} in {{ ?language }}?"))
             .withDefaults(Map.of("word", "apple"))
             .withJsonResponse();
 

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

@@ -120,7 +120,7 @@ public Stream<String> streamChatCompletion(@Nonnull final String topic) {
   @Nonnull
   public OrchestrationChatResponse template(@Nonnull final String language) {
     val template = Message.user("Reply with 'Orchestration Service is working!' in {{?language}}");
-    val templatingConfig = TemplateConfig.create().withTemplateMessages(List.of(template));
+    val templatingConfig = TemplateConfig.create().withMessages(template);
     val configWithTemplate = config.withTemplateConfig(templatingConfig);
 
     val inputParams = Map.of("language", language);
@@ -426,8 +426,7 @@ record Translation(
   @Nonnull
   public OrchestrationChatResponse responseFormatJsonObject(@Nonnull final String word) {
     val template = Message.user("What is '%s' in German?".formatted(word));
-    val templatingConfig =
-        TemplateConfig.create().withTemplateMessages(List.of(template)).withJsonResponse();
+    val templatingConfig = TemplateConfig.create().withMessages(template).withJsonResponse();
     val configWithTemplate = config.withTemplateConfig(templatingConfig);
 
     val prompt =