Refactored the package structure to use io.github.ollama4j instead of the old naming io.github.amithkoujalgi.ollama4j.core

Signed-off-by: Amith Koujalgi <koujalgi.amith@gmail.com>
This commit is contained in:
Amith Koujalgi 2024-07-27 16:37:47 +05:30
parent 0b041f4340
commit e43bd3acb4
79 changed files with 308 additions and 193 deletions

1
.gitignore vendored
View File

@ -37,6 +37,5 @@ build/
### Mac OS ### ### Mac OS ###
.DS_Store .DS_Store
/.idea/ /.idea/
/src/main/java/io/github/amithkoujalgi/ollama4j/core/localtests/
pom.xml.* pom.xml.*
release.properties release.properties

View File

@ -58,9 +58,9 @@ elevate your projects.
I look forward to seeing the incredible applications/projects you'll build with Ollama4j! 🌟 I look forward to seeing the incredible applications/projects you'll build with Ollama4j! 🌟
Find the full API spec here: https://amithkoujalgi.github.io/ollama4j/ Find the full API spec here: https://ollama4j.github.io/ollama4j/
Find the Javadoc here: https://amithkoujalgi.github.io/ollama4j/apidocs/ Find the Javadoc here: https://ollama4j.github.io/ollama4j/apidocs/
Ollama4j Docs is powered by [Docusaurus](https://docusaurus.io). Ollama4j Docs is powered by [Docusaurus](https://docusaurus.io).

View File

@ -10,6 +10,8 @@ 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. After configuring basic authentication, all subsequent requests will include the Basic Auth header.
```java ```java
import io.github.ollama4j.OllamaAPI;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -36,8 +36,9 @@ from [javadoc](https://ollama4j.github.io/ollama4j/apidocs/io/github/ollama4j/ol
## Build an empty `Options` object ## Build an empty `Options` object
```java ```java
import io.github.amithkoujalgi.ollama4j.core.utils.Options; import io.github.ollama4j.OllamaAPI;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.Options;
import io.github.ollama4j.utils.OptionsBuilder;
public class Main { public class Main {
@ -55,8 +56,8 @@ public class Main {
## Build the `Options` object with values ## Build the `Options` object with values
```java ```java
import io.github.amithkoujalgi.ollama4j.core.utils.Options; import io.github.ollama4j.utils.Options;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
public class Main { public class Main {

View File

@ -7,6 +7,8 @@ sidebar_position: 3
This API lets you check the reachability of Ollama server. This API lets you check the reachability of Ollama server.
```java ```java
import io.github.ollama4j.OllamaAPI;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -7,6 +7,8 @@ sidebar_position: 2
This API lets you set the request timeout for the Ollama client. This API lets you set the request timeout for the Ollama client.
```java ```java
import io.github.ollama4j.OllamaAPI;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -9,6 +9,8 @@ This API lets you set the verbosity of the Ollama client.
## Try asking a question about the model. ## Try asking a question about the model.
```java ```java
import io.github.ollama4j.OllamaAPI;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -10,6 +10,13 @@ information using the history of already asked questions and the respective answ
## Create a new conversation and use chat history to augment follow up questions ## Create a new conversation and use chat history to augment follow up questions
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.ollama4j.models.chat.OllamaChatResult;
import io.github.ollama4j.types.OllamaModelType;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -78,6 +85,14 @@ You will get a response similar to:
## Create a conversation where the answer is streamed ## Create a conversation where the answer is streamed
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.ollama4j.models.chat.OllamaChatResult;
import io.github.ollama4j.models.generate.OllamaStreamHandler;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -113,7 +128,13 @@ You will get a response similar to:
## Use a simple Console Output Stream Handler ## Use a simple Console Output Stream Handler
```java ```java
import io.github.amithkoujalgi.ollama4j.core.impl.ConsoleOutputStreamHandler; import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.impl.ConsoleOutputStreamHandler;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.ollama4j.models.generate.OllamaStreamHandler;
import io.github.ollama4j.types.OllamaModelType;
public class Main { public class Main {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
@ -132,6 +153,14 @@ public class Main {
## Create a new conversation with individual system prompt ## Create a new conversation with individual system prompt
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.ollama4j.models.chat.OllamaChatResult;
import io.github.ollama4j.types.OllamaModelType;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -162,6 +191,16 @@ You will get a response similar to:
## Create a conversation about an image (requires model with image recognition skills) ## Create a conversation about an image (requires model with image recognition skills)
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.ollama4j.models.chat.OllamaChatResult;
import io.github.ollama4j.types.OllamaModelType;
import java.io.File;
import java.util.List;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -174,7 +213,8 @@ public class Main {
// Load Image from File and attach to user message (alternatively images could also be added via URL) // Load Image from File and attach to user message (alternatively images could also be added via URL)
OllamaChatRequestModel requestModel = OllamaChatRequestModel requestModel =
builder.withMessage(OllamaChatMessageRole.USER, "What's in the picture?", builder.withMessage(OllamaChatMessageRole.USER, "What's in the picture?",
List.of(getImageFileFromClasspath("dog-on-a-boat.jpg"))).build(); List.of(
new File("/path/to/image"))).build();
OllamaChatResult chatResult = ollamaAPI.chat(requestModel); OllamaChatResult chatResult = ollamaAPI.chat(requestModel);
System.out.println("First answer: " + chatResult.getResponse()); System.out.println("First answer: " + chatResult.getResponse());

View File

@ -12,6 +12,10 @@ This API corresponds to
the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion) API. the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion) API.
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaAsyncResultStreamer;
import io.github.ollama4j.types.OllamaModelType;
public class Main { public class Main {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
@ -38,9 +42,7 @@ public class Main {
System.out.println("Complete Response:"); System.out.println("Complete Response:");
System.out.println("------------------------"); System.out.println("------------------------");
System.out.println(streamer.getResult()); System.out.println(streamer.getCompleteResponse());
} }
} }
``` ```
You will get a steaming response.

View File

@ -12,6 +12,10 @@ Parameters:
- `prompt`: text to generate embeddings for - `prompt`: text to generate embeddings for
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.types.OllamaModelType;
import java.util.List;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -22,6 +22,13 @@ If you have this image downloaded and you pass the path to the downloaded image
![Img](https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg) ![Img](https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg)
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.types.OllamaModelType;
import io.github.ollama4j.utils.OptionsBuilder;
import java.io.File;
import java.util.List;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -32,7 +39,9 @@ public class Main {
OllamaResult result = ollamaAPI.generateWithImageFiles(OllamaModelType.LLAVA, OllamaResult result = ollamaAPI.generateWithImageFiles(OllamaModelType.LLAVA,
"What's in this image?", "What's in this image?",
List.of( List.of(
new File("/path/to/image"))); new File("/path/to/image")),
new OptionsBuilder().build()
);
System.out.println(result.getResponse()); System.out.println(result.getResponse());
} }
} }

View File

@ -22,6 +22,12 @@ Passing the link of this image the following code:
![Img](https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg) ![Img](https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg)
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.types.OllamaModelType;
import io.github.ollama4j.utils.OptionsBuilder;
import java.util.List;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -32,7 +38,9 @@ public class Main {
OllamaResult result = ollamaAPI.generateWithImageURLs(OllamaModelType.LLAVA, OllamaResult result = ollamaAPI.generateWithImageURLs(OllamaModelType.LLAVA,
"What's in this image?", "What's in this image?",
List.of( List.of(
"https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg")); "https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg"),
new OptionsBuilder().build()
);
System.out.println(result.getResponse()); System.out.println(result.getResponse());
} }
} }

View File

@ -29,6 +29,8 @@ You could do that with ease with the `function calling` capabilities of the mode
### Create Functions ### Create Functions
We can create static functions as our tools.
This function takes the arguments `location` and `fuelType` and performs an operation with these arguments and returns This function takes the arguments `location` and `fuelType` and performs an operation with these arguments and returns
fuel price value. fuel price value.
@ -50,6 +52,8 @@ public static String getCurrentWeather(Map<String, Object> arguments) {
} }
``` ```
Another way to create our tools is by creating classes by extending `ToolFunction`.
This function takes the argument `employee-name` and performs an operation with the argument and returns employee This function takes the argument `employee-name` and performs an operation with the argument and returns employee
details. details.
@ -211,13 +215,13 @@ Rahul Kumar, Address: King St, Hyderabad, India, Phone: 9876543210}`
### Full Example ### Full Example
```java ```java
import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; import io.github.ollama4j.OllamaAPI;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.exceptions.ToolInvocationException; import io.github.ollama4j.exceptions.ToolInvocationException;
import io.github.amithkoujalgi.ollama4j.core.tools.OllamaToolsResult; import io.github.ollama4j.tools.OllamaToolsResult;
import io.github.amithkoujalgi.ollama4j.core.tools.ToolFunction; import io.github.ollama4j.tools.ToolFunction;
import io.github.amithkoujalgi.ollama4j.core.tools.Tools; import io.github.ollama4j.tools.Tools;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
@ -341,7 +345,7 @@ Rahul Kumar, Address: King St, Hyderabad, India, Phone: 9876543210}`
:::: ::::
### Room for improvement ### Potential Improvements
Instead of explicitly registering `ollamaAPI.registerTool(toolSpecification)`, we could introduce annotation-based tool Instead of explicitly registering `ollamaAPI.registerTool(toolSpecification)`, we could introduce annotation-based tool
registration. For example: registration. For example:

View File

@ -16,6 +16,11 @@ to [this](/apis-extras/options-builder).
## Try asking a question about the model. ## Try asking a question about the model.
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.types.OllamaModelType;
import io.github.ollama4j.utils.OptionsBuilder;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -44,6 +49,11 @@ You will get a response similar to:
## Try asking a question, receiving the answer streamed ## Try asking a question, receiving the answer streamed
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.models.generate.OllamaStreamHandler;
import io.github.ollama4j.utils.OptionsBuilder;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -80,6 +90,11 @@ You will get a response similar to:
## Try asking a question from general topics. ## Try asking a question from general topics.
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.types.OllamaModelType;
import io.github.ollama4j.utils.OptionsBuilder;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -123,6 +138,12 @@ You'd then get a response from the model:
## Try asking for a Database query for your data schema. ## Try asking for a Database query for your data schema.
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.types.OllamaModelType;
import io.github.ollama4j.utils.OptionsBuilder;
import io.github.ollama4j.utils.SamplePrompts;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -8,13 +8,13 @@ This is designed for prompt engineering. It allows you to easily build the promp
inferences. inferences.
```java ```java
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.OllamaResult;
import io.github.ollama4j.types.OllamaModelType;
import io.github.ollama4j.utils.OptionsBuilder;
import io.github.ollama4j.utils.PromptBuilder;
import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; public class Main {
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 { public static void main(String[] args) throws Exception {
String host = "http://localhost:11434/"; String host = "http://localhost:11434/";
@ -42,7 +42,8 @@ public class AskPhi {
.addSeparator() .addSeparator()
.add("How do I read a file in Go and print its contents to stdout?"); .add("How do I read a file in Go and print its contents to stdout?");
OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), new OptionsBuilder().build()); boolean raw = false;
OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), raw, new OptionsBuilder().build());
System.out.println(response.getResponse()); System.out.println(response.getResponse());
} }
} }

View File

@ -9,6 +9,8 @@ This API lets you create a custom model on the Ollama server.
### Create a model from an existing Modelfile in the Ollama server ### Create a model from an existing Modelfile in the Ollama server
```java title="CreateModel.java" ```java title="CreateModel.java"
import io.github.ollama4j.OllamaAPI;
public class CreateModel { public class CreateModel {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -7,6 +7,8 @@ sidebar_position: 5
This API lets you create a delete a model from the Ollama server. This API lets you create a delete a model from the Ollama server.
```java title="DeleteModel.java" ```java title="DeleteModel.java"
import io.github.ollama4j.OllamaAPI;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -7,6 +7,10 @@ sidebar_position: 3
This API lets you get the details of a model on the Ollama server. This API lets you get the details of a model on the Ollama server.
```java title="GetModelDetails.java" ```java title="GetModelDetails.java"
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.ModelDetail;
import io.github.ollama4j.types.OllamaModelType;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -7,6 +7,11 @@ sidebar_position: 1
This API lets you list available models on the Ollama server. This API lets you list available models on the Ollama server.
```java title="ListModels.java" ```java title="ListModels.java"
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.models.Model;
import java.util.List;
public class ListModels { public class ListModels {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -7,6 +7,9 @@ sidebar_position: 2
This API lets you pull a model on the Ollama server. This API lets you pull a model on the Ollama server.
```java title="PullModel.java" ```java title="PullModel.java"
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.types.OllamaModelType;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -78,9 +78,9 @@ Add the dependency to your project's `pom.xml`.
```xml ```xml
<dependency> <dependency>
<groupId>io.github.amithkoujalgi</groupId> <groupId>io.github.ollama4j</groupId>
<artifactId>ollama4j</artifactId> <artifactId>ollama4j</artifactId>
<version>1.0.27</version> <version>1.0.78</version>
</dependency> </dependency>
``` ```
@ -116,6 +116,8 @@ or use other suitable implementations.
Create a new Java class in your project and add this code. Create a new Java class in your project and add this code.
```java ```java
import io.github.ollama4j.OllamaAPI;
public class OllamaAPITest { public class OllamaAPITest {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -1,21 +1,21 @@
package io.github.amithkoujalgi.ollama4j.core; package io.github.ollama4j;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.exceptions.ToolInvocationException; import io.github.ollama4j.exceptions.ToolInvocationException;
import io.github.amithkoujalgi.ollama4j.core.exceptions.ToolNotFoundException; import io.github.ollama4j.exceptions.ToolNotFoundException;
import io.github.amithkoujalgi.ollama4j.core.models.*; import io.github.ollama4j.models.*;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessage; import io.github.ollama4j.models.chat.OllamaChatMessage;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder; import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel; import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResult; import io.github.ollama4j.models.chat.OllamaChatResult;
import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingResponseModel; import io.github.ollama4j.models.embeddings.OllamaEmbeddingResponseModel;
import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel; import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestModel;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel; import io.github.ollama4j.models.generate.OllamaGenerateRequestModel;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; import io.github.ollama4j.models.generate.OllamaStreamHandler;
import io.github.amithkoujalgi.ollama4j.core.models.request.*; import io.github.ollama4j.models.request.*;
import io.github.amithkoujalgi.ollama4j.core.tools.*; import io.github.ollama4j.tools.*;
import io.github.amithkoujalgi.ollama4j.core.utils.Options; import io.github.ollama4j.utils.Options;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Setter; import lombok.Setter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core; package io.github.ollama4j;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.exceptions; package io.github.ollama4j.exceptions;
public class OllamaBaseException extends Exception { public class OllamaBaseException extends Exception {

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.exceptions; package io.github.ollama4j.exceptions;
public class ToolInvocationException extends Exception { public class ToolInvocationException extends Exception {

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.exceptions; package io.github.ollama4j.exceptions;
public class ToolNotFoundException extends Exception { public class ToolNotFoundException extends Exception {

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.impl; package io.github.ollama4j.impl;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; import io.github.ollama4j.models.generate.OllamaStreamHandler;
public class ConsoleOutputStreamHandler implements OllamaStreamHandler { public class ConsoleOutputStreamHandler implements OllamaStreamHandler {
private final StringBuffer response = new StringBuffer(); private final StringBuffer response = new StringBuffer();

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;

View File

@ -1,11 +1,10 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import java.time.LocalDateTime;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Data; import lombok.Data;
@Data @Data

View File

@ -1,9 +1,9 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Data; import lombok.Data;
@Data @Data

View File

@ -1,9 +1,9 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Data; import lombok.Data;
@Data @Data

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

View File

@ -1,10 +1,10 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import io.github.amithkoujalgi.ollama4j.core.OllamaResultStream; import io.github.ollama4j.OllamaResultStream;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel; import io.github.ollama4j.models.generate.OllamaGenerateRequestModel;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateResponseModel; import io.github.ollama4j.models.generate.OllamaGenerateResponseModel;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.github.amithkoujalgi.ollama4j.core.utils.BooleanToJsonFormatFlagSerializer; import io.github.ollama4j.utils.BooleanToJsonFormatFlagSerializer;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Data; import lombok.Data;
@Data @Data

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models; package io.github.ollama4j.models;
import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper; import static io.github.ollama4j.utils.Utils.getObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Data; import lombok.Data;

View File

@ -1,11 +1,11 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper; import static io.github.ollama4j.utils.Utils.getObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.github.amithkoujalgi.ollama4j.core.utils.FileToBase64Serializer; import io.github.ollama4j.utils.FileToBase64Serializer;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -11,8 +11,8 @@ import java.util.stream.Collectors;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import io.github.amithkoujalgi.ollama4j.core.utils.Options; import io.github.ollama4j.utils.Options;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
/** /**
* Helper class for creating {@link OllamaChatRequestModel} objects using the builder-pattern. * Helper class for creating {@link OllamaChatRequestModel} objects using the builder-pattern.

View File

@ -1,8 +1,9 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import java.util.List; import java.util.List;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaCommonRequestModel;
import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; import io.github.ollama4j.models.OllamaCommonRequestModel;
import io.github.ollama4j.utils.OllamaRequestBody;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;

View File

@ -1,8 +1,8 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import java.util.List; import java.util.List;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
/** /**
* Specific chat-API result that contains the chat history sent to the model and appends the answer as {@link OllamaChatResult} given by the * Specific chat-API result that contains the chat history sent to the model and appends the answer as {@link OllamaChatResult} given by the

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models.chat; package io.github.ollama4j.models.chat;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; import io.github.ollama4j.models.generate.OllamaStreamHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.embeddings; package io.github.ollama4j.models.embeddings;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models.embeddings; package io.github.ollama4j.models.embeddings;
import io.github.amithkoujalgi.ollama4j.core.utils.Options; import io.github.ollama4j.utils.Options;
public class OllamaEmbeddingsRequestBuilder { public class OllamaEmbeddingsRequestBuilder {

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models.embeddings; package io.github.ollama4j.models.embeddings;
import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper; import static io.github.ollama4j.utils.Utils.getObjectMapper;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;

View File

@ -1,9 +1,9 @@
package io.github.amithkoujalgi.ollama4j.core.models.generate; package io.github.ollama4j.models.generate;
import io.github.amithkoujalgi.ollama4j.core.utils.Options; import io.github.ollama4j.utils.Options;
/** /**
* Helper class for creating {@link io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel} * Helper class for creating {@link OllamaGenerateRequestModel}
* objects using the builder-pattern. * objects using the builder-pattern.
*/ */
public class OllamaGenerateRequestBuilder { public class OllamaGenerateRequestBuilder {

View File

@ -1,8 +1,8 @@
package io.github.amithkoujalgi.ollama4j.core.models.generate; package io.github.ollama4j.models.generate;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaCommonRequestModel; import io.github.ollama4j.models.OllamaCommonRequestModel;
import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; import io.github.ollama4j.utils.OllamaRequestBody;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.generate; package io.github.ollama4j.models.generate;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.generate; package io.github.ollama4j.models.generate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.models.generate; package io.github.ollama4j.models.generate;
import java.util.function.Consumer; import java.util.function.Consumer;

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models.request; package io.github.ollama4j.models.request;
import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper; import static io.github.ollama4j.utils.Utils.getObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models.request; package io.github.ollama4j.models.request;
import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper; import static io.github.ollama4j.utils.Utils.getObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.models.request; package io.github.ollama4j.models.request;
import static io.github.amithkoujalgi.ollama4j.core.utils.Utils.getObjectMapper; import static io.github.ollama4j.utils.Utils.getObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,14 +1,14 @@
package io.github.amithkoujalgi.ollama4j.core.models.request; package io.github.ollama4j.models.request;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; import io.github.ollama4j.models.BasicAuth;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResponseModel; import io.github.ollama4j.models.chat.OllamaChatResponseModel;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatStreamObserver; import io.github.ollama4j.models.chat.OllamaChatStreamObserver;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; import io.github.ollama4j.models.generate.OllamaStreamHandler;
import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; import io.github.ollama4j.utils.OllamaRequestBody;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,12 +1,12 @@
package io.github.amithkoujalgi.ollama4j.core.models.request; package io.github.ollama4j.models.request;
import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; import io.github.ollama4j.OllamaAPI;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; import io.github.ollama4j.models.BasicAuth;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaErrorResponseModel; import io.github.ollama4j.models.OllamaErrorResponseModel;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; import io.github.ollama4j.utils.OllamaRequestBody;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,14 +1,14 @@
package io.github.amithkoujalgi.ollama4j.core.models.request; package io.github.ollama4j.models.request;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; import io.github.ollama4j.models.BasicAuth;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateResponseModel; import io.github.ollama4j.models.generate.OllamaGenerateResponseModel;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateStreamObserver; import io.github.ollama4j.models.generate.OllamaGenerateStreamObserver;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; import io.github.ollama4j.models.generate.OllamaStreamHandler;
import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; import io.github.ollama4j.utils.OllamaRequestBody;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.tools; package io.github.ollama4j.tools;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.tools; package io.github.ollama4j.tools;
import java.util.Map; import java.util.Map;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.tools; package io.github.ollama4j.tools;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.tools; package io.github.ollama4j.tools;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

View File

@ -1,11 +1,11 @@
package io.github.amithkoujalgi.ollama4j.core.tools; package io.github.ollama4j.tools;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.types; package io.github.ollama4j.types;
/** /**
* A class to provide constants for all the supported models by Ollama. * A class to provide constants for all the supported models by Ollama.

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import java.io.IOException; import java.io.IOException;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import java.io.IOException; import java.io.IOException;
import java.util.Base64; import java.util.Base64;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import java.net.http.HttpRequest.BodyPublisher; import java.net.http.HttpRequest.BodyPublisher;
import java.net.http.HttpRequest.BodyPublishers; import java.net.http.HttpRequest.BodyPublishers;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import java.util.Map; import java.util.Map;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import java.util.HashMap; import java.util.HashMap;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
/** /**
* The {@code PromptBuilder} class is used to construct prompt texts for language models (LLMs). It * The {@code PromptBuilder} class is used to construct prompt texts for language models (LLMs). It

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; import io.github.ollama4j.OllamaAPI;
import java.io.InputStream; import java.io.InputStream;
import java.util.Scanner; import java.util.Scanner;

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.core.utils; package io.github.ollama4j.utils;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;

View File

@ -1,16 +1,16 @@
package io.github.amithkoujalgi.ollama4j.integrationtests; package io.github.ollama4j.integrationtests;
import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; import io.github.ollama4j.OllamaAPI;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail; import io.github.ollama4j.models.ModelDetail;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessageRole; import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder; import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel; import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResult; import io.github.ollama4j.models.chat.OllamaChatResult;
import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder; import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestBuilder;
import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel; import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestModel;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
import lombok.Data; import lombok.Data;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Order;

View File

@ -1,12 +1,12 @@
package io.github.amithkoujalgi.ollama4j.unittests; package io.github.ollama4j.unittests;
import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; import io.github.ollama4j.OllamaAPI;
import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail; import io.github.ollama4j.models.ModelDetail;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaAsyncResultStreamer; import io.github.ollama4j.models.OllamaAsyncResultStreamer;
import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; import io.github.ollama4j.models.OllamaResult;
import io.github.amithkoujalgi.ollama4j.core.types.OllamaModelType; import io.github.ollama4j.types.OllamaModelType;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;

View File

@ -1,10 +1,10 @@
package io.github.amithkoujalgi.ollama4j.unittests.jackson; package io.github.ollama4j.unittests.jackson;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.fail;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import io.github.amithkoujalgi.ollama4j.core.utils.Utils; import io.github.ollama4j.utils.Utils;
public abstract class AbstractSerializationTest<T> { public abstract class AbstractSerializationTest<T> {

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.unittests.jackson; package io.github.ollama4j.unittests.jackson;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -9,10 +9,10 @@ import org.json.JSONObject;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessageRole; import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder; import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel; import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
public class TestChatRequestSerialization extends AbstractSerializationTest<OllamaChatRequestModel> { public class TestChatRequestSerialization extends AbstractSerializationTest<OllamaChatRequestModel> {

View File

@ -1,11 +1,11 @@
package io.github.amithkoujalgi.ollama4j.unittests.jackson; package io.github.ollama4j.unittests.jackson;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel; import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestModel;
import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder; import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestBuilder;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
public class TestEmbeddingsRequestSerialization extends AbstractSerializationTest<OllamaEmbeddingsRequestModel> { public class TestEmbeddingsRequestSerialization extends AbstractSerializationTest<OllamaEmbeddingsRequestModel> {

View File

@ -1,4 +1,4 @@
package io.github.amithkoujalgi.ollama4j.unittests.jackson; package io.github.ollama4j.unittests.jackson;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -7,9 +7,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestBuilder; import io.github.ollama4j.models.generate.OllamaGenerateRequestBuilder;
import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel; import io.github.ollama4j.models.generate.OllamaGenerateRequestModel;
import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; import io.github.ollama4j.utils.OptionsBuilder;
public class TestGenerateRequestSerialization extends AbstractSerializationTest<OllamaGenerateRequestModel> { public class TestGenerateRequestSerialization extends AbstractSerializationTest<OllamaGenerateRequestModel> {

View File

@ -1,6 +1,6 @@
package io.github.amithkoujalgi.ollama4j.unittests.jackson; package io.github.ollama4j.unittests.jackson;
import io.github.amithkoujalgi.ollama4j.core.models.Model; import io.github.ollama4j.models.Model;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class TestModelRequestSerialization extends AbstractSerializationTest<Model> { public class TestModelRequestSerialization extends AbstractSerializationTest<Model> {