[maven-release-plugin] prepare release v1.0.64

Adds test case of OllamaChatRequestBuilder

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());
+        OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), new OptionsBuilder().build());
         System.out.println(response.getResponse());
     }
 }

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>io.github.amithkoujalgi</groupId>
     <artifactId>ollama4j</artifactId>
-    <version>1.0.57</version>
+    <version>1.0.64</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.57</tag>
+        <tag>v1.0.64</tag>
     </scm>
 
     <build>

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

@@ -8,57 +8,72 @@ 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 LLAVA = "llava";
   public static final String MIXTRAL = "mixtral";
-  public static final String STARLING_LM = "starling-lm";
+  public static final String LLAVA = "llava";
   public static final String NEURAL_CHAT = "neural-chat";
   public static final String CODELLAMA = "codellama";
-  public static final String LLAMA2_UNCENSORED = "llama2-uncensored";
   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 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 PHIND_CODELLAMA = "phind-codellama";
-  public static final String PHI = "phi";
   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 MISTRAL_OPENORCA = "mistral-openorca";
-  public static final String NOUS_HERMES = "nous-hermes";
-  public static final String DEEPSEEK_CODER = "deepseek-coder";
-  public static final String WIZARD_MATH = "wizard-math";
   public static final String LLAMA2_CHINESE = "llama2-chinese";
-  public static final String FALCON = "falcon";
-  public static final String ORCA2 = "orca2";
-  public static final String STABLE_BELUGA = "stable-beluga";
-  public static final String CODEUP = "codeup";
-  public static final String EVERYTHINGLM = "everythinglm";
-  public static final String MEDLLAMA2 = "medllama2";
-  public static final String WIZARDLM_UNCENSORED = "wizardlm-uncensored";
-  public static final String STARCODER = "starcoder";
-  public static final String DOLPHIN22_MISTRAL = "dolphin2.2-mistral";
+  public static final String TINYLLAMA = "tinyllama";
+  public static final String PHIND_CODELLAMA = "phind-codellama";
   public static final String OPENCHAT = "openchat";
-  public static final String WIZARD_VICUNA = "wizard-vicuna";
-  public static final String OPENHERMES25_MISTRAL = "openhermes2.5-mistral";
-  public static final String OPEN_ORCA_PLATYPUS2 = "open-orca-platypus2";
+  public static final String ORCA2 = "orca2";
+  public static final String FALCON = "falcon";
+  public static final String WIZARD_MATH = "wizard-math";
+  public static final String TINYDOLPHIN = "tinydolphin";
+  public static final String NOUS_HERMES = "nous-hermes";
   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 DOLPHIN21_MISTRAL = "dolphin2.1-mistral";
-  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 DOLPHIN_PHI = "dolphin-phi";
+  public static final String STARLING_LM = "starling-lm";
+  public static final String STARCODER = "starcoder";
+  public static final String CODEUP = "codeup";
+  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 YARN_MISTRAL = "yarn-mistral";
+  public static final String NOUS_HERMES2_MIXTRAL = "nous-hermes2-mixtral";
+  public static final String SAMANTHA_MISTRAL = "samantha-mistral";
+  public static final String STABLELM_ZEPHYR = "stablelm-zephyr";
+  public static final String MEDITRON = "meditron";
+  public static final String WIZARD_VICUNA = "wizard-vicuna";
+  public static final String STABLELM2 = "stablelm2";
+  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 MISTRALLITE = "mistrallite";
+  public static final String NEXUSRAVEN = "nexusraven";
+  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 XWINLM = "xwinlm";
+  public static final String NOTUS = "notus";
+  public static final String DUCKDB_NSQL = "duckdb-nsql";
+  public static final String ALL_MINILM = "all-minilm";
 }

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

@@ -51,12 +51,27 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
     public void testRequestWithOptions() {
         OptionsBuilder b = new OptionsBuilder();
         OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt")
-                .withOptions(b.setMirostat(1).build()).build();
+            .withOptions(b.setMirostat(1).build())
+            .withOptions(b.setTemperature(1L).build())
+            .withOptions(b.setMirostatEta(1L).build())
+            .withOptions(b.setMirostatTau(1L).build())
+            .withOptions(b.setNumGpu(1).build())
+            .withOptions(b.setSeed(1).build())
+            .withOptions(b.setTopK(1).build())
+            .withOptions(b.setTopP(1).build())
+            .build();
 
         String jsonRequest = serializeRequest(req);
-        OllamaChatRequestModel deserializeRequest = deserializeRequest(jsonRequest,OllamaChatRequestModel.class);
+        OllamaChatRequestModel deserializeRequest = deserializeRequest(jsonRequest, OllamaChatRequestModel.class);
         assertEqualsAfterUnmarshalling(deserializeRequest, req);
         assertEquals(1, deserializeRequest.getOptions().get("mirostat"));
+        assertEquals(1.0, deserializeRequest.getOptions().get("temperature"));
+        assertEquals(1.0, deserializeRequest.getOptions().get("mirostat_eta"));
+        assertEquals(1.0, deserializeRequest.getOptions().get("mirostat_tau"));
+        assertEquals(1, deserializeRequest.getOptions().get("num_gpu"));
+        assertEquals(1, deserializeRequest.getOptions().get("seed"));
+        assertEquals(1, deserializeRequest.getOptions().get("top_k"));
+        assertEquals(1.0, deserializeRequest.getOptions().get("top_p"));
     }
 
     @Test
@@ -71,4 +86,28 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
         String requestFormatProperty = jsonObject.getString("format");
         assertEquals("json", requestFormatProperty);
     }
+
+    @Test
+    public void testWithTemplate() {
+        OllamaChatRequestModel req = builder.withTemplate("System Template")
+            .build();
+        String jsonRequest = serializeRequest(req);
+        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest, OllamaChatRequestModel.class), req);
+    }
+
+    @Test
+    public void testWithStreaming() {
+        OllamaChatRequestModel req = builder.withStreaming().build();
+        String jsonRequest = serializeRequest(req);
+        assertEquals(deserializeRequest(jsonRequest, OllamaChatRequestModel.class).isStream(), true);
+    }
+
+    @Test
+    public void testWithKeepAlive() {
+        String expectedKeepAlive = "5m";
+        OllamaChatRequestModel req = builder.withKeepAlive(expectedKeepAlive)
+            .build();
+        String jsonRequest = serializeRequest(req);
+        assertEquals(deserializeRequest(jsonRequest, OllamaChatRequestModel.class).getKeepAlive(), expectedKeepAlive);
+    }
 }