Added llama3.1

Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>

README.md

@@ -221,7 +221,7 @@ In your Maven project, add this dependency:
 
 ```groovy
 dependencies {
-    implementation 'com.github.ollama4j:ollama4j:1.0.79'
+    implementation 'io.github.ollama4j:ollama4j:1.0.79'
 }
 ```
 
@@ -277,8 +277,12 @@ Newer artifacts are published via GitHub Actions CI workflow when a new release
 - `ollama-translator`: Minecraft 1.20.6 spigot plugin allows to easily break language barriers by using ollama on the
   server to translate all messages into a specfic target language.
     - https://github.com/liebki/ollama-translator
+    - https://www.reddit.com/r/fabricmc/comments/1e65x5s/comment/ldr2vcf/
 - `Ollama4j Web UI`: A web UI for Ollama written in Java using Spring Boot and Vaadin framework and
-  Ollama4j. https://github.com/ollama4j/ollama4j-web-ui
+  Ollama4j.
+    - https://github.com/ollama4j/ollama4j-web-ui
+- `JnsCLI`: A command-line tool for Jenkins that manages jobs, builds, and configurations directly from the terminal while offering AI-powered error analysis for quick troubleshooting.
+    -  https://github.com/mirum8/jnscli
 
 #### Traction
 

docs/docs/apis-generate/chat.md

@@ -82,6 +82,33 @@ You will get a response similar to:
 ]
 ```
 
+## Conversational loop
+
+```java
+public class Main {
+
+    public static void main(String[] args) {
+
+        OllamaAPI ollamaAPI = new OllamaAPI();
+        ollamaAPI.setRequestTimeoutSeconds(60);
+
+        OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance("<your-model>");
+
+        OllamaChatRequest requestModel = builder.withMessage(OllamaChatMessageRole.USER, "<your-first-message>").build();
+        OllamaChatResult initialChatResult = ollamaAPI.chat(requestModel);
+        System.out.println(initialChatResult.getResponse());
+
+        List<OllamaChatMessage> history = initialChatResult.getChatHistory();
+
+        while (true) {
+            OllamaChatResult chatResult = ollamaAPI.chat(builder.withMessages(history).withMessage(OllamaChatMessageRole.USER, "<your-new-message").build());
+            System.out.println(chatResult.getResponse());
+            history = chatResult.getChatHistory();
+        }
+    }
+}
+```
+
 ## Create a conversation where the answer is streamed
 
 ```java

docs/docs/intro.md

@@ -118,6 +118,24 @@ Create a new Java class in your project and add this code.
 ```java
 import io.github.ollama4j.OllamaAPI;
 
+public class OllamaAPITest {
+
+    public static void main(String[] args) {
+        OllamaAPI ollamaAPI = new OllamaAPI();
+
+        boolean isOllamaServerReachable = ollamaAPI.ping();
+
+        System.out.println("Is Ollama server running: " + isOllamaServerReachable);
+    }
+}
+```
+This uses the default Ollama host as `http://localhost:11434`.
+
+Specify a different Ollama host that you want to connect to.
+
+```java
+import io.github.ollama4j.OllamaAPI;
+
 public class OllamaAPITest {
 
     public static void main(String[] args) {
@@ -129,7 +147,7 @@ public class OllamaAPITest {
 
         boolean isOllamaServerReachable = ollamaAPI.ping();
 
-        System.out.println("Is Ollama server alive: " + isOllamaServerReachable);
+        System.out.println("Is Ollama server running: " + isOllamaServerReachable);
     }
 }
 ```

docs/docusaurus.config.js

@@ -58,6 +58,10 @@ const config = {
                 theme: {
                     customCss: './src/css/custom.css',
                 },
+                gtag: {
+                    trackingID: 'G-G7FLH6FNDC',
+                    anonymizeIP: false,
+                },
             }),
         ],
     ],

docs/package-lock.json

@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@docusaurus/core": "^3.4.0",
+        "@docusaurus/plugin-google-gtag": "^3.4.0",
         "@docusaurus/preset-classic": "^3.4.0",
         "@docusaurus/theme-mermaid": "^3.4.0",
         "@mdx-js/react": "^3.0.0",

docs/package.json

@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@docusaurus/core": "^3.4.0",
+    "@docusaurus/plugin-google-gtag": "^3.4.0",
     "@docusaurus/preset-classic": "^3.4.0",
     "@docusaurus/theme-mermaid": "^3.4.0",
     "@mdx-js/react": "^3.0.0",

docs/src/components/BuyMeACoffee/index.js

@@ -0,0 +1,41 @@
+import React from "react";
+
+class BuyMeACoffee extends React.Component {
+  constructor(props) {
+    super(props)
+    let script = document.createElement("script");
+    script.src = 'https://cdnjs.buymeacoffee.com/1.0.0/widget.prod.min.js';
+    script.dataset.name = 'BMC-Widget';
+    script.dataset.cfasync = 'false';
+    script.dataset.id = 'amithkoujalgi';
+    script.dataset.description = 'Support me on Buy me a coffee!';
+    script.dataset.message = 'If you like my work and want to say thanks, or encourage me to do more, you can buy me a coffee! 😊';
+    script.dataset.color = '#2e8555';
+    script.dataset.position = 'Right';
+    script.dataset.x_margin = '18';
+    script.dataset.y_margin = '18';
+    script.async = true
+
+    script.onload = function () {
+      let evt = document.createEvent('Event');
+      evt.initEvent('DOMContentLoaded', false, false);
+      window.dispatchEvent(evt);
+    }
+    this.script = script
+  }
+
+  componentDidMount() {
+    document.head.appendChild(this.script)
+  }
+
+  // componentWillUnmount() {
+  //   document.head.removeChild(this.script);
+  //   document.body.removeChild(document.getElementById("bmc-wbtn"))
+  // }
+
+  render() {
+    return null
+  }
+}
+
+export default BuyMeACoffee;

docs/src/css/custom.css

@@ -37,4 +37,12 @@ div > h1,
 header > h1,
 h2 > a {
     font-size: 2rem !important;
+}
+
+#bmc-wbtn{
+    bottom: 15px;
+}
+
+#bmc-wbtn + div{
+    bottom:15px;
 }

docs/src/pages/index.js

@@ -3,38 +3,40 @@ import Link from '@docusaurus/Link';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Layout from '@theme/Layout';
 import HomepageFeatures from '@site/src/components/HomepageFeatures';
-
+import BuyMeACoffee from '@site/src/components/BuyMeACoffee';
 import Heading from '@theme/Heading';
 import styles from './index.module.css';
 
 function HomepageHeader() {
-    const {siteConfig} = useDocusaurusContext();
+  const {siteConfig} = useDocusaurusContext();
-    return (<header className={clsx('hero hero--primary', styles.heroBanner)}>
+  return (<header className={clsx('hero hero--primary', styles.heroBanner)}>
-        <div className="container">
+    <div className="container">
-            <Heading as="h1" className="hero__title">
+      <Heading as="h1" className="hero__title">
-                {siteConfig.title}
+        {siteConfig.title}
-            </Heading>
+      </Heading>
-            <img src="img/logo.svg" alt="Ollama4j Logo" className={styles.logo} style={{maxWidth: '20vh'}}/>
+      <img src="img/logo.svg" alt="Ollama4j Logo" className={styles.logo}
-            <p className="hero__subtitle">{siteConfig.tagline}</p>
+           style={{maxWidth: '20vh'}}/>
-            <div className={styles.buttons}>
+      <p className="hero__subtitle">{siteConfig.tagline}</p>
-                <Link
+      <div className={styles.buttons}>
-                    className="button button--secondary button--lg"
+        <Link
-                    to="/intro">
+            className="button button--secondary button--lg"
-                    Getting Started
+            to="/intro">
-                </Link>
+          Getting Started
-            </div>
+        </Link>
-        </div>
+      </div>
-    </header>);
+    </div>
+  </header>);
 }
 
 export default function Home() {
-    const {siteConfig} = useDocusaurusContext();
+  const {siteConfig} = useDocusaurusContext();
-    return (<Layout
+  return (<Layout
-        title={`Hello from ${siteConfig.title}`}
+      title={`Hello from ${siteConfig.title}`}
-        description="Description will go into a meta tag in <head />">
+      description="Description will go into a meta tag in <head />">
-        <HomepageHeader/>
+    <HomepageHeader/>
-        <main>
+    <main>
-            <HomepageFeatures/>
+      <HomepageFeatures/>
-        </main>
+      <BuyMeACoffee/>
-    </Layout>);
+    </main>
-}
+  </Layout>);
+}

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

@@ -58,7 +58,14 @@ public class OllamaAPI {
     private final ToolRegistry toolRegistry = new ToolRegistry();
 
     /**
-     * Instantiates the Ollama API.
+     * Instantiates the Ollama API with default Ollama host: <a href="http://localhost:11434">http://localhost:11434</a>
+     **/
+    public OllamaAPI() {
+        this.host = "http://localhost:11434";
+    }
+
+    /**
+     * Instantiates the Ollama API with specified Ollama host address.
      *
      * @param host the host address of Ollama server
      */

src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestBuilder.java

@@ -1,5 +1,10 @@
 package io.github.ollama4j.models.chat;
 
+import io.github.ollama4j.utils.Options;
+import io.github.ollama4j.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -8,12 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.github.ollama4j.utils.Options;
-import io.github.ollama4j.utils.Utils;
-
 /**
  * Helper class for creating {@link OllamaChatRequest} objects using the builder-pattern.
  */
@@ -21,88 +20,85 @@ public class OllamaChatRequestBuilder {
 
     private static final Logger LOG = LoggerFactory.getLogger(OllamaChatRequestBuilder.class);
 
-    private OllamaChatRequestBuilder(String model, List<OllamaChatMessage> messages){
+    private OllamaChatRequestBuilder(String model, List<OllamaChatMessage> messages) {
         request = new OllamaChatRequest(model, messages);
     }
 
     private OllamaChatRequest request;
 
-    public static OllamaChatRequestBuilder getInstance(String model){
+    public static OllamaChatRequestBuilder getInstance(String model) {
         return new OllamaChatRequestBuilder(model, new ArrayList<>());
     }
 
-    public OllamaChatRequest build(){
+    public OllamaChatRequest build() {
         return request;
     }
 
-    public void reset(){
+    public void reset() {
         request = new OllamaChatRequest(request.getModel(), new ArrayList<>());
     }
 
-    public OllamaChatRequestBuilder withMessage(OllamaChatMessageRole role, String content, List<File> images){
+    public OllamaChatRequestBuilder withMessage(OllamaChatMessageRole role, String content, List<File> images) {
         List<OllamaChatMessage> messages = this.request.getMessages();
 
         List<byte[]> binaryImages = images.stream().map(file -> {
             try {
                 return Files.readAllBytes(file.toPath());
             } catch (IOException e) {
-                LOG.warn(String.format("File '%s' could not be accessed, will not add to message!",file.toPath()), e);
+                LOG.warn(String.format("File '%s' could not be accessed, will not add to message!", file.toPath()), e);
                 return new byte[0];
             }
         }).collect(Collectors.toList());
 
-        messages.add(new OllamaChatMessage(role,content,binaryImages));
+        messages.add(new OllamaChatMessage(role, content, binaryImages));
         return this;
     }
 
-    public OllamaChatRequestBuilder withMessage(OllamaChatMessageRole role, String content, String... imageUrls){
+    public OllamaChatRequestBuilder withMessage(OllamaChatMessageRole role, String content, String... imageUrls) {
         List<OllamaChatMessage> messages = this.request.getMessages();
         List<byte[]> binaryImages = null;
-        if(imageUrls.length>0){
+        if (imageUrls.length > 0) {
             binaryImages = new ArrayList<>();
             for (String imageUrl : imageUrls) {
-                try{
+                try {
                     binaryImages.add(Utils.loadImageBytesFromUrl(imageUrl));
-                }
+                } catch (URISyntaxException e) {
-                    catch (URISyntaxException e){
+                    LOG.warn(String.format("URL '%s' could not be accessed, will not add to message!", imageUrl), e);
-                        LOG.warn(String.format("URL '%s' could not be accessed, will not add to message!",imageUrl), e);
+                } catch (IOException e) {
-                }
+                    LOG.warn(String.format("Content of URL '%s' could not be read, will not add to message!", imageUrl), e);
-                catch (IOException e){
-                    LOG.warn(String.format("Content of URL '%s' could not be read, will not add to message!",imageUrl), e);
                 }
             }
         }
-        
+
-        messages.add(new OllamaChatMessage(role,content,binaryImages));
+        messages.add(new OllamaChatMessage(role, content, binaryImages));
         return this;
     }
 
-    public OllamaChatRequestBuilder withMessages(List<OllamaChatMessage> messages){
+    public OllamaChatRequestBuilder withMessages(List<OllamaChatMessage> messages) {
-        this.request.getMessages().addAll(messages);
+        return new OllamaChatRequestBuilder(request.getModel(), messages);
-        return this;
     }
 
-    public OllamaChatRequestBuilder withOptions(Options options){
+    public OllamaChatRequestBuilder withOptions(Options options) {
         this.request.setOptions(options.getOptionsMap());
         return this;
     }
 
-    public OllamaChatRequestBuilder withGetJsonResponse(){
+    public OllamaChatRequestBuilder withGetJsonResponse() {
         this.request.setReturnFormatJson(true);
         return this;
     }
 
-    public OllamaChatRequestBuilder withTemplate(String template){
+    public OllamaChatRequestBuilder withTemplate(String template) {
         this.request.setTemplate(template);
         return this;
     }
 
-    public OllamaChatRequestBuilder withStreaming(){
+    public OllamaChatRequestBuilder withStreaming() {
         this.request.setStream(true);
         return this;
     }
 
-    public OllamaChatRequestBuilder withKeepAlive(String keepAlive){
+    public OllamaChatRequestBuilder withKeepAlive(String keepAlive) {
         this.request.setKeepAlive(keepAlive);
         return this;
     }

src/main/java/io/github/ollama4j/models/ps/ModelsProcessResponse.java

@@ -1,5 +1,7 @@
 package io.github.ollama4j.models.ps;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -7,29 +9,55 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ModelsProcessResponse {
+    @JsonProperty("models")
     private List<ModelProcess> models;
 
     @Data
     @NoArgsConstructor
     public static class ModelProcess {
+        @JsonProperty("name")
         private String name;
+
+        @JsonProperty("model")
         private String model;
+
+        @JsonProperty("size")
         private long size;
+
+        @JsonProperty("digest")
         private String digest;
+
+        @JsonProperty("details")
         private ModelDetails details;
-        private String expiresAt;
+
+        @JsonProperty("expires_at")
+        private String expiresAt; // Consider using LocalDateTime if you need to process date/time
+
+        @JsonProperty("size_vram")
         private long sizeVram;
     }
 
     @Data
     @NoArgsConstructor
     public static class ModelDetails {
+        @JsonProperty("parent_model")
         private String parentModel;
+
+        @JsonProperty("format")
         private String format;
+
+        @JsonProperty("family")
         private String family;
+
+        @JsonProperty("families")
         private List<String> families;
+
+        @JsonProperty("parameter_size")
         private String parameterSize;
+
+        @JsonProperty("quantization_level")
         private String quantizationLevel;
     }
 }

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

@@ -14,6 +14,8 @@ public class OllamaModelType {
 
     public static final String LLAMA2 = "llama2";
     public static final String LLAMA3 = "llama3";
+    public static final String LLAMA3_1 = "llama3.1";
+
     public static final String MISTRAL = "mistral";
     public static final String MIXTRAL = "mixtral";
     public static final String LLAVA = "llava";