UserMessage: returned back support for "content" property of type String for backwards compatibility with OpenAI-like APIs

Author: deep-learning-dynamo

src/main/java/dev/ai4j/openai4j/chat/UserMessage.java

@@ -12,19 +12,19 @@
 public final class UserMessage implements Message {
 
  private final Role role = USER;
- private final List<Content> content;
+ private final Object content;
  private final String name;
 
  private UserMessage(Builder builder) {
- this.content = builder.content;
+ this.content = builder.stringContent != null ? builder.stringContent : builder.content;
  this.name = builder.name;
  }
 
  public Role role() {
  return role;
  }
 
- public List<Content> content() {
+ public Object content() {
  return content;
  }
 
@@ -63,6 +63,12 @@ public String toString() {
  + "}";
  }
 
+ public static UserMessage from(String text) {
+ return UserMessage.builder()
+ .content(text)
+ .build();
+ }
+
  public static UserMessage from(String text, String... imageUrls) {
  return UserMessage.builder()
  .addText(text)
@@ -76,6 +82,7 @@ public static Builder builder() {
 
  public static final class Builder {
 
+ private String stringContent; // keeping it for compatibility with other OpenAI-like APIs
  private List<Content> content;
  private String name;
 
@@ -127,6 +134,11 @@ public Builder content(List<Content> content) {
  return this;
  }
 
+ public Builder content(String content) {
+ this.stringContent = content;
+ return this;
+ }
+
  public Builder name(String name) {
  this.name = name;
  return this;

src/test/java/dev/ai4j/openai4j/Test.java

@@ -429,4 +429,27 @@ void testGpt4Vision() {
  // then
  assertThat(response.content()).containsIgnoringCase("green");
  }
+
+ @ParameterizedTest
+ @EnumSource(value = ChatCompletionModel.class, mode = EXCLUDE, names = {
+ "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613" // I don't have access to these models
+ })
+ void testUserMessageWithStringContent(ChatCompletionModel model) {
+
+ // given
+ UserMessage userMessage = UserMessage.builder()
+ .content("What is the capital of Germany?")
+ .build();
+
+ ChatCompletionRequest request = ChatCompletionRequest.builder()
+ .model(model)
+ .messages(userMessage)
+ .build();
+
+ // when
+ ChatCompletionResponse response = client.chatCompletion(request).execute();
+
+ // then
+ assertThat(response.content()).contains("Berlin");
+ }
 }