From e43bd3acb43b7562047cfd75046e605489988a17 Mon Sep 17 00:00:00 2001 From: Amith Koujalgi Date: Sat, 27 Jul 2024 16:37:47 +0530 Subject: [PATCH] Refactored the package structure to use `io.github.ollama4j` instead of the old naming `io.github.amithkoujalgi.ollama4j.core` Signed-off-by: Amith Koujalgi --- .gitignore | 1 - docs/blog/2023-12-22-release-post.md | 4 +- docs/docs/apis-extras/basic-auth.md | 2 + docs/docs/apis-extras/options-builder.md | 9 ++-- docs/docs/apis-extras/ping.md | 2 + docs/docs/apis-extras/request-timeout.md | 2 + docs/docs/apis-extras/verbosity.md | 2 + docs/docs/apis-generate/chat.md | 44 ++++++++++++++++++- docs/docs/apis-generate/generate-async.md | 10 +++-- .../docs/apis-generate/generate-embeddings.md | 4 ++ .../generate-with-image-files.md | 11 ++++- .../apis-generate/generate-with-image-urls.md | 10 ++++- .../docs/apis-generate/generate-with-tools.md | 20 +++++---- docs/docs/apis-generate/generate.md | 21 +++++++++ docs/docs/apis-generate/prompt-builder.md | 15 ++++--- .../apis-model-management/create-model.md | 2 + .../apis-model-management/delete-model.md | 2 + .../get-model-details.md | 4 ++ .../docs/apis-model-management/list-models.md | 5 +++ docs/docs/apis-model-management/pull-model.md | 5 ++- docs/docs/intro.md | 6 ++- .../ollama4j/core => ollama4j}/OllamaAPI.java | 34 +++++++------- .../core => ollama4j}/OllamaResultStream.java | 2 +- .../exceptions/OllamaBaseException.java | 2 +- .../exceptions/ToolInvocationException.java | 2 +- .../exceptions/ToolNotFoundException.java | 2 +- .../impl/ConsoleOutputStreamHandler.java | 4 +- .../core => ollama4j}/models/BasicAuth.java | 2 +- .../models/ListModelsResponse.java | 2 +- .../core => ollama4j}/models/Model.java | 5 +-- .../core => ollama4j}/models/ModelDetail.java | 4 +- .../core => ollama4j}/models/ModelMeta.java | 4 +- .../models/ModelPullResponse.java | 2 +- .../models/OllamaAsyncResultStreamer.java | 12 ++--- .../models/OllamaCommonRequestModel.java | 6 +-- .../models/OllamaErrorResponseModel.java | 2 +- .../models/OllamaResult.java | 4 +- .../models/chat/OllamaChatMessage.java | 6 +-- .../models/chat/OllamaChatMessageRole.java | 2 +- .../models/chat/OllamaChatRequestBuilder.java | 6 +-- .../models/chat/OllamaChatRequestModel.java | 7 +-- .../models/chat/OllamaChatResponseModel.java | 2 +- .../models/chat/OllamaChatResult.java | 4 +- .../models/chat/OllamaChatStreamObserver.java | 4 +- .../OllamaEmbeddingResponseModel.java | 2 +- .../OllamaEmbeddingsRequestBuilder.java | 4 +- .../OllamaEmbeddingsRequestModel.java | 4 +- .../OllamaGenerateRequestBuilder.java | 6 +-- .../generate/OllamaGenerateRequestModel.java | 6 +-- .../generate/OllamaGenerateResponseModel.java | 2 +- .../OllamaGenerateStreamObserver.java | 2 +- .../models/generate/OllamaStreamHandler.java | 2 +- .../CustomModelFileContentsRequest.java | 4 +- .../request/CustomModelFilePathRequest.java | 4 +- .../models/request/ModelRequest.java | 4 +- .../request/OllamaChatEndpointCaller.java | 18 ++++---- .../models/request/OllamaEndpointCaller.java | 16 +++---- .../request/OllamaGenerateEndpointCaller.java | 18 ++++---- .../tools/OllamaToolsResult.java | 4 +- .../core => ollama4j}/tools/ToolFunction.java | 2 +- .../tools/ToolFunctionCallSpec.java | 2 +- .../core => ollama4j}/tools/ToolRegistry.java | 2 +- .../core => ollama4j}/tools/Tools.java | 4 +- .../types/OllamaModelType.java | 2 +- .../BooleanToJsonFormatFlagSerializer.java | 2 +- .../utils/FileToBase64Serializer.java | 2 +- .../utils/OllamaRequestBody.java | 2 +- .../core => ollama4j}/utils/Options.java | 2 +- .../utils/OptionsBuilder.java | 2 +- .../utils/PromptBuilder.java | 2 +- .../utils/SamplePrompts.java | 4 +- .../core => ollama4j}/utils/Utils.java | 2 +- .../integrationtests/TestRealAPIs.java | 24 +++++----- .../ollama4j/unittests/TestMockedAPIs.java | 16 +++---- .../jackson/AbstractSerializationTest.java | 4 +- .../jackson/TestChatRequestSerialization.java | 10 ++--- .../TestEmbeddingsRequestSerialization.java | 8 ++-- .../TestGenerateRequestSerialization.java | 8 ++-- .../TestModelRequestSerialization.java | 4 +- 79 files changed, 308 insertions(+), 193 deletions(-) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/OllamaAPI.java (95%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/OllamaResultStream.java (91%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/exceptions/OllamaBaseException.java (68%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/exceptions/ToolInvocationException.java (71%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/exceptions/ToolNotFoundException.java (68%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/impl/ConsoleOutputStreamHandler.java (71%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/BasicAuth.java (79%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/ListModelsResponse.java (68%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/Model.java (87%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/ModelDetail.java (86%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/ModelMeta.java (87%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/ModelPullResponse.java (83%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/OllamaAsyncResultStreamer.java (91%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/OllamaCommonRequestModel.java (82%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/OllamaErrorResponseModel.java (78%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/OllamaResult.java (88%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatMessage.java (83%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatMessageRole.java (85%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatRequestBuilder.java (95%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatRequestModel.java (79%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatResponseModel.java (93%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatResult.java (88%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/chat/OllamaChatStreamObserver.java (84%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/embeddings/OllamaEmbeddingResponseModel.java (79%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/embeddings/OllamaEmbeddingsRequestBuilder.java (86%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/embeddings/OllamaEmbeddingsRequestModel.java (83%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/generate/OllamaGenerateRequestBuilder.java (84%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/generate/OllamaGenerateRequestModel.java (80%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/generate/OllamaGenerateResponseModel.java (92%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/generate/OllamaGenerateStreamObserver.java (92%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/generate/OllamaStreamHandler.java (68%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/request/CustomModelFileContentsRequest.java (76%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/request/CustomModelFilePathRequest.java (76%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/request/ModelRequest.java (74%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/request/OllamaChatEndpointCaller.java (71%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/request/OllamaEndpointCaller.java (91%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/models/request/OllamaGenerateEndpointCaller.java (70%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/tools/OllamaToolsResult.java (88%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/tools/ToolFunction.java (70%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/tools/ToolFunctionCallSpec.java (83%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/tools/ToolRegistry.java (87%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/tools/Tools.java (97%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/types/OllamaModelType.java (98%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/BooleanToJsonFormatFlagSerializer.java (91%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/FileToBase64Serializer.java (92%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/OllamaRequestBody.java (94%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/Options.java (75%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/OptionsBuilder.java (99%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/PromptBuilder.java (97%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/SamplePrompts.java (88%) rename src/main/java/io/github/{amithkoujalgi/ollama4j/core => ollama4j}/utils/Utils.java (95%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/integrationtests/TestRealAPIs.java (94%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/unittests/TestMockedAPIs.java (92%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/unittests/jackson/AbstractSerializationTest.java (89%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/unittests/jackson/TestChatRequestSerialization.java (92%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java (80%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java (85%) rename src/test/java/io/github/{amithkoujalgi => }/ollama4j/unittests/jackson/TestModelRequestSerialization.java (93%) diff --git a/.gitignore b/.gitignore index f8c9181..1c00e11 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,5 @@ build/ ### Mac OS ### .DS_Store /.idea/ -/src/main/java/io/github/amithkoujalgi/ollama4j/core/localtests/ pom.xml.* release.properties \ No newline at end of file diff --git a/docs/blog/2023-12-22-release-post.md b/docs/blog/2023-12-22-release-post.md index 4a9f020..aba2a53 100644 --- a/docs/blog/2023-12-22-release-post.md +++ b/docs/blog/2023-12-22-release-post.md @@ -58,9 +58,9 @@ elevate your projects. 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). diff --git a/docs/docs/apis-extras/basic-auth.md b/docs/docs/apis-extras/basic-auth.md index 226a18f..15f681c 100644 --- a/docs/docs/apis-extras/basic-auth.md +++ b/docs/docs/apis-extras/basic-auth.md @@ -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. ```java +import io.github.ollama4j.OllamaAPI; + public class Main { public static void main(String[] args) { diff --git a/docs/docs/apis-extras/options-builder.md b/docs/docs/apis-extras/options-builder.md index f7f8ed8..10aeea5 100644 --- a/docs/docs/apis-extras/options-builder.md +++ b/docs/docs/apis-extras/options-builder.md @@ -36,8 +36,9 @@ from [javadoc](https://ollama4j.github.io/ollama4j/apidocs/io/github/ollama4j/ol ## Build an empty `Options` object ```java -import io.github.amithkoujalgi.ollama4j.core.utils.Options; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.utils.Options; +import io.github.ollama4j.utils.OptionsBuilder; public class Main { @@ -55,8 +56,8 @@ public class Main { ## Build the `Options` object with values ```java -import io.github.amithkoujalgi.ollama4j.core.utils.Options; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +import io.github.ollama4j.utils.Options; +import io.github.ollama4j.utils.OptionsBuilder; public class Main { diff --git a/docs/docs/apis-extras/ping.md b/docs/docs/apis-extras/ping.md index cc69f3d..2c9d8d3 100644 --- a/docs/docs/apis-extras/ping.md +++ b/docs/docs/apis-extras/ping.md @@ -7,6 +7,8 @@ sidebar_position: 3 This API lets you check the reachability of Ollama server. ```java +import io.github.ollama4j.OllamaAPI; + public class Main { public static void main(String[] args) { diff --git a/docs/docs/apis-extras/request-timeout.md b/docs/docs/apis-extras/request-timeout.md index ff3f40f..f22971a 100644 --- a/docs/docs/apis-extras/request-timeout.md +++ b/docs/docs/apis-extras/request-timeout.md @@ -7,6 +7,8 @@ sidebar_position: 2 This API lets you set the request timeout for the Ollama client. ```java +import io.github.ollama4j.OllamaAPI; + public class Main { public static void main(String[] args) { diff --git a/docs/docs/apis-extras/verbosity.md b/docs/docs/apis-extras/verbosity.md index 35a150e..c8809c9 100644 --- a/docs/docs/apis-extras/verbosity.md +++ b/docs/docs/apis-extras/verbosity.md @@ -9,6 +9,8 @@ This API lets you set the verbosity of the Ollama client. ## Try asking a question about the model. ```java +import io.github.ollama4j.OllamaAPI; + public class Main { public static void main(String[] args) { diff --git a/docs/docs/apis-generate/chat.md b/docs/docs/apis-generate/chat.md index b4d51b1..78827bd 100644 --- a/docs/docs/apis-generate/chat.md +++ b/docs/docs/apis-generate/chat.md @@ -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 ```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 static void main(String[] args) { @@ -78,6 +85,14 @@ You will get a response similar to: ## Create a conversation where the answer is streamed ```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 static void main(String[] args) { @@ -113,7 +128,13 @@ You will get a response similar to: ## Use a simple Console Output Stream Handler ```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 static void main(String[] args) throws Exception { @@ -132,6 +153,14 @@ public class Main { ## Create a new conversation with individual system prompt ```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 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) ```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 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) OllamaChatRequestModel requestModel = 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); System.out.println("First answer: " + chatResult.getResponse()); diff --git a/docs/docs/apis-generate/generate-async.md b/docs/docs/apis-generate/generate-async.md index e71d2a7..ad5b786 100644 --- a/docs/docs/apis-generate/generate-async.md +++ b/docs/docs/apis-generate/generate-async.md @@ -12,6 +12,10 @@ This API corresponds to the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#generate-a-completion) API. ```java +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.models.OllamaAsyncResultStreamer; +import io.github.ollama4j.types.OllamaModelType; + public class Main { public static void main(String[] args) throws Exception { @@ -38,9 +42,7 @@ public class Main { System.out.println("Complete Response:"); System.out.println("------------------------"); - System.out.println(streamer.getResult()); + System.out.println(streamer.getCompleteResponse()); } } -``` - -You will get a steaming response. \ No newline at end of file +``` \ No newline at end of file diff --git a/docs/docs/apis-generate/generate-embeddings.md b/docs/docs/apis-generate/generate-embeddings.md index 1da45e1..586b215 100644 --- a/docs/docs/apis-generate/generate-embeddings.md +++ b/docs/docs/apis-generate/generate-embeddings.md @@ -12,6 +12,10 @@ Parameters: - `prompt`: text to generate embeddings for ```java +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.types.OllamaModelType; +import java.util.List; + public class Main { public static void main(String[] args) { diff --git a/docs/docs/apis-generate/generate-with-image-files.md b/docs/docs/apis-generate/generate-with-image-files.md index 1e1f9f9..4e4214a 100644 --- a/docs/docs/apis-generate/generate-with-image-files.md +++ b/docs/docs/apis-generate/generate-with-image-files.md @@ -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) ```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 static void main(String[] args) { @@ -32,7 +39,9 @@ public class Main { OllamaResult result = ollamaAPI.generateWithImageFiles(OllamaModelType.LLAVA, "What's in this image?", List.of( - new File("/path/to/image"))); + new File("/path/to/image")), + new OptionsBuilder().build() + ); System.out.println(result.getResponse()); } } diff --git a/docs/docs/apis-generate/generate-with-image-urls.md b/docs/docs/apis-generate/generate-with-image-urls.md index 2fd3941..04573b9 100644 --- a/docs/docs/apis-generate/generate-with-image-urls.md +++ b/docs/docs/apis-generate/generate-with-image-urls.md @@ -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) ```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 static void main(String[] args) { @@ -32,7 +38,9 @@ public class Main { 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")); + "https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg"), + new OptionsBuilder().build() + ); System.out.println(result.getResponse()); } } diff --git a/docs/docs/apis-generate/generate-with-tools.md b/docs/docs/apis-generate/generate-with-tools.md index dfa1ec0..3a40150 100644 --- a/docs/docs/apis-generate/generate-with-tools.md +++ b/docs/docs/apis-generate/generate-with-tools.md @@ -29,6 +29,8 @@ You could do that with ease with the `function calling` capabilities of the mode ### 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 fuel price value. @@ -50,6 +52,8 @@ public static String getCurrentWeather(Map 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 details. @@ -211,13 +215,13 @@ Rahul Kumar, Address: King St, Hyderabad, India, Phone: 9876543210}` ### Full Example ```java -import io.github.amithkoujalgi.ollama4j.core.OllamaAPI; -import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.exceptions.ToolInvocationException; -import io.github.amithkoujalgi.ollama4j.core.tools.OllamaToolsResult; -import io.github.amithkoujalgi.ollama4j.core.tools.ToolFunction; -import io.github.amithkoujalgi.ollama4j.core.tools.Tools; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.exceptions.ToolInvocationException; +import io.github.ollama4j.tools.OllamaToolsResult; +import io.github.ollama4j.tools.ToolFunction; +import io.github.ollama4j.tools.Tools; +import io.github.ollama4j.utils.OptionsBuilder; import java.io.IOException; 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 registration. For example: diff --git a/docs/docs/apis-generate/generate.md b/docs/docs/apis-generate/generate.md index 4754c54..70bbb89 100644 --- a/docs/docs/apis-generate/generate.md +++ b/docs/docs/apis-generate/generate.md @@ -16,6 +16,11 @@ to [this](/apis-extras/options-builder). ## Try asking a question about the model. ```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 static void main(String[] args) { @@ -44,6 +49,11 @@ You will get a response similar to: ## Try asking a question, receiving the answer streamed ```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 static void main(String[] args) { @@ -80,6 +90,11 @@ You will get a response similar to: ## Try asking a question from general topics. ```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 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. ```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 static void main(String[] args) { diff --git a/docs/docs/apis-generate/prompt-builder.md b/docs/docs/apis-generate/prompt-builder.md index ffe57d7..150f3cd 100644 --- a/docs/docs/apis-generate/prompt-builder.md +++ b/docs/docs/apis-generate/prompt-builder.md @@ -8,13 +8,13 @@ This is designed for prompt engineering. It allows you to easily build the promp inferences. ```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; -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 class Main { public static void main(String[] args) throws Exception { String host = "http://localhost:11434/"; @@ -42,7 +42,8 @@ public class AskPhi { .addSeparator() .add("How do I read a file in Go and print its contents to stdout?"); - OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), new OptionsBuilder().build()); + boolean raw = false; + OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), raw, new OptionsBuilder().build()); System.out.println(response.getResponse()); } } diff --git a/docs/docs/apis-model-management/create-model.md b/docs/docs/apis-model-management/create-model.md index 437e291..866cf73 100644 --- a/docs/docs/apis-model-management/create-model.md +++ b/docs/docs/apis-model-management/create-model.md @@ -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 ```java title="CreateModel.java" +import io.github.ollama4j.OllamaAPI; + public class CreateModel { public static void main(String[] args) { diff --git a/docs/docs/apis-model-management/delete-model.md b/docs/docs/apis-model-management/delete-model.md index 16bca70..edb8197 100644 --- a/docs/docs/apis-model-management/delete-model.md +++ b/docs/docs/apis-model-management/delete-model.md @@ -7,6 +7,8 @@ sidebar_position: 5 This API lets you create a delete a model from the Ollama server. ```java title="DeleteModel.java" +import io.github.ollama4j.OllamaAPI; + public class Main { public static void main(String[] args) { diff --git a/docs/docs/apis-model-management/get-model-details.md b/docs/docs/apis-model-management/get-model-details.md index 184a55a..d415a5c 100644 --- a/docs/docs/apis-model-management/get-model-details.md +++ b/docs/docs/apis-model-management/get-model-details.md @@ -7,6 +7,10 @@ sidebar_position: 3 This API lets you get the details of a model on the Ollama server. ```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 static void main(String[] args) { diff --git a/docs/docs/apis-model-management/list-models.md b/docs/docs/apis-model-management/list-models.md index 0840470..19738da 100644 --- a/docs/docs/apis-model-management/list-models.md +++ b/docs/docs/apis-model-management/list-models.md @@ -7,6 +7,11 @@ sidebar_position: 1 This API lets you list available models on the Ollama server. ```java title="ListModels.java" +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.models.Model; + +import java.util.List; + public class ListModels { public static void main(String[] args) { diff --git a/docs/docs/apis-model-management/pull-model.md b/docs/docs/apis-model-management/pull-model.md index 1e248ef..bfe2e26 100644 --- a/docs/docs/apis-model-management/pull-model.md +++ b/docs/docs/apis-model-management/pull-model.md @@ -7,10 +7,13 @@ sidebar_position: 2 This API lets you pull a model on the Ollama server. ```java title="PullModel.java" +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.types.OllamaModelType; + public class Main { public static void main(String[] args) { - + String host = "http://localhost:11434/"; OllamaAPI ollamaAPI = new OllamaAPI(host); diff --git a/docs/docs/intro.md b/docs/docs/intro.md index c5b7555..77ada7b 100644 --- a/docs/docs/intro.md +++ b/docs/docs/intro.md @@ -78,9 +78,9 @@ Add the dependency to your project's `pom.xml`. ```xml - io.github.amithkoujalgi + io.github.ollama4j ollama4j - 1.0.27 + 1.0.78 ``` @@ -116,6 +116,8 @@ or use other suitable implementations. Create a new Java class in your project and add this code. ```java +import io.github.ollama4j.OllamaAPI; + public class OllamaAPITest { public static void main(String[] args) { diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java b/src/main/java/io/github/ollama4j/OllamaAPI.java similarity index 95% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java rename to src/main/java/io/github/ollama4j/OllamaAPI.java index 516ca19..32f6ede 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java +++ b/src/main/java/io/github/ollama4j/OllamaAPI.java @@ -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.amithkoujalgi.ollama4j.core.exceptions.ToolInvocationException; -import io.github.amithkoujalgi.ollama4j.core.exceptions.ToolNotFoundException; -import io.github.amithkoujalgi.ollama4j.core.models.*; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessage; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResult; -import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingResponseModel; -import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; -import io.github.amithkoujalgi.ollama4j.core.models.request.*; -import io.github.amithkoujalgi.ollama4j.core.tools.*; -import io.github.amithkoujalgi.ollama4j.core.utils.Options; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.exceptions.ToolInvocationException; +import io.github.ollama4j.exceptions.ToolNotFoundException; +import io.github.ollama4j.models.*; +import io.github.ollama4j.models.chat.OllamaChatMessage; +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.embeddings.OllamaEmbeddingResponseModel; +import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestModel; +import io.github.ollama4j.models.generate.OllamaGenerateRequestModel; +import io.github.ollama4j.models.generate.OllamaStreamHandler; +import io.github.ollama4j.models.request.*; +import io.github.ollama4j.tools.*; +import io.github.ollama4j.utils.Options; +import io.github.ollama4j.utils.Utils; import lombok.Setter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaResultStream.java b/src/main/java/io/github/ollama4j/OllamaResultStream.java similarity index 91% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaResultStream.java rename to src/main/java/io/github/ollama4j/OllamaResultStream.java index 21a15b1..7530421 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaResultStream.java +++ b/src/main/java/io/github/ollama4j/OllamaResultStream.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core; +package io.github.ollama4j; import java.util.Iterator; import java.util.LinkedList; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/OllamaBaseException.java b/src/main/java/io/github/ollama4j/exceptions/OllamaBaseException.java similarity index 68% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/OllamaBaseException.java rename to src/main/java/io/github/ollama4j/exceptions/OllamaBaseException.java index 7c8612f..9474d72 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/OllamaBaseException.java +++ b/src/main/java/io/github/ollama4j/exceptions/OllamaBaseException.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.exceptions; +package io.github.ollama4j.exceptions; public class OllamaBaseException extends Exception { diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/ToolInvocationException.java b/src/main/java/io/github/ollama4j/exceptions/ToolInvocationException.java similarity index 71% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/ToolInvocationException.java rename to src/main/java/io/github/ollama4j/exceptions/ToolInvocationException.java index 3a1a715..ea81bb9 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/ToolInvocationException.java +++ b/src/main/java/io/github/ollama4j/exceptions/ToolInvocationException.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.exceptions; +package io.github.ollama4j.exceptions; public class ToolInvocationException extends Exception { diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/ToolNotFoundException.java b/src/main/java/io/github/ollama4j/exceptions/ToolNotFoundException.java similarity index 68% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/ToolNotFoundException.java rename to src/main/java/io/github/ollama4j/exceptions/ToolNotFoundException.java index 990400e..bd3e007 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/exceptions/ToolNotFoundException.java +++ b/src/main/java/io/github/ollama4j/exceptions/ToolNotFoundException.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.exceptions; +package io.github.ollama4j.exceptions; public class ToolNotFoundException extends Exception { diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java b/src/main/java/io/github/ollama4j/impl/ConsoleOutputStreamHandler.java similarity index 71% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java rename to src/main/java/io/github/ollama4j/impl/ConsoleOutputStreamHandler.java index 6b3a391..c9f8e36 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java +++ b/src/main/java/io/github/ollama4j/impl/ConsoleOutputStreamHandler.java @@ -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 { private final StringBuffer response = new StringBuffer(); diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/BasicAuth.java b/src/main/java/io/github/ollama4j/models/BasicAuth.java similarity index 79% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/BasicAuth.java rename to src/main/java/io/github/ollama4j/models/BasicAuth.java index dbcf8a7..897e71f 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/BasicAuth.java +++ b/src/main/java/io/github/ollama4j/models/BasicAuth.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models; +package io.github.ollama4j.models; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ListModelsResponse.java b/src/main/java/io/github/ollama4j/models/ListModelsResponse.java similarity index 68% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ListModelsResponse.java rename to src/main/java/io/github/ollama4j/models/ListModelsResponse.java index db6f413..e78700d 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ListModelsResponse.java +++ b/src/main/java/io/github/ollama4j/models/ListModelsResponse.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models; +package io.github.ollama4j.models; import java.util.List; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java b/src/main/java/io/github/ollama4j/models/Model.java similarity index 87% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java rename to src/main/java/io/github/ollama4j/models/Model.java index 15efd70..5841c8f 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java +++ b/src/main/java/io/github/ollama4j/models/Model.java @@ -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 com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.Utils; import lombok.Data; @Data diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelDetail.java b/src/main/java/io/github/ollama4j/models/ModelDetail.java similarity index 86% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelDetail.java rename to src/main/java/io/github/ollama4j/models/ModelDetail.java index e81a20e..3d1a397 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelDetail.java +++ b/src/main/java/io/github/ollama4j/models/ModelDetail.java @@ -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.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.Utils; import lombok.Data; @Data diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelMeta.java b/src/main/java/io/github/ollama4j/models/ModelMeta.java similarity index 87% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelMeta.java rename to src/main/java/io/github/ollama4j/models/ModelMeta.java index e534832..812bf0c 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelMeta.java +++ b/src/main/java/io/github/ollama4j/models/ModelMeta.java @@ -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.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.Utils; import lombok.Data; @Data diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelPullResponse.java b/src/main/java/io/github/ollama4j/models/ModelPullResponse.java similarity index 83% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelPullResponse.java rename to src/main/java/io/github/ollama4j/models/ModelPullResponse.java index d9db5c1..12afa88 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/ModelPullResponse.java +++ b/src/main/java/io/github/ollama4j/models/ModelPullResponse.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models; +package io.github.ollama4j.models; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaAsyncResultStreamer.java b/src/main/java/io/github/ollama4j/models/OllamaAsyncResultStreamer.java similarity index 91% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaAsyncResultStreamer.java rename to src/main/java/io/github/ollama4j/models/OllamaAsyncResultStreamer.java index 66dde93..0655b41 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaAsyncResultStreamer.java +++ b/src/main/java/io/github/ollama4j/models/OllamaAsyncResultStreamer.java @@ -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.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateResponseModel; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.OllamaResultStream; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.models.generate.OllamaGenerateRequestModel; +import io.github.ollama4j.models.generate.OllamaGenerateResponseModel; +import io.github.ollama4j.utils.Utils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaCommonRequestModel.java b/src/main/java/io/github/ollama4j/models/OllamaCommonRequestModel.java similarity index 82% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaCommonRequestModel.java rename to src/main/java/io/github/ollama4j/models/OllamaCommonRequestModel.java index 6f985ab..b6ef074 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaCommonRequestModel.java +++ b/src/main/java/io/github/ollama4j/models/OllamaCommonRequestModel.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models; +package io.github.ollama4j.models; import java.util.Map; 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.databind.annotation.JsonSerialize; -import io.github.amithkoujalgi.ollama4j.core.utils.BooleanToJsonFormatFlagSerializer; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.BooleanToJsonFormatFlagSerializer; +import io.github.ollama4j.utils.Utils; import lombok.Data; @Data diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaErrorResponseModel.java b/src/main/java/io/github/ollama4j/models/OllamaErrorResponseModel.java similarity index 78% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaErrorResponseModel.java rename to src/main/java/io/github/ollama4j/models/OllamaErrorResponseModel.java index be3d8e4..39e8df3 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaErrorResponseModel.java +++ b/src/main/java/io/github/ollama4j/models/OllamaErrorResponseModel.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models; +package io.github.ollama4j.models; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResult.java b/src/main/java/io/github/ollama4j/models/OllamaResult.java similarity index 88% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResult.java rename to src/main/java/io/github/ollama4j/models/OllamaResult.java index 1276f5f..c7bd08d 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResult.java +++ b/src/main/java/io/github/ollama4j/models/OllamaResult.java @@ -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 lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatMessage.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java similarity index 83% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatMessage.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java index 0b14315..d4fe195 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatMessage.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java @@ -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.databind.annotation.JsonSerialize; -import io.github.amithkoujalgi.ollama4j.core.utils.FileToBase64Serializer; +import io.github.ollama4j.utils.FileToBase64Serializer; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatMessageRole.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java similarity index 85% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatMessageRole.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java index cbecb00..3986135 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatMessageRole.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models.chat; +package io.github.ollama4j.models.chat; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatRequestBuilder.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestBuilder.java similarity index 95% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatRequestBuilder.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestBuilder.java index e07722f..547fda6 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatRequestBuilder.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestBuilder.java @@ -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.IOException; @@ -11,8 +11,8 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.github.amithkoujalgi.ollama4j.core.utils.Options; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.Options; +import io.github.ollama4j.utils.Utils; /** * Helper class for creating {@link OllamaChatRequestModel} objects using the builder-pattern. diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatRequestModel.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestModel.java similarity index 79% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatRequestModel.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestModel.java index e55bf6a..d40739e 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatRequestModel.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestModel.java @@ -1,8 +1,9 @@ -package io.github.amithkoujalgi.ollama4j.core.models.chat; +package io.github.ollama4j.models.chat; 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.Setter; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResponseModel.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatResponseModel.java similarity index 93% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResponseModel.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatResponseModel.java index 418338f..2ccc731 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResponseModel.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatResponseModel.java @@ -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 lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResult.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatResult.java similarity index 88% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResult.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatResult.java index 6ac6578..c779c60 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatResult.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatResult.java @@ -1,8 +1,8 @@ -package io.github.amithkoujalgi.ollama4j.core.models.chat; +package io.github.ollama4j.models.chat; 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 diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatStreamObserver.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatStreamObserver.java similarity index 84% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatStreamObserver.java rename to src/main/java/io/github/ollama4j/models/chat/OllamaChatStreamObserver.java index f653001..9f1bf7f 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatStreamObserver.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatStreamObserver.java @@ -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.List; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingResponseModel.java b/src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingResponseModel.java similarity index 79% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingResponseModel.java rename to src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingResponseModel.java index 85dba31..24d95bc 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingResponseModel.java +++ b/src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingResponseModel.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models.embeddings; +package io.github.ollama4j.models.embeddings; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestBuilder.java b/src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingsRequestBuilder.java similarity index 86% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestBuilder.java rename to src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingsRequestBuilder.java index ef7a84e..b542931 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestBuilder.java +++ b/src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingsRequestBuilder.java @@ -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 { diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestModel.java b/src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingsRequestModel.java similarity index 83% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestModel.java rename to src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingsRequestModel.java index a369124..d700b91 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/embeddings/OllamaEmbeddingsRequestModel.java +++ b/src/main/java/io/github/ollama4j/models/embeddings/OllamaEmbeddingsRequestModel.java @@ -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 com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateRequestBuilder.java b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestBuilder.java similarity index 84% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateRequestBuilder.java rename to src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestBuilder.java index 48b4d18..2bd3dce 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateRequestBuilder.java +++ b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestBuilder.java @@ -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. */ public class OllamaGenerateRequestBuilder { diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateRequestModel.java b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestModel.java similarity index 80% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateRequestModel.java rename to src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestModel.java index b060a4c..3b4c693 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateRequestModel.java +++ b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestModel.java @@ -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.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; +import io.github.ollama4j.models.OllamaCommonRequestModel; +import io.github.ollama4j.utils.OllamaRequestBody; import java.util.List; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateResponseModel.java b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateResponseModel.java similarity index 92% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateResponseModel.java rename to src/main/java/io/github/ollama4j/models/generate/OllamaGenerateResponseModel.java index a575a7a..9fb975e 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateResponseModel.java +++ b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateResponseModel.java @@ -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.JsonProperty; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateStreamObserver.java similarity index 92% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java rename to src/main/java/io/github/ollama4j/models/generate/OllamaGenerateStreamObserver.java index 333ba5a..bc47fa0 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java +++ b/src/main/java/io/github/ollama4j/models/generate/OllamaGenerateStreamObserver.java @@ -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.List; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java b/src/main/java/io/github/ollama4j/models/generate/OllamaStreamHandler.java similarity index 68% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java rename to src/main/java/io/github/ollama4j/models/generate/OllamaStreamHandler.java index 1151e9b..e2da640 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java +++ b/src/main/java/io/github/ollama4j/models/generate/OllamaStreamHandler.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.models.generate; +package io.github.ollama4j.models.generate; import java.util.function.Consumer; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/CustomModelFileContentsRequest.java b/src/main/java/io/github/ollama4j/models/request/CustomModelFileContentsRequest.java similarity index 76% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/CustomModelFileContentsRequest.java rename to src/main/java/io/github/ollama4j/models/request/CustomModelFileContentsRequest.java index 9e606d3..6841476 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/CustomModelFileContentsRequest.java +++ b/src/main/java/io/github/ollama4j/models/request/CustomModelFileContentsRequest.java @@ -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 lombok.AllArgsConstructor; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/CustomModelFilePathRequest.java b/src/main/java/io/github/ollama4j/models/request/CustomModelFilePathRequest.java similarity index 76% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/CustomModelFilePathRequest.java rename to src/main/java/io/github/ollama4j/models/request/CustomModelFilePathRequest.java index ea08dbf..2fcda43 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/CustomModelFilePathRequest.java +++ b/src/main/java/io/github/ollama4j/models/request/CustomModelFilePathRequest.java @@ -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 lombok.AllArgsConstructor; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/ModelRequest.java b/src/main/java/io/github/ollama4j/models/request/ModelRequest.java similarity index 74% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/ModelRequest.java rename to src/main/java/io/github/ollama4j/models/request/ModelRequest.java index d3fdec4..923cd87 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/ModelRequest.java +++ b/src/main/java/io/github/ollama4j/models/request/ModelRequest.java @@ -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 lombok.AllArgsConstructor; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java b/src/main/java/io/github/ollama4j/models/request/OllamaChatEndpointCaller.java similarity index 71% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java rename to src/main/java/io/github/ollama4j/models/request/OllamaChatEndpointCaller.java index 9184edf..a3314d4 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java +++ b/src/main/java/io/github/ollama4j/models/request/OllamaChatEndpointCaller.java @@ -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 io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; -import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResponseModel; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatStreamObserver; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; -import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.models.BasicAuth; +import io.github.ollama4j.models.OllamaResult; +import io.github.ollama4j.models.chat.OllamaChatResponseModel; +import io.github.ollama4j.models.chat.OllamaChatStreamObserver; +import io.github.ollama4j.models.generate.OllamaStreamHandler; +import io.github.ollama4j.utils.OllamaRequestBody; +import io.github.ollama4j.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaEndpointCaller.java b/src/main/java/io/github/ollama4j/models/request/OllamaEndpointCaller.java similarity index 91% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaEndpointCaller.java rename to src/main/java/io/github/ollama4j/models/request/OllamaEndpointCaller.java index 350200a..c1aed87 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaEndpointCaller.java +++ b/src/main/java/io/github/ollama4j/models/request/OllamaEndpointCaller.java @@ -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.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; -import io.github.amithkoujalgi.ollama4j.core.models.OllamaErrorResponseModel; -import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; -import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.models.BasicAuth; +import io.github.ollama4j.models.OllamaErrorResponseModel; +import io.github.ollama4j.models.OllamaResult; +import io.github.ollama4j.utils.OllamaRequestBody; +import io.github.ollama4j.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java b/src/main/java/io/github/ollama4j/models/request/OllamaGenerateEndpointCaller.java similarity index 70% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java rename to src/main/java/io/github/ollama4j/models/request/OllamaGenerateEndpointCaller.java index 54457ae..da73316 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java +++ b/src/main/java/io/github/ollama4j/models/request/OllamaGenerateEndpointCaller.java @@ -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 io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; -import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateResponseModel; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateStreamObserver; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; -import io.github.amithkoujalgi.ollama4j.core.utils.OllamaRequestBody; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.models.BasicAuth; +import io.github.ollama4j.models.OllamaResult; +import io.github.ollama4j.models.generate.OllamaGenerateResponseModel; +import io.github.ollama4j.models.generate.OllamaGenerateStreamObserver; +import io.github.ollama4j.models.generate.OllamaStreamHandler; +import io.github.ollama4j.utils.OllamaRequestBody; +import io.github.ollama4j.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/OllamaToolsResult.java b/src/main/java/io/github/ollama4j/tools/OllamaToolsResult.java similarity index 88% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/OllamaToolsResult.java rename to src/main/java/io/github/ollama4j/tools/OllamaToolsResult.java index 1ff3656..bf048b0 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/OllamaToolsResult.java +++ b/src/main/java/io/github/ollama4j/tools/OllamaToolsResult.java @@ -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.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolFunction.java b/src/main/java/io/github/ollama4j/tools/ToolFunction.java similarity index 70% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolFunction.java rename to src/main/java/io/github/ollama4j/tools/ToolFunction.java index d670aa7..51ab8c5 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolFunction.java +++ b/src/main/java/io/github/ollama4j/tools/ToolFunction.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.tools; +package io.github.ollama4j.tools; import java.util.Map; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolFunctionCallSpec.java b/src/main/java/io/github/ollama4j/tools/ToolFunctionCallSpec.java similarity index 83% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolFunctionCallSpec.java rename to src/main/java/io/github/ollama4j/tools/ToolFunctionCallSpec.java index 1ce69cb..7a4f7fd 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolFunctionCallSpec.java +++ b/src/main/java/io/github/ollama4j/tools/ToolFunctionCallSpec.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.tools; +package io.github.ollama4j.tools; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolRegistry.java b/src/main/java/io/github/ollama4j/tools/ToolRegistry.java similarity index 87% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolRegistry.java rename to src/main/java/io/github/ollama4j/tools/ToolRegistry.java index 432a4d7..2ead13a 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/ToolRegistry.java +++ b/src/main/java/io/github/ollama4j/tools/ToolRegistry.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.tools; +package io.github.ollama4j.tools; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/Tools.java b/src/main/java/io/github/ollama4j/tools/Tools.java similarity index 97% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/Tools.java rename to src/main/java/io/github/ollama4j/tools/Tools.java index 5315d19..986302f 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/tools/Tools.java +++ b/src/main/java/io/github/ollama4j/tools/Tools.java @@ -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.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.Utils; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java b/src/main/java/io/github/ollama4j/types/OllamaModelType.java similarity index 98% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java rename to src/main/java/io/github/ollama4j/types/OllamaModelType.java index 2613d86..dc7b447 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/types/OllamaModelType.java +++ b/src/main/java/io/github/ollama4j/types/OllamaModelType.java @@ -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. diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/BooleanToJsonFormatFlagSerializer.java b/src/main/java/io/github/ollama4j/utils/BooleanToJsonFormatFlagSerializer.java similarity index 91% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/BooleanToJsonFormatFlagSerializer.java rename to src/main/java/io/github/ollama4j/utils/BooleanToJsonFormatFlagSerializer.java index f4d4ab3..a94e4d1 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/BooleanToJsonFormatFlagSerializer.java +++ b/src/main/java/io/github/ollama4j/utils/BooleanToJsonFormatFlagSerializer.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.utils; +package io.github.ollama4j.utils; import java.io.IOException; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/FileToBase64Serializer.java b/src/main/java/io/github/ollama4j/utils/FileToBase64Serializer.java similarity index 92% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/FileToBase64Serializer.java rename to src/main/java/io/github/ollama4j/utils/FileToBase64Serializer.java index 8e862ab..235ebde 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/FileToBase64Serializer.java +++ b/src/main/java/io/github/ollama4j/utils/FileToBase64Serializer.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.utils; +package io.github.ollama4j.utils; import java.io.IOException; import java.util.Base64; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OllamaRequestBody.java b/src/main/java/io/github/ollama4j/utils/OllamaRequestBody.java similarity index 94% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OllamaRequestBody.java rename to src/main/java/io/github/ollama4j/utils/OllamaRequestBody.java index f787cee..5a2dfab 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OllamaRequestBody.java +++ b/src/main/java/io/github/ollama4j/utils/OllamaRequestBody.java @@ -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.BodyPublishers; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Options.java b/src/main/java/io/github/ollama4j/utils/Options.java similarity index 75% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Options.java rename to src/main/java/io/github/ollama4j/utils/Options.java index 2339969..c6e5e53 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Options.java +++ b/src/main/java/io/github/ollama4j/utils/Options.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.utils; +package io.github.ollama4j.utils; import java.util.Map; import lombok.Data; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OptionsBuilder.java b/src/main/java/io/github/ollama4j/utils/OptionsBuilder.java similarity index 99% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OptionsBuilder.java rename to src/main/java/io/github/ollama4j/utils/OptionsBuilder.java index d605f81..c71818a 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/OptionsBuilder.java +++ b/src/main/java/io/github/ollama4j/utils/OptionsBuilder.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.utils; +package io.github.ollama4j.utils; import java.util.HashMap; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/PromptBuilder.java b/src/main/java/io/github/ollama4j/utils/PromptBuilder.java similarity index 97% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/PromptBuilder.java rename to src/main/java/io/github/ollama4j/utils/PromptBuilder.java index be487d9..bb24ef8 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/PromptBuilder.java +++ b/src/main/java/io/github/ollama4j/utils/PromptBuilder.java @@ -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 diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/SamplePrompts.java b/src/main/java/io/github/ollama4j/utils/SamplePrompts.java similarity index 88% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/SamplePrompts.java rename to src/main/java/io/github/ollama4j/utils/SamplePrompts.java index 1e5dfdc..89a7f83 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/SamplePrompts.java +++ b/src/main/java/io/github/ollama4j/utils/SamplePrompts.java @@ -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.util.Scanner; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java b/src/main/java/io/github/ollama4j/utils/Utils.java similarity index 95% rename from src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java rename to src/main/java/io/github/ollama4j/utils/Utils.java index 96b07ae..d854df1 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java +++ b/src/main/java/io/github/ollama4j/utils/Utils.java @@ -1,4 +1,4 @@ -package io.github.amithkoujalgi.ollama4j.core.utils; +package io.github.ollama4j.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java b/src/test/java/io/github/ollama4j/integrationtests/TestRealAPIs.java similarity index 94% rename from src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java rename to src/test/java/io/github/ollama4j/integrationtests/TestRealAPIs.java index 58e55a1..7c21ec9 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/integrationtests/TestRealAPIs.java +++ b/src/test/java/io/github/ollama4j/integrationtests/TestRealAPIs.java @@ -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.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail; -import io.github.amithkoujalgi.ollama4j.core.models.OllamaResult; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessageRole; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatResult; -import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder; -import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +import io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.models.ModelDetail; +import io.github.ollama4j.models.OllamaResult; +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.embeddings.OllamaEmbeddingsRequestBuilder; +import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestModel; +import io.github.ollama4j.utils.OptionsBuilder; import lombok.Data; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java b/src/test/java/io/github/ollama4j/unittests/TestMockedAPIs.java similarity index 92% rename from src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java rename to src/test/java/io/github/ollama4j/unittests/TestMockedAPIs.java index 3b1613f..61023e9 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/TestMockedAPIs.java +++ b/src/test/java/io/github/ollama4j/unittests/TestMockedAPIs.java @@ -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.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; -import io.github.amithkoujalgi.ollama4j.core.models.ModelDetail; -import io.github.amithkoujalgi.ollama4j.core.models.OllamaAsyncResultStreamer; -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 io.github.ollama4j.OllamaAPI; +import io.github.ollama4j.exceptions.OllamaBaseException; +import io.github.ollama4j.models.ModelDetail; +import io.github.ollama4j.models.OllamaAsyncResultStreamer; +import io.github.ollama4j.models.OllamaResult; +import io.github.ollama4j.types.OllamaModelType; +import io.github.ollama4j.utils.OptionsBuilder; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/AbstractSerializationTest.java b/src/test/java/io/github/ollama4j/unittests/jackson/AbstractSerializationTest.java similarity index 89% rename from src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/AbstractSerializationTest.java rename to src/test/java/io/github/ollama4j/unittests/jackson/AbstractSerializationTest.java index d0ffc2c..6e03566 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/AbstractSerializationTest.java +++ b/src/test/java/io/github/ollama4j/unittests/jackson/AbstractSerializationTest.java @@ -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.fail; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.amithkoujalgi.ollama4j.core.utils.Utils; +import io.github.ollama4j.utils.Utils; public abstract class AbstractSerializationTest { diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java b/src/test/java/io/github/ollama4j/unittests/jackson/TestChatRequestSerialization.java similarity index 92% rename from src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java rename to src/test/java/io/github/ollama4j/unittests/jackson/TestChatRequestSerialization.java index 3ad049c..fc9a1ea 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java +++ b/src/test/java/io/github/ollama4j/unittests/jackson/TestChatRequestSerialization.java @@ -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; @@ -9,10 +9,10 @@ import org.json.JSONObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatMessageRole; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestBuilder; -import io.github.amithkoujalgi.ollama4j.core.models.chat.OllamaChatRequestModel; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +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.utils.OptionsBuilder; public class TestChatRequestSerialization extends AbstractSerializationTest { diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java b/src/test/java/io/github/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java similarity index 80% rename from src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java rename to src/test/java/io/github/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java index a546d6d..7cb0297 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java +++ b/src/test/java/io/github/ollama4j/unittests/jackson/TestEmbeddingsRequestSerialization.java @@ -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 org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestModel; -import io.github.amithkoujalgi.ollama4j.core.models.embeddings.OllamaEmbeddingsRequestBuilder; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestModel; +import io.github.ollama4j.models.embeddings.OllamaEmbeddingsRequestBuilder; +import io.github.ollama4j.utils.OptionsBuilder; public class TestEmbeddingsRequestSerialization extends AbstractSerializationTest { diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java b/src/test/java/io/github/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java similarity index 85% rename from src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java rename to src/test/java/io/github/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java index 8e95288..58de683 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java +++ b/src/test/java/io/github/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java @@ -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; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestBuilder; -import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaGenerateRequestModel; -import io.github.amithkoujalgi.ollama4j.core.utils.OptionsBuilder; +import io.github.ollama4j.models.generate.OllamaGenerateRequestBuilder; +import io.github.ollama4j.models.generate.OllamaGenerateRequestModel; +import io.github.ollama4j.utils.OptionsBuilder; public class TestGenerateRequestSerialization extends AbstractSerializationTest { diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestModelRequestSerialization.java b/src/test/java/io/github/ollama4j/unittests/jackson/TestModelRequestSerialization.java similarity index 93% rename from src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestModelRequestSerialization.java rename to src/test/java/io/github/ollama4j/unittests/jackson/TestModelRequestSerialization.java index 712e507..ac6213e 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestModelRequestSerialization.java +++ b/src/test/java/io/github/ollama4j/unittests/jackson/TestModelRequestSerialization.java @@ -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; public class TestModelRequestSerialization extends AbstractSerializationTest {