Updated base route of docs

README.md

@@ -67,7 +67,7 @@ In your Maven project, add this dependency:
 <dependency>
     <groupId>io.github.amithkoujalgi</groupId>
     <artifactId>ollama4j</artifactId>
-    <version>1.0.57</version>
+    <version>1.0.47</version>
 </dependency>
 ```
 
@@ -125,15 +125,15 @@ Actions CI workflow.
 - [x] Update request body creation with Java objects
 - [ ] Async APIs for images
 - [ ] Add custom headers to requests
-- [x] Add additional params for `ask` APIs such as:
+- [ ] Add additional params for `ask` APIs such as:
     - [x] `options`: additional model parameters for the Modelfile such as `temperature` -
       Supported [params](https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values).
-    - [x] `system`: system prompt to (overrides what is defined in the Modelfile)
+    - [ ] `system`: system prompt to (overrides what is defined in the Modelfile)
-    - [x] `template`: the full prompt or prompt template (overrides what is defined in the Modelfile)
+    - [ ] `template`: the full prompt or prompt template (overrides what is defined in the Modelfile)
-    - [x] `context`: the context parameter returned from a previous request, which can be used to keep a
+    - [ ] `context`: the context parameter returned from a previous request, which can be used to keep a
       short
       conversational memory
-    - [x] `stream`: Add support for streaming responses from the model
+    - [ ] `stream`: Add support for streaming responses from the model
 - [ ] Add test cases
 - [ ] Handle exceptions better (maybe throw more appropriate exceptions)
 

docs/docs/apis-generate/generate.md

@@ -11,7 +11,7 @@ the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#gener
 Use the `OptionBuilder` to build the `Options` object
 with [extra parameters](https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values).
 Refer
-to [this](/docs/apis-extras/options-builder).
+to [this](/apis-extras/options-builder).
 
 ## Try asking a question about the model.
 
@@ -53,25 +53,26 @@ public class Main {
         OllamaAPI ollamaAPI = new OllamaAPI(host);
         // define a stream handler (Consumer<String>)
         OllamaStreamHandler streamHandler = (s) -> {
-           System.out.println(s);
+            System.out.println(s);
         };
 
         // Should be called using seperate thread to gain non blocking streaming effect.
         OllamaResult result = ollamaAPI.generate(config.getModel(),
-          "What is the capital of France? And what's France's connection with Mona Lisa?",
+                "What is the capital of France? And what's France's connection with Mona Lisa?",
-          new OptionsBuilder().build(), streamHandler);
+                new OptionsBuilder().build(), streamHandler);
-        
+
-        System.out.println("Full response: " +result.getResponse());
+        System.out.println("Full response: " + result.getResponse());
     }
 }
 ```
+
 You will get a response similar to:
 
 > The
 > The capital
 > The capital of
 > The capital of France
-> The capital of France is 
+> The capital of France is
 > The capital of France is Paris
 > The capital of France is Paris.
 > Full response: The capital of France is Paris.

docs/docs/apis-generate/prompt-builder.md

@@ -42,7 +42,7 @@ public class AskPhi {
                         .addSeparator()
                         .add("How do I read a file in Go and print its contents to stdout?");
 
-        OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), new OptionsBuilder().build());
+        OllamaResult response = ollamaAPI.generate(model, promptBuilder.build());
         System.out.println(response.getResponse());
     }
 }

docs/docusaurus.config.js

@@ -40,6 +40,8 @@ const config = {
             /** @type {import('@docusaurus/preset-classic').Options} */
             ({
                 docs: {
+                    path: 'docs',
+                    routeBasePath: '', // change this to any URL route you'd want. For example: `home` - if you want /home/intro.
                     sidebarPath: './sidebars.js',
                     // Please change this to your repo.
                     // Remove this to remove the "edit this page" links.

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>io.github.amithkoujalgi</groupId>
     <artifactId>ollama4j</artifactId>
-    <version>1.0.63</version>
+    <version>1.0.57-SNAPSHOT</version>
 
     <name>Ollama4j</name>
     <description>Java library for interacting with Ollama API.</description>
@@ -39,7 +39,7 @@
         <connection>scm:git:git@github.com:amithkoujalgi/ollama4j.git</connection>
         <developerConnection>scm:git:https://github.com/amithkoujalgi/ollama4j.git</developerConnection>
         <url>https://github.com/amithkoujalgi/ollama4j</url>
-        <tag>v1.0.63</tag>
+        <tag>v1.0.16</tag>
     </scm>
 
     <build>
@@ -99,7 +99,7 @@
                 <configuration>
                     <skipTests>${skipUnitTests}</skipTests>
                     <includes>
-                        <include>**/unittests/**/*.java</include>
+                        <include>**/unittests/*.java</include>
                     </includes>
                 </configuration>
             </plugin>

src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java

@@ -6,11 +6,10 @@ import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessage;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResult;
-import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingResponseModel;
-import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.models.request.CustomModelFileContentsRequest;
 import io.github.amithkoujalgi.ollama4j.core.models.request.CustomModelFilePathRequest;
+import io.github.amithkoujalgi.ollama4j.core.models.request.ModelEmbeddingsRequest;
 import io.github.amithkoujalgi.ollama4j.core.models.request.ModelRequest;
 import io.github.amithkoujalgi.ollama4j.core.models.request.OllamaChatEndpointCaller;
 import io.github.amithkoujalgi.ollama4j.core.models.request.OllamaGenerateEndpointCaller;
@@ -314,18 +313,8 @@ public class OllamaAPI {
    */
   public List<Double> generateEmbeddings(String model, String prompt)
       throws IOException, InterruptedException, OllamaBaseException {
-        return generateEmbeddings(new OllamaEmbeddingsRequestModel(model, prompt));
-  }
-
-    /**
-   * Generate embeddings using a {@link OllamaEmbeddingsRequestModel}.
-   *
-   * @param modelRequest request for '/api/embeddings' endpoint
-   * @return embeddings
-   */
-  public List<Double> generateEmbeddings(OllamaEmbeddingsRequestModel modelRequest) throws IOException, InterruptedException, OllamaBaseException{
     URI uri = URI.create(this.host + "/api/embeddings");
-    String jsonData = modelRequest.toString();
+    String jsonData = new ModelEmbeddingsRequest(model, prompt).toString();
     HttpClient httpClient = HttpClient.newHttpClient();
     HttpRequest.Builder requestBuilder =
         getRequestBuilderDefault(uri)
@@ -336,8 +325,8 @@ public class OllamaAPI {
     int statusCode = response.statusCode();
     String responseBody = response.body();
     if (statusCode == 200) {
-      OllamaEmbeddingResponseModel embeddingResponse =
+      EmbeddingResponse embeddingResponse =
-          Utils.getObjectMapper().readValue(responseBody, OllamaEmbeddingResponseModel.class);
+          Utils.getObjectMapper().readValue(responseBody, EmbeddingResponse.class);
       return embeddingResponse.getEmbedding();
     } else {
       throw new OllamaBaseException(statusCode + " - " + responseBody);

src/main/java/io/github/amithkoujalgi/ollama4j/core/models/EmbeddingResponse.java

@@ -1,4 +1,4 @@
-package io.github.amithkoujalgi.ollama4j.core.models.embeddings;
+package io.github.amithkoujalgi.ollama4j.core.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -7,7 +7,7 @@ import lombok.Data;
 
 @SuppressWarnings("unused")
 @Data
-public class OllamaEmbeddingResponseModel {
+public class EmbeddingResponse {
     @JsonProperty("embedding")
     private List<Double> embedding;
 }

src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestBuilder.java

@@ -1,31 +0,0 @@
-package io.github.amithkoujalgi.ollama4j.core.models.embeddings;
-
-import io.github.amithkoujalgi.ollama4j.core.utils.Options;
-
-public class OllamaEmbeddingsRequestBuilder {
-
-    private OllamaEmbeddingsRequestBuilder(String model, String prompt){
-        request = new OllamaEmbeddingsRequestModel(model, prompt);
-    }
-
-    private OllamaEmbeddingsRequestModel request;
-
-    public static OllamaEmbeddingsRequestBuilder getInstance(String model, String prompt){
-        return new OllamaEmbeddingsRequestBuilder(model, prompt);
-    }
-
-    public OllamaEmbeddingsRequestModel build(){
-        return request;
-    }
-
-    public OllamaEmbeddingsRequestBuilder withOptions(Options options){
-        this.request.setOptions(options.getOptionsMap());
-        return this;
-    }
-
-    public OllamaEmbeddingsRequestBuilder withKeepAlive(String keepAlive){
-        this.request.setKeepAlive(keepAlive);
-        return this;
-    }
-
-}

src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestModel.java

@@ -1,33 +0,0 @@
-package io.github.amithkoujalgi.ollama4j.core.models.embeddings;
-
-import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@RequiredArgsConstructor
-@NoArgsConstructor
-public class OllamaEmbeddingsRequestModel {
-  @NonNull
-  private String model;
-  @NonNull
-  private String prompt;
-
-  protected Map<String, Object> options;
-  @JsonProperty(value = "keep_alive")
-  private String keepAlive;
-
-  @Override
-  public String toString() {
-    try {
-      return getObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(this);
-    } catch (JsonProcessingException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}

src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/ModelEmbeddingsRequest.java

@@ -0,0 +1,23 @@
+package io.github.amithkoujalgi.ollama4j.core.models.request;
+
+import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ModelEmbeddingsRequest {
+  private String model;
+  private String prompt;
+
+  @Override
+  public String toString() {
+    try {
+      return getObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(this);
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java

@@ -8,72 +8,57 @@ package io.github.amithkoujalgi.ollama4j.core.types;
  */
 @SuppressWarnings("ALL")
 public class OllamaModelType {
-  public static final String GEMMA = "gemma";
   public static final String LLAMA2 = "llama2";
   public static final String MISTRAL = "mistral";
-  public static final String MIXTRAL = "mixtral";
   public static final String LLAVA = "llava";
+  public static final String MIXTRAL = "mixtral";
+  public static final String STARLING_LM = "starling-lm";
   public static final String NEURAL_CHAT = "neural-chat";
   public static final String CODELLAMA = "codellama";
-  public static final String DOLPHIN_MIXTRAL = "dolphin-mixtral";
-  public static final String MISTRAL_OPENORCA = "mistral-openorca";
   public static final String LLAMA2_UNCENSORED = "llama2-uncensored";
-  public static final String PHI = "phi";
+  public static final String DOLPHIN_MIXTRAL = "dolphin-mixtral";
   public static final String ORCA_MINI = "orca-mini";
-  public static final String DEEPSEEK_CODER = "deepseek-coder";
-  public static final String DOLPHIN_MISTRAL = "dolphin-mistral";
   public static final String VICUNA = "vicuna";
   public static final String WIZARD_VICUNA_UNCENSORED = "wizard-vicuna-uncensored";
-  public static final String ZEPHYR = "zephyr";
-  public static final String OPENHERMES = "openhermes";
-  public static final String QWEN = "qwen";
-  public static final String WIZARDCODER = "wizardcoder";
-  public static final String LLAMA2_CHINESE = "llama2-chinese";
-  public static final String TINYLLAMA = "tinyllama";
   public static final String PHIND_CODELLAMA = "phind-codellama";
-  public static final String OPENCHAT = "openchat";
+  public static final String PHI = "phi";
-  public static final String ORCA2 = "orca2";
+  public static final String ZEPHYR = "zephyr";
-  public static final String FALCON = "falcon";
+  public static final String WIZARDCODER = "wizardcoder";
-  public static final String WIZARD_MATH = "wizard-math";
+  public static final String MISTRAL_OPENORCA = "mistral-openorca";
-  public static final String TINYDOLPHIN = "tinydolphin";
   public static final String NOUS_HERMES = "nous-hermes";
-  public static final String YI = "yi";
+  public static final String DEEPSEEK_CODER = "deepseek-coder";
-  public static final String DOLPHIN_PHI = "dolphin-phi";
+  public static final String WIZARD_MATH = "wizard-math";
-  public static final String STARLING_LM = "starling-lm";
+  public static final String LLAMA2_CHINESE = "llama2-chinese";
-  public static final String STARCODER = "starcoder";
+  public static final String FALCON = "falcon";
-  public static final String CODEUP = "codeup";
+  public static final String ORCA2 = "orca2";
-  public static final String MEDLLAMA2 = "medllama2";
-  public static final String STABLE_CODE = "stable-code";
-  public static final String WIZARDLM_UNCENSORED = "wizardlm-uncensored";
-  public static final String BAKLLAVA = "bakllava";
-  public static final String EVERYTHINGLM = "everythinglm";
-  public static final String SOLAR = "solar";
   public static final String STABLE_BELUGA = "stable-beluga";
-  public static final String SQLCODER = "sqlcoder";
+  public static final String CODEUP = "codeup";
-  public static final String YARN_MISTRAL = "yarn-mistral";
+  public static final String EVERYTHINGLM = "everythinglm";
-  public static final String NOUS_HERMES2_MIXTRAL = "nous-hermes2-mixtral";
+  public static final String MEDLLAMA2 = "medllama2";
-  public static final String SAMANTHA_MISTRAL = "samantha-mistral";
+  public static final String WIZARDLM_UNCENSORED = "wizardlm-uncensored";
-  public static final String STABLELM_ZEPHYR = "stablelm-zephyr";
+  public static final String STARCODER = "starcoder";
-  public static final String MEDITRON = "meditron";
+  public static final String DOLPHIN22_MISTRAL = "dolphin2.2-mistral";
+  public static final String OPENCHAT = "openchat";
   public static final String WIZARD_VICUNA = "wizard-vicuna";
-  public static final String STABLELM2 = "stablelm2";
+  public static final String OPENHERMES25_MISTRAL = "openhermes2.5-mistral";
-  public static final String MAGICODER = "magicoder";
-  public static final String YARN_LLAMA2 = "yarn-llama2";
-  public static final String NOUS_HERMES2 = "nous-hermes2";
-  public static final String DEEPSEEK_LLM = "deepseek-llm";
-  public static final String LLAMA_PRO = "llama-pro";
   public static final String OPEN_ORCA_PLATYPUS2 = "open-orca-platypus2";
-  public static final String CODEBOOGA = "codebooga";
+  public static final String YI = "yi";
+  public static final String YARN_MISTRAL = "yarn-mistral";
+  public static final String SAMANTHA_MISTRAL = "samantha-mistral";
+  public static final String SQLCODER = "sqlcoder";
+  public static final String YARN_LLAMA2 = "yarn-llama2";
+  public static final String MEDITRON = "meditron";
+  public static final String STABLELM_ZEPHYR = "stablelm-zephyr";
+  public static final String OPENHERMES2_MISTRAL = "openhermes2-mistral";
+  public static final String DEEPSEEK_LLM = "deepseek-llm";
   public static final String MISTRALLITE = "mistrallite";
-  public static final String NEXUSRAVEN = "nexusraven";
+  public static final String DOLPHIN21_MISTRAL = "dolphin2.1-mistral";
-  public static final String GOLIATH = "goliath";
-  public static final String NOMIC_EMBED_TEXT = "nomic-embed-text";
-  public static final String NOTUX = "notux";
-  public static final String ALFRED = "alfred";
-  public static final String MEGADOLPHIN = "megadolphin";
   public static final String WIZARDLM = "wizardlm";
+  public static final String CODEBOOGA = "codebooga";
+  public static final String MAGICODER = "magicoder";
+  public static final String GOLIATH = "goliath";
+  public static final String NEXUSRAVEN = "nexusraven";
+  public static final String ALFRED = "alfred";
   public static final String XWINLM = "xwinlm";
-  public static final String NOTUS = "notus";
+  public static final String BAKLLAVA = "bakllava";
-  public static final String DUCKDB_NSQL = "duckdb-nsql";
-  public static final String ALL_MINILM = "all-minilm";
 }

src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java

@@ -10,8 +10,6 @@ import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessageRole;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResult;
-import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel;
-import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
 import java.io.File;
 import java.io.IOException;
@@ -63,7 +61,7 @@ class TestRealAPIs {
     } catch (HttpConnectTimeoutException e) {
       fail(e.getMessage());
     } catch (Exception e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -75,7 +73,7 @@ class TestRealAPIs {
       assertNotNull(ollamaAPI.listModels());
       ollamaAPI.listModels().forEach(System.out::println);
     } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -90,7 +88,7 @@ class TestRealAPIs {
               .anyMatch(model -> model.getModel().equalsIgnoreCase(config.getModel()));
       assertTrue(found);
     } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -103,7 +101,7 @@ class TestRealAPIs {
       assertNotNull(modelDetails);
       System.out.println(modelDetails);
     } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -121,7 +119,7 @@ class TestRealAPIs {
       assertNotNull(result.getResponse());
       assertFalse(result.getResponse().isEmpty());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -147,7 +145,7 @@ class TestRealAPIs {
       assertFalse(result.getResponse().isEmpty());
       assertEquals(sb.toString().trim(), result.getResponse().trim());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -165,7 +163,7 @@ class TestRealAPIs {
       assertNotNull(result.getResponse());
       assertFalse(result.getResponse().isEmpty());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -185,7 +183,7 @@ class TestRealAPIs {
       assertFalse(chatResult.getResponse().isBlank());
       assertEquals(4,chatResult.getChatHistory().size());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -207,7 +205,7 @@ class TestRealAPIs {
       assertTrue(chatResult.getResponse().startsWith("NI"));
       assertEquals(3, chatResult.getChatHistory().size());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -232,7 +230,7 @@ class TestRealAPIs {
       assertNotNull(chatResult);
       assertEquals(sb.toString().trim(), chatResult.getResponse().trim());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -263,7 +261,7 @@ class TestRealAPIs {
 
 
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -280,7 +278,7 @@ class TestRealAPIs {
       OllamaChatResult chatResult = ollamaAPI.chat(requestModel);
       assertNotNull(chatResult);
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -300,7 +298,7 @@ class TestRealAPIs {
       assertNotNull(result.getResponse());
       assertFalse(result.getResponse().isEmpty());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -324,7 +322,7 @@ class TestRealAPIs {
       assertFalse(result.getResponse().isEmpty());
       assertEquals(sb.toString().trim(), result.getResponse().trim());
     } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -344,24 +342,7 @@ class TestRealAPIs {
       assertNotNull(result.getResponse());
       assertFalse(result.getResponse().isEmpty());
     } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
-      fail(e);
+      throw new RuntimeException(e);
-    }
-  }
-
-  @Test
-  @Order(3)
-  public void testEmbedding() {
-    testEndpointReachability();
-    try {
-      OllamaEmbeddingsRequestModel request = OllamaEmbeddingsRequestBuilder
-          .getInstance(config.getModel(), "What is the capital of France?").build();
-
-      List<Double> embeddings = ollamaAPI.generateEmbeddings(request);
-
-      assertNotNull(embeddings);
-      assertFalse(embeddings.isEmpty());
-    } catch (IOException | OllamaBaseException | InterruptedException e) {
-      fail(e);
     }
   }
 }

src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/AbstractRequestSerializationTest.java

@@ -1,35 +0,0 @@
-package io.github.amithkoujalgi.ollama4j.unittests.jackson;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
-
-public abstract class AbstractRequestSerializationTest<T> {
-
-    protected ObjectMapper mapper = Utils.getObjectMapper();
-
-    protected String serializeRequest(T req) {
-        try {
-            return mapper.writeValueAsString(req);
-        } catch (JsonProcessingException e) {
-            fail("Could not serialize request!", e);
-            return null;
-        }
-    }
-
-    protected T deserializeRequest(String jsonRequest, Class<T> requestClass) {
-        try {
-            return mapper.readValue(jsonRequest, requestClass);
-        } catch (JsonProcessingException e) {
-            fail("Could not deserialize jsonRequest!", e);
-            return null;
-        }
-    }
-
-    protected void assertEqualsAfterUnmarshalling(T unmarshalledRequest,
-        T req) {
-        assertEquals(req, unmarshalledRequest);
-    }
-}

src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java

@@ -1,6 +1,7 @@
 package io.github.amithkoujalgi.ollama4j.unittests.jackson;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.util.List;
@@ -9,15 +10,21 @@ import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessageRole;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder;
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
 
-public class TestChatRequestSerialization extends AbstractRequestSerializationTest<OllamaChatRequestModel>{
+public class TestChatRequestSerialization {
 
     private OllamaChatRequestBuilder builder;
 
+    private ObjectMapper mapper = Utils.getObjectMapper();
+
     @BeforeEach
     public void init() {
         builder = OllamaChatRequestBuilder.getInstance("DummyModel");
@@ -25,9 +32,10 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
 
     @Test
     public void testRequestOnlyMandatoryFields() {
-        OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt").build();
+        OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt",
+                List.of(new File("src/test/resources/dog-on-a-boat.jpg"))).build();
         String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaChatRequestModel.class), req);
+        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest), req);
     }
 
     @Test
@@ -36,7 +44,7 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
         .withMessage(OllamaChatMessageRole.USER, "Some prompt")
         .build();
         String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaChatRequestModel.class), req);
+        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest), req);
     }
 
     @Test
@@ -44,7 +52,7 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
         OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt",
                 List.of(new File("src/test/resources/dog-on-a-boat.jpg"))).build();
         String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaChatRequestModel.class), req);
+        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest), req);
     }
 
     @Test
@@ -54,7 +62,7 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
                 .withOptions(b.setMirostat(1).build()).build();
 
         String jsonRequest = serializeRequest(req);
-        OllamaChatRequestModel deserializeRequest = deserializeRequest(jsonRequest,OllamaChatRequestModel.class);
+        OllamaChatRequestModel deserializeRequest = deserializeRequest(jsonRequest);
         assertEqualsAfterUnmarshalling(deserializeRequest, req);
         assertEquals(1, deserializeRequest.getOptions().get("mirostat"));
     }
@@ -71,4 +79,28 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
         String requestFormatProperty = jsonObject.getString("format");
         assertEquals("json", requestFormatProperty);
     }
+
+    private String serializeRequest(OllamaChatRequestModel req) {
+        try {
+            return mapper.writeValueAsString(req);
+        } catch (JsonProcessingException e) {
+            fail("Could not serialize request!", e);
+            return null;
+        }
+    }
+
+    private OllamaChatRequestModel deserializeRequest(String jsonRequest) {
+        try {
+            return mapper.readValue(jsonRequest, OllamaChatRequestModel.class);
+        } catch (JsonProcessingException e) {
+            fail("Could not deserialize jsonRequest!", e);
+            return null;
+        }
+    }
+
+    private void assertEqualsAfterUnmarshalling(OllamaChatRequestModel unmarshalledRequest,
+            OllamaChatRequestModel req) {
+        assertEquals(req, unmarshalledRequest);
+    }
+
 }

src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java

@@ -1,37 +0,0 @@
-package io.github.amithkoujalgi.ollama4j.unittests.jackson;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel;
-import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder;
-import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
-
-public class TestEmbeddingsRequestSerialization extends AbstractRequestSerializationTest<OllamaEmbeddingsRequestModel>{
-
-        private OllamaEmbeddingsRequestBuilder builder;
-
-        @BeforeEach
-        public void init() {
-            builder = OllamaEmbeddingsRequestBuilder.getInstance("DummyModel","DummyPrompt");
-        }
-
-            @Test
-    public void testRequestOnlyMandatoryFields() {
-        OllamaEmbeddingsRequestModel req = builder.build();
-        String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaEmbeddingsRequestModel.class), req);
-    }
-
-        @Test
-        public void testRequestWithOptions() {
-            OptionsBuilder b = new OptionsBuilder();
-            OllamaEmbeddingsRequestModel req = builder
-                    .withOptions(b.setMirostat(1).build()).build();
-
-            String jsonRequest = serializeRequest(req);
-            OllamaEmbeddingsRequestModel deserializeRequest = deserializeRequest(jsonRequest,OllamaEmbeddingsRequestModel.class);
-            assertEqualsAfterUnmarshalling(deserializeRequest, req);
-            assertEquals(1, deserializeRequest.getOptions().get("mirostat"));
-        }
-}

src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java

@@ -1,20 +1,26 @@
 package io.github.amithkoujalgi.ollama4j.unittests.jackson;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestBuilder;
 import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
 
-public class TestGenerateRequestSerialization extends AbstractRequestSerializationTest<OllamaGenerateRequestModel>{
+public class TestGenerateRequestSerialization {
 
     private OllamaGenerateRequestBuilder builder;
 
+    private ObjectMapper mapper = Utils.getObjectMapper();
+
     @BeforeEach
     public void init() {
         builder = OllamaGenerateRequestBuilder.getInstance("DummyModel");
@@ -25,7 +31,7 @@ public class TestGenerateRequestSerialization extends AbstractRequestSerializati
         OllamaGenerateRequestModel req = builder.withPrompt("Some prompt").build();
 
         String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest, OllamaGenerateRequestModel.class), req);
+        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest), req);
     }
 
     @Test
@@ -35,7 +41,7 @@ public class TestGenerateRequestSerialization extends AbstractRequestSerializati
                 builder.withPrompt("Some prompt").withOptions(b.setMirostat(1).build()).build();
 
         String jsonRequest = serializeRequest(req);
-        OllamaGenerateRequestModel deserializeRequest = deserializeRequest(jsonRequest, OllamaGenerateRequestModel.class);
+        OllamaGenerateRequestModel deserializeRequest = deserializeRequest(jsonRequest);
         assertEqualsAfterUnmarshalling(deserializeRequest, req);
         assertEquals(1, deserializeRequest.getOptions().get("mirostat"));
     }
@@ -53,4 +59,27 @@ public class TestGenerateRequestSerialization extends AbstractRequestSerializati
         assertEquals("json", requestFormatProperty);
     }
 
+    private String serializeRequest(OllamaGenerateRequestModel req) {
+        try {
+            return mapper.writeValueAsString(req);
+        } catch (JsonProcessingException e) {
+            fail("Could not serialize request!", e);
+            return null;
+        }
+    }
+
+    private OllamaGenerateRequestModel deserializeRequest(String jsonRequest) {
+        try {
+            return mapper.readValue(jsonRequest, OllamaGenerateRequestModel.class);
+        } catch (JsonProcessingException e) {
+            fail("Could not deserialize jsonRequest!", e);
+            return null;
+        }
+    }
+
+    private void assertEqualsAfterUnmarshalling(OllamaGenerateRequestModel unmarshalledRequest,
+            OllamaGenerateRequestModel req) {
+        assertEquals(req, unmarshalledRequest);
+    }
+
 }