Rebase fix and make message class constructors package private

Author: rpanackal

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

@@ -1,10 +1,13 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import static lombok.AccessLevel.PACKAGE;
+
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestAssistantMessage;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestAssistantMessageContent;
 import java.util.List;
 import javax.annotation.Nonnull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -17,6 +20,7 @@
 @Beta
 @Value
 @Accessors(fluent = true)
+@AllArgsConstructor(access = PACKAGE)
 public class OpenAiAssistantMessage implements OpenAiMessage {
 
   /** The role associated with this message. */

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

@@ -1,8 +1,11 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import com.google.common.annotations.Beta;
+
 /**
  * Represents an item in a {@link OpenAiMessageContent} object.
  *
- * @since 1.3.0
+ * @since 1.4.0
  */
+@Beta
 public sealed interface OpenAiContentItem permits OpenAiTextItem, OpenAiImageItem {}

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

@@ -1,5 +1,6 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import com.google.common.annotations.Beta;
 import java.util.Locale;
 import javax.annotation.Nonnull;
 
@@ -8,8 +9,9 @@
  *
  * @param imageUrl the URL of the image
  * @param detailLevel the detail level of the image (optional)
- * @since 1.3.0
+ * @since 1.4.0
  */
+@Beta
 public record OpenAiImageItem(@Nonnull String imageUrl, @Nonnull DetailLevel detailLevel)
     implements OpenAiContentItem {
 

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

@@ -1,12 +1,14 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import com.google.common.annotations.Beta;
 import java.util.List;
 import javax.annotation.Nonnull;
 
 /**
  * Represents the content of a chat message.
  *
  * @param items a list of the content items
- * @since 1.3.0
+ * @since 1.4.0
  */
+@Beta
 public record OpenAiMessageContent(@Nonnull List<OpenAiContentItem> items) {}

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

@@ -1,5 +1,7 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import static lombok.AccessLevel.PACKAGE;
+
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartText;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestSystemMessage;
@@ -8,6 +10,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -21,6 +24,7 @@
 @Beta
 @Value
 @Accessors(fluent = true)
+@AllArgsConstructor(access = PACKAGE)
 public class OpenAiSystemMessage implements OpenAiMessage {
 
   /** The role associated with this message. */

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

@@ -1,11 +1,13 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import com.google.common.annotations.Beta;
 import javax.annotation.Nonnull;
 
 /**
  * Represents a text item in a {@link OpenAiMessageContent} object.
  *
  * @param text the text of the item
- * @since 1.3.0
+ * @since 1.4.0
  */
+@Beta
 public record OpenAiTextItem(@Nonnull String text) implements OpenAiContentItem {}

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

@@ -1,26 +1,32 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestMessageContentPartText;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestToolMessage;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestToolMessageContent;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestToolMessageContentPart;
+import static lombok.AccessLevel.PACKAGE;
+
+import com.google.common.annotations.Beta;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartText;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestToolMessage;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestToolMessageContent;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestToolMessageContentPart;
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
+import lombok.AllArgsConstructor;
 import lombok.Value;
 import lombok.experimental.Accessors;
 import lombok.experimental.Tolerate;
 
 /**
  * Represents a tool message in the OpenAI service.
  *
- * @since 1.3.0
+ * @since 1.4.0
  */
+@Beta
 @Value
 @Accessors(fluent = true)
+@AllArgsConstructor(access = PACKAGE)
 public class OpenAiToolMessage implements OpenAiMessage {
 
-  /** The role of the message, which is "tool". */
+  /** The role associated with this message. */
   String role = "tool";
 
   /** The content of the message. */

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

@@ -1,5 +1,7 @@
 package com.sap.ai.sdk.foundationmodels.openai;
 
+import static lombok.AccessLevel.PACKAGE;
+
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartImage;
 import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartImageImageUrl;
@@ -12,6 +14,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -25,6 +28,7 @@
 @Beta
 @Value
 @Accessors(fluent = true)
+@AllArgsConstructor(access = PACKAGE)
 public class OpenAiUserMessage implements OpenAiMessage {
 
   /** The role associated with this message. */

…odels/openai/MessageConvenienceTest.java …tionmodels/openai/OpenAIMessageTest.javafoundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/MessageConvenienceTest.java renamed to foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAIMessageTest.java foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/MessageConvenienceTest.java renamed to foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/OpenAIMessageTest.java

@@ -2,17 +2,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestAssistantMessage;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestAssistantMessageContent;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestMessageContentPartImage;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestMessageContentPartImageImageUrl;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestMessageContentPartText;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestSystemMessage;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestSystemMessageContent;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestToolMessage;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestToolMessageContent;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestUserMessage;
-import com.sap.ai.sdk.foundationmodels.openai.model2.ChatCompletionRequestUserMessageContent;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestAssistantMessage;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestAssistantMessageContent;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartImage;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartImageImageUrl;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestMessageContentPartText;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestSystemMessage;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestSystemMessageContent;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestToolMessage;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestToolMessageContent;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestUserMessage;
+import com.sap.ai.sdk.foundationmodels.openai.generated.model.ChatCompletionRequestUserMessageContent;
 import java.net.URI;
 import java.util.List;
 import java.util.stream.Stream;
@@ -23,7 +23,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class MessageConvenienceTest {
+class OpenAIMessageTest {
   static String validText = "Some string";
   static String validImageUrl = "http://valid-url.com";