made the output of the image results as a list of strings & removed dependency on .properties file

Author: artemnefedov

src/main/java/io/github/artemnefedov/javaai/service/OpenAI.java

@@ -40,16 +40,16 @@ public interface OpenAI {
      * @param prompt parameters for text generation.
      * @return the response from the API as a string
      */
-    public String generateText(String prompt);
+    String generateText(String prompt);
 
     /**
      * The method that generates the image interacts with the
      * <a href="https://platform.openai.com/docs/api-reference/images/create">Create image</a>.
      *
      * @param prompt parameters for image generation.
-     * @return the response from the API as a string
+     * @return the response from the API as a List of strings
      */
-    public String generateImage(String prompt);
+    List<String> generateImage(String prompt);
 
     /**
      * The method that generates text, taking into account chat messages,
@@ -58,40 +58,40 @@ public interface OpenAI {
      * @param messages List of {@link ChatMessage}  containing your chat by role.
      * @return the response from the API as a string
      */
-    public String chat(List<ChatMessage> messages);
+    String chat(List<ChatMessage> messages);
 
     /**
      * Sets your dto to work with the API
      * @param completions dto with your options.
      */
-    public void customCompetitionsConfig(Completions completions);
+    void customCompetitionsConfig(Completions completions);
 
     /**
      * Sets your dto to work with the API
      *
      * @param imageBuilder dto with your options.
      */
-    public void customImageBuilderConfig(ImageBuilder imageBuilder);
+    void customImageBuilderConfig(ImageBuilder imageBuilder);
 
     /**
      * Sets your dto to work with the API
      *
      * @param chat dto with your options.
      */
-    public void customChatConfig(Chat chat);
+    void customChatConfig(Chat chat);
 
     /**
      * Sets default options for dto, usually this should be enough to get the job done.
      */
-    public void defaultCompetitionsConfig();
+    void defaultCompetitionsConfig();
 
     /**
      * Sets default options for dto, usually this should be enough to get the job done.
      */
-    public void defaultImageBuilderConfig();
+    void defaultImageBuilderConfig();
 
     /**
      * Sets default options for dto, usually this should be enough to get the job done.
      */
-    public void defaultChatConfig();
+    void defaultChatConfig();
 }

src/main/java/io/github/artemnefedov/javaai/service/impl/OpenAIImplementation.java

@@ -24,6 +24,7 @@
 
 package io.github.artemnefedov.javaai.service.impl;
 
+import io.github.artemnefedov.javaai.dto.image.ImageData;
 import io.github.artemnefedov.javaai.dto.image.request.ImageBuilder;
 import io.github.artemnefedov.javaai.dto.image.response.ImageModelResponse;
 import io.github.artemnefedov.javaai.dto.language.request.Chat;
@@ -33,10 +34,10 @@
 import io.github.artemnefedov.javaai.dto.language.request.Completions;
 import io.github.artemnefedov.javaai.dto.language.response.LanguageModelResponse;
 import io.github.artemnefedov.javaai.service.OpenAI;
-import io.github.artemnefedov.javaai.util.Config;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -46,16 +47,10 @@
 @Setter
 public class OpenAIImplementation implements OpenAI {
 
-    private String baseURL = Config.getInstance()
-            .getProperties("url.openai.base");
-    private String compURL = baseURL + Config.getInstance()
-            .getProperties("url.openai.completions");
-    private String imgBuilderURL = baseURL + Config.getInstance()
-            .getProperties("url.openai.image_generator");
-    private String chatURL = baseURL + Config.getInstance()
-            .getProperties("url.openai.chat");
-
-
+    private String baseURL = "https://api.openai.com";
+    private String compURL = baseURL + "/v1/completions";
+    private String imgBuilderURL = baseURL + "/v1/images/generations";
+    private String chatURL = baseURL + "/v1/chat/completions";
 
     protected Completions completions;
     protected ImageBuilder imageBuilder;
@@ -84,10 +79,12 @@ public String generateText(String prompt) {
     }
 
     @Override
-    public String generateImage(String prompt) {
+    public List<String> generateImage(String prompt) {
 
+        List<String> images = new ArrayList<>();
 
         if (this.imageBuilder == null) {
+
             defaultImageBuilderConfig();
         }
 
@@ -96,19 +93,30 @@ public String generateImage(String prompt) {
         ImageModelResponse imageResponse = connections
                 .postStream(imageBuilder, imgBuilderURL, ImageModelResponse.class);
 
-        if (imageBuilder.getResponse_format().equals("url")) {
 
-            return imageResponse.getData().get(0).getUrl();
-        } else {
+            if (imageBuilder.getResponse_format().equals("url")) {
 
-            return imageResponse.getData().get(0).getB64Json();
-        }
+                for (ImageData data : imageResponse.getData()) {
+
+                    images.add(data.getUrl());
+                }
+            } else {
+
+                for (ImageData data : imageResponse.getData()) {
+
+                    images.add(data.getB64Json());
+                }
+            }
+
+        return images;
     }
 
+
     @Override
     public String chat(List<ChatMessage> messages) {
 
         if (this.chat == null) {
+
             defaultChatConfig();
         }
 

src/main/java/io/github/artemnefedov/javaai/util/Config.java

@@ -27,9 +27,7 @@
 import io.github.artemnefedov.javaai.dto.language.ChatMessage;
 import io.github.artemnefedov.javaai.dto.language.request.Completions;
 import io.github.artemnefedov.javaai.service.impl.OpenAIImplementation;
-import io.github.artemnefedov.javaai.util.Config;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -41,14 +39,7 @@
 
 class OpenAITest {
 
-    OpenAI openAI = new OpenAIImplementation(null);
-
-
-    @BeforeEach
-    void newOpenAI() {
-
-        OpenAI openAI = new OpenAIImplementation(Config.getInstance().getProperties("api_key.openai"));
-    }
+    OpenAI openAI = new OpenAIImplementation("API_KEY");
 
     @Test
     void generateTextTest() {
@@ -59,8 +50,12 @@ void generateTextTest() {
     @Test
     void generateImageTest() {
 
-        String response = openAI.generateImage("A cute baby sea otter");
-        assertTrue( response != null && response.matches("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]"));
+        List<String> response = openAI.generateImage("A cute baby sea otter");
+
+        for (String url: response) {
+            assertTrue( url != null && url.matches("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]"));
+        }
+
     }
 
     @Test