Updated README.md

Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>
Updated README.md
2024-07-13 13:47:08 +05:30 · 2024-07-13 13:46:43 +05:30 · 2024-07-13 19:06:40 +05:30 · 2024-07-13 19:06:11 +05:30 · 2024-07-13 19:05:01 +05:30 · 2024-07-13 19:03:12 +05:30
39 changed files with 3167 additions and 2518 deletions
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -1,68 +1,41 @@
 # This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
 # For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path

-name: Test and Publish Package
-
-#on:
-#  release:
-#    types: [ "created" ]
+name: Release Artifacts

 on:
-  push:
-    branches: [ "main" ]
-  workflow_dispatch:
+  release:
+    types: [ created ]

 jobs:
  build:
+
    runs-on: ubuntu-latest
    permissions:
-      contents: write
+      contents: read
      packages: write
+
    steps:
      - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
        uses: actions/setup-java@v3
        with:
-          java-version: '11'
-          distribution: 'adopt-hotspot'
+          java-version: '17'
+          distribution: 'temurin'
          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - name: Find and Replace
+        uses: jacobtomlinson/gha-find-replace@v3
+        with:
+          find: "ollama4j-revision"
+          replace: ${{ github.ref_name }}
+          regex: false
+
      - name: Build with Maven
        run: mvn --file pom.xml -U clean package -Punit-tests
-      - name: Set up Apache Maven Central (Overwrite settings.xml)
-        uses: actions/setup-java@v3
-        with: # running setup-java again overwrites the settings.xml
-          java-version: '11'
-          distribution: 'adopt-hotspot'
-          cache: 'maven'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-      - name: Set up Maven cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Build
-        run: mvn -B -ntp clean install
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
      - name: Publish to GitHub Packages Apache Maven
-        #        if: >
-        #          github.event_name != 'pull_request' &&
-        #          github.ref_name == 'main' &&
-        #          contains(github.event.head_commit.message, 'release')
-        run: |
-          git config --global user.email "koujalgi.amith@gmail.com"
-          git config --global user.name "amithkoujalgi"
-          mvn -B -ntp -DskipTests -Pci-cd -Darguments="-DskipTests -Pci-cd" release:clean release:prepare release:perform
+        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file pom.xml
        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GITHUB_TOKEN: ${{ github.token }}
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -2,9 +2,8 @@
 name: Deploy Docs to GH Pages

 on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: [ "main" ]
+  release:
+    types: [ created ]

  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
--- a/.github/workflows/publish-javadoc.yml
+++ b/.github/workflows/publish-javadoc.yml
@@ -1,52 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy Javadoc content to Pages
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: [ "none" ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-  packages: write
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Single deploy job since we're just deploying
-  deploy:
-    runs-on: ubuntu-latest
-
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt-hotspot'
-          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-      - name: Build with Maven
-        run: mvn --file pom.xml -U clean package
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          # Upload entire repository
-          path: './target/apidocs/.'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
--- a/.github/workflows/release-jar.yml
+++ b/.github/workflows/release-jar.yml
@@ -1,41 +0,0 @@
-name: Release JAR
-
-on:
-  push:
-    tags:
-      - '**'
-
-permissions:
-  contents: read
-  id-token: write
-  packages: write
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      pull-requests: write
-      repository-projects: write
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - name: Build with Maven
-        run: mvn -B clean install package --file pom.xml
-
-      - name: Release Assets
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: target/*.jar
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+<div style="text-align: center">
+
 ### Ollama4j

 <img src='https://raw.githubusercontent.com/amithkoujalgi/ollama4j/65a9d526150da8fcd98e2af6a164f055572bf722/ollama4j.jpeg' width='100' alt="ollama4j-icon">
@@ -9,23 +11,36 @@ Find more details on the [website](https://amithkoujalgi.github.io/ollama4j/).
 ![GitHub stars](https://img.shields.io/github/stars/amithkoujalgi/ollama4j)
 ![GitHub forks](https://img.shields.io/github/forks/amithkoujalgi/ollama4j)
 ![GitHub watchers](https://img.shields.io/github/watchers/amithkoujalgi/ollama4j)
+![Contributors](https://img.shields.io/github/contributors/amithkoujalgi/ollama4j)
+![GitHub License](https://img.shields.io/github/license/amithkoujalgi/ollama4j)
+
 ![GitHub repo size](https://img.shields.io/github/repo-size/amithkoujalgi/ollama4j)
-![GitHub language count](https://img.shields.io/github/languages/count/amithkoujalgi/ollama4j)
 ![GitHub top language](https://img.shields.io/github/languages/top/amithkoujalgi/ollama4j)
 ![GitHub last commit](https://img.shields.io/github/last-commit/amithkoujalgi/ollama4j?color=green)
-![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Famithkoujalgi%2Follama4j&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)
-
 [![codecov](https://codecov.io/gh/amithkoujalgi/ollama4j/graph/badge.svg?token=U0TE7BGP8L)](https://codecov.io/gh/amithkoujalgi/ollama4j)

+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues-raw/amithkoujalgi/ollama4j)
+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues-closed-raw/amithkoujalgi/ollama4j)
+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues-pr-raw/amithkoujalgi/ollama4j)
+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues-pr-closed-raw/amithkoujalgi/ollama4j)
+![GitHub Discussions](https://img.shields.io/github/discussions/amithkoujalgi/ollama4j)
+
 ![Build Status](https://github.com/amithkoujalgi/ollama4j/actions/workflows/maven-publish.yml/badge.svg)

+
+</div>
+
+[//]: # (![Hits]&#40;https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Famithkoujalgi%2Follama4j&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false&#41;)
+
+[//]: # (![GitHub language count]&#40;https://img.shields.io/github/languages/count/amithkoujalgi/ollama4j&#41;)
+
 ## Table of Contents

 - [How does it work?](#how-does-it-work)
 - [Requirements](#requirements)
 - [Installation](#installation)
- [API Spec](#api-spec)
- [Demo APIs](#try-out-the-apis-with-ollama-server)
+- [API Spec](https://amithkoujalgi.github.io/ollama4j/docs/category/apis---model-management)
+- [Javadoc Spec](https://amithkoujalgi.github.io/ollama4j/apidocs/)
 - [Development](#development)
 - [Contributions](#get-involved)
 - [References](#references)
@@ -60,22 +75,88 @@ Find more details on the [website](https://amithkoujalgi.github.io/ollama4j/).

 #### Installation

-In your Maven project, add this dependency:
+Check the releases [here](https://github.com/amithkoujalgi/ollama4j/releases).
+
+![GitHub Release](https://img.shields.io/github/v/release/amithkoujalgi/ollama4j)
+
+##### For Maven
+
+1. In your Maven project, add this dependency:

 ```xml

 <dependency>
    <groupId>io.github.amithkoujalgi</groupId>
    <artifactId>ollama4j</artifactId>
-    <version>1.0.57</version>
+    <version>v1.0.74</version>
 </dependency>
 ```

-Latest release:
+2. Add repository to your project's pom.xml:

-![Maven Central](https://img.shields.io/maven-central/v/io.github.amithkoujalgi/ollama4j)
+```xml

-[![][lib-shield]][lib]
+<repositories>
+    <repository>
+        <id>github</id>
+        <name>GitHub Apache Maven Packages</name>
+        <url>https://maven.pkg.github.com/amithkoujalgi/ollama4j</url>
+        <releases>
+            <enabled>true</enabled>
+        </releases>
+        <snapshots>
+            <enabled>true</enabled>
+        </snapshots>
+    </repository>
+</repositories>
+```
+
+3. Add GitHub server to settings.xml. (Usually available at ~/.m2/settings.xml)
+
+```xml
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>github</id>
+            <username>YOUR-USERNAME</username>
+            <password>YOUR-TOKEN</password>
+        </server>
+    </servers>
+</settings>
+```
+
+##### For Gradle
+
+In your Gradle project, add the dependency using the Kotlin DSL or the Groovy DSL:
+
+```kotlin
+dependencies {
+
+    val ollama4jVersion = "1.0.74"
+
+    implementation("io.github.amithkoujalgi:ollama4j:$ollama4jVersion")
+}
+ ```
+
+```groovy
+dependencies {
+    implementation("io.github.amithkoujalgi:ollama4j:1.0.74")
+}
+```
+
+[//]: # (Latest release:)
+
+[//]: # ()
+
+[//]: # (![Maven Central]&#40;https://img.shields.io/maven-central/v/io.github.amithkoujalgi/ollama4j&#41;)
+
+[//]: # ()
+
+[//]: # ([![][lib-shield]][lib])

 [lib]: https://central.sonatype.com/artifact/io.github.amithkoujalgi/ollama4j

@@ -110,6 +191,16 @@ make it
 Releases (newer artifact versions) are done automatically on pushing the code to the `main` branch through GitHub
 Actions CI workflow.

+#### Who's using Ollama4j?
+
+- `Datafaker`: a library to generate fake data
+    - https://github.com/datafaker-net/datafaker-experimental/tree/main/ollama-api
+- `Vaadin Web UI`: UI-Tester for Interactions with Ollama via ollama4j
+    - https://github.com/TEAMPB/ollama4j-vaadin-ui
+- `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
+
 #### Traction

 [![Star History Chart](https://api.star-history.com/svg?repos=amithkoujalgi/ollama4j&type=Date)](https://star-history.com/#amithkoujalgi/ollama4j&Date)
@@ -124,6 +215,9 @@ Actions CI workflow.
 - [x] Use lombok
 - [x] Update request body creation with Java objects
 - [ ] Async APIs for images
+- [ ] Support for function calling with models like Mistral
+    - [x] generate in sync mode
+    - [ ] generate in async mode
 - [ ] Add custom headers to requests
 - [x] Add additional params for `ask` APIs such as:
    - [x] `options`: additional model parameters for the Modelfile such as `temperature` -
@@ -143,11 +237,28 @@ Contributions are most welcome! Whether it's reporting a bug, proposing an enhan
 with code - any sort
 of contribution is much appreciated.

+### References
+
+- [Ollama REST APIs](https://github.com/jmorganca/ollama/blob/main/docs/api.md)
+
 ### Credits

 The nomenclature and the icon have been adopted from the incredible [Ollama](https://ollama.ai/)
 project.

-### References

- [Ollama REST APIs](https://github.com/jmorganca/ollama/blob/main/docs/api.md)
+<div style="text-align: center">
+
+**Thanks to the amazing contributors**
+
+<a href="https://github.com/amithkoujalgi/ollama4j/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=amithkoujalgi/ollama4j" />
+</a>
+
+### Appreciate my work?
+
+<a href="https://www.buymeacoffee.com/amithkoujalgi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
+
+
+</div>
+
--- a/docs/docs/apis-generate/chat.md
+++ b/docs/docs/apis-generate/chat.md
@@ -20,7 +20,7 @@ public class Main {
        OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance(OllamaModelType.LLAMA2);

        // create first user question
-        OllamaChatRequestModel requestModel = builder.withMessage(OllamaChatMessageRole.USER,"What is the capital of France?")
+        OllamaChatRequestModel requestModel = builder.withMessage(OllamaChatMessageRole.USER, "What is the capital of France?")
                .build();

        // start conversation with model
@@ -29,7 +29,7 @@ public class Main {
        System.out.println("First answer: " + chatResult.getResponse());

        // create next userQuestion
-        requestModel = builder.withMessages(chatResult.getChatHistory()).withMessage(OllamaChatMessageRole.USER,"And what is the second largest city?").build();
+        requestModel = builder.withMessages(chatResult.getChatHistory()).withMessage(OllamaChatMessageRole.USER, "And what is the second largest city?").build();

        // "continue" conversation with model
        chatResult = ollamaAPI.chat(requestModel);
@@ -41,6 +41,7 @@ public class Main {
 }

 ```
+
 You will get a response similar to:

 > First answer: Should be Paris!
@@ -50,23 +51,28 @@ You will get a response similar to:
 > Chat History:

 ```json
-[ {
-    "role" : "user",
-    "content" : "What is the capital of France?",
-    "images" : [ ]
-  }, {
-    "role" : "assistant",
-    "content" : "Should be Paris!",
-    "images" : [ ]
-  }, {
-    "role" : "user",
-    "content" : "And what is the second largest city?",
-    "images" : [ ]
-  }, {
-    "role" : "assistant",
-    "content" : "Marseille.",
-    "images" : [ ]
-  } ]
+[
+  {
+    "role": "user",
+    "content": "What is the capital of France?",
+    "images": []
+  },
+  {
+    "role": "assistant",
+    "content": "Should be Paris!",
+    "images": []
+  },
+  {
+    "role": "user",
+    "content": "And what is the second largest city?",
+    "images": []
+  },
+  {
+    "role": "assistant",
+    "content": "Marseille.",
+    "images": []
+  }
+]
 ```

 ## Create a conversation where the answer is streamed
@@ -89,10 +95,11 @@ public class Main {
            System.out.println(s);
        };

-        OllamaChatResult chatResult = ollamaAPI.chat(requestModel,streamHandler);
+        OllamaChatResult chatResult = ollamaAPI.chat(requestModel, streamHandler);
    }
 }
 ```
+
 You will get a response similar to:

 > The
@@ -103,8 +110,27 @@ You will get a response similar to:
 > The capital of France is Paris
 > The capital of France is Paris.

+## Use a simple Console Output Stream Handler
+
+```java
+import io.github.amithkoujalgi.ollama4j.core.impl.ConsoleOutputStreamHandler;
+
+public class Main {
+    public static void main(String[] args) throws Exception {
+        String host = "http://localhost:11434/";
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+
+        OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance(OllamaModelType.LLAMA2);
+        OllamaChatRequestModel requestModel = builder.withMessage(OllamaChatMessageRole.USER, "List all cricket world cup teams of 2019. Name the teams!")
+                .build();
+        OllamaStreamHandler streamHandler = new ConsoleOutputStreamHandler();
+        ollamaAPI.chat(requestModel, streamHandler);
+    }
+}
+```

 ## Create a new conversation with individual system prompt
+
 ```java
 public class Main {

@@ -117,7 +143,7 @@ public class Main {

        // create request with system-prompt (overriding the model defaults) and user question
        OllamaChatRequestModel requestModel = builder.withMessage(OllamaChatMessageRole.SYSTEM, "You are a silent bot that only says 'NI'. Do not say anything else under any circumstances!")
-             .withMessage(OllamaChatMessageRole.USER,"What is the capital of France? And what's France's connection with Mona Lisa?")
+                .withMessage(OllamaChatMessageRole.USER, "What is the capital of France? And what's France's connection with Mona Lisa?")
                .build();

        // start conversation with model
@@ -128,6 +154,7 @@ public class Main {
 }

 ```
+
 You will get a response similar to:

 > NI.
@@ -167,6 +194,12 @@ public class Main {

 You will get a response similar to:

-> First Answer: The image shows a dog sitting on the bow of a boat that is docked in calm water. The boat has two levels, with the lower level containing seating and what appears to be an engine cover. The dog seems relaxed and comfortable on the boat, looking out over the water. The background suggests it might be late afternoon or early evening, given the warm lighting and the low position of the sun in the sky.
+> First Answer: The image shows a dog sitting on the bow of a boat that is docked in calm water. The boat has two
+> levels, with the lower level containing seating and what appears to be an engine cover. The dog seems relaxed and
+> comfortable on the boat, looking out over the water. The background suggests it might be late afternoon or early
+> evening, given the warm lighting and the low position of the sun in the sky.
 >
-> Second Answer: Based on the image, it's difficult to definitively determine the breed of the dog. However, the dog appears to be medium-sized with a short coat and a brown coloration, which might suggest that it is a Golden Retriever or a similar breed. Without more details like ear shape and tail length, it's not possible to identify the exact breed confidently.
+> Second Answer: Based on the image, it's difficult to definitively determine the breed of the dog. However, the dog
+> appears to be medium-sized with a short coat and a brown coloration, which might suggest that it is a Golden Retriever
+> or a similar breed. Without more details like ear shape and tail length, it's not possible to identify the exact breed
+> confidently.
--- a/docs/docs/apis-generate/generate-async.md
+++ b/docs/docs/apis-generate/generate-async.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 2
+sidebar_position: 3
 ---

 # Generate - Async
--- a/docs/docs/apis-generate/generate-with-image-files.md
+++ b/docs/docs/apis-generate/generate-with-image-files.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 3
+sidebar_position: 4
 ---

 # Generate - With Image Files
--- a/docs/docs/apis-generate/generate-with-image-urls.md
+++ b/docs/docs/apis-generate/generate-with-image-urls.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 4
+sidebar_position: 5
 ---

 # Generate - With Image URLs
--- a/docs/docs/apis-generate/generate-with-tools.md
+++ b/docs/docs/apis-generate/generate-with-tools.md
@@ -0,0 +1,271 @@
+---
+sidebar_position: 2
+---
+
+# Generate - With Tools
+
+This API lets you perform [function calling](https://docs.mistral.ai/capabilities/function_calling/) using LLMs in a
+synchronous way.
+This API correlates to
+the [generate](https://github.com/ollama/ollama/blob/main/docs/api.md#request-raw-mode) API with `raw` mode.
+
+:::note
+
+This is an only an experimental implementation and has a very basic design.
+
+Currently, built and tested for [Mistral's latest model](https://ollama.com/library/mistral) only. We could redesign
+this
+in the future if tooling is supported for more models with a generic interaction standard from Ollama.
+
+:::
+
+### Function Calling/Tools
+
+Assume you want to call a method in your code based on the response generated from the model.
+For instance, let's say that based on a user's question, you'd want to identify a transaction and get the details of the
+transaction from your database and respond to the user with the transaction details.
+
+You could do that with ease with the `function calling` capabilities of the models by registering your `tools`.
+
+### Create Functions
+
+This function takes the arguments `location` and `fuelType` and performs an operation with these arguments and returns a
+value.
+
+```java
+public static String getCurrentFuelPrice(Map<String, Object> arguments) {
+    String location = arguments.get("location").toString();
+    String fuelType = arguments.get("fuelType").toString();
+    return "Current price of " + fuelType + " in " + location + " is Rs.103/L";
+}
+```
+
+This function takes the argument `city` and performs an operation with the argument and returns a
+value.
+
+```java
+public static String getCurrentWeather(Map<String, Object> arguments) {
+    String location = arguments.get("city").toString();
+    return "Currently " + location + "'s weather is nice.";
+}
+```
+
+### Define Tool Specifications
+
+Lets define a sample tool specification called **Fuel Price Tool** for getting the current fuel price.
+
+- Specify the function `name`, `description`, and `required` properties (`location` and `fuelType`).
+- Associate the `getCurrentFuelPrice` function you defined earlier with `SampleTools::getCurrentFuelPrice`.
+
+```java
+MistralTools.ToolSpecification fuelPriceToolSpecification = MistralTools.ToolSpecification.builder()
+        .functionName("current-fuel-price")
+        .functionDesc("Get current fuel price")
+        .props(
+                new MistralTools.PropsBuilder()
+                        .withProperty("location", MistralTools.PromptFuncDefinition.Property.builder().type("string").description("The city, e.g. New Delhi, India").required(true).build())
+                        .withProperty("fuelType", MistralTools.PromptFuncDefinition.Property.builder().type("string").description("The fuel type.").enumValues(Arrays.asList("petrol", "diesel")).required(true).build())
+                        .build()
+        )
+        .toolDefinition(SampleTools::getCurrentFuelPrice)
+        .build();
+```
+
+Lets also define a sample tool specification called **Weather Tool** for getting the current weather.
+
+- Specify the function `name`, `description`, and `required` property (`city`).
+- Associate the `getCurrentWeather` function you defined earlier with `SampleTools::getCurrentWeather`.
+
+```java
+MistralTools.ToolSpecification weatherToolSpecification = MistralTools.ToolSpecification.builder()
+        .functionName("current-weather")
+        .functionDesc("Get current weather")
+        .props(
+                new MistralTools.PropsBuilder()
+                        .withProperty("city", MistralTools.PromptFuncDefinition.Property.builder().type("string").description("The city, e.g. New Delhi, India").required(true).build())
+                        .build()
+        )
+        .toolDefinition(SampleTools::getCurrentWeather)
+        .build();
+```
+
+### Register the Tools
+
+Register the defined tools (`fuel price` and `weather`) with the OllamaAPI.
+
+```shell
+ollamaAPI.registerTool(fuelPriceToolSpecification);
+ollamaAPI.registerTool(weatherToolSpecification);
+```
+
+### Create prompt with Tools
+
+`Prompt 1`: Create a prompt asking for the petrol price in Bengaluru using the defined fuel price and weather tools.
+
+```shell
+String prompt1 = new MistralTools.PromptBuilder()
+        .withToolSpecification(fuelPriceToolSpecification)
+        .withToolSpecification(weatherToolSpecification)
+        .withPrompt("What is the petrol price in Bengaluru?")
+        .build();
+OllamaToolsResult toolsResult = ollamaAPI.generateWithTools(model, prompt1, false, new OptionsBuilder().build());
+for (Map.Entry<ToolDef, Object> r : toolsResult.getToolResults().entrySet()) {
+  System.out.printf("[Response from tool '%s']: %s%n", r.getKey().getName(), r.getValue().toString());
+}
+```
+
+Now, fire away your question to the model.
+
+You will get a response similar to:
+
+::::tip[LLM Response]
+
+[Response from tool 'current-fuel-price']: Current price of petrol in Bengaluru is Rs.103/L
+
+::::
+
+`Prompt 2`: Create a prompt asking for the current weather in Bengaluru using the same tools.
+
+```shell
+String prompt2 = new MistralTools.PromptBuilder()
+        .withToolSpecification(fuelPriceToolSpecification)
+        .withToolSpecification(weatherToolSpecification)
+        .withPrompt("What is the current weather in Bengaluru?")
+        .build();
+OllamaToolsResult toolsResult = ollamaAPI.generateWithTools(model, prompt2, false, new OptionsBuilder().build());
+for (Map.Entry<ToolDef, Object> r : toolsResult.getToolResults().entrySet()) {
+  System.out.printf("[Response from tool '%s']: %s%n", r.getKey().getName(), r.getValue().toString());
+}
+```
+
+Again, fire away your question to the model.
+
+You will get a response similar to:
+
+::::tip[LLM Response]
+
+[Response from tool 'current-weather']: Currently Bengaluru's weather is nice
+::::
+
+### Full Example
+
+```java
+
+import io.github.amithkoujalgi.ollama4j.core.OllamaAPI;
+import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
+import io.github.amithkoujalgi.ollama4j.core.tools.ToolDef;
+import io.github.amithkoujalgi.ollama4j.core.tools.MistralTools;
+import io.github.amithkoujalgi.ollama4j.core.tools.OllamaToolsResult;
+import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+
+public class FunctionCallingWithMistral {
+    public static void main(String[] args) throws Exception {
+        String host = "http://localhost:11434/";
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+        ollamaAPI.setRequestTimeoutSeconds(60);
+
+        String model = "mistral";
+
+
+        MistralTools.ToolSpecification fuelPriceToolSpecification = MistralTools.ToolSpecification.builder()
+                .functionName("current-fuel-price")
+                .functionDesc("Get current fuel price")
+                .props(
+                        new MistralTools.PropsBuilder()
+                                .withProperty("location", MistralTools.PromptFuncDefinition.Property.builder().type("string").description("The city, e.g. New Delhi, India").required(true).build())
+                                .withProperty("fuelType", MistralTools.PromptFuncDefinition.Property.builder().type("string").description("The fuel type.").enumValues(Arrays.asList("petrol", "diesel")).required(true).build())
+                                .build()
+                )
+                .toolDefinition(SampleTools::getCurrentFuelPrice)
+                .build();
+
+        MistralTools.ToolSpecification weatherToolSpecification = MistralTools.ToolSpecification.builder()
+                .functionName("current-weather")
+                .functionDesc("Get current weather")
+                .props(
+                        new MistralTools.PropsBuilder()
+                                .withProperty("city", MistralTools.PromptFuncDefinition.Property.builder().type("string").description("The city, e.g. New Delhi, India").required(true).build())
+                                .build()
+                )
+                .toolDefinition(SampleTools::getCurrentWeather)
+                .build();
+
+        ollamaAPI.registerTool(fuelPriceToolSpecification);
+        ollamaAPI.registerTool(weatherToolSpecification);
+
+        String prompt1 = new MistralTools.PromptBuilder()
+                .withToolSpecification(fuelPriceToolSpecification)
+                .withToolSpecification(weatherToolSpecification)
+                .withPrompt("What is the petrol price in Bengaluru?")
+                .build();
+        String prompt2 = new MistralTools.PromptBuilder()
+                .withToolSpecification(fuelPriceToolSpecification)
+                .withToolSpecification(weatherToolSpecification)
+                .withPrompt("What is the current weather in Bengaluru?")
+                .build();
+
+        ask(ollamaAPI, model, prompt1);
+        ask(ollamaAPI, model, prompt2);
+    }
+
+    public static void ask(OllamaAPI ollamaAPI, String model, String prompt) throws OllamaBaseException, IOException, InterruptedException {
+        OllamaToolsResult toolsResult = ollamaAPI.generateWithTools(model, prompt, false, new OptionsBuilder().build());
+        for (Map.Entry<ToolDef, Object> r : toolsResult.getToolResults().entrySet()) {
+            System.out.printf("[Response from tool '%s']: %s%n", r.getKey().getName(), r.getValue().toString());
+        }
+    }
+}
+
+class SampleTools {
+    public static String getCurrentFuelPrice(Map<String, Object> arguments) {
+        String location = arguments.get("location").toString();
+        String fuelType = arguments.get("fuelType").toString();
+        return "Current price of " + fuelType + " in " + location + " is Rs.103/L";
+    }
+
+    public static String getCurrentWeather(Map<String, Object> arguments) {
+        String location = arguments.get("city").toString();
+        return "Currently " + location + "'s weather is nice.";
+    }
+}
+
+```
+
+Run this full example and you will get a response similar to:
+
+::::tip[LLM Response]
+
+[Response from tool 'current-fuel-price']: Current price of petrol in Bengaluru is Rs.103/L
+
+[Response from tool 'current-weather']: Currently Bengaluru's weather is nice
+::::
+
+### Room for improvement
+
+Instead of explicitly registering `ollamaAPI.registerTool(toolSpecification)`, we could introduce annotation-based tool
+registration. For example:
+
+```java
+
+@ToolSpec(name = "current-fuel-price", desc = "Get current fuel price")
+public String getCurrentFuelPrice(Map<String, Object> arguments) {
+    String location = arguments.get("location").toString();
+    String fuelType = arguments.get("fuelType").toString();
+    return "Current price of " + fuelType + " in " + location + " is Rs.103/L";
+}
+```
+
+Instead of passing a map of args `Map<String, Object> arguments` to the tool functions, we could support passing
+specific args separately with their data types. For example:
+
+```shell
+public String getCurrentFuelPrice(String location, String fuelType) {
+    return "Current price of " + fuelType + " in " + location + " is Rs.103/L";
+}
+```
+
+Updating async/chat APIs with support for tool-based generation. 
--- a/docs/docs/apis-generate/generate.md
+++ b/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.

@@ -61,10 +61,11 @@ public class Main {
                "What is the capital of France? And what's France's connection with Mona Lisa?",
                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
--- a/docs/docs/apis-generate/prompt-builder.md
+++ b/docs/docs/apis-generate/prompt-builder.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 5
+sidebar_position: 6
 ---

 # Prompt Builder
@@ -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());
    }
 }
--- a/docs/docusaurus.config.js
+++ b/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.
@@ -96,7 +98,7 @@ const config = {
                        items: [
                            {
                                label: 'Tutorial',
-                                to: '/docs/intro',
+                                to: '/intro',
                            },
                        ],
                    },
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
--- a/docs/package.json
+++ b/docs/package.json
@@ -14,9 +14,9 @@
    "write-heading-ids": "docusaurus write-heading-ids"
  },
  "dependencies": {
-    "@docusaurus/core": "3.0.1",
-    "@docusaurus/preset-classic": "3.0.1",
-    "@docusaurus/theme-mermaid": "^3.0.1",
+    "@docusaurus/core": "^3.4.0",
+    "@docusaurus/preset-classic": "^3.4.0",
+    "@docusaurus/theme-mermaid": "^3.4.0",
    "@mdx-js/react": "^3.0.0",
    "clsx": "^2.0.0",
    "prism-react-renderer": "^2.3.0",
@@ -24,8 +24,8 @@
    "react-dom": "^18.0.0"
  },
  "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.0.1",
-    "@docusaurus/types": "3.0.1"
+    "@docusaurus/module-type-aliases": "^3.4.0",
+    "@docusaurus/types": "^3.4.0"
  },
  "browserslist": {
    "production": [
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -19,7 +19,7 @@ function HomepageHeader() {
            <div className={styles.buttons}>
                <Link
                    className="button button--secondary button--lg"
-                    to="/docs/intro">
+                    to="/intro">
                    Getting Started
                </Link>
            </div>
--- a/maven-publish.yml
+++ b/maven-publish.yml
@@ -0,0 +1,68 @@
+## This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
+## For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
+#
+#name: Test and Publish Package
+#
+##on:
+##  release:
+##    types: [ "created" ]
+#
+#on:
+#  push:
+#    branches: [ "main" ]
+#  workflow_dispatch:
+#
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest
+#    permissions:
+#      contents: write
+#      packages: write
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'adopt-hotspot'
+#          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+#          settings-path: ${{ github.workspace }} # location for the settings.xml file
+#      - name: Build with Maven
+#        run: mvn --file pom.xml -U clean package -Punit-tests
+#      - name: Set up Apache Maven Central (Overwrite settings.xml)
+#        uses: actions/setup-java@v3
+#        with: # running setup-java again overwrites the settings.xml
+#          java-version: '11'
+#          distribution: 'adopt-hotspot'
+#          cache: 'maven'
+#          server-id: ossrh
+#          server-username: MAVEN_USERNAME
+#          server-password: MAVEN_PASSWORD
+#          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+#          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+#      - name: Set up Maven cache
+#        uses: actions/cache@v3
+#        with:
+#          path: ~/.m2/repository
+#          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+#          restore-keys: |
+#            ${{ runner.os }}-maven-
+#      - name: Build
+#        run: mvn -B -ntp clean install
+#      - name: Upload coverage reports to Codecov
+#        uses: codecov/codecov-action@v3
+#        env:
+#          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+#      - name: Publish to GitHub Packages Apache Maven
+#        #        if: >
+#        #          github.event_name != 'pull_request' &&
+#        #          github.ref_name == 'main' &&
+#        #          contains(github.event.head_commit.message, 'release')
+#        run: |
+#          git config --global user.email "koujalgi.amith@gmail.com"
+#          git config --global user.name "amithkoujalgi"
+#          mvn -B -ntp -DskipTests -Pci-cd -Darguments="-DskipTests -Pci-cd" release:clean release:prepare release:perform
+#        env:
+#          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+#          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+#          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <groupId>io.github.amithkoujalgi</groupId>
    <artifactId>ollama4j</artifactId>
-    <version>1.0.61</version>
+    <version>ollama4j-revision</version>

    <name>Ollama4j</name>
    <description>Java library for interacting with Ollama API.</description>
    <url>https://github.com/amithkoujalgi/ollama4j</url>
+    <packaging>jar</packaging>

    <properties>
        <maven.compiler.source>11</maven.compiler.source>
@@ -39,7 +41,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.61</tag>
+        <tag>v1.0.16</tag>
    </scm>

    <build>
@@ -127,15 +129,15 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.1</version>
-                <configuration>
-                    <!--                    <goals>install</goals>-->
-                    <tagNameFormat>v@{project.version}</tagNameFormat>
-                </configuration>
-            </plugin>
+            <!--            <plugin>-->
+            <!--                <groupId>org.apache.maven.plugins</groupId>-->
+            <!--                <artifactId>maven-release-plugin</artifactId>-->
+            <!--                <version>3.0.1</version>-->
+            <!--                <configuration>-->
+            <!--                    &lt;!&ndash;                    <goals>install</goals>&ndash;&gt;-->
+            <!--                    <tagNameFormat>v@{project.version}</tagNameFormat>-->
+            <!--                </configuration>-->
+            <!--            </plugin>-->
        </plugins>
    </build>

@@ -149,12 +151,17 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.15.3</version>
+            <version>2.17.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.17.1</version>
        </dependency>
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
-            <version>1.4.12</version>
+            <version>1.5.6</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -182,14 +189,23 @@
        </dependency>
    </dependencies>

+    <!--    <distributionManagement>-->
+    <!--        <snapshotRepository>-->
+    <!--            <id>ossrh</id>-->
+    <!--            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
+    <!--        </snapshotRepository>-->
+    <!--        <repository>-->
+    <!--            <id>ossrh</id>-->
+    <!--            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>-->
+    <!--        </repository>-->
+    <!--    </distributionManagement>-->
+
+    <!--    Replaced publishing packages to GitHub Packages instead of Maven central -->
    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
+            <id>github</id>
+            <name>GitHub Packages</name>
+            <url>https://maven.pkg.github.com/amithkoujalgi/ollama4j</url>
        </repository>
    </distributionManagement>

@@ -245,39 +261,39 @@
            </properties>
            <build>
                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- Prevent gpg from using pinentry programs. Fixes:
-                                         gpg: signing failed: Inappropriate ioctl for device -->
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
+                    <!--                    <plugin>-->
+                    <!--                        <groupId>org.apache.maven.plugins</groupId>-->
+                    <!--                        <artifactId>maven-gpg-plugin</artifactId>-->
+                    <!--                        <version>3.1.0</version>-->
+                    <!--                        <executions>-->
+                    <!--                            <execution>-->
+                    <!--                                <id>sign-artifacts</id>-->
+                    <!--                                <phase>verify</phase>-->
+                    <!--                                <goals>-->
+                    <!--                                    <goal>sign</goal>-->
+                    <!--                                </goals>-->
+                    <!--                                <configuration>-->
+                    <!--                                    &lt;!&ndash; Prevent gpg from using pinentry programs. Fixes:-->
+                    <!--                                         gpg: signing failed: Inappropriate ioctl for device &ndash;&gt;-->
+                    <!--                                    <gpgArguments>-->
+                    <!--                                        <arg>&#45;&#45;pinentry-mode</arg>-->
+                    <!--                                        <arg>loopback</arg>-->
+                    <!--                                    </gpgArguments>-->
+                    <!--                                </configuration>-->
+                    <!--                            </execution>-->
+                    <!--                        </executions>-->
+                    <!--                    </plugin>-->
+                    <!--                    <plugin>-->
+                    <!--                        <groupId>org.sonatype.plugins</groupId>-->
+                    <!--                        <artifactId>nexus-staging-maven-plugin</artifactId>-->
+                    <!--                        <version>1.6.13</version>-->
+                    <!--                        <extensions>true</extensions>-->
+                    <!--                        <configuration>-->
+                    <!--                            <serverId>ossrh</serverId>-->
+                    <!--                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>-->
+                    <!--                            <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
+                    <!--                        </configuration>-->
+                    <!--                    </plugin>-->

                    <plugin>
                        <groupId>org.jacoco</groupId>
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java
@@ -9,18 +9,14 @@ 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.ModelRequest;
-import io.github.amithkoujalgi.ollama4j.core.models.request.OllamaChatEndpointCaller;
-import io.github.amithkoujalgi.ollama4j.core.models.request.OllamaGenerateEndpointCaller;
+import io.github.amithkoujalgi.ollama4j.core.models.request.*;
+import io.github.amithkoujalgi.ollama4j.core.tools.*;
 import io.github.amithkoujalgi.ollama4j.core.utils.Options;
 import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
@@ -30,19 +26,17 @@ import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.*;

-/** The base Ollama API class. */
+/**
+ * The base Ollama API class.
+ */
@SuppressWarnings("DuplicatedCode")
 public class OllamaAPI {

    private static final Logger logger = LoggerFactory.getLogger(OllamaAPI.class);
    private final String host;
-  private long requestTimeoutSeconds = 3;
+    private long requestTimeoutSeconds = 10;
    private boolean verbose = true;
    private BasicAuth basicAuth;

@@ -323,7 +317,7 @@ public class OllamaAPI {
     * @param modelRequest request for '/api/embeddings' endpoint
     * @return embeddings
     */
-  public List<Double> generateEmbeddings(OllamaEmbeddingsRequestModel modelRequest) throws IOException, InterruptedException, OllamaBaseException{
+    public List<Double> generateEmbeddings(OllamaEmbeddingsRequestModel modelRequest) throws IOException, InterruptedException, OllamaBaseException {
        URI uri = URI.create(this.host + "/api/embeddings");
        String jsonData = modelRequest.toString();
        HttpClient httpClient = HttpClient.newHttpClient();
@@ -344,6 +338,7 @@ public class OllamaAPI {
        }
    }

+
    /**
     * Generate response for a question to a model running on Ollama server. This is a sync/blocking
     * call.
@@ -356,23 +351,48 @@ public class OllamaAPI {
     * @param streamHandler optional callback consumer that will be applied every time a streamed response is received. If not set, the stream parameter of the request is set to false.
     * @return OllamaResult that includes response text and time taken for response
     */
-  public OllamaResult generate(String model, String prompt, Options options, OllamaStreamHandler streamHandler)
+    public OllamaResult generate(String model, String prompt, boolean raw, Options options, OllamaStreamHandler streamHandler)
            throws OllamaBaseException, IOException, InterruptedException {
        OllamaGenerateRequestModel ollamaRequestModel = new OllamaGenerateRequestModel(model, prompt);
+        ollamaRequestModel.setRaw(raw);
        ollamaRequestModel.setOptions(options.getOptionsMap());
-    return generateSyncForOllamaRequestModel(ollamaRequestModel,streamHandler);
+        return generateSyncForOllamaRequestModel(ollamaRequestModel, streamHandler);
    }

    /**
     * Convenience method to call Ollama API without streaming responses.
+     * <p>
+     * Uses {@link #generate(String, String, boolean, Options, OllamaStreamHandler)}
     *
-   * Uses {@link #generate(String, String, Options, OllamaStreamHandler)}
+     * @param model   Model to use
+     * @param prompt  Prompt text
+     * @param raw     In some cases, you may wish to bypass the templating system and provide a full prompt. In this case, you can use the raw parameter to disable templating. Also note that raw mode will not return a context.
+     * @param options Additional Options
+     * @return OllamaResult
     */
-  public OllamaResult generate(String model, String prompt, Options options)
+    public OllamaResult generate(String model, String prompt, boolean raw, Options options)
            throws OllamaBaseException, IOException, InterruptedException {
-    return generate(model, prompt, options,null);
+        return generate(model, prompt, raw, options, null);
    }

+
+    public OllamaToolsResult generateWithTools(String model, String prompt, boolean raw, Options options)
+            throws OllamaBaseException, IOException, InterruptedException {
+        OllamaToolsResult toolResult = new OllamaToolsResult();
+        Map<ToolDef, Object> toolResults = new HashMap<>();
+
+        OllamaResult result = generate(model, prompt, raw, options, null);
+        toolResult.setModelResult(result);
+
+        List<ToolDef> toolDefs = Utils.getObjectMapper().readValue(result.getResponse(), Utils.getObjectMapper().getTypeFactory().constructCollectionType(List.class, ToolDef.class));
+        for (ToolDef toolDef : toolDefs) {
+            toolResults.put(toolDef, invokeTool(toolDef));
+        }
+        toolResult.setToolResults(toolResults);
+        return toolResult;
+    }
+
+
    /**
     * Generate response for a question to a model running on Ollama server and get a callback handle
     * that can be used to check for status and get the response from the model later. This would be
@@ -382,9 +402,9 @@ public class OllamaAPI {
     * @param prompt the prompt/question text
     * @return the ollama async result callback handle
     */
-  public OllamaAsyncResultCallback generateAsync(String model, String prompt) {
+    public OllamaAsyncResultCallback generateAsync(String model, String prompt, boolean raw) {
        OllamaGenerateRequestModel ollamaRequestModel = new OllamaGenerateRequestModel(model, prompt);
-
+        ollamaRequestModel.setRaw(raw);
        URI uri = URI.create(this.host + "/api/generate");
        OllamaAsyncResultCallback ollamaAsyncResultCallback =
                new OllamaAsyncResultCallback(
@@ -415,19 +435,19 @@ public class OllamaAPI {
        }
        OllamaGenerateRequestModel ollamaRequestModel = new OllamaGenerateRequestModel(model, prompt, images);
        ollamaRequestModel.setOptions(options.getOptionsMap());
-    return generateSyncForOllamaRequestModel(ollamaRequestModel,streamHandler);
+        return generateSyncForOllamaRequestModel(ollamaRequestModel, streamHandler);
    }

    /**
     * Convenience method to call Ollama API without streaming responses.
-   * 
+     * <p>
     * Uses {@link #generateWithImageFiles(String, String, List, Options, OllamaStreamHandler)}
     */
    public OllamaResult generateWithImageFiles(
            String model, String prompt, List<File> imageFiles, Options options)
-    throws OllamaBaseException, IOException, InterruptedException{
+            throws OllamaBaseException, IOException, InterruptedException {
        return generateWithImageFiles(model, prompt, imageFiles, options, null);
-}
+    }

    /**
     * With one or more image URLs, ask a question to a model running on Ollama server. This is a
@@ -451,12 +471,12 @@ public class OllamaAPI {
        }
        OllamaGenerateRequestModel ollamaRequestModel = new OllamaGenerateRequestModel(model, prompt, images);
        ollamaRequestModel.setOptions(options.getOptionsMap());
-    return generateSyncForOllamaRequestModel(ollamaRequestModel,streamHandler);
+        return generateSyncForOllamaRequestModel(ollamaRequestModel, streamHandler);
    }

    /**
     * Convenience method to call Ollama API without streaming responses.
-   * 
+     * <p>
     * Uses {@link #generateWithImageURLs(String, String, List, Options, OllamaStreamHandler)}
     */
    public OllamaResult generateWithImageURLs(String model, String prompt, List<String> imageURLs,
@@ -466,7 +486,6 @@ public class OllamaAPI {
    }


-  
    /**
     * Ask a question to a model based on a given message stack (i.e. a chat history). Creates a synchronous call to the api
     * 'api/chat'.
@@ -478,14 +497,14 @@ public class OllamaAPI {
     * @throws IOException          in case the responseStream can not be read
     * @throws InterruptedException in case the server is not reachable or network issues happen
     */
-  public OllamaChatResult chat(String model, List<OllamaChatMessage> messages)  throws OllamaBaseException, IOException, InterruptedException{
+    public OllamaChatResult chat(String model, List<OllamaChatMessage> messages) throws OllamaBaseException, IOException, InterruptedException {
        OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance(model);
        return chat(builder.withMessages(messages).build());
    }

    /**
     * Ask a question to a model using an {@link OllamaChatRequestModel}. This can be constructed using an {@link OllamaChatRequestBuilder}.
-   * 
+     * <p>
     * Hint: the OllamaChatRequestModel#getStream() property is not implemented.
     *
     * @param request request object to be sent to the server
@@ -494,13 +513,13 @@ public class OllamaAPI {
     * @throws IOException          in case the responseStream can not be read
     * @throws InterruptedException in case the server is not reachable or network issues happen
     */
-  public OllamaChatResult chat(OllamaChatRequestModel request)  throws OllamaBaseException, IOException, InterruptedException{
-    return chat(request,null);
+    public OllamaChatResult chat(OllamaChatRequestModel request) throws OllamaBaseException, IOException, InterruptedException {
+        return chat(request, null);
    }

    /**
     * Ask a question to a model using an {@link OllamaChatRequestModel}. This can be constructed using an {@link OllamaChatRequestBuilder}.
-   * 
+     * <p>
     * Hint: the OllamaChatRequestModel#getStream() property is not implemented.
     *
     * @param request       request object to be sent to the server
@@ -510,14 +529,13 @@ public class OllamaAPI {
     * @throws IOException          in case the responseStream can not be read
     * @throws InterruptedException in case the server is not reachable or network issues happen
     */
-  public OllamaChatResult chat(OllamaChatRequestModel request, OllamaStreamHandler streamHandler)  throws OllamaBaseException, IOException, InterruptedException{
+    public OllamaChatResult chat(OllamaChatRequestModel request, OllamaStreamHandler streamHandler) throws OllamaBaseException, IOException, InterruptedException {
        OllamaChatEndpointCaller requestCaller = new OllamaChatEndpointCaller(host, basicAuth, requestTimeoutSeconds, verbose);
        OllamaResult result;
-    if(streamHandler != null){
+        if (streamHandler != null) {
            request.setStream(true);
            result = requestCaller.call(request, streamHandler);
-    }
-    else {
+        } else {
            result = requestCaller.callSync(request);
        }
        return new OllamaChatResult(result.getResponse(), result.getResponseTime(), result.getHttpStatusCode(), request.getMessages());
@@ -583,4 +601,24 @@ public class OllamaAPI {
    private boolean isBasicAuthCredentialsSet() {
        return basicAuth != null;
    }
+
+
+    public void registerTool(MistralTools.ToolSpecification toolSpecification) {
+        ToolRegistry.addFunction(toolSpecification.getFunctionName(), toolSpecification.getToolDefinition());
+    }
+
+    private Object invokeTool(ToolDef toolDef) {
+        try {
+            String methodName = toolDef.getName();
+            Map<String, Object> arguments = toolDef.getArguments();
+            DynamicFunction function = ToolRegistry.getFunction(methodName);
+            if (function == null) {
+                throw new IllegalArgumentException("No such tool: " + methodName);
+            }
+            return function.apply(arguments);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "Error calling tool: " + e.getMessage();
+        }
+    }
 }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java
@@ -0,0 +1,14 @@
+package io.github.amithkoujalgi.ollama4j.core.impl;
+
+import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler;
+
+public class ConsoleOutputStreamHandler implements OllamaStreamHandler {
+    private final StringBuffer response = new StringBuffer();
+
+    @Override
+    public void accept(String message) {
+        String substr = message.substring(response.length());
+        response.append(substr);
+        System.out.print(substr);
+    }
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java
@@ -1,5 +1,8 @@
 package io.github.amithkoujalgi.ollama4j.core.models;

+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
@@ -11,7 +14,9 @@ public class Model {
  private String name;
  private String model;
  @JsonProperty("modified_at")
-  private String modifiedAt;
+  private OffsetDateTime modifiedAt;
+  @JsonProperty("expires_at")
+  private OffsetDateTime expiresAt;
  private String digest;
  private long size;
  @JsonProperty("details")
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResponseModel.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResponseModel.java
@@ -1,14 +1,15 @@
 package io.github.amithkoujalgi.ollama4j.core.models.chat;

 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;

 import java.util.List;
-import lombok.Data;

@Data
 public class OllamaChatResponseModel {
    private String model;
    private @JsonProperty("created_at") String createdAt;
+    private @JsonProperty("done_reason") String doneReason;
    private OllamaChatMessage message;
    private boolean done;
    private String error;
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java
@@ -1,12 +1,6 @@
 package io.github.amithkoujalgi.ollama4j.core.models.request;

-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler;
 import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
 import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth;
@@ -15,11 +9,15 @@ import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResponseModel
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatStreamObserver;
 import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody;
 import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;

 /**
 * Specialization class for requests
 */
-public class OllamaChatEndpointCaller extends OllamaEndpointCaller{
+public class OllamaChatEndpointCaller extends OllamaEndpointCaller {

    private static final Logger LOG = LoggerFactory.getLogger(OllamaChatEndpointCaller.class);

@@ -39,12 +37,12 @@ public class OllamaChatEndpointCaller extends OllamaEndpointCaller{
        try {
            OllamaChatResponseModel ollamaResponseModel = Utils.getObjectMapper().readValue(line, OllamaChatResponseModel.class);
            responseBuffer.append(ollamaResponseModel.getMessage().getContent());
-            if(streamObserver != null) {
+            if (streamObserver != null) {
                streamObserver.notify(ollamaResponseModel);
            }
            return ollamaResponseModel.isDone();
        } catch (JsonProcessingException e) {
-            LOG.error("Error parsing the Ollama chat response!",e);
+            LOG.error("Error parsing the Ollama chat response!", e);
            return true;
        }
    }
@@ -54,7 +52,4 @@ public class OllamaChatEndpointCaller extends OllamaEndpointCaller{
        streamObserver = new OllamaChatStreamObserver(streamHandler);
        return super.callSync(body);
    }
-
-    
- 
 }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaEndpointCaller.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaEndpointCaller.java
@@ -1,5 +1,15 @@
 package io.github.amithkoujalgi.ollama4j.core.models.request;

+import io.github.amithkoujalgi.ollama4j.core.OllamaAPI;
+import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
+import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth;
+import io.github.amithkoujalgi.ollama4j.core.models.OllamaErrorResponseModel;
+import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult;
+import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody;
+import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,17 +22,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Base64;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.github.amithkoujalgi.ollama4j.core.OllamaAPI;
-import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
-import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth;
-import io.github.amithkoujalgi.ollama4j.core.models.OllamaErrorResponseModel;
-import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult;
-import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody;
-import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
-
 /**
 * Abstract helperclass to call the ollama api server.
 */
@@ -56,8 +55,7 @@ public abstract class OllamaEndpointCaller {
     * @throws IOException          in case the responseStream can not be read
     * @throws InterruptedException in case the server is not reachable or network issues happen
     */
-    public OllamaResult callSync(OllamaRequestBody body)  throws OllamaBaseException, IOException, InterruptedException{
-
+    public OllamaResult callSync(OllamaRequestBody body) throws OllamaBaseException, IOException, InterruptedException {
        // Create Request
        long startTime = System.currentTimeMillis();
        HttpClient httpClient = HttpClient.newHttpClient();
@@ -71,7 +69,6 @@ public abstract class OllamaEndpointCaller {
        HttpResponse<InputStream> response =
                httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());

-        
        int statusCode = response.statusCode();
        InputStream responseBodyStream = response.body();
        StringBuilder responseBuffer = new StringBuilder();
@@ -96,7 +93,7 @@ public abstract class OllamaEndpointCaller {
                            OllamaErrorResponseModel.class);
                    responseBuffer.append(ollamaResponseModel.getError());
                } else {
-          boolean finished = parseResponseAndAddToBuffer(line,responseBuffer);
+                    boolean finished = parseResponseAndAddToBuffer(line, responseBuffer);
                    if (finished) {
                        break;
                    }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java
@@ -1,9 +1,5 @@
 package io.github.amithkoujalgi.ollama4j.core.models.request;

-import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler;
 import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
@@ -13,8 +9,12 @@ import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRespo
 import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateStreamObserver;
 import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody;
 import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

-public class OllamaGenerateEndpointCaller extends OllamaEndpointCaller{
+import java.io.IOException;
+
+public class OllamaGenerateEndpointCaller extends OllamaEndpointCaller {

    private static final Logger LOG = LoggerFactory.getLogger(OllamaGenerateEndpointCaller.class);

@@ -34,12 +34,12 @@ public class OllamaGenerateEndpointCaller extends OllamaEndpointCaller{
        try {
            OllamaGenerateResponseModel ollamaResponseModel = Utils.getObjectMapper().readValue(line, OllamaGenerateResponseModel.class);
            responseBuffer.append(ollamaResponseModel.getResponse());
-                    if(streamObserver != null) {
+            if (streamObserver != null) {
                streamObserver.notify(ollamaResponseModel);
            }
            return ollamaResponseModel.isDone();
        } catch (JsonProcessingException e) {
-                    LOG.error("Error parsing the Ollama chat response!",e);
+            LOG.error("Error parsing the Ollama chat response!", e);
            return true;
        }
    }
@@ -49,6 +49,4 @@ public class OllamaGenerateEndpointCaller extends OllamaEndpointCaller{
        streamObserver = new OllamaGenerateStreamObserver(streamHandler);
        return super.callSync(body);
    }
-    
-    
 }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/DynamicFunction.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/DynamicFunction.java
@@ -0,0 +1,8 @@
+package io.github.amithkoujalgi.ollama4j.core.tools;
+
+import java.util.Map;
+
+@FunctionalInterface
+public interface DynamicFunction {
+    Object apply(Map<String, Object> arguments);
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/MistralTools.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/MistralTools.java
@@ -0,0 +1,139 @@
+package io.github.amithkoujalgi.ollama4j.core.tools;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MistralTools {
+    @Data
+    @Builder
+    public static class ToolSpecification {
+        private String functionName;
+        private String functionDesc;
+        private Map<String, PromptFuncDefinition.Property> props;
+        private DynamicFunction toolDefinition;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class PromptFuncDefinition {
+        private String type;
+        private PromptFuncSpec function;
+
+        @Data
+        public static class PromptFuncSpec {
+            private String name;
+            private String description;
+            private Parameters parameters;
+        }
+
+        @Data
+        public static class Parameters {
+            private String type;
+            private Map<String, Property> properties;
+            private List<String> required;
+        }
+
+        @Data
+        @Builder
+        public static class Property {
+            private String type;
+            private String description;
+            @JsonProperty("enum")
+            @JsonInclude(JsonInclude.Include.NON_NULL)
+            private List<String> enumValues;
+            @JsonIgnore
+            private boolean required;
+        }
+    }
+
+    public static class PropsBuilder {
+        private final Map<String, PromptFuncDefinition.Property> props = new HashMap<>();
+
+        public PropsBuilder withProperty(String key, PromptFuncDefinition.Property property) {
+            props.put(key, property);
+            return this;
+        }
+
+        public Map<String, PromptFuncDefinition.Property> build() {
+            return props;
+        }
+    }
+
+    public static class PromptBuilder {
+        private final List<PromptFuncDefinition> tools = new ArrayList<>();
+
+        private String promptText;
+
+        public String build() throws JsonProcessingException {
+            return "[AVAILABLE_TOOLS] " + Utils.getObjectMapper().writeValueAsString(tools) + "[/AVAILABLE_TOOLS][INST] " + promptText + " [/INST]";
+        }
+
+        public PromptBuilder withPrompt(String prompt) throws JsonProcessingException {
+            promptText = prompt;
+            return this;
+        }
+
+        public PromptBuilder withToolSpecification(ToolSpecification spec) {
+            PromptFuncDefinition def = new PromptFuncDefinition();
+            def.setType("function");
+
+            PromptFuncDefinition.PromptFuncSpec functionDetail = new PromptFuncDefinition.PromptFuncSpec();
+            functionDetail.setName(spec.getFunctionName());
+            functionDetail.setDescription(spec.getFunctionDesc());
+
+            PromptFuncDefinition.Parameters parameters = new PromptFuncDefinition.Parameters();
+            parameters.setType("object");
+            parameters.setProperties(spec.getProps());
+
+            List<String> requiredValues = new ArrayList<>();
+            for (Map.Entry<String, PromptFuncDefinition.Property> p : spec.getProps().entrySet()) {
+                if (p.getValue().isRequired()) {
+                    requiredValues.add(p.getKey());
+                }
+            }
+            parameters.setRequired(requiredValues);
+            functionDetail.setParameters(parameters);
+            def.setFunction(functionDetail);
+
+            tools.add(def);
+            return this;
+        }
+//
+//        public PromptBuilder withToolSpecification(String functionName, String functionDesc, Map<String, PromptFuncDefinition.Property> props) {
+//            PromptFuncDefinition def = new PromptFuncDefinition();
+//            def.setType("function");
+//
+//            PromptFuncDefinition.PromptFuncSpec functionDetail = new PromptFuncDefinition.PromptFuncSpec();
+//            functionDetail.setName(functionName);
+//            functionDetail.setDescription(functionDesc);
+//
+//            PromptFuncDefinition.Parameters parameters = new PromptFuncDefinition.Parameters();
+//            parameters.setType("object");
+//            parameters.setProperties(props);
+//
+//            List<String> requiredValues = new ArrayList<>();
+//            for (Map.Entry<String, PromptFuncDefinition.Property> p : props.entrySet()) {
+//                if (p.getValue().isRequired()) {
+//                    requiredValues.add(p.getKey());
+//                }
+//            }
+//            parameters.setRequired(requiredValues);
+//            functionDetail.setParameters(parameters);
+//            def.setFunction(functionDetail);
+//
+//            tools.add(def);
+//            return this;
+//        }
+    }
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/OllamaToolsResult.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/OllamaToolsResult.java
@@ -0,0 +1,16 @@
+package io.github.amithkoujalgi.ollama4j.core.tools;
+
+import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OllamaToolsResult {
+    private OllamaResult modelResult;
+    private Map<ToolDef, Object> toolResults;
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolDef.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolDef.java
@@ -0,0 +1,18 @@
+package io.github.amithkoujalgi.ollama4j.core.tools;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ToolDef {
+
+    private String name;
+    private Map<String, Object> arguments;
+
+}
+
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolRegistry.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolRegistry.java
@@ -0,0 +1,17 @@
+package io.github.amithkoujalgi.ollama4j.core.tools;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToolRegistry {
+    private static final Map<String, DynamicFunction> functionMap = new HashMap<>();
+
+
+    public static DynamicFunction getFunction(String name) {
+        return functionMap.get(name);
+    }
+
+    public static void addFunction(String name, DynamicFunction function) {
+        functionMap.put(name, function);
+    }
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java
@@ -9,16 +9,22 @@ package io.github.amithkoujalgi.ollama4j.core.types;
@SuppressWarnings("ALL")
 public class OllamaModelType {
    public static final String GEMMA = "gemma";
+    public static final String GEMMA2 = "gemma2";
+
+
    public static final String LLAMA2 = "llama2";
+    public static final String LLAMA3 = "llama3";
    public static final String MISTRAL = "mistral";
    public static final String MIXTRAL = "mixtral";
    public static final String LLAVA = "llava";
+    public static final String LLAVA_PHI3 = "llava-phi3";
    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 PHI3 = "phi3";
    public static final String ORCA_MINI = "orca-mini";
    public static final String DEEPSEEK_CODER = "deepseek-coder";
    public static final String DOLPHIN_MISTRAL = "dolphin-mistral";
@@ -27,6 +33,8 @@ public class OllamaModelType {
    public static final String ZEPHYR = "zephyr";
    public static final String OPENHERMES = "openhermes";
    public static final String QWEN = "qwen";
+
+    public static final String QWEN2 = "qwen2";
    public static final String WIZARDCODER = "wizardcoder";
    public static final String LLAMA2_CHINESE = "llama2-chinese";
    public static final String TINYLLAMA = "tinyllama";
@@ -76,4 +84,5 @@ public class OllamaModelType {
    public static final String NOTUS = "notus";
    public static final String DUCKDB_NSQL = "duckdb-nsql";
    public static final String ALL_MINILM = "all-minilm";
+    public static final String CODESTRAL = "codestral";
 }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java
@@ -8,10 +8,18 @@ import java.net.URISyntaxException;
 import java.net.URL;

 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

 public class Utils {
+
+  private static ObjectMapper objectMapper;
+
  public static ObjectMapper getObjectMapper() {
-    return new ObjectMapper();
+    if(objectMapper == null) {
+      objectMapper = new ObjectMapper();
+      objectMapper.registerModule(new JavaTimeModule());
+    }
+    return objectMapper;
  }

  public static byte[] loadImageBytesFromUrl(String imageUrl)
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java
@@ -1,7 +1,5 @@
 package io.github.amithkoujalgi.ollama4j.integrationtests;

-import static org.junit.jupiter.api.Assertions.*;
-
 import io.github.amithkoujalgi.ollama4j.core.OllamaAPI;
 import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
 import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail;
@@ -10,9 +8,16 @@ 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.models.embeddings.OllamaEmbeddingsRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+import lombok.Data;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,12 +27,8 @@ import java.net.http.HttpConnectTimeoutException;
 import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
-import lombok.Data;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.*;

 class TestRealAPIs {

@@ -116,6 +117,7 @@ class TestRealAPIs {
                    ollamaAPI.generate(
                            config.getModel(),
                            "What is the capital of France? And what's France's connection with Mona Lisa?",
+                            false,
                            new OptionsBuilder().build());
            assertNotNull(result);
            assertNotNull(result.getResponse());
@@ -130,11 +132,10 @@ class TestRealAPIs {
    void testAskModelWithDefaultOptionsStreamed() {
        testEndpointReachability();
        try {
-
            StringBuffer sb = new StringBuffer("");
-
            OllamaResult result = ollamaAPI.generate(config.getModel(),
                    "What is the capital of France? And what's France's connection with Mona Lisa?",
+                    false,
                    new OptionsBuilder().build(), (s) -> {
                        LOG.info(s);
                        String substring = s.substring(sb.toString().length(), s.length());
@@ -160,6 +161,7 @@ class TestRealAPIs {
                    ollamaAPI.generate(
                            config.getModel(),
                            "What is the capital of France? And what's France's connection with Mona Lisa?",
+                            true,
                            new OptionsBuilder().setTemperature(0.9f).build());
            assertNotNull(result);
            assertNotNull(result.getResponse());
@@ -177,13 +179,13 @@ class TestRealAPIs {
            OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance(config.getModel());
            OllamaChatRequestModel requestModel = builder.withMessage(OllamaChatMessageRole.USER, "What is the capital of France?")
                    .withMessage(OllamaChatMessageRole.ASSISTANT, "Should be Paris!")
-             .withMessage(OllamaChatMessageRole.USER,"And what is the second larges city?")
+                    .withMessage(OllamaChatMessageRole.USER, "And what is the second larges city?")
                    .build();

            OllamaChatResult chatResult = ollamaAPI.chat(requestModel);
            assertNotNull(chatResult);
            assertFalse(chatResult.getResponse().isBlank());
-      assertEquals(4,chatResult.getChatHistory().size());
+            assertEquals(4, chatResult.getChatHistory().size());
        } catch (IOException | OllamaBaseException | InterruptedException e) {
            fail(e);
        }
@@ -223,7 +225,7 @@ class TestRealAPIs {

            StringBuffer sb = new StringBuffer("");

-      OllamaChatResult chatResult = ollamaAPI.chat(requestModel,(s) -> {
+            OllamaChatResult chatResult = ollamaAPI.chat(requestModel, (s) -> {
                LOG.info(s);
                String substring = s.substring(sb.toString().length(), s.length());
                LOG.info(substring);
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java
@@ -1,7 +1,5 @@
 package io.github.amithkoujalgi.ollama4j.unittests;

-import static org.mockito.Mockito.*;
-
 import io.github.amithkoujalgi.ollama4j.core.OllamaAPI;
 import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException;
 import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail;
@@ -9,12 +7,15 @@ import io.github.amithkoujalgi.ollama4j.core.models.OllamaAsyncResultCallback;
 import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult;
 import io.github.amithkoujalgi.ollama4j.core.types.OllamaModelType;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
+
+import static org.mockito.Mockito.*;

 class TestMockedAPIs {
    @Test
@@ -103,10 +104,10 @@ class TestMockedAPIs {
        String prompt = "some prompt text";
        OptionsBuilder optionsBuilder = new OptionsBuilder();
        try {
-      when(ollamaAPI.generate(model, prompt, optionsBuilder.build()))
+            when(ollamaAPI.generate(model, prompt, false, optionsBuilder.build()))
                    .thenReturn(new OllamaResult("", 0, 200));
-      ollamaAPI.generate(model, prompt, optionsBuilder.build());
-      verify(ollamaAPI, times(1)).generate(model, prompt, optionsBuilder.build());
+            ollamaAPI.generate(model, prompt, false, optionsBuilder.build());
+            verify(ollamaAPI, times(1)).generate(model, prompt, false, optionsBuilder.build());
        } catch (IOException | OllamaBaseException | InterruptedException e) {
            throw new RuntimeException(e);
        }
@@ -155,9 +156,9 @@ class TestMockedAPIs {
        OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
        String model = OllamaModelType.LLAMA2;
        String prompt = "some prompt text";
-    when(ollamaAPI.generateAsync(model, prompt))
+        when(ollamaAPI.generateAsync(model, prompt, false))
                .thenReturn(new OllamaAsyncResultCallback(null, null, 3));
-    ollamaAPI.generateAsync(model, prompt);
-    verify(ollamaAPI, times(1)).generateAsync(model, prompt);
+        ollamaAPI.generateAsync(model, prompt, false);
+        verify(ollamaAPI, times(1)).generateAsync(model, prompt, false);
    }
 }
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/AbstractRequestSerializationTest.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/AbstractRequestSerializationTest.java
@@ -6,30 +6,30 @@ 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> {
+public abstract class AbstractSerializationTest<T> {

    protected ObjectMapper mapper = Utils.getObjectMapper();

-    protected String serializeRequest(T req) {
+    protected String serialize(T obj) {
        try {
-            return mapper.writeValueAsString(req);
+            return mapper.writeValueAsString(obj);
        } catch (JsonProcessingException e) {
            fail("Could not serialize request!", e);
            return null;
        }
    }

-    protected T deserializeRequest(String jsonRequest, Class<T> requestClass) {
+    protected T deserialize(String jsonObject, Class<T> deserializationClass) {
        try {
-            return mapper.readValue(jsonRequest, requestClass);
+            return mapper.readValue(jsonObject, deserializationClass);
        } catch (JsonProcessingException e) {
-            fail("Could not deserialize jsonRequest!", e);
+            fail("Could not deserialize jsonObject!", e);
            return null;
        }
    }

-    protected void assertEqualsAfterUnmarshalling(T unmarshalledRequest,
+    protected void assertEqualsAfterUnmarshalling(T unmarshalledObject,
        T req) {
-        assertEquals(req, unmarshalledRequest);
+        assertEquals(req, unmarshalledObject);
    }
 }
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java
@@ -14,7 +14,7 @@ import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilde
 import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;

-public class TestChatRequestSerialization extends AbstractRequestSerializationTest<OllamaChatRequestModel>{
+public class TestChatRequestSerialization extends AbstractSerializationTest<OllamaChatRequestModel> {

    private OllamaChatRequestBuilder builder;

@@ -26,8 +26,8 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
    @Test
    public void testRequestOnlyMandatoryFields() {
        OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt").build();
-        String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaChatRequestModel.class), req);
+        String jsonRequest = serialize(req);
+        assertEqualsAfterUnmarshalling(deserialize(jsonRequest,OllamaChatRequestModel.class), req);
    }

    @Test
@@ -35,28 +35,43 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
        OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.SYSTEM, "System prompt")
        .withMessage(OllamaChatMessageRole.USER, "Some prompt")
        .build();
-        String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaChatRequestModel.class), req);
+        String jsonRequest = serialize(req);
+        assertEqualsAfterUnmarshalling(deserialize(jsonRequest,OllamaChatRequestModel.class), req);
    }

    @Test
    public void testRequestWithMessageAndImage() {
        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);
+        String jsonRequest = serialize(req);
+        assertEqualsAfterUnmarshalling(deserialize(jsonRequest,OllamaChatRequestModel.class), req);
    }

    @Test
    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);
+        String jsonRequest = serialize(req);
+        OllamaChatRequestModel deserializeRequest = deserialize(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
@@ -64,11 +79,35 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe
        OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt")
                .withGetJsonResponse().build();

-        String jsonRequest = serializeRequest(req);
+        String jsonRequest = serialize(req);
        // no jackson deserialization as format property is not boolean ==> omit as deserialization
        // of request is never used in real code anyways
        JSONObject jsonObject = new JSONObject(jsonRequest);
        String requestFormatProperty = jsonObject.getString("format");
        assertEquals("json", requestFormatProperty);
    }
+
+    @Test
+    public void testWithTemplate() {
+        OllamaChatRequestModel req = builder.withTemplate("System Template")
+            .build();
+        String jsonRequest = serialize(req);
+        assertEqualsAfterUnmarshalling(deserialize(jsonRequest, OllamaChatRequestModel.class), req);
+    }
+
+    @Test
+    public void testWithStreaming() {
+        OllamaChatRequestModel req = builder.withStreaming().build();
+        String jsonRequest = serialize(req);
+        assertEquals(deserialize(jsonRequest, OllamaChatRequestModel.class).isStream(), true);
+    }
+
+    @Test
+    public void testWithKeepAlive() {
+        String expectedKeepAlive = "5m";
+        OllamaChatRequestModel req = builder.withKeepAlive(expectedKeepAlive)
+            .build();
+        String jsonRequest = serialize(req);
+        assertEquals(deserialize(jsonRequest, OllamaChatRequestModel.class).getKeepAlive(), expectedKeepAlive);
+    }
 }
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java
@@ -7,7 +7,7 @@ import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsR
 import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;

-public class TestEmbeddingsRequestSerialization extends AbstractRequestSerializationTest<OllamaEmbeddingsRequestModel>{
+public class TestEmbeddingsRequestSerialization extends AbstractSerializationTest<OllamaEmbeddingsRequestModel> {

        private OllamaEmbeddingsRequestBuilder builder;

@@ -19,8 +19,8 @@ public class TestEmbeddingsRequestSerialization extends AbstractRequestSerializa
            @Test
    public void testRequestOnlyMandatoryFields() {
        OllamaEmbeddingsRequestModel req = builder.build();
-        String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest,OllamaEmbeddingsRequestModel.class), req);
+        String jsonRequest = serialize(req);
+        assertEqualsAfterUnmarshalling(deserialize(jsonRequest,OllamaEmbeddingsRequestModel.class), req);
    }

        @Test
@@ -29,8 +29,8 @@ public class TestEmbeddingsRequestSerialization extends AbstractRequestSerializa
            OllamaEmbeddingsRequestModel req = builder
                    .withOptions(b.setMirostat(1).build()).build();

-            String jsonRequest = serializeRequest(req);
-            OllamaEmbeddingsRequestModel deserializeRequest = deserializeRequest(jsonRequest,OllamaEmbeddingsRequestModel.class);
+            String jsonRequest = serialize(req);
+            OllamaEmbeddingsRequestModel deserializeRequest = deserialize(jsonRequest,OllamaEmbeddingsRequestModel.class);
            assertEqualsAfterUnmarshalling(deserializeRequest, req);
            assertEquals(1, deserializeRequest.getOptions().get("mirostat"));
        }
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java
@@ -11,7 +11,7 @@ import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateReque
 import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel;
 import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;

-public class TestGenerateRequestSerialization extends AbstractRequestSerializationTest<OllamaGenerateRequestModel>{
+public class TestGenerateRequestSerialization extends AbstractSerializationTest<OllamaGenerateRequestModel> {

    private OllamaGenerateRequestBuilder builder;

@@ -24,8 +24,8 @@ public class TestGenerateRequestSerialization extends AbstractRequestSerializati
    public void testRequestOnlyMandatoryFields() {
        OllamaGenerateRequestModel req = builder.withPrompt("Some prompt").build();

-        String jsonRequest = serializeRequest(req);
-        assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest, OllamaGenerateRequestModel.class), req);
+        String jsonRequest = serialize(req);
+        assertEqualsAfterUnmarshalling(deserialize(jsonRequest, OllamaGenerateRequestModel.class), req);
    }

    @Test
@@ -34,8 +34,8 @@ public class TestGenerateRequestSerialization extends AbstractRequestSerializati
        OllamaGenerateRequestModel req =
                builder.withPrompt("Some prompt").withOptions(b.setMirostat(1).build()).build();

-        String jsonRequest = serializeRequest(req);
-        OllamaGenerateRequestModel deserializeRequest = deserializeRequest(jsonRequest, OllamaGenerateRequestModel.class);
+        String jsonRequest = serialize(req);
+        OllamaGenerateRequestModel deserializeRequest = deserialize(jsonRequest, OllamaGenerateRequestModel.class);
        assertEqualsAfterUnmarshalling(deserializeRequest, req);
        assertEquals(1, deserializeRequest.getOptions().get("mirostat"));
    }
@@ -45,7 +45,7 @@ public class TestGenerateRequestSerialization extends AbstractRequestSerializati
        OllamaGenerateRequestModel req =
                builder.withPrompt("Some prompt").withGetJsonResponse().build();

-        String jsonRequest = serializeRequest(req);
+        String jsonRequest = serialize(req);
        // no jackson deserialization as format property is not boolean ==> omit as deserialization
        // of request is never used in real code anyways
        JSONObject jsonObject = new JSONObject(jsonRequest);
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestModelRequestSerialization.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestModelRequestSerialization.java
@@ -0,0 +1,42 @@
+package io.github.amithkoujalgi.ollama4j.unittests.jackson;
+
+import io.github.amithkoujalgi.ollama4j.core.models.Model;
+import org.junit.jupiter.api.Test;
+
+public class TestModelRequestSerialization extends AbstractSerializationTest<Model> {
+
+    @Test
+    public void testDeserializationOfModelResponseWithOffsetTime(){
+        String serializedTestStringWithOffsetTime = "{\n"
+                + "\"name\": \"codellama:13b\",\n"
+                + "\"modified_at\": \"2023-11-04T14:56:49.277302595-07:00\",\n"
+                + "\"size\": 7365960935,\n"
+                + "\"digest\": \"9f438cb9cd581fc025612d27f7c1a6669ff83a8bb0ed86c94fcf4c5440555697\",\n"
+                + "\"details\": {\n"
+                + "\"format\": \"gguf\",\n"
+                + "\"family\": \"llama\",\n"
+                + "\"families\": null,\n"
+                + "\"parameter_size\": \"13B\",\n"
+                + "\"quantization_level\": \"Q4_0\"\n"
+                + "}}";
+        deserialize(serializedTestStringWithOffsetTime,Model.class);
+    }
+
+    @Test
+    public void testDeserializationOfModelResponseWithZuluTime(){
+        String serializedTestStringWithZuluTimezone = "{\n"
+                + "\"name\": \"codellama:13b\",\n"
+                + "\"modified_at\": \"2023-11-04T14:56:49.277302595Z\",\n"
+                + "\"size\": 7365960935,\n"
+                + "\"digest\": \"9f438cb9cd581fc025612d27f7c1a6669ff83a8bb0ed86c94fcf4c5440555697\",\n"
+                + "\"details\": {\n"
+                + "\"format\": \"gguf\",\n"
+                + "\"family\": \"llama\",\n"
+                + "\"families\": null,\n"
+                + "\"parameter_size\": \"13B\",\n"
+                + "\"quantization_level\": \"Q4_0\"\n"
+                + "}}";
+        deserialize(serializedTestStringWithZuluTimezone,Model.class);
+    }
+
+}
Author	SHA1	Message	Date
Amith Koujalgi	a05052e095	Updated README.md Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>	2024-07-13 13:47:08 +05:30
Amith Koujalgi	10eb803e26	Updated README.md Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>	2024-07-13 13:46:43 +05:30
koujalgi.amith@gmail.com	bd2da8fdda	updated README.md Signed-off-by: koujalgi.amith@gmail.com <koujalgi.amith@gmail.com>	2024-07-13 19:06:40 +05:30
koujalgi.amith@gmail.com	b0bb082bec	updated README.md Signed-off-by: koujalgi.amith@gmail.com <koujalgi.amith@gmail.com>	2024-07-13 19:06:11 +05:30
koujalgi.amith@gmail.com	81f564ef7f	updated README.md Signed-off-by: koujalgi.amith@gmail.com <koujalgi.amith@gmail.com>	2024-07-13 19:05:01 +05:30
koujalgi.amith@gmail.com	006b52f3db	updated README.md Signed-off-by: koujalgi.amith@gmail.com <koujalgi.amith@gmail.com>	2024-07-13 19:03:12 +05:30
Amith Koujalgi	16634e60e4	clean up Signed-off-by: koujalgi.amith@gmail.com <koujalgi.amith@gmail.com>	2024-07-13 18:34:51 +05:30
koujalgi.amith@gmail.com	db8b73075b	clean up Signed-off-by: koujalgi.amith@gmail.com <koujalgi.amith@gmail.com>	2024-07-13 18:33:51 +05:30
Amith Koujalgi	dc9f79959a	Updated logback-classic version Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>	2024-07-13 18:32:04 +05:30
Amith Koujalgi	88f6d00763	Docs fixes Signed-off-by: Amith Koujalgi <amith.koujalgi@razorthink.com>	2024-07-13 18:24:48 +05:30
Amith Koujalgi	fd3a989a49	Updated GH action to publish docs on release creation Signed-off-by: Amith Koujalgi <amith.koujalgi@razorthink.com>	2024-07-13 18:08:38 +05:30
Amith Koujalgi	7580c6a549	Merge pull request #56 from amithkoujalgi/test Updated GitHub workflows to publish to GItHub packages instead of Maven Central	2024-07-13 18:06:44 +05:30
Amith Koujalgi	9e6503d84b	clean up Signed-off-by: Amith Koujalgi <amith.koujalgi@razorthink.com>	2024-07-13 18:01:53 +05:30
Amith Koujalgi	ee21f7fdd8	Updated GH action to publish maven pkg Signed-off-by: Amith Koujalgi <amith.koujalgi@razorthink.com>	2024-07-13 17:55:25 +05:30
Amith Koujalgi	ecc295f484	Updated GH action to publish maven pkg Signed-off-by: Amith Koujalgi <amith.koujalgi@razorthink.com>	2024-07-13 17:46:09 +05:30
Amith Koujalgi	c528fef5fc	Updated GH action to publish maven pkg Signed-off-by: Amith Koujalgi <amith.koujalgi@razorthink.com>	2024-07-13 17:38:03 +05:30
Amith Koujalgi	38f1bda105	Merge branch 'main' of https://github.com/amithkoujalgi/ollama4j into test	2024-07-13 17:27:43 +05:30
Amith Koujalgi	d8a703503a	Merge remote-tracking branch 'origin/main'	2024-07-13 11:51:09 +05:30
Amith Koujalgi	dd9ba7c937	discarded outdated GH workflows Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>	2024-07-13 11:50:52 +05:30
amithkoujalgi	cf52c9610c	[maven-release-plugin] prepare for next development iteration	2024-07-12 12:07:01 +00:00
amithkoujalgi	e8d709e99a	[maven-release-plugin] prepare release v1.0.77	2024-07-12 12:07:00 +00:00
Amith Koujalgi	51fbedad69	Updated README.md	2024-07-12 17:35:41 +05:30
amithkoujalgi	953605fa73	[maven-release-plugin] prepare for next development iteration	2024-07-12 11:38:03 +00:00
amithkoujalgi	30bfdd9c6d	[maven-release-plugin] prepare release v1.0.76	2024-07-12 11:38:02 +00:00
Amith Koujalgi	91ee6cb4c1	Added support for tools/function calling - specifically for Mistral's latest model.	2024-07-12 17:06:41 +05:30
amithkoujalgi	8ef6fac28e	[maven-release-plugin] prepare for next development iteration	2024-07-11 19:37:04 +00:00
amithkoujalgi	d9e3860123	[maven-release-plugin] prepare release v1.0.75	2024-07-11 19:37:03 +00:00
Amith Koujalgi	515d1f0399	Update README.md	2024-07-12 01:05:56 +05:30
amithkoujalgi	be549430c5	[maven-release-plugin] prepare for next development iteration	2024-07-11 18:07:00 +00:00
amithkoujalgi	4744315d45	[maven-release-plugin] prepare release v1.0.74	2024-07-11 18:06:59 +00:00
Amith Koujalgi	8eea19a539	Added model types - `gemma2` and `qwen2`	2024-07-11 23:35:39 +05:30
amithkoujalgi	b5801d84e0	[maven-release-plugin] prepare for next development iteration	2024-06-12 03:22:50 +00:00
amithkoujalgi	165d04b1bb	[maven-release-plugin] prepare release v1.0.73	2024-06-12 03:22:49 +00:00
Amith Koujalgi	16d2160b52	Merge pull request #51 from ajt001/main	2024-06-12 08:51:43 +05:30
andrewtodd	e39c47b8e1	Add codestral as a model.	2024-06-09 16:43:46 +10:00
amithkoujalgi	bb0785140b	[maven-release-plugin] prepare for next development iteration	2024-05-20 14:55:02 +00:00
amithkoujalgi	e33ad1a1e3	[maven-release-plugin] prepare release v1.0.72	2024-05-20 14:55:01 +00:00
Amith Koujalgi	cd60c506cb	Merge pull request #47 from kelvinwatson/kelvinwatson/gradleDependencyInReadMe Update README to include gradle project set up options	2024-05-20 20:24:03 +05:30
amithkoujalgi	b55925df28	[maven-release-plugin] prepare for next development iteration	2024-05-20 14:53:55 +00:00
amithkoujalgi	3a9b8c309d	[maven-release-plugin] prepare release v1.0.71	2024-05-20 14:53:54 +00:00
Amith Koujalgi	bf07159522	Merge pull request #49 from AgentSchmecker/bugfix/48 Changes Datatype of ModelResponse fields to OffsetTime	2024-05-20 20:22:56 +05:30
AgentSchmecker	f8ca4d041d	Changes DateTime types of Model.java to OffsetDatetime Fixes #48	2024-05-20 11:10:03 +00:00
AgentSchmecker	9c6a55f7b0	Generalizes Abstract Serialization Test Class Removes the "Request" naming context as this base class technically serves for general serialization purposes.	2024-05-20 11:08:49 +00:00
Kelvin Watson	2866d83a2f	Update README.md	2024-05-19 11:58:08 -07:00
Kelvin Watson	45e5d07581	update README to include gradle options	2024-05-19 11:57:09 -07:00
amithkoujalgi	3a264cb6bb	[maven-release-plugin] prepare for next development iteration	2024-05-19 13:57:34 +00:00
amithkoujalgi	e1b9d42771	[maven-release-plugin] prepare release v1.0.70	2024-05-19 13:57:32 +00:00
Amith Koujalgi	1a086c37c0	Merge pull request #46 from AgentSchmecker/model_update Updates Model.java to be up to date with current OllamaAPI	2024-05-19 19:26:28 +05:30
Markus Klenke	54edba144c	Merge pull request #2 from AgentSchmecker/model_update Updates Model.java to be up to date with current OllamaAPI	2024-05-17 00:09:15 +02:00
AgentSchmecker	3ed3187ba9	Updates Model.java to be up to date with current OllamaAPI Also adds Jackson-JSR310 for java.time JSON Mapping	2024-05-16 22:00:11 +00:00
amithkoujalgi	b7cd81a7f5	[maven-release-plugin] prepare for next development iteration	2024-05-14 05:42:56 +00:00
amithkoujalgi	e750c2d7f9	[maven-release-plugin] prepare release v1.0.69	2024-05-14 05:42:55 +00:00
Amith Koujalgi	62f16131f3	Merge remote-tracking branch 'origin/main'	2024-05-14 11:11:51 +05:30
Amith Koujalgi	2cbaf12d7c	Updated library usages in README.md	2024-05-14 11:11:38 +05:30
amithkoujalgi	e2d555d404	[maven-release-plugin] prepare for next development iteration	2024-05-14 05:29:36 +00:00
amithkoujalgi	c296b34174	[maven-release-plugin] prepare release v1.0.68	2024-05-14 05:29:35 +00:00
Amith Koujalgi	e8f99f28ec	Updated library usages in README.md	2024-05-14 10:58:29 +05:30
amithkoujalgi	250b1abc79	[maven-release-plugin] prepare for next development iteration	2024-05-14 05:07:20 +00:00
amithkoujalgi	42b15ad93f	[maven-release-plugin] prepare release v1.0.67	2024-05-14 05:07:18 +00:00
Amith Koujalgi	6f7a714bae	Merge remote-tracking branch 'origin/main'	2024-05-14 10:36:04 +05:30
Amith Koujalgi	92618e5084	Updated `OllamaChatResponseModel` to include `done_reason` field. Refer to the Ollama version: https://github.com/ollama/ollama/releases/tag/v0.1.37	2024-05-14 10:35:55 +05:30
amithkoujalgi	391a9242c3	[maven-release-plugin] prepare for next development iteration	2024-05-14 04:59:08 +00:00
amithkoujalgi	e1b6dc3b54	[maven-release-plugin] prepare release v1.0.66	2024-05-14 04:59:07 +00:00
Amith Koujalgi	04124cf978	Updated default request timeout to 10 seconds	2024-05-14 10:27:56 +05:30
amithkoujalgi	e4e717b747	[maven-release-plugin] prepare for next development iteration	2024-05-13 15:36:38 +00:00
amithkoujalgi	10d2a8f5ff	[maven-release-plugin] prepare release v1.0.65	2024-05-13 15:36:37 +00:00
Amith Koujalgi	899fa38805	- Updated newly supported Ollama models - Added `ConsoleOutputStreamHandler`	2024-05-13 21:05:20 +05:30
amithkoujalgi	2df878c953	[maven-release-plugin] prepare for next development iteration	2024-04-22 04:39:41 +00:00
amithkoujalgi	78a5eedc8f	[maven-release-plugin] prepare release v1.0.64	2024-04-22 04:39:40 +00:00
Amith Koujalgi	364f961ee2	Merge pull request #37 from anjeongkyun/eddy/add-test1 Adds test case of OllamaChatRequestBuilder	2024-04-22 10:08:32 +05:30
anjeongkyun	b21aa6add2	Adds test of testWithKeepAlive	2024-04-21 23:52:42 +09:00
anjeongkyun	ec4abd1c2d	Adds test of testWithStreaming	2024-04-21 23:49:42 +09:00
anjeongkyun	9900ae92fb	Adds test of testWithTemplate	2024-04-21 23:43:49 +09:00
anjeongkyun	fa20daf6e5	Adds test case of testRequestWithOptions	2024-04-21 23:37:18 +09:00
amithkoujalgi	44949c0559	[maven-release-plugin] prepare for next development iteration	2024-03-20 10:44:54 +00:00
amithkoujalgi	e88711a017	[maven-release-plugin] prepare release v1.0.63	2024-03-20 10:44:52 +00:00
Amith Koujalgi	32169ded18	Merge pull request #33 from anjeongkyun/fix/prompt-builder-docs	2024-03-20 16:13:42 +05:30
anjeongkyun	4b2d566fd9	Fixes generate method of prompt builder	2024-03-19 21:04:26 +09:00
amithkoujalgi	fb4b7a7ce5	[maven-release-plugin] prepare for next development iteration	2024-03-02 17:49:32 +00:00
amithkoujalgi	18f27775b0	[maven-release-plugin] prepare release v1.0.62	2024-03-02 17:49:31 +00:00
Amith Koujalgi	cb462ad05a	Merge remote-tracking branch 'origin/main'	2024-03-02 23:18:23 +05:30
Amith Koujalgi	1eec22ca1a	Added release-assets GH action	2024-03-02 23:18:15 +05:30
amithkoujalgi	c1f3c51f88	[maven-release-plugin] prepare for next development iteration	2024-03-02 15:08:58 +00:00
Amith Koujalgi	9224d2da06	Updated base route of docs	2024-02-22 11:50:41 +05:30