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

Merge pull request #22 from AgentSchmecker/bugfix/add_model_property_to_model_api
Adds model property to Model Type
2025-10-26 22:20:41 +01:00 · 2024-02-09 18:19:36 +00:00 · 2024-02-09 23:48:36 +05:30 · 2024-02-09 16:54:09 +00:00 · 2024-02-09 06:39:34 +00:00 · 2024-02-09 06:39:33 +00:00
36 changed files with 2672 additions and 223 deletions
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -49,6 +49,10 @@ jobs:
            ${{ 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' &&
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -50,6 +50,12 @@ jobs:
      - name: Build with Maven
        run: mvn --file pom.xml -U clean package && cp -r ./target/apidocs/. ./docs/build/apidocs

+      - name: Doxygen Action
+        uses: mattnotmitt/doxygen-action@v1.1.0
+        with:
+          doxyfile-path: "./Doxyfile"
+          working-directory: "."
+
      - name: Setup Pages
        uses: actions/configure-pages@v3
      - name: Upload artifact
--- a/413
+++ b/413
@@ -0,0 +1,413 @@
+# Doxyfile 1.10.0
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = "Ollama4j"
+PROJECT_NUMBER         =
+PROJECT_BRIEF          = "A Java library (wrapper/binding) for Ollama server."
+PROJECT_LOGO           = ./logo-small.png
+PROJECT_ICON           = ./logo-small.png
+OUTPUT_DIRECTORY       = ./docs/build/doxygen
+CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS_LEVEL   = 8
+ALLOW_UNICODE_NAMES    = NO
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+JAVADOC_BANNER         = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+PYTHON_DOCSTRING       = YES
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 4
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = YES
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
+MARKDOWN_ID_STYLE      = DOXYGEN
+AUTOLINK_SUPPORT       = YES
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+NUM_PROC_THREADS       = 1
+TIMESTAMP              = NO
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PACKAGE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
+RESOLVE_UNNAMED_PARAMS = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = SYSTEM
+HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_HEADERFILE        = YES
+SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_IF_INCOMPLETE_DOC = YES
+WARN_NO_PARAMDOC       = NO
+WARN_IF_UNDOC_ENUM_VAL = NO
+WARN_AS_ERROR          = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LINE_FORMAT       = "at line $line of file $file"
+WARN_LOGFILE           =
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = ./src/main
+INPUT_ENCODING         = UTF-8
+INPUT_FILE_ENCODING    =
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cxxm \
+                         *.cpp \
+                         *.cppm \
+                         *.ccm \
+                         *.c++ \
+                         *.c++m \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.ixx \
+                         *.l \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f18 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
+RECURSIVE              = YES
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       = *
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
+FORTRAN_COMMENT_AFTER  = 72
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = NO
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+CLANG_ASSISTED_PARSING = NO
+CLANG_ADD_INC_PATHS    = YES
+CLANG_OPTIONS          =
+CLANG_DATABASE_PATH    =
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+IGNORE_PREFIX          =
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE        = LIGHT
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_CODE_FOLDING      = YES
+HTML_COPY_CLIPBOARD    = YES
+HTML_PROJECT_COOKIE    =
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_FEEDURL         =
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+SITEMAP_URL            =
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
+DISABLE_INDEX          = NO
+GENERATE_TREEVIEW      = YES
+FULL_SIDEBAR           = NO
+ENUM_VALUES_PER_LINE   = 4
+TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+OBFUSCATE_EMAILS       = YES
+HTML_FORMULA_FORMAT    = png
+FORMULA_FONTSIZE       = 10
+FORMULA_MACROFILE      =
+USE_MATHJAX            = NO
+MATHJAX_VERSION        = MathJax_2
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        =
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = YES
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = YES
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         =
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_BIB_STYLE        = plain
+LATEX_EMOJI_DIRECTORY  =
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_SUBDIR             =
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# Configuration options related to Sqlite3 output
+#---------------------------------------------------------------------------
+GENERATE_SQLITE3       = NO
+SQLITE3_OUTPUT         = sqlite3
+SQLITE3_RECREATE_DB    = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
+#---------------------------------------------------------------------------
+# Configuration options related to diagram generator tools
+#---------------------------------------------------------------------------
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+DOT_NUM_THREADS        = 0
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+UML_LIMIT_NUM_FIELDS   = 10
+DOT_UML_DETAILS        = NO
+DOT_WRAP_THRESHOLD     = 17
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DIR_GRAPH_MAX_DEPTH    = 1
+DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+DIA_PATH               =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+MSCGEN_TOOL            =
+MSCFILE_DIRS           =
--- a/17
+++ b/17
@@ -7,7 +7,22 @@ ut:
 it:
 	mvn clean verify -Pintegration-tests

+doxygen:
+	doxygen Doxyfile
+
 list-releases:
 	curl 'https://central.sonatype.com/api/internal/browse/component/versions?sortField=normalizedVersion&sortDirection=asc&page=0&size=12&filter=namespace%3Aio.github.amithkoujalgi%2Cname%3Aollama4j' \
      --compressed \
-      --silent | jq '.components[].version'
+      --silent | jq '.components[].version'
+
+build-docs:
+	npm i --prefix docs && npm run build --prefix docs
+
+start-docs:
+	npm i --prefix docs && npm run start --prefix docs
+
+start-cpu:
+	docker run -it -v ~/ollama:/root/.ollama -p 11434:11434 ollama/ollama
+
+start-gpu:
+	docker run -it --gpus=all -v ~/ollama:/root/.ollama -p 11434:11434 ollama/ollama
--- a/README.md
+++ b/README.md
@@ -2,8 +2,35 @@

 <img src='https://raw.githubusercontent.com/amithkoujalgi/ollama4j/65a9d526150da8fcd98e2af6a164f055572bf722/ollama4j.jpeg' width='100' alt="ollama4j-icon">

-A Java library (wrapper/binding)
-for [Ollama](https://github.com/jmorganca/ollama/blob/main/docs/api.md) APIs.
+A Java library (wrapper/binding) for [Ollama](https://ollama.ai/) server.
+
+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)
+![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)
+
+![Build Status](https://github.com/amithkoujalgi/ollama4j/actions/workflows/maven-publish.yml/badge.svg)
+
+## 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)
+- [Development](#development)
+- [Contributions](#get-involved)
+- [References](#references)
+
+#### How does it work?

 ```mermaid
  flowchart LR
@@ -17,39 +44,19 @@ for [Ollama](https://github.com/jmorganca/ollama/blob/main/docs/api.md) APIs.
    end
 ```

-![Build Status](https://github.com/amithkoujalgi/ollama4j/actions/workflows/maven-publish.yml/badge.svg)
-
-![GitHub stars](https://img.shields.io/github/stars/amithkoujalgi/ollama4j?style=social)
-![GitHub forks](https://img.shields.io/github/forks/amithkoujalgi/ollama4j?style=social)
-![GitHub watchers](https://img.shields.io/github/watchers/amithkoujalgi/ollama4j?style=social)
-![GitHub repo size](https://img.shields.io/github/repo-size/amithkoujalgi/ollama4j?style=plastic)
-![GitHub language count](https://img.shields.io/github/languages/count/amithkoujalgi/ollama4j?style=plastic)
-![GitHub top language](https://img.shields.io/github/languages/top/amithkoujalgi/ollama4j?style=plastic)
-![GitHub last commit](https://img.shields.io/github/last-commit/amithkoujalgi/ollama4j?color=red&style=plastic)
-![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)
-
-## Table of Contents
-
- [Requirements](#requirements)
- [Installation](#installation)
- [API Spec](#api-spec)
- [Demo APIs](#try-out-the-apis-with-ollama-server)
- [Development](#development)
- [Contributions](#get-involved)
-
 #### Requirements

-![Java](https://img.shields.io/badge/Java-11_+-green.svg?style=for-the-badge&labelColor=gray)
+![Java](https://img.shields.io/badge/Java-11_+-green.svg?style=just-the-message&labelColor=gray)

-[![][ollama-shield]][ollama] Or  [![][ollama-docker-shield]][ollama-docker]
+[![][ollama-shield]][ollama] **Or** [![][ollama-docker-shield]][ollama-docker]

 [ollama]: https://ollama.ai/

-[ollama-shield]: https://img.shields.io/badge/Ollama-Local_Installation-blue.svg?style=for-the-badge&labelColor=gray
+[ollama-shield]: https://img.shields.io/badge/Ollama-Local_Installation-blue.svg?style=just-the-message&labelColor=gray

 [ollama-docker]: https://hub.docker.com/r/ollama/ollama

-[ollama-docker-shield]: https://img.shields.io/badge/Ollama-Docker-blue.svg?style=for-the-badge&labelColor=gray
+[ollama-docker-shield]: https://img.shields.io/badge/Ollama-Docker-blue.svg?style=just-the-message&labelColor=gray

 #### Installation

@@ -60,21 +67,23 @@ In your Maven project, add this dependency:
 <dependency>
    <groupId>io.github.amithkoujalgi</groupId>
    <artifactId>ollama4j</artifactId>
-    <version>1.0.29</version>
+    <version>1.0.47</version>
 </dependency>
 ```

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

 [![][lib-shield]][lib]

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

-[lib-shield]: https://img.shields.io/badge/ollama4j-get_latest_version-blue.svg?style=for-the-badge&labelColor=gray
+[lib-shield]: https://img.shields.io/badge/ollama4j-get_latest_version-blue.svg?style=just-the-message&labelColor=gray

 #### API Spec

-Find the full `Javadoc` (API specifications) [here](https://amithkoujalgi.github.io/ollama4j/).
+Find the full API specifications on the [website](https://amithkoujalgi.github.io/ollama4j/).

 #### Development

@@ -115,14 +124,16 @@ Actions CI workflow.
 - [x] Use lombok
 - [x] Update request body creation with Java objects
 - [ ] Async APIs for images
+- [ ] Add custom headers to requests
 - [ ] Add additional params for `ask` APIs such as:
-    - `options`: additional model parameters for the Modelfile such as `temperature`
-    - `system`: system prompt to (overrides what is defined in the Modelfile)
-    - `template`: the full prompt or prompt template (overrides what is defined in the Modelfile)
-    - `context`: the context parameter returned from a previous request, which can be used to keep a
+    - [x] `options`: additional model parameters for the Modelfile such as `temperature` -
+      Supported [params](https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values).
+    - [ ] `system`: system prompt to (overrides what is defined in the Modelfile)
+    - [ ] `template`: the full prompt or prompt template (overrides what is defined in the Modelfile)
+    - [ ] `context`: the context parameter returned from a previous request, which can be used to keep a
      short
      conversational memory
-    - `stream`: Add support for streaming responses from the model
+    - [ ] `stream`: Add support for streaming responses from the model
 - [ ] Add test cases
 - [ ] Handle exceptions better (maybe throw more appropriate exceptions)

@@ -136,3 +147,7 @@ of contribution is much appreciated.

 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)
--- a/docs/docs/apis-ask/ask-async.md
+++ b/docs/docs/apis-ask/ask-async.md
@@ -2,7 +2,7 @@
 sidebar_position: 2
 ---

-# Ask - Async
+# Generate - Async

 This API lets you ask questions to the LLMs in a asynchronous way.
 These APIs correlate to
@@ -19,13 +19,13 @@ public class Main {

        String prompt = "Who are you?";

-        OllamaAsyncResultCallback callback = ollamaAPI.askAsync(OllamaModelType.LLAMA2, prompt);
+        OllamaAsyncResultCallback callback = ollamaAPI.generateAsync(OllamaModelType.LLAMA2, prompt);

        while (!callback.isComplete() || !callback.getStream().isEmpty()) {
            // poll for data from the response stream
            String result = callback.getStream().poll();
-            if (response != null) {
-                System.out.print(result.getResponse());
+            if (result != null) {
+                System.out.print(result);
            }
            Thread.sleep(100);
        }
--- a/docs/docs/apis-ask/ask-with-image-files.md
+++ b/docs/docs/apis-ask/ask-with-image-files.md
@@ -2,20 +2,20 @@
 sidebar_position: 3
 ---

-# Ask - With Image Files
+# Generate - With Image Files

 This API lets you ask questions along with the image files to the LLMs.
 These APIs correlate to
 the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion) APIs.

-:::caution
+:::note

 Executing this on Ollama server running in CPU-mode will take longer to generate response. Hence, GPU-mode is
 recommended.

 :::

-## Ask (Sync)
+## Synchronous mode

 If you have this image downloaded and you pass the path to the downloaded image to the following code:

@@ -29,7 +29,7 @@ public class Main {
        OllamaAPI ollamaAPI = new OllamaAPI(host);
        ollamaAPI.setRequestTimeoutSeconds(10);

-        OllamaResult result = ollamaAPI.askWithImageFiles(OllamaModelType.LLAVA,
+        OllamaResult result = ollamaAPI.generateWithImageFiles(OllamaModelType.LLAVA,
                "What's in this image?",
                List.of(
                        new File("/path/to/image")));
--- a/docs/docs/apis-ask/ask-with-image-urls.md
+++ b/docs/docs/apis-ask/ask-with-image-urls.md
@@ -2,13 +2,13 @@
 sidebar_position: 4
 ---

-# Ask - With Image URLs
+# Generate - With Image URLs

 This API lets you ask questions along with the image files to the LLMs.
 These APIs correlate to
 the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion) APIs.

-:::caution
+:::note

 Executing this on Ollama server running in CPU-mode will take longer to generate response. Hence, GPU-mode is
 recommended.
@@ -29,7 +29,7 @@ public class Main {
        OllamaAPI ollamaAPI = new OllamaAPI(host);
        ollamaAPI.setRequestTimeoutSeconds(10);

-        OllamaResult result = ollamaAPI.askWithImageURLs(OllamaModelType.LLAVA,
+        OllamaResult result = ollamaAPI.generateWithImageURLs(OllamaModelType.LLAVA,
                "What's in this image?",
                List.of(
                        "https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg"));
--- a/docs/docs/apis-ask/ask.md
+++ b/docs/docs/apis-ask/ask.md
@@ -2,12 +2,17 @@
 sidebar_position: 1
 ---

-# Ask - Sync
+# Generate - Sync

 This API lets you ask questions to the LLMs in a synchronous way.
 These APIs correlate to
 the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion) APIs.

+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).
+
 ## Try asking a question about the model.

 ```java
@@ -19,11 +24,13 @@ public class Main {

        OllamaAPI ollamaAPI = new OllamaAPI(host);

-        OllamaResult result = ollamaAPI.ask(OllamaModelType.LLAMA2, "Who are you?");
+        OllamaResult result =
+                ollamaAPI.generate(OllamaModelType.LLAMA2, "Who are you?", new OptionsBuilder().build());

        System.out.println(result.getResponse());
    }
 }
+
 ```

 You will get a response similar to:
@@ -47,11 +54,13 @@ public class Main {

        String prompt = "List all cricket world cup teams of 2019.";

-        OllamaResult result = ollamaAPI.ask(OllamaModelType.LLAMA2, prompt);
+        OllamaResult result =
+                ollamaAPI.generate(OllamaModelType.LLAMA2, prompt, new OptionsBuilder().build());

        System.out.println(result.getResponse());
    }
 }
+
 ```

 You'd then get a response from the model:
@@ -84,12 +93,15 @@ public class Main {
        String host = "http://localhost:11434/";
        OllamaAPI ollamaAPI = new OllamaAPI(host);

-        String prompt = SamplePrompts.getSampleDatabasePromptWithQuestion(
-                "List all customer names who have bought one or more products");
-        OllamaResult result = ollamaAPI.ask(OllamaModelType.SQLCODER, prompt);
+        String prompt =
+                SamplePrompts.getSampleDatabasePromptWithQuestion(
+                        "List all customer names who have bought one or more products");
+        OllamaResult result =
+                ollamaAPI.generate(OllamaModelType.SQLCODER, prompt, new OptionsBuilder().build());
        System.out.println(result.getResponse());
    }
 }
+
 ```

 _Note: Here I've used
--- a/docs/docs/apis-ask/generate-embeddings.md
+++ b/docs/docs/apis-ask/generate-embeddings.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 5
+sidebar_position: 6
 ---

 # Generate Embeddings
@@ -30,17 +30,17 @@ public class Main {

 You will get a response similar to:

-```json
+```javascript
 [
-  0.5670403838157654,
-  0.009260174818336964,
-  0.23178744316101074,
-  -0.2916173040866852,
-  -0.8924556970596313,
-  0.8785552978515625,
-  -0.34576427936553955,
-  0.5742510557174683,
-  -0.04222835972905159,
-  -0.137906014919281
+    0.5670403838157654,
+    0.009260174818336964,
+    0.23178744316101074,
+    -0.2916173040866852,
+    -0.8924556970596313,
+    0.8785552978515625,
+    -0.34576427936553955,
+    0.5742510557174683,
+    -0.04222835972905159,
+    -0.137906014919281
 ]
 ```
--- a/docs/docs/apis-ask/prompt-builder.md
+++ b/docs/docs/apis-ask/prompt-builder.md
@@ -0,0 +1,73 @@
+---
+sidebar_position: 5
+---
+
+# Prompt Builder
+
+This is designed for prompt engineering. It allows you to easily build the prompt text for zero-shot, one-shot, few-shot
+inferences.
+
+```java
+
+import io.github.amithkoujalgi.ollama4j.core.OllamaAPI;
+import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult;
+import io.github.amithkoujalgi.ollama4j.core.types.OllamaModelType;
+import io.github.amithkoujalgi.ollama4j.core.utils.PromptBuilder;
+
+public class AskPhi {
+    public static void main(String[] args) throws Exception {
+
+        String host = "http://localhost:11434/";
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+        ollamaAPI.setRequestTimeoutSeconds(10);
+
+        String model = OllamaModelType.PHI;
+
+        PromptBuilder promptBuilder =
+                new PromptBuilder()
+                        .addLine("You are an expert coder and understand different programming languages.")
+                        .addLine("Given a question, answer ONLY with code.")
+                        .addLine("Produce clean, formatted and indented code in markdown format.")
+                        .addLine(
+                                "DO NOT include ANY extra text apart from code. Follow this instruction very strictly!")
+                        .addLine("If there's any additional information you want to add, use comments within code.")
+                        .addLine("Answer only in the programming language that has been asked for.")
+                        .addSeparator()
+                        .addLine("Example: Sum 2 numbers in Python")
+                        .addLine("Answer:")
+                        .addLine("```python")
+                        .addLine("def sum(num1: int, num2: int) -> int:")
+                        .addLine("    return num1 + num2")
+                        .addLine("```")
+                        .addSeparator()
+                        .add("How do I read a file in Go and print its contents to stdout?");
+
+        OllamaResult response = ollamaAPI.generate(model, promptBuilder.build());
+        System.out.println(response.getResponse());
+    }
+}
+```
+
+You will get a response similar to:
+
+```go
+package main
+
+import (
+    "fmt"
+    "io/ioutil"
+)
+
+func readFile(fileName string) {
+    file, err := ioutil.ReadFile(fileName)
+    if err != nil {
+        fmt.Fprintln(os.Stderr, "Error reading file:", err.Error())
+        return
+    }
+
+    f, _ := ioutil.ReadFile("file.txt")
+    if f != nil {
+        fmt.Println(f.String())
+    }
+}
+```
--- a/docs/docs/apis-extras/basic-auth.md
+++ b/docs/docs/apis-extras/basic-auth.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 2
+---
+
+# Set Basic Authentication
+
+This API lets you set the basic authentication for the Ollama client. This would help in scenarios where
+Ollama server would be setup behind a gateway/reverse proxy with basic auth.
+
+After configuring basic authentication, all subsequent requests will include the Basic Auth header.
+
+```java
+public class Main {
+
+    public static void main(String[] args) {
+
+        String host = "http://localhost:11434/";
+
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+
+        ollamaAPI.setBasicAuth("username", "password");
+    }
+}
+```
--- a/docs/docs/apis-extras/options-builder.md
+++ b/docs/docs/apis-extras/options-builder.md
@@ -0,0 +1,78 @@
+---
+sidebar_position: 1
+---
+
+# Options Builder
+
+This lets you build options for the `ask()` API.
+
+Following are the parameters supported by Ollama:
+
+| Parameter      | Description                                                                                                                                                                                                                                             | Value Type | Example Usage        |
+|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|----------------------|
+| mirostat       | Enable Mirostat sampling for controlling perplexity. (default: 0, 0 = disabled, 1 = Mirostat, 2 = Mirostat 2.0)                                                                                                                                         | int        | mirostat 0           |
+| mirostat_eta   | Influences how quickly the algorithm responds to feedback from the generated text. A lower learning rate will result in slower adjustments, while a higher learning rate will make the algorithm more responsive. (Default: 0.1)                        | float      | mirostat_eta 0.1     |
+| mirostat_tau   | Controls the balance between coherence and diversity of the output. A lower value will result in more focused and coherent text. (Default: 5.0)                                                                                                         | float      | mirostat_tau 5.0     |
+| num_ctx        | Sets the size of the context window used to generate the next token. (Default: 2048)                                                                                                                                                                    | int        | num_ctx 4096         |
+| num_gqa        | The number of GQA groups in the transformer layer. Required for some models, for example it is 8 for llama2:70b                                                                                                                                         | int        | num_gqa 1            |
+| num_gpu        | The number of layers to send to the GPU(s). On macOS it defaults to 1 to enable metal support, 0 to disable.                                                                                                                                            | int        | num_gpu 50           |
+| num_thread     | Sets the number of threads to use during computation. By default, Ollama will detect this for optimal performance. It is recommended to set this value to the number of physical CPU cores your system has (as opposed to the logical number of cores). | int        | num_thread 8         |
+| repeat_last_n  | Sets how far back for the model to look back to prevent repetition. (Default: 64, 0 = disabled, -1 = num_ctx)                                                                                                                                           | int        | repeat_last_n 64     |
+| repeat_penalty | Sets how strongly to penalize repetitions. A higher value (e.g., 1.5) will penalize repetitions more strongly, while a lower value (e.g., 0.9) will be more lenient. (Default: 1.1)                                                                     | float      | repeat_penalty 1.1   |
+| temperature    | The temperature of the model. Increasing the temperature will make the model answer more creatively. (Default: 0.8)                                                                                                                                     | float      | temperature 0.7      |
+| seed           | Sets the random number seed to use for generation. Setting this to a specific number will make the model generate the same text for the same prompt. (Default: 0)                                                                                       | int        | seed 42              |
+| stop           | Sets the stop sequences to use. When this pattern is encountered the LLM will stop generating text and return. Multiple stop patterns may be set by specifying multiple separate `stop` parameters in a modelfile.                                      | string     | stop "AI assistant:" |
+| tfs_z          | Tail free sampling is used to reduce the impact of less probable tokens from the output. A higher value (e.g., 2.0) will reduce the impact more, while a value of 1.0 disables this setting. (default: 1)                                               | float      | tfs_z 1              |
+| num_predict    | Maximum number of tokens to predict when generating text. (Default: 128, -1 = infinite generation, -2 = fill context)                                                                                                                                   | int        | num_predict 42       |
+| top_k          | Reduces the probability of generating nonsense. A higher value (e.g. 100) will give more diverse answers, while a lower value (e.g. 10) will be more conservative. (Default: 40)                                                                        | int        | top_k 40             |
+| top_p          | Works together with top-k. A higher value (e.g., 0.95) will lead to more diverse text, while a lower value (e.g., 0.5) will generate more focused and conservative text. (Default: 0.9)                                                                 | float      | top_p 0.9            |
+
+Link to [source](https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values).
+
+Also, see how to set those Ollama parameters using
+the `OptionsBuilder`
+from [javadoc](https://amithkoujalgi.github.io/ollama4j/apidocs/io/github/amithkoujalgi/ollama4j/core/utils/OptionsBuilder.html).
+
+## Build an empty `Options` object
+
+```java
+import io.github.amithkoujalgi.ollama4j.core.utils.Options;
+import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+
+public class Main {
+
+    public static void main(String[] args) {
+
+        String host = "http://localhost:11434/";
+
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+
+        Options options = new OptionsBuilder().build();
+    }
+}
+```
+
+## Build the `Options` object with values
+
+```java
+import io.github.amithkoujalgi.ollama4j.core.utils.Options;
+import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+
+public class Main {
+
+    public static void main(String[] args) {
+
+        String host = "http://localhost:11434/";
+
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+
+        Options options =
+                new OptionsBuilder()
+                        .setMirostat(10)
+                        .setMirostatEta(0.5f)
+                        .setNumGpu(2)
+                        .setTemperature(1.5f)
+                        .build();
+    }
+}
+```
--- a/docs/docs/apis-model-management/create-model.md
+++ b/docs/docs/apis-model-management/create-model.md
@@ -6,6 +6,8 @@ sidebar_position: 4

 This API lets you create a custom model on the Ollama server.

+### Create a model from an existing Modelfile in the Ollama server
+
 ```java title="CreateModel.java"
 public class CreateModel {

@@ -15,9 +17,144 @@ public class CreateModel {

        OllamaAPI ollamaAPI = new OllamaAPI(host);

-        ollamaAPI.createModel("mycustommodel", "/path/to/modelfile/on/ollama-server");
+        ollamaAPI.createModelWithFilePath("mario", "/path/to/mario/modelfile/on/ollama-server");
    }
 }
 ```

-Once created, you can see it when you use [list models](./list-models) API.
+### Create a model by passing the contents of Modelfile
+
+```java title="CreateModel.java"
+public class CreateModel {
+
+    public static void main(String[] args) {
+
+        String host = "http://localhost:11434/";
+
+        OllamaAPI ollamaAPI = new OllamaAPI(host);
+
+        ollamaAPI.createModelWithModelFileContents("mario", "FROM llama2\nSYSTEM You are mario from Super Mario Bros.");
+    }
+}
+```
+
+Once created, you can see it when you use [list models](./list-models) API.
+
+### Example of a `Modelfile`
+
+```
+FROM llama2
+# sets the temperature to 1 [higher is more creative, lower is more coherent]
+PARAMETER temperature 1
+# sets the context window size to 4096, this controls how many tokens the LLM can use as context to generate the next token
+PARAMETER num_ctx 4096
+
+# sets a custom system message to specify the behavior of the chat assistant
+SYSTEM You are Mario from super mario bros, acting as an assistant.
+```
+
+### Format of the `Modelfile`
+
+```modelfile
+# comment
+INSTRUCTION arguments
+```
+
+| Instruction                         | Description                                                    |
+|-------------------------------------|----------------------------------------------------------------|
+| [`FROM`](#from-required) (required) | Defines the base model to use.                                 |
+| [`PARAMETER`](#parameter)           | Sets the parameters for how Ollama will run the model.         |
+| [`TEMPLATE`](#template)             | The full prompt template to be sent to the model.              |
+| [`SYSTEM`](#system)                 | Specifies the system message that will be set in the template. |
+| [`ADAPTER`](#adapter)               | Defines the (Q)LoRA adapters to apply to the model.            |
+| [`LICENSE`](#license)               | Specifies the legal license.                                   |
+
+#### PARAMETER
+
+The `PARAMETER` instruction defines a parameter that can be set when the model is run.
+
+| Parameter      | Description                                                                                                                                                                                                                                             | Value Type | Example Usage        |
+|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|----------------------|
+| mirostat       | Enable Mirostat sampling for controlling perplexity. (default: 0, 0 = disabled, 1 = Mirostat, 2 = Mirostat 2.0)                                                                                                                                         | int        | mirostat 0           |
+| mirostat_eta   | Influences how quickly the algorithm responds to feedback from the generated text. A lower learning rate will result in slower adjustments, while a higher learning rate will make the algorithm more responsive. (Default: 0.1)                        | float      | mirostat_eta 0.1     |
+| mirostat_tau   | Controls the balance between coherence and diversity of the output. A lower value will result in more focused and coherent text. (Default: 5.0)                                                                                                         | float      | mirostat_tau 5.0     |
+| num_ctx        | Sets the size of the context window used to generate the next token. (Default: 2048)                                                                                                                                                                    | int        | num_ctx 4096         |
+| num_gqa        | The number of GQA groups in the transformer layer. Required for some models, for example it is 8 for llama2:70b                                                                                                                                         | int        | num_gqa 1            |
+| num_gpu        | The number of layers to send to the GPU(s). On macOS it defaults to 1 to enable metal support, 0 to disable.                                                                                                                                            | int        | num_gpu 50           |
+| num_thread     | Sets the number of threads to use during computation. By default, Ollama will detect this for optimal performance. It is recommended to set this value to the number of physical CPU cores your system has (as opposed to the logical number of cores). | int        | num_thread 8         |
+| repeat_last_n  | Sets how far back for the model to look back to prevent repetition. (Default: 64, 0 = disabled, -1 = num_ctx)                                                                                                                                           | int        | repeat_last_n 64     |
+| repeat_penalty | Sets how strongly to penalize repetitions. A higher value (e.g., 1.5) will penalize repetitions more strongly, while a lower value (e.g., 0.9) will be more lenient. (Default: 1.1)                                                                     | float      | repeat_penalty 1.1   |
+| temperature    | The temperature of the model. Increasing the temperature will make the model answer more creatively. (Default: 0.8)                                                                                                                                     | float      | temperature 0.7      |
+| seed           | Sets the random number seed to use for generation. Setting this to a specific number will make the model generate the same text for the same prompt. (Default: 0)                                                                                       | int        | seed 42              |
+| stop           | Sets the stop sequences to use. When this pattern is encountered the LLM will stop generating text and return. Multiple stop patterns may be set by specifying multiple separate `stop` parameters in a modelfile.                                      | string     | stop "AI assistant:" |
+| tfs_z          | Tail free sampling is used to reduce the impact of less probable tokens from the output. A higher value (e.g., 2.0) will reduce the impact more, while a value of 1.0 disables this setting. (default: 1)                                               | float      | tfs_z 1              |
+| num_predict    | Maximum number of tokens to predict when generating text. (Default: 128, -1 = infinite generation, -2 = fill context)                                                                                                                                   | int        | num_predict 42       |
+| top_k          | Reduces the probability of generating nonsense. A higher value (e.g. 100) will give more diverse answers, while a lower value (e.g. 10) will be more conservative. (Default: 40)                                                                        | int        | top_k 40             |
+| top_p          | Works together with top-k. A higher value (e.g., 0.95) will lead to more diverse text, while a lower value (e.g., 0.5) will generate more focused and conservative text. (Default: 0.9)                                                                 | float      | top_p 0.9            |
+
+#### TEMPLATE
+
+`TEMPLATE` of the full prompt template to be passed into the model. It may include (optionally) a system message and a
+user's prompt. This is used to create a full custom prompt, and syntax may be model specific. You can usually find the
+template for a given model in the readme for that model.
+
+#### Template Variables
+
+| Variable        | Description                                                                                                   |
+|-----------------|---------------------------------------------------------------------------------------------------------------|
+| `{{ .System }}` | The system message used to specify custom behavior, this must also be set in the Modelfile as an instruction. |
+| `{{ .Prompt }}` | The incoming prompt, this is not specified in the model file and will be set based on input.                  |
+| `{{ .First }}`  | A boolean value used to render specific template information for the first generation of a session.           |
+
+```modelfile
+TEMPLATE """
+{{- if .First }}
+### System:
+{{ .System }}
+{{- end }}
+
+### User:
+{{ .Prompt }}
+
+### Response:
+"""
+
+SYSTEM """<system message>"""
+```
+
+### SYSTEM
+
+The `SYSTEM` instruction specifies the system message to be used in the template, if applicable.
+
+```modelfile
+SYSTEM """<system message>"""
+```
+
+### ADAPTER
+
+The `ADAPTER` instruction specifies the LoRA adapter to apply to the base model. The value of this instruction should be
+an absolute path or a path relative to the Modelfile and the file must be in a GGML file format. The adapter should be
+tuned from the base model otherwise the behaviour is undefined.
+
+```modelfile
+ADAPTER ./ollama-lora.bin
+```
+
+### LICENSE
+
+The `LICENSE` instruction allows you to specify the legal license under which the model used with this Modelfile is
+shared or distributed.
+
+```modelfile
+LICENSE """
+<license text>
+"""
+```
+
+## Notes
+
+- the **`Modelfile` is not case sensitive**. In the examples, uppercase instructions are used to make it easier to
+  distinguish it from arguments.
+- Instructions can be in any order. In the examples, the `FROM` instruction is first to keep it easily readable.
+
+Read more about Modelfile: https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md
--- a/docs/docs/intro.md
+++ b/docs/docs/intro.md
@@ -2,10 +2,38 @@
 sidebar_position: 1
 ---

-# Intro
+# Introduction

 Let's get started with **Ollama4j**.

+## 🦙 What is Ollama?
+
+[Ollama](https://ollama.ai/) is an advanced AI tool that allows users to easily set up and run large language models
+locally (in CPU and GPU
+modes). With Ollama, users can leverage powerful language models such as Llama 2 and even customize and create their own
+models.
+
+## 👨‍💻 Why Ollama4j?
+
+Ollama4j was built for the simple purpose of integrating Ollama with Java applications.
+
+```mermaid
+  flowchart LR
+    o4j[Ollama4j]
+    o[Ollama Server]
+    o4j -->|Communicates with| o;
+    m[Models]
+    p[Your Java Project]
+    subgraph Your Java Environment
+        direction TB
+        p -->|Uses| o4j
+    end
+    subgraph Ollama Setup
+        direction TB
+        o -->|Manages| m
+    end
+```
+
 ## Getting Started

 ### What you'll need
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -76,9 +76,10 @@ const config = {
                        type: 'docSidebar',
                        sidebarId: 'tutorialSidebar',
                        position: 'left',
-                        label: 'Usage',
+                        label: 'Docs',
                    },
                    {to: 'https://amithkoujalgi.github.io/ollama4j/apidocs/', label: 'Javadoc', position: 'left'},
+                    {to: 'https://amithkoujalgi.github.io/ollama4j/doxygen/html/', label: 'Doxygen', position: 'left'},
                    {to: '/blog', label: 'Blog', position: 'left'},
                    {
                        href: 'https://github.com/amithkoujalgi/ollama4j',
@@ -131,8 +132,13 @@ const config = {
            prism: {
                theme: prismThemes.github,
                darkTheme: prismThemes.dracula,
+                additionalLanguages: ['java'],
            },
        }),
+    markdown: {
+        mermaid: true,
+    },
+    themes: ['@docusaurus/theme-mermaid']
 };

 export default config;
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
--- a/docs/package.json
+++ b/docs/package.json
@@ -16,6 +16,7 @@
  "dependencies": {
    "@docusaurus/core": "3.0.1",
    "@docusaurus/preset-classic": "3.0.1",
+    "@docusaurus/theme-mermaid": "^3.0.1",
    "@mdx-js/react": "^3.0.0",
    "clsx": "^2.0.0",
    "prism-react-renderer": "^2.3.0",
--- a/docs/src/css/custom.css
+++ b/docs/src/css/custom.css
@@ -6,25 +6,35 @@

 /* You can override the default Infima variables here. */
 :root {
-  --ifm-color-primary: #2e8555;
-  --ifm-color-primary-dark: #29784c;
-  --ifm-color-primary-darker: #277148;
-  --ifm-color-primary-darkest: #205d3b;
-  --ifm-color-primary-light: #33925d;
-  --ifm-color-primary-lighter: #359962;
-  --ifm-color-primary-lightest: #3cad6e;
-  --ifm-code-font-size: 95%;
-  --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.1);
+    --ifm-color-primary: #2e8555;
+    --ifm-color-primary-dark: #29784c;
+    --ifm-color-primary-darker: #277148;
+    --ifm-color-primary-darkest: #205d3b;
+    --ifm-color-primary-light: #33925d;
+    --ifm-color-primary-lighter: #359962;
+    --ifm-color-primary-lightest: #3cad6e;
+    --ifm-code-font-size: 95%;
+    --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.1);
 }

 /* For readability concerns, you should choose a lighter palette in dark mode. */
 [data-theme='dark'] {
-  --ifm-color-primary: #25c2a0;
-  --ifm-color-primary-dark: #21af90;
-  --ifm-color-primary-darker: #1fa588;
-  --ifm-color-primary-darkest: #1a8870;
-  --ifm-color-primary-light: #29d5b0;
-  --ifm-color-primary-lighter: #32d8b4;
-  --ifm-color-primary-lightest: #4fddbf;
-  --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.3);
+    --ifm-color-primary: #25c2a0;
+    --ifm-color-primary-dark: #21af90;
+    --ifm-color-primary-darker: #1fa588;
+    --ifm-color-primary-darkest: #1a8870;
+    --ifm-color-primary-light: #29d5b0;
+    --ifm-color-primary-lighter: #32d8b4;
+    --ifm-color-primary-lightest: #4fddbf;
+    --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.3);
 }
+
+article > header > h1 {
+    font-size: 2rem !important;
+}
+
+div > h1,
+header > h1,
+h2 > a {
+    font-size: 2rem !important;
+}
--- a/logo-small.png
+++ b/logo-small.png
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@

    <groupId>io.github.amithkoujalgi</groupId>
    <artifactId>ollama4j</artifactId>
-    <version>1.0.30</version>
+    <version>1.0.49</version>

    <name>Ollama4j</name>
    <description>Java library for interacting with Ollama API.</description>
@@ -39,7 +39,7 @@
        <connection>scm:git:git@github.com:amithkoujalgi/ollama4j.git</connection>
        <developerConnection>scm:git:https://github.com/amithkoujalgi/ollama4j.git</developerConnection>
        <url>https://github.com/amithkoujalgi/ollama4j</url>
-        <tag>v1.0.30</tag>
+        <tag>v1.0.49</tag>
    </scm>

    <build>
@@ -154,7 +154,7 @@
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
-            <version>1.3.11</version>
+            <version>1.4.12</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -198,6 +198,29 @@
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.8.11</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>report</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
        </profile>
        <profile>
            <id>integration-tests</id>
@@ -249,6 +272,26 @@
                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
                        </configuration>
                    </plugin>
+
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.8.7</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>report</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                </plugins>
            </build>
        </profile>
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java
@@ -6,6 +6,7 @@ import io.github.amithkoujalgi.ollama4j.core.models.request.CustomModelFileConte
 import io.github.amithkoujalgi.ollama4j.core.models.request.CustomModelFilePathRequest;
 import io.github.amithkoujalgi.ollama4j.core.models.request.ModelEmbeddingsRequest;
 import io.github.amithkoujalgi.ollama4j.core.models.request.ModelRequest;
+import io.github.amithkoujalgi.ollama4j.core.utils.Options;
 import io.github.amithkoujalgi.ollama4j.core.utils.Utils;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -37,8 +38,7 @@ public class OllamaAPI {
  private final String host;
  private long requestTimeoutSeconds = 3;
  private boolean verbose = true;
-  private String username;
-  private String password;
+  private BasicAuth basicAuth;

  /**
   * Instantiates the Ollama API.
@@ -53,6 +53,11 @@ public class OllamaAPI {
    }
  }

+  /**
+   * Set request timeout in seconds. Default is 3 seconds.
+   *
+   * @param requestTimeoutSeconds the request timeout in seconds
+   */
  public void setRequestTimeoutSeconds(long requestTimeoutSeconds) {
    this.requestTimeoutSeconds = requestTimeoutSeconds;
  }
@@ -67,11 +72,13 @@ public class OllamaAPI {
  }

  /**
+   * Set basic authentication for accessing Ollama server that's behind a reverse-proxy/gateway.
   *
+   * @param username the username
+   * @param password the password
   */
  public void setBasicAuth(String username, String password) {
-    this.username = username;
-    this.password = password;
+    this.basicAuth = new BasicAuth(username, password);
  }

  /**
@@ -85,11 +92,9 @@ public class OllamaAPI {
    HttpRequest httpRequest = null;
    try {
      httpRequest =
-          HttpRequest.newBuilder()
-              .uri(new URI(url))
+          getRequestBuilderDefault(new URI(url))
              .header("Accept", "application/json")
              .header("Content-type", "application/json")
-              .timeout(Duration.ofSeconds(requestTimeoutSeconds))
              .GET()
              .build();
    } catch (URISyntaxException e) {
@@ -117,11 +122,9 @@ public class OllamaAPI {
    String url = this.host + "/api/tags";
    HttpClient httpClient = HttpClient.newHttpClient();
    HttpRequest httpRequest =
-        HttpRequest.newBuilder()
-            .uri(new URI(url))
+        getRequestBuilderDefault(new URI(url))
            .header("Accept", "application/json")
            .header("Content-type", "application/json")
-            .timeout(Duration.ofSeconds(requestTimeoutSeconds))
            .GET()
            .build();
    HttpResponse<String> response =
@@ -148,12 +151,10 @@ public class OllamaAPI {
    String url = this.host + "/api/pull";
    String jsonData = new ModelRequest(modelName).toString();
    HttpRequest request =
-        HttpRequest.newBuilder()
-            .uri(new URI(url))
+        getRequestBuilderDefault(new URI(url))
            .POST(HttpRequest.BodyPublishers.ofString(jsonData))
            .header("Accept", "application/json")
            .header("Content-type", "application/json")
-            .timeout(Duration.ofSeconds(requestTimeoutSeconds))
            .build();
    HttpClient client = HttpClient.newHttpClient();
    HttpResponse<InputStream> response =
@@ -184,15 +185,13 @@ public class OllamaAPI {
   * @return the model details
   */
  public ModelDetail getModelDetails(String modelName)
-      throws IOException, OllamaBaseException, InterruptedException {
+      throws IOException, OllamaBaseException, InterruptedException, URISyntaxException {
    String url = this.host + "/api/show";
    String jsonData = new ModelRequest(modelName).toString();
    HttpRequest request =
-        HttpRequest.newBuilder()
-            .uri(URI.create(url))
+        getRequestBuilderDefault(new URI(url))
            .header("Accept", "application/json")
            .header("Content-type", "application/json")
-            .timeout(Duration.ofSeconds(requestTimeoutSeconds))
            .POST(HttpRequest.BodyPublishers.ofString(jsonData))
            .build();
    HttpClient client = HttpClient.newHttpClient();
@@ -214,15 +213,13 @@ public class OllamaAPI {
   * @param modelFilePath the path to model file that exists on the Ollama server.
   */
  public void createModelWithFilePath(String modelName, String modelFilePath)
-      throws IOException, InterruptedException, OllamaBaseException {
+      throws IOException, InterruptedException, OllamaBaseException, URISyntaxException {
    String url = this.host + "/api/create";
    String jsonData = new CustomModelFilePathRequest(modelName, modelFilePath).toString();
    HttpRequest request =
-        HttpRequest.newBuilder()
-            .uri(URI.create(url))
+        getRequestBuilderDefault(new URI(url))
            .header("Accept", "application/json")
            .header("Content-Type", "application/json")
-            .timeout(Duration.ofSeconds(requestTimeoutSeconds))
            .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8))
            .build();
    HttpClient client = HttpClient.newHttpClient();
@@ -250,15 +247,13 @@ public class OllamaAPI {
   * @param modelFileContents the path to model file that exists on the Ollama server.
   */
  public void createModelWithModelFileContents(String modelName, String modelFileContents)
-      throws IOException, InterruptedException, OllamaBaseException {
+      throws IOException, InterruptedException, OllamaBaseException, URISyntaxException {
    String url = this.host + "/api/create";
    String jsonData = new CustomModelFileContentsRequest(modelName, modelFileContents).toString();
    HttpRequest request =
-        HttpRequest.newBuilder()
-            .uri(URI.create(url))
+        getRequestBuilderDefault(new URI(url))
            .header("Accept", "application/json")
            .header("Content-Type", "application/json")
-            .timeout(Duration.ofSeconds(requestTimeoutSeconds))
            .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8))
            .build();
    HttpClient client = HttpClient.newHttpClient();
@@ -280,20 +275,17 @@ public class OllamaAPI {
   * Delete a model from Ollama server.
   *
   * @param modelName the name of the model to be deleted.
-   * @param ignoreIfNotPresent - ignore errors if the specified model is not present on Ollama
-   *     server.
+   * @param ignoreIfNotPresent ignore errors if the specified model is not present on Ollama server.
   */
  public void deleteModel(String modelName, boolean ignoreIfNotPresent)
-      throws IOException, InterruptedException, OllamaBaseException {
+      throws IOException, InterruptedException, OllamaBaseException, URISyntaxException {
    String url = this.host + "/api/delete";
    String jsonData = new ModelRequest(modelName).toString();
    HttpRequest request =
-        HttpRequest.newBuilder()
-            .uri(URI.create(url))
+        getRequestBuilderDefault(new URI(url))
            .method("DELETE", HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8))
            .header("Accept", "application/json")
            .header("Content-type", "application/json")
-            .timeout(Duration.ofSeconds(requestTimeoutSeconds))
            .build();
    HttpClient client = HttpClient.newHttpClient();
    HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
@@ -319,7 +311,8 @@ public class OllamaAPI {
    URI uri = URI.create(this.host + "/api/embeddings");
    String jsonData = new ModelEmbeddingsRequest(model, prompt).toString();
    HttpClient httpClient = HttpClient.newHttpClient();
-    HttpRequest.Builder requestBuilder = getRequestBuilderDefault(uri)
+    HttpRequest.Builder requestBuilder =
+        getRequestBuilderDefault(uri)
            .header("Accept", "application/json")
            .POST(HttpRequest.BodyPublishers.ofString(jsonData));
    HttpRequest request = requestBuilder.build();
@@ -336,33 +329,39 @@ public class OllamaAPI {
  }

  /**
-   * Ask a question to a model running on Ollama server. This is a sync/blocking call.
+   * Generate response for a question to a model running on Ollama server. This is a sync/blocking
+   * call.
   *
   * @param model the ollama model to ask the question to
-   * @param promptText the prompt/question text
-   * @return OllamaResult - that includes response text and time taken for response
+   * @param prompt the prompt/question text
+   * @param options the Options object - <a
+   *     href="https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values">More
+   *     details on the options</a>
+   * @return OllamaResult that includes response text and time taken for response
   */
-  public OllamaResult ask(String model, String promptText)
+  public OllamaResult generate(String model, String prompt, Options options)
      throws OllamaBaseException, IOException, InterruptedException {
-    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, promptText);
-    return askSync(ollamaRequestModel);
+    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, prompt);
+    ollamaRequestModel.setOptions(options.getOptionsMap());
+    return generateSync(ollamaRequestModel);
  }

  /**
-   * Ask 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 an
-   * async/non-blocking call.
+   * 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
+   * an async/non-blocking call.
   *
   * @param model the ollama model to ask the question to
-   * @param promptText the prompt/question text
+   * @param prompt the prompt/question text
   * @return the ollama async result callback handle
   */
-  public OllamaAsyncResultCallback askAsync(String model, String promptText) {
-    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, promptText);
-    HttpClient httpClient = HttpClient.newHttpClient();
+  public OllamaAsyncResultCallback generateAsync(String model, String prompt) {
+    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, prompt);
+
    URI uri = URI.create(this.host + "/api/generate");
    OllamaAsyncResultCallback ollamaAsyncResultCallback =
-        new OllamaAsyncResultCallback(httpClient, uri, ollamaRequestModel, requestTimeoutSeconds);
+        new OllamaAsyncResultCallback(
+            getRequestBuilderDefault(uri), ollamaRequestModel, requestTimeoutSeconds);
    ollamaAsyncResultCallback.start();
    return ollamaAsyncResultCallback;
  }
@@ -372,18 +371,23 @@ public class OllamaAPI {
   * sync/blocking call.
   *
   * @param model the ollama model to ask the question to
-   * @param promptText the prompt/question text
+   * @param prompt the prompt/question text
   * @param imageFiles the list of image files to use for the question
-   * @return OllamaResult - that includes response text and time taken for response
+   * @param options the Options object - <a
+   *     href="https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values">More
+   *     details on the options</a>
+   * @return OllamaResult that includes response text and time taken for response
   */
-  public OllamaResult askWithImageFiles(String model, String promptText, List<File> imageFiles)
+  public OllamaResult generateWithImageFiles(
+      String model, String prompt, List<File> imageFiles, Options options)
      throws OllamaBaseException, IOException, InterruptedException {
    List<String> images = new ArrayList<>();
    for (File imageFile : imageFiles) {
      images.add(encodeFileToBase64(imageFile));
    }
-    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, promptText, images);
-    return askSync(ollamaRequestModel);
+    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, prompt, images);
+    ollamaRequestModel.setOptions(options.getOptionsMap());
+    return generateSync(ollamaRequestModel);
  }

  /**
@@ -391,18 +395,23 @@ public class OllamaAPI {
   * sync/blocking call.
   *
   * @param model the ollama model to ask the question to
-   * @param promptText the prompt/question text
+   * @param prompt the prompt/question text
   * @param imageURLs the list of image URLs to use for the question
-   * @return OllamaResult - that includes response text and time taken for response
+   * @param options the Options object - <a
+   *     href="https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values">More
+   *     details on the options</a>
+   * @return OllamaResult that includes response text and time taken for response
   */
-  public OllamaResult askWithImageURLs(String model, String promptText, List<String> imageURLs)
+  public OllamaResult generateWithImageURLs(
+      String model, String prompt, List<String> imageURLs, Options options)
      throws OllamaBaseException, IOException, InterruptedException, URISyntaxException {
    List<String> images = new ArrayList<>();
    for (String imageURL : imageURLs) {
      images.add(encodeByteArrayToBase64(loadImageBytesFromUrl(imageURL)));
    }
-    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, promptText, images);
-    return askSync(ollamaRequestModel);
+    OllamaRequestModel ollamaRequestModel = new OllamaRequestModel(model, prompt, images);
+    ollamaRequestModel.setOptions(options.getOptionsMap());
+    return generateSync(ollamaRequestModel);
  }

  private static String encodeFileToBase64(File file) throws IOException {
@@ -427,17 +436,18 @@ public class OllamaAPI {
    }
  }

-  private OllamaResult askSync(OllamaRequestModel ollamaRequestModel)
+  private OllamaResult generateSync(OllamaRequestModel ollamaRequestModel)
      throws OllamaBaseException, IOException, InterruptedException {
    long startTime = System.currentTimeMillis();
    HttpClient httpClient = HttpClient.newHttpClient();
    URI uri = URI.create(this.host + "/api/generate");
-    HttpRequest.Builder requestBuilder = getRequestBuilderDefault(uri)
+    HttpRequest.Builder requestBuilder =
+        getRequestBuilderDefault(uri)
            .POST(
                HttpRequest.BodyPublishers.ofString(
                    Utils.getObjectMapper().writeValueAsString(ollamaRequestModel)));
    HttpRequest request = requestBuilder.build();
-    logger.debug("Ask model '" + ollamaRequestModel + "' ...");
+    if (verbose) logger.info("Asking model: " + ollamaRequestModel);
    HttpResponse<InputStream> response =
        httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
    int statusCode = response.statusCode();
@@ -455,9 +465,10 @@ public class OllamaAPI {
        } else if (statusCode == 401) {
          logger.warn("Status code: 401 (Unauthorized)");
          OllamaErrorResponseModel ollamaResponseModel =
-                  Utils.getObjectMapper().readValue("{\"error\":\"Unauthorized\"}", OllamaErrorResponseModel.class);
+              Utils.getObjectMapper()
+                  .readValue("{\"error\":\"Unauthorized\"}", OllamaErrorResponseModel.class);
          responseBuffer.append(ollamaResponseModel.getError());
-        }else {
+        } else {
          OllamaResponseModel ollamaResponseModel =
              Utils.getObjectMapper().readValue(line, OllamaResponseModel.class);
          if (!ollamaResponseModel.isDone()) {
@@ -466,45 +477,52 @@ public class OllamaAPI {
        }
      }
    }
+
    if (statusCode != 200) {
-      logger.error("Status code " + statusCode + " instead 200");
+      logger.error("Status code " + statusCode);
      throw new OllamaBaseException(responseBuffer.toString());
    } else {
      long endTime = System.currentTimeMillis();
-      return new OllamaResult(responseBuffer.toString().trim(), endTime - startTime, statusCode);
+      OllamaResult ollamaResult =
+          new OllamaResult(responseBuffer.toString().trim(), endTime - startTime, statusCode);
+      if (verbose) logger.info("Model response: " + ollamaResult);
+      return ollamaResult;
    }
  }

  /**
+   * Get default request builder.
   *
+   * @param uri URI to get a HttpRequest.Builder
+   * @return HttpRequest.Builder
   */
  private HttpRequest.Builder getRequestBuilderDefault(URI uri) {
    HttpRequest.Builder requestBuilder =
-            HttpRequest.newBuilder(uri)
-                    .header("Content-Type", "application/json")
-                    .timeout(Duration.ofSeconds(requestTimeoutSeconds));
-    if (basicAuthCredentialsSet()) {
+        HttpRequest.newBuilder(uri)
+            .header("Content-Type", "application/json")
+            .timeout(Duration.ofSeconds(requestTimeoutSeconds));
+    if (isBasicAuthCredentialsSet()) {
      requestBuilder.header("Authorization", getBasicAuthHeaderValue());
    }
    return requestBuilder;
  }

  /**
+   * Get basic authentication header value.
+   *
   * @return basic authentication header value (encoded credentials)
   */
  private String getBasicAuthHeaderValue() {
-    String credentialsToEncode = username + ":" + password;
+    String credentialsToEncode = basicAuth.getUsername() + ":" + basicAuth.getPassword();
    return "Basic " + Base64.getEncoder().encodeToString(credentialsToEncode.getBytes());
  }

  /**
+   * Check if Basic Auth credentials set.
+   *
   * @return true when Basic Auth credentials set
   */
-  private boolean basicAuthCredentialsSet() {
-    if (username != null && password !=  null) {
-      return true;
-    } else {
-      return false;
-    }
+  private boolean isBasicAuthCredentialsSet() {
+    return basicAuth != null;
  }
 }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/BasicAuth.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/BasicAuth.java
@@ -0,0 +1,13 @@
+package io.github.amithkoujalgi.ollama4j.core.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BasicAuth {
+  private String username;
+  private String password;
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java
@@ -7,6 +7,7 @@ import lombok.Data;
 public class Model {

  private String name;
+  private String model;
  @JsonProperty("modified_at")
  private String modifiedAt;
  private String digest;
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaAsyncResultCallback.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaAsyncResultCallback.java
@@ -6,7 +6,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -14,30 +13,44 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.LinkedList;
 import java.util.Queue;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;

+@Data
+@EqualsAndHashCode(callSuper = true)
@SuppressWarnings("unused")
 public class OllamaAsyncResultCallback extends Thread {
-  private final HttpClient client;
-  private final URI uri;
+  private final HttpRequest.Builder requestBuilder;
  private final OllamaRequestModel ollamaRequestModel;
  private final Queue<String> queue = new LinkedList<>();
  private String result;
  private boolean isDone;
-  private boolean succeeded;
+
+  /**
+   * -- GETTER -- Returns the status of the request. Indicates if the request was successful or a
+   * failure. If the request was a failure, the `getResponse()` method will return the error
+   * message.
+   */
+  @Getter private boolean succeeded;

  private long requestTimeoutSeconds;

-  private int httpStatusCode;
-  private long responseTime = 0;
+  /**
+   * -- GETTER -- Returns the HTTP response status code for the request that was made to Ollama
+   * server.
+   */
+  @Getter private int httpStatusCode;
+
+  /** -- GETTER -- Returns the response time in milliseconds. */
+  @Getter private long responseTime = 0;

  public OllamaAsyncResultCallback(
-      HttpClient client,
-      URI uri,
+      HttpRequest.Builder requestBuilder,
      OllamaRequestModel ollamaRequestModel,
      long requestTimeoutSeconds) {
-    this.client = client;
+    this.requestBuilder = requestBuilder;
    this.ollamaRequestModel = ollamaRequestModel;
-    this.uri = uri;
    this.isDone = false;
    this.result = "";
    this.queue.add("");
@@ -46,10 +59,11 @@ public class OllamaAsyncResultCallback extends Thread {

  @Override
  public void run() {
+    HttpClient httpClient = HttpClient.newHttpClient();
    try {
      long startTime = System.currentTimeMillis();
      HttpRequest request =
-          HttpRequest.newBuilder(uri)
+          requestBuilder
              .POST(
                  HttpRequest.BodyPublishers.ofString(
                      Utils.getObjectMapper().writeValueAsString(ollamaRequestModel)))
@@ -57,7 +71,7 @@ public class OllamaAsyncResultCallback extends Thread {
              .timeout(Duration.ofSeconds(requestTimeoutSeconds))
              .build();
      HttpResponse<InputStream> response =
-          client.send(request, HttpResponse.BodyHandlers.ofInputStream());
+          httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
      int statusCode = response.statusCode();
      this.httpStatusCode = statusCode;

@@ -109,28 +123,9 @@ public class OllamaAsyncResultCallback extends Thread {
  }

  /**
-   * Returns the HTTP response status code for the request that was made to Ollama server.
+   * Returns the final completion/response when the execution completes. Does not return intermediate results.
   *
-   * @return int - the status code for the request
-   */
-  public int getHttpStatusCode() {
-    return httpStatusCode;
-  }
-
-  /**
-   * Returns the status of the request. Indicates if the request was successful or a failure. If the
-   * request was a failure, the `getResponse()` method will return the error message.
-   *
-   * @return boolean - status
-   */
-  public boolean isSucceeded() {
-    return succeeded;
-  }
-
-  /**
-   * Returns the final response when the execution completes. Does not return intermediate results.
-   *
-   * @return String - response text
+   * @return String completion/response text
   */
  public String getResponse() {
    return result;
@@ -140,15 +135,6 @@ public class OllamaAsyncResultCallback extends Thread {
    return queue;
  }

-  /**
-   * Returns the response time in milliseconds.
-   *
-   * @return long - response time in milliseconds.
-   */
-  public long getResponseTime() {
-    return responseTime;
-  }
-
  public void setRequestTimeoutSeconds(long requestTimeoutSeconds) {
    this.requestTimeoutSeconds = requestTimeoutSeconds;
  }
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaRequestModel.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaRequestModel.java
@@ -1,10 +1,10 @@
 package io.github.amithkoujalgi.ollama4j.core.models;

-
 import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper;

 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.List;
+import java.util.Map;
 import lombok.Data;

@Data
@@ -13,6 +13,7 @@ public class OllamaRequestModel {
  private String model;
  private String prompt;
  private List<String> images;
+  private Map<String, Object> options;

  public OllamaRequestModel(String model, String prompt) {
    this.model = model;
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResult.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResult.java
@@ -13,9 +13,9 @@ import lombok.Getter;
 public class OllamaResult {
  /**
   * -- GETTER --
-   *  Get the response text
+   *  Get the completion/response text
   *
-   * @return String - response text
+   * @return String completion/response text
   */
  private final String response;

--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java
@@ -21,6 +21,7 @@ public class OllamaModelType {
  public static final String VICUNA = "vicuna";
  public static final String WIZARD_VICUNA_UNCENSORED = "wizard-vicuna-uncensored";
  public static final String PHIND_CODELLAMA = "phind-codellama";
+  public static final String PHI = "phi";
  public static final String ZEPHYR = "zephyr";
  public static final String WIZARDCODER = "wizardcoder";
  public static final String MISTRAL_OPENORCA = "mistral-openorca";
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Options.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Options.java
@@ -0,0 +1,11 @@
+package io.github.amithkoujalgi.ollama4j.core.utils;
+
+import java.util.Map;
+import lombok.Data;
+
+/** Class for options for Ollama model. */
+@Data
+public class Options {
+
+  private final Map<String, Object> optionsMap;
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OptionsBuilder.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OptionsBuilder.java
@@ -0,0 +1,218 @@
+package io.github.amithkoujalgi.ollama4j.core.utils;
+
+import java.util.HashMap;
+
+/** Builder class for creating options for Ollama model. */
+public class OptionsBuilder {
+
+  private final Options options;
+
+  /** Constructs a new OptionsBuilder with an empty options map. */
+  public OptionsBuilder() {
+    this.options = new Options(new HashMap<>());
+  }
+
+  /**
+   * Enable Mirostat sampling for controlling perplexity. (default: 0, 0 = disabled, 1 = Mirostat, 2
+   * = Mirostat 2.0)
+   *
+   * @param value The value for the "mirostat" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setMirostat(int value) {
+    options.getOptionsMap().put("mirostat", value);
+    return this;
+  }
+
+  /**
+   * Influences how quickly the algorithm responds to feedback from the generated text. A lower
+   * learning rate will result in slower adjustments, while a higher learning rate will make the
+   * algorithm more responsive. (Default: 0.1)
+   *
+   * @param value The value for the "mirostat_eta" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setMirostatEta(float value) {
+    options.getOptionsMap().put("mirostat_eta", value);
+    return this;
+  }
+
+  /**
+   * Controls the balance between coherence and diversity of the output. A lower value will result
+   * in more focused and coherent text. (Default: 5.0)
+   *
+   * @param value The value for the "mirostat_tau" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setMirostatTau(float value) {
+    options.getOptionsMap().put("mirostat_tau", value);
+    return this;
+  }
+
+  /**
+   * Sets the size of the context window used to generate the next token. (Default: 2048)
+   *
+   * @param value The value for the "num_ctx" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setNumCtx(int value) {
+    options.getOptionsMap().put("num_ctx", value);
+    return this;
+  }
+
+  /**
+   * The number of GQA groups in the transformer layer. Required for some models, for example, it is
+   * 8 for llama2:70b.
+   *
+   * @param value The value for the "num_gqa" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setNumGqa(int value) {
+    options.getOptionsMap().put("num_gqa", value);
+    return this;
+  }
+
+  /**
+   * The number of layers to send to the GPU(s). On macOS it defaults to 1 to enable metal support,
+   * 0 to disable.
+   *
+   * @param value The value for the "num_gpu" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setNumGpu(int value) {
+    options.getOptionsMap().put("num_gpu", value);
+    return this;
+  }
+
+  /**
+   * Sets the number of threads to use during computation. By default, Ollama will detect this for
+   * optimal performance. It is recommended to set this value to the number of physical CPU cores
+   * your system has (as opposed to the logical number of cores).
+   *
+   * @param value The value for the "num_thread" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setNumThread(int value) {
+    options.getOptionsMap().put("num_thread", value);
+    return this;
+  }
+
+  /**
+   * Sets how far back for the model to look back to prevent repetition. (Default: 64, 0 = disabled,
+   * -1 = num_ctx)
+   *
+   * @param value The value for the "repeat_last_n" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setRepeatLastN(int value) {
+    options.getOptionsMap().put("repeat_last_n", value);
+    return this;
+  }
+
+  /**
+   * Sets how strongly to penalize repetitions. A higher value (e.g., 1.5) will penalize repetitions
+   * more strongly, while a lower value (e.g., 0.9) will be more lenient. (Default: 1.1)
+   *
+   * @param value The value for the "repeat_penalty" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setRepeatPenalty(float value) {
+    options.getOptionsMap().put("repeat_penalty", value);
+    return this;
+  }
+
+  /**
+   * The temperature of the model. Increasing the temperature will make the model answer more
+   * creatively. (Default: 0.8)
+   *
+   * @param value The value for the "temperature" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setTemperature(float value) {
+    options.getOptionsMap().put("temperature", value);
+    return this;
+  }
+
+  /**
+   * Sets the random number seed to use for generation. Setting this to a specific number will make
+   * the model generate the same text for the same prompt. (Default: 0)
+   *
+   * @param value The value for the "seed" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setSeed(int value) {
+    options.getOptionsMap().put("seed", value);
+    return this;
+  }
+
+  /**
+   * Sets the stop sequences to use. When this pattern is encountered the LLM will stop generating
+   * text and return. Multiple stop patterns may be set by specifying multiple separate `stop`
+   * parameters in a modelfile.
+   *
+   * @param value The value for the "stop" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setStop(String value) {
+    options.getOptionsMap().put("stop", value);
+    return this;
+  }
+
+  /**
+   * Tail free sampling is used to reduce the impact of less probable tokens from the output. A
+   * higher value (e.g., 2.0) will reduce the impact more, while a value of 1.0 disables this
+   * setting. (default: 1)
+   *
+   * @param value The value for the "tfs_z" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setTfsZ(float value) {
+    options.getOptionsMap().put("tfs_z", value);
+    return this;
+  }
+
+  /**
+   * Maximum number of tokens to predict when generating text. (Default: 128, -1 = infinite
+   * generation, -2 = fill context)
+   *
+   * @param value The value for the "num_predict" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setNumPredict(int value) {
+    options.getOptionsMap().put("num_predict", value);
+    return this;
+  }
+
+  /**
+   * Reduces the probability of generating nonsense. A higher value (e.g. 100) will give more
+   * diverse answers, while a lower value (e.g. 10) will be more conservative. (Default: 40)
+   *
+   * @param value The value for the "top_k" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setTopK(int value) {
+    options.getOptionsMap().put("top_k", value);
+    return this;
+  }
+
+  /**
+   * Works together with top-k. A higher value (e.g., 0.95) will lead to more diverse text, while a
+   * lower value (e.g., 0.5) will generate more focused and conservative text. (Default: 0.9)
+   *
+   * @param value The value for the "top_p" parameter.
+   * @return The updated OptionsBuilder.
+   */
+  public OptionsBuilder setTopP(float value) {
+    options.getOptionsMap().put("top_p", value);
+    return this;
+  }
+
+  /**
+   * Builds the options map.
+   *
+   * @return The populated options map.
+   */
+  public Options build() {
+    return options;
+  }
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/PromptBuilder.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/PromptBuilder.java
@@ -0,0 +1,69 @@
+package io.github.amithkoujalgi.ollama4j.core.utils;
+
+/**
+ * The {@code PromptBuilder} class is used to construct prompt texts for language models (LLMs). It
+ * provides methods for adding text, adding lines, adding separators, and building the final prompt.
+ *
+ * <p>Example usage:
+ *
+ * <pre>{@code
+ * PromptBuilder promptBuilder = new PromptBuilder();
+ * promptBuilder.add("This is a sample prompt for language models.")
+ *              .addLine("You can add lines to provide context.")
+ *              .addSeparator()
+ *              .add("Feel free to customize as needed.");
+ * String finalPrompt = promptBuilder.build();
+ * System.out.println(finalPrompt);
+ * }</pre>
+ */
+public class PromptBuilder {
+
+  private final StringBuilder prompt;
+
+  /** Constructs a new {@code PromptBuilder} with an empty prompt. */
+  public PromptBuilder() {
+    this.prompt = new StringBuilder();
+  }
+
+  /**
+   * Appends the specified text to the prompt.
+   *
+   * @param text the text to be added to the prompt
+   * @return a reference to this {@code PromptBuilder} instance for method chaining
+   */
+  public PromptBuilder add(String text) {
+    prompt.append(text);
+    return this;
+  }
+
+  /**
+   * Appends the specified text followed by a newline character to the prompt.
+   *
+   * @param text the text to be added as a line to the prompt
+   * @return a reference to this {@code PromptBuilder} instance for method chaining
+   */
+  public PromptBuilder addLine(String text) {
+    prompt.append(text).append("\n");
+    return this;
+  }
+
+  /**
+   * Appends a separator line to the prompt. The separator is a newline followed by a line of
+   * dashes.
+   *
+   * @return a reference to this {@code PromptBuilder} instance for method chaining
+   */
+  public PromptBuilder addSeparator() {
+    prompt.append("\n--------------------------------------------------\n");
+    return this;
+  }
+
+  /**
+   * Builds and returns the final prompt as a string.
+   *
+   * @return the final prompt as a string
+   */
+  public String build() {
+    return prompt.toString();
+  }
+}
--- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java
+++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java
@@ -3,7 +3,7 @@ package io.github.amithkoujalgi.ollama4j.core.utils;
 import com.fasterxml.jackson.databind.ObjectMapper;

 public class Utils {
-    public static ObjectMapper getObjectMapper() {
-        return new ObjectMapper();
-    }
+  public static ObjectMapper getObjectMapper() {
+    return new ObjectMapper();
+  }
 }
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java
@@ -4,12 +4,17 @@ 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.OllamaResult;
 import io.github.amithkoujalgi.ollama4j.core.types.OllamaModelType;
+import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.ConnectException;
 import java.net.URISyntaxException;
 import java.net.http.HttpConnectTimeoutException;
+import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Order;
@@ -32,10 +37,16 @@ class TestRealAPIs {
    }
  }

+  private File getImageFileFromClasspath(String fileName) {
+    ClassLoader classLoader = getClass().getClassLoader();
+    return new File(Objects.requireNonNull(classLoader.getResource(fileName)).getFile());
+  }
+
  @BeforeEach
  void setUp() {
    Properties properties = loadProperties();
    ollamaAPI = new OllamaAPI(properties.getProperty("ollama.api.url"));
+    ollamaAPI.setRequestTimeoutSeconds(20);
  }

  @Test
@@ -83,4 +94,80 @@ class TestRealAPIs {
      throw new RuntimeException(e);
    }
  }
+
+  @Test
+  @Order(3)
+  void testAskModelWithDefaultOptions() {
+    testEndpointReachability();
+    try {
+      OllamaResult result =
+          ollamaAPI.generate(
+              OllamaModelType.LLAMA2,
+              "What is the capital of France? And what's France's connection with Mona Lisa?",
+              new OptionsBuilder().build());
+      assertNotNull(result);
+      assertNotNull(result.getResponse());
+      assertFalse(result.getResponse().isEmpty());
+    } catch (IOException | OllamaBaseException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Test
+  @Order(3)
+  void testAskModelWithOptions() {
+    testEndpointReachability();
+    try {
+      OllamaResult result =
+          ollamaAPI.generate(
+              OllamaModelType.LLAMA2,
+              "What is the capital of France? And what's France's connection with Mona Lisa?",
+              new OptionsBuilder().setTemperature(0.9f).build());
+      assertNotNull(result);
+      assertNotNull(result.getResponse());
+      assertFalse(result.getResponse().isEmpty());
+    } catch (IOException | OllamaBaseException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Test
+  @Order(3)
+  void testAskModelWithOptionsAndImageFiles() {
+    testEndpointReachability();
+    File imageFile = getImageFileFromClasspath("dog-on-a-boat.jpg");
+    try {
+      OllamaResult result =
+          ollamaAPI.generateWithImageFiles(
+              OllamaModelType.LLAVA,
+              "What is in this image?",
+              List.of(imageFile),
+              new OptionsBuilder().build());
+      assertNotNull(result);
+      assertNotNull(result.getResponse());
+      assertFalse(result.getResponse().isEmpty());
+    } catch (IOException | OllamaBaseException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Test
+  @Order(3)
+  void testAskModelWithOptionsAndImageURLs() {
+    testEndpointReachability();
+    try {
+      OllamaResult result =
+          ollamaAPI.generateWithImageURLs(
+              OllamaModelType.LLAVA,
+              "What is in this image?",
+              List.of(
+                  "https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg"),
+              new OptionsBuilder().build());
+      assertNotNull(result);
+      assertNotNull(result.getResponse());
+      assertFalse(result.getResponse().isEmpty());
+    } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }
--- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java
+++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java
@@ -8,15 +8,17 @@ import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail;
 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 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;

 class TestMockedAPIs {
  @Test
-  void testMockPullModel() {
+  void testPullModel() {
    OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
    String model = OllamaModelType.LLAMA2;
    try {
@@ -49,7 +51,7 @@ class TestMockedAPIs {
      doNothing().when(ollamaAPI).createModelWithModelFileContents(model, modelFilePath);
      ollamaAPI.createModelWithModelFileContents(model, modelFilePath);
      verify(ollamaAPI, times(1)).createModelWithModelFileContents(model, modelFilePath);
-    } catch (IOException | OllamaBaseException | InterruptedException e) {
+    } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
      throw new RuntimeException(e);
    }
  }
@@ -62,7 +64,7 @@ class TestMockedAPIs {
      doNothing().when(ollamaAPI).deleteModel(model, true);
      ollamaAPI.deleteModel(model, true);
      verify(ollamaAPI, times(1)).deleteModel(model, true);
-    } catch (IOException | OllamaBaseException | InterruptedException e) {
+    } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
      throw new RuntimeException(e);
    }
  }
@@ -75,7 +77,7 @@ class TestMockedAPIs {
      when(ollamaAPI.getModelDetails(model)).thenReturn(new ModelDetail());
      ollamaAPI.getModelDetails(model);
      verify(ollamaAPI, times(1)).getModelDetails(model);
-    } catch (IOException | OllamaBaseException | InterruptedException e) {
+    } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
      throw new RuntimeException(e);
    }
  }
@@ -99,23 +101,63 @@ class TestMockedAPIs {
    OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
    String model = OllamaModelType.LLAMA2;
    String prompt = "some prompt text";
+    OptionsBuilder optionsBuilder = new OptionsBuilder();
    try {
-      when(ollamaAPI.ask(model, prompt)).thenReturn(new OllamaResult("", 0, 200));
-      ollamaAPI.ask(model, prompt);
-      verify(ollamaAPI, times(1)).ask(model, prompt);
+      when(ollamaAPI.generate(model, prompt, optionsBuilder.build()))
+          .thenReturn(new OllamaResult("", 0, 200));
+      ollamaAPI.generate(model, prompt, optionsBuilder.build());
+      verify(ollamaAPI, times(1)).generate(model, prompt, optionsBuilder.build());
    } catch (IOException | OllamaBaseException | InterruptedException e) {
      throw new RuntimeException(e);
    }
  }

+  @Test
+  void testAskWithImageFiles() {
+    OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
+    String model = OllamaModelType.LLAMA2;
+    String prompt = "some prompt text";
+    try {
+      when(ollamaAPI.generateWithImageFiles(
+              model, prompt, Collections.emptyList(), new OptionsBuilder().build()))
+          .thenReturn(new OllamaResult("", 0, 200));
+      ollamaAPI.generateWithImageFiles(
+          model, prompt, Collections.emptyList(), new OptionsBuilder().build());
+      verify(ollamaAPI, times(1))
+          .generateWithImageFiles(
+              model, prompt, Collections.emptyList(), new OptionsBuilder().build());
+    } catch (IOException | OllamaBaseException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Test
+  void testAskWithImageURLs() {
+    OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
+    String model = OllamaModelType.LLAMA2;
+    String prompt = "some prompt text";
+    try {
+      when(ollamaAPI.generateWithImageURLs(
+              model, prompt, Collections.emptyList(), new OptionsBuilder().build()))
+          .thenReturn(new OllamaResult("", 0, 200));
+      ollamaAPI.generateWithImageURLs(
+          model, prompt, Collections.emptyList(), new OptionsBuilder().build());
+      verify(ollamaAPI, times(1))
+          .generateWithImageURLs(
+              model, prompt, Collections.emptyList(), new OptionsBuilder().build());
+    } catch (IOException | OllamaBaseException | InterruptedException | URISyntaxException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
  @Test
  void testAskAsync() {
    OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
    String model = OllamaModelType.LLAMA2;
    String prompt = "some prompt text";
-    when(ollamaAPI.askAsync(model, prompt))
-        .thenReturn(new OllamaAsyncResultCallback(null, null, null, 3));
-    ollamaAPI.askAsync(model, prompt);
-    verify(ollamaAPI, times(1)).askAsync(model, prompt);
+    when(ollamaAPI.generateAsync(model, prompt))
+        .thenReturn(new OllamaAsyncResultCallback(null, null, 3));
+    ollamaAPI.generateAsync(model, prompt);
+    verify(ollamaAPI, times(1)).generateAsync(model, prompt);
  }
 }
--- a/src/test/resources/dog-on-a-boat.jpg
+++ b/src/test/resources/dog-on-a-boat.jpg
--- a/src/test/resources/test-config.properties
+++ b/src/test/resources/test-config.properties
@@ -1 +1,2 @@
-ollama.api.url=http://192.168.29.223:11434
+ollama.api.url=http://192.168.29.223:11434
+ollama.model=llava
Author	SHA1	Message	Date
amithkoujalgi	5d3a975e4c	[maven-release-plugin] prepare release v1.0.49	2024-02-09 18:19:36 +00:00
Amith Koujalgi	ad670c3c62	Merge pull request #22 from AgentSchmecker/bugfix/add_model_property_to_model_api Adds model property to Model Type	2024-02-09 23:48:36 +05:30
Markus Klenke	5e2a07ad41	Adds model property to Model Type	2024-02-09 16:54:09 +00:00
amithkoujalgi	9636807819	[maven-release-plugin] prepare for next development iteration	2024-02-09 06:39:34 +00:00
amithkoujalgi	455251d1d4	[maven-release-plugin] prepare release v1.0.48	2024-02-09 06:39:33 +00:00
Amith Koujalgi	ec00ffae7f	Merge pull request #21 from AgentSchmecker/main Correction of Documentation for ask-async	2024-02-09 12:08:33 +05:30
Markus Klenke	d969c7ad46	Fixes currently not working code snippet for ask-async doc	2024-02-08 22:52:41 +00:00
amithkoujalgi	02bf769188	[maven-release-plugin] prepare for next development iteration	2024-02-01 14:39:21 +00:00
amithkoujalgi	1c8a6b4f2a	[maven-release-plugin] prepare release v1.0.47	2024-02-01 14:39:20 +00:00
Amith Koujalgi	60fe5d6ffb	Update APIs from `ask` to `generate`	2024-02-01 20:08:01 +05:30
amithkoujalgi	327ae7437f	[maven-release-plugin] prepare for next development iteration	2024-01-23 19:43:40 +00:00
amithkoujalgi	795b9f2b9b	[maven-release-plugin] prepare release v1.0.46	2024-01-23 19:43:39 +00:00
Amith Koujalgi	54da069e68	Merge remote-tracking branch 'origin/main'	2024-01-24 01:12:32 +05:30
Amith Koujalgi	bfc5cebac1	clean up	2024-01-24 01:12:21 +05:30
amithkoujalgi	d46b1d48d8	[maven-release-plugin] prepare for next development iteration	2024-01-23 19:39:05 +00:00
amithkoujalgi	96320e7761	[maven-release-plugin] prepare release v1.0.45	2024-01-23 19:39:04 +00:00
Amith Koujalgi	e6472f0a81	clean up	2024-01-24 01:07:51 +05:30
amithkoujalgi	816bbd9bbf	[maven-release-plugin] prepare for next development iteration	2024-01-04 04:30:00 +00:00
amithkoujalgi	da1123271d	[maven-release-plugin] prepare release v1.0.44	2024-01-04 04:29:59 +00:00
Amith Koujalgi	12f099260f	clean up	2024-01-04 09:58:53 +05:30
amithkoujalgi	35728ae208	[maven-release-plugin] prepare for next development iteration	2024-01-03 10:50:04 +00:00
amithkoujalgi	7dba9cc798	[maven-release-plugin] prepare release v1.0.43	2024-01-03 10:50:02 +00:00
Amith Koujalgi	bb1c920e22	- updated `askWithImageFiles` and `askWithImageURLs` APIs to use `Options` - updated jacoco version	2024-01-03 16:18:49 +05:30
amithkoujalgi	770cbd7639	[maven-release-plugin] prepare for next development iteration	2024-01-02 18:10:40 +00:00
amithkoujalgi	b43c9b8d93	[maven-release-plugin] prepare release v1.0.42	2024-01-02 18:10:38 +00:00
Amith Koujalgi	935964c9b0	Merge remote-tracking branch 'origin/main'	2024-01-02 23:39:29 +05:30
Amith Koujalgi	9aed9a5237	added `OptionsBuilder` and support for specifying extra params for `ask` API	2024-01-02 23:39:18 +05:30
amithkoujalgi	6c082c94c4	[maven-release-plugin] prepare for next development iteration	2024-01-02 17:49:26 +00:00
amithkoujalgi	6c93b8304a	[maven-release-plugin] prepare release v1.0.41	2024-01-02 17:49:24 +00:00
Amith Koujalgi	85acf0fe78	added `OptionsBuilder` and support for specifying extra params for `ask` API	2024-01-02 23:18:17 +05:30
amithkoujalgi	fe64c6dd10	[maven-release-plugin] prepare for next development iteration	2023-12-30 20:05:10 +00:00
amithkoujalgi	b15066a204	[maven-release-plugin] prepare release v1.0.40	2023-12-30 20:05:08 +00:00
Amith Koujalgi	e2b29b6a07	added `Prompt Builder`	2023-12-31 01:33:59 +05:30
amithkoujalgi	7470ebe846	[maven-release-plugin] prepare for next development iteration	2023-12-30 17:42:18 +00:00
amithkoujalgi	422efa68aa	[maven-release-plugin] prepare release v1.0.39	2023-12-30 17:42:17 +00:00
Amith Koujalgi	f4d8671922	updated docs	2023-12-30 23:10:50 +05:30
amithkoujalgi	70b136c9fc	[maven-release-plugin] prepare for next development iteration	2023-12-30 15:53:15 +00:00
amithkoujalgi	7adb5e93c7	[maven-release-plugin] prepare release v1.0.38	2023-12-30 15:53:14 +00:00
Amith Koujalgi	a8b7117878	updated docs	2023-12-30 21:22:04 +05:30
amithkoujalgi	3bd99cd1e8	[maven-release-plugin] prepare for next development iteration	2023-12-30 08:48:46 +00:00
amithkoujalgi	1d6af26857	[maven-release-plugin] prepare release v1.0.37	2023-12-30 08:48:45 +00:00
Amith Koujalgi	14d18d731f	Fixed javadoc	2023-12-30 14:17:36 +05:30
amithkoujalgi	c8d7cbbc2c	[maven-release-plugin] prepare for next development iteration	2023-12-30 08:34:44 +00:00
amithkoujalgi	ef4303fbbb	[maven-release-plugin] prepare release v1.0.36	2023-12-30 08:34:42 +00:00
Amith Koujalgi	2df9a9c69b	Merge remote-tracking branch 'origin/main'	2023-12-30 14:03:41 +05:30
Amith Koujalgi	6bb5d9f644	Added CodeCov setup	2023-12-30 14:03:34 +05:30
amithkoujalgi	94b221248a	[maven-release-plugin] prepare for next development iteration	2023-12-30 08:29:50 +00:00
amithkoujalgi	2a887f5015	[maven-release-plugin] prepare release v1.0.35	2023-12-30 08:29:49 +00:00
Amith Koujalgi	7e3dddf1bb	Merge remote-tracking branch 'origin/main' # Conflicts: # pom.xml	2023-12-30 13:58:38 +05:30
Amith Koujalgi	fe95a7df2a	Added CodeCov setup	2023-12-30 13:56:35 +05:30
amithkoujalgi	98f6a30c6b	[maven-release-plugin] prepare for next development iteration	2023-12-30 08:12:45 +00:00
amithkoujalgi	00288053bf	[maven-release-plugin] prepare release v1.0.34	2023-12-30 08:12:43 +00:00
Amith Koujalgi	6a7feb98bd	Added CodeCov setup	2023-12-30 13:41:33 +05:30
amithkoujalgi	770d511067	[maven-release-plugin] prepare for next development iteration	2023-12-30 06:54:50 +00:00
amithkoujalgi	b57fc1f818	[maven-release-plugin] prepare release v1.0.33	2023-12-30 06:54:48 +00:00
Amith Koujalgi	01c5a8f07f	updated readme	2023-12-30 12:23:42 +05:30
amithkoujalgi	243b8a3747	[maven-release-plugin] prepare for next development iteration	2023-12-29 04:56:21 +00:00
amithkoujalgi	987fce7f07	[maven-release-plugin] prepare release v1.0.32	2023-12-29 04:56:20 +00:00
Amith Koujalgi	657593be09	Updated all APIs to use `getRequestBuilderDefault()` method	2023-12-29 10:25:18 +05:30
amithkoujalgi	0afba7e3e3	[maven-release-plugin] prepare for next development iteration	2023-12-29 04:03:48 +00:00
amithkoujalgi	ac00bb9029	[maven-release-plugin] prepare release v1.0.31	2023-12-29 04:03:46 +00:00
Amith Koujalgi	67cb444d82	Merge pull request #14 from omcodedthis/patch-3 Updated documentation	2023-12-29 09:32:46 +05:30
amithkoujalgi	1914a29163	[maven-release-plugin] prepare for next development iteration	2023-12-29 03:57:59 +00:00
oM	00bb4e92dc	Updated documentation	2023-12-29 11:43:27 +08:00