feat: [DevOps] Update orchestration specification

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

@@ -1,16 +1,17 @@
 package com.sap.ai.sdk.orchestration;
 
+import static com.sap.ai.sdk.orchestration.model.AssistantChatMessage.RoleEnum.ASSISTANT;
+
 import com.google.common.annotations.Beta;
+import com.sap.ai.sdk.orchestration.model.AssistantChatMessage;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
-import com.sap.ai.sdk.orchestration.model.ResponseMessageToolCall;
-import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
+import com.sap.ai.sdk.orchestration.model.MessageToolCall;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
-import lombok.val;
 
 /** Represents a chat message as 'assistant' to the orchestration service. */
 @Value
@@ -27,7 +28,7 @@ public class AssistantMessage implements Message {
   MessageContent content;
 
   /** Tool call if there is any. */
-  @Nullable List<ResponseMessageToolCall> toolCalls;
+  @Nullable List<MessageToolCall> toolCalls;
 
   /**
    * Creates a new assistant message with the given single message.
@@ -44,7 +45,7 @@ public AssistantMessage(@Nonnull final String singleMessage) {
    *
    * @param toolCalls list of tool call objects
    */
-  public AssistantMessage(@Nonnull final List<ResponseMessageToolCall> toolCalls) {
+  public AssistantMessage(@Nonnull final List<MessageToolCall> toolCalls) {
     content = new MessageContent(List.of());
     this.toolCalls = toolCalls;
   }
@@ -53,10 +54,7 @@ public AssistantMessage(@Nonnull final List<ResponseMessageToolCall> toolCalls)
   @Override
   public ChatMessage createChatMessage() {
     if (toolCalls() != null) {
-      // content shouldn't be required for tool calls 🤷
-      val message = SingleChatMessage.create().role(role).content("");
-      message.setCustomField("tool_calls", toolCalls);
-      return message;
+      return AssistantChatMessage.create().role(ASSISTANT).toolCalls(toolCalls);
     }
     return Message.super.createChatMessage();
   }

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

@@ -2,10 +2,10 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
+import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.ImageContent;
-import com.sap.ai.sdk.orchestration.model.ImageContentImageUrl;
+import com.sap.ai.sdk.orchestration.model.ImageContentUrl;
 import com.sap.ai.sdk.orchestration.model.MultiChatMessage;
-import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
 import com.sap.ai.sdk.orchestration.model.TextContent;
 import java.util.LinkedList;
@@ -71,13 +71,13 @@ default ChatMessage createChatMessage() {
     if (itemList.size() == 1 && itemList.get(0) instanceof TextItem textItem) {
       return SingleChatMessage.create().role(role()).content(textItem.text());
     }
-    final var contentList = new LinkedList<MultiChatMessageContent>();
+    final var contentList = new LinkedList<ChatMessageContent>();
     for (final ContentItem item : itemList) {
       if (item instanceof TextItem textItem) {
         contentList.add(TextContent.create().type(TextContent.TypeEnum.TEXT).text(textItem.text()));
       } else if (item instanceof ImageItem imageItem) {
         final var detail = imageItem.detailLevel().toString();
-        final var img = ImageContentImageUrl.create().url(imageItem.imageUrl()).detail(detail);
+        final var img = ImageContentUrl.create().url(imageItem.imageUrl()).detail(detail);
         contentList.add(ImageContent.create().type(ImageContent.TypeEnum.IMAGE_URL).imageUrl(img));
       }
     }

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

@@ -1,7 +1,7 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.ImageContent;
-import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.TextContent;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -14,8 +14,7 @@
  */
 public record MessageContent(@Nonnull List<ContentItem> items) {
   @Nonnull
-  static MessageContent fromMCMContentList(
-      @Nonnull final List<MultiChatMessageContent> mCMContentList) {
+  static MessageContent fromMCMContentList(@Nonnull final List<ChatMessageContent> mCMContentList) {
     final var itemList =
         mCMContentList.stream()
             .map(

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

@@ -1,6 +1,10 @@
 package com.sap.ai.sdk.orchestration;
 
+import static com.sap.ai.sdk.orchestration.model.SystemChatMessage.RoleEnum.SYSTEM;
+
 import com.google.common.annotations.Beta;
+import com.sap.ai.sdk.orchestration.model.ChatMessage;
+import com.sap.ai.sdk.orchestration.model.SystemChatMessage;
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -48,4 +52,10 @@ public SystemMessage withText(@Nonnull final String message) {
     contentItems.add(new TextItem(message));
     return new SystemMessage(new MessageContent(contentItems));
   }
+
+  @Nonnull
+  @Override
+  public ChatMessage createChatMessage() {
+    return SystemChatMessage.create().role(SYSTEM).content(content);
+  }
 }

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

@@ -1,7 +1,10 @@
 package com.sap.ai.sdk.orchestration;
 
+import static com.sap.ai.sdk.orchestration.model.ToolChatMessage.RoleEnum.TOOL;
+
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
-import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
+import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
+import com.sap.ai.sdk.orchestration.model.ToolChatMessage;
 import java.util.List;
 import javax.annotation.Nonnull;
 import lombok.Value;
@@ -32,8 +35,9 @@ public MessageContent content() {
   @Nonnull
   @Override
   public ChatMessage createChatMessage() {
-    final SingleChatMessage message = SingleChatMessage.create().role(role()).content(content);
-    message.setCustomField("tool_call_id", id);
-    return message;
+    return ToolChatMessage.create()
+        .role(TOOL)
+        .toolCallId(id)
+        .content(ChatMessageContent.create(content));
   }
 }