Add helper initializers for content parts

StefanBratanov · Feb 13, 2024 · d77b933 · d77b933
1 parent 97562b8
commit d77b933
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/io/github/stefanbratanov/jvm/openai/ChatMessage.java b/src/main/java/io/github/stefanbratanov/jvm/openai/ChatMessage.java
@@ -59,6 +59,18 @@ public String type() {
 
           public record ImageUrl(String url, Optional<String> detail) {}
         }
+
+        static TextContentPart textContentPart(String text) {
+          return new TextContentPart(text);
+        }
+
+        static ImageContentPart imageContentPart(String url) {
+          return new ImageContentPart(new ImageContentPart.ImageUrl(url, Optional.empty()));
+        }
+
+        static ImageContentPart imageContentPart(String url, String detail) {
+          return new ImageContentPart(new ImageContentPart.ImageUrl(url, Optional.of(detail)));
+        }
       }
     }
   }

diff --git a/src/test/java/io/github/stefanbratanov/jvm/openai/TestDataUtil.java b/src/test/java/io/github/stefanbratanov/jvm/openai/TestDataUtil.java
@@ -1,7 +1,6 @@
 package io.github.stefanbratanov.jvm.openai;
 
 import io.github.stefanbratanov.jvm.openai.ChatMessage.UserMessage.UserMessageWithContentParts.ContentPart;
-import io.github.stefanbratanov.jvm.openai.ChatMessage.UserMessage.UserMessageWithContentParts.ContentPart.ImageContentPart;
 import io.github.stefanbratanov.jvm.openai.CreateChatCompletionRequest.ResponseFormat;
 import io.github.stefanbratanov.jvm.openai.ThreadMessage.Content.ImageFileContent;
 import io.github.stefanbratanov.jvm.openai.ThreadMessage.Content.TextContent;
@@ -438,10 +437,10 @@ private ChatMessage randomChatMessage() {
                 randomInt(1, 5),
                 () ->
                     oneOf(
-                        new ContentPart.TextContentPart(randomString(15)),
-                        new ImageContentPart(
-                            new ImageContentPart.ImageUrl(
-                                randomString(7), Optional.of(oneOf("auto", "low", "high"))))),
+                        ContentPart.textContentPart(randomString(15)),
+                        ContentPart.imageContentPart(randomString(7)),
+                        ContentPart.imageContentPart(
+                            randomString(7), oneOf("auto", "low", "high"))),
                 ContentPart[]::new)),
         ChatMessage.assistantMessage(randomString(10)),
         ChatMessage.assistantMessage(