From c9b05a725bb3edf8cb0456e757d69ff9d5d2e85c Mon Sep 17 00:00:00 2001 From: "koujalgi.amith@gmail.com" Date: Sun, 14 Jul 2024 00:05:43 +0530 Subject: [PATCH] Refactor Signed-off-by: koujalgi.amith@gmail.com --- .../github/amithkoujalgi/ollama4j/core/OllamaAPI.java | 1 + .../ollama4j/core/OllamaStreamHandler.java | 7 ------- .../ollama4j/core/impl/ConsoleOutputStreamHandler.java | 2 +- .../core/models/chat/OllamaChatStreamObserver.java | 10 +++++----- .../models/generate/OllamaGenerateStreamObserver.java | 8 +++----- .../core/models/generate/OllamaStreamHandler.java | 7 +++++++ .../core/models/request/OllamaChatEndpointCaller.java | 2 +- .../models/request/OllamaGenerateEndpointCaller.java | 2 +- 8 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaStreamHandler.java create mode 100644 src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java index 340fcb9..d5089ee 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java @@ -9,6 +9,7 @@ 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; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaStreamHandler.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaStreamHandler.java deleted file mode 100644 index 803f393..0000000 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaStreamHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.amithkoujalgi.ollama4j.core; - -import java.util.function.Consumer; - -public interface OllamaStreamHandler extends Consumer{ - void accept(String message); -} diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java index 6807019..6b3a391 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/impl/ConsoleOutputStreamHandler.java @@ -1,6 +1,6 @@ package io.github.amithkoujalgi.ollama4j.core.impl; -import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler; +import io.github.amithkoujalgi.ollama4j.core.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/chat/OllamaChatStreamObserver.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatStreamObserver.java index ea4b4d8..f653001 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatStreamObserver.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/chat/OllamaChatStreamObserver.java @@ -1,10 +1,10 @@ package io.github.amithkoujalgi.ollama4j.core.models.chat; +import io.github.amithkoujalgi.ollama4j.core.models.generate.OllamaStreamHandler; + import java.util.ArrayList; import java.util.List; -import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler; - public class OllamaChatStreamObserver { private OllamaStreamHandler streamHandler; @@ -17,12 +17,12 @@ public class OllamaChatStreamObserver { this.streamHandler = streamHandler; } - public void notify(OllamaChatResponseModel currentResponsePart){ + public void notify(OllamaChatResponseModel currentResponsePart) { responseParts.add(currentResponsePart); handleCurrentResponsePart(currentResponsePart); } - - protected void handleCurrentResponsePart(OllamaChatResponseModel currentResponsePart){ + + protected void handleCurrentResponsePart(OllamaChatResponseModel currentResponsePart) { message = message + currentResponsePart.getMessage().getContent(); streamHandler.accept(message); } diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java index a166bac..333ba5a 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaGenerateStreamObserver.java @@ -3,8 +3,6 @@ package io.github.amithkoujalgi.ollama4j.core.models.generate; import java.util.ArrayList; import java.util.List; -import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler; - public class OllamaGenerateStreamObserver { private OllamaStreamHandler streamHandler; @@ -17,12 +15,12 @@ public class OllamaGenerateStreamObserver { this.streamHandler = streamHandler; } - public void notify(OllamaGenerateResponseModel currentResponsePart){ + public void notify(OllamaGenerateResponseModel currentResponsePart) { responseParts.add(currentResponsePart); handleCurrentResponsePart(currentResponsePart); } - - protected void handleCurrentResponsePart(OllamaGenerateResponseModel currentResponsePart){ + + protected void handleCurrentResponsePart(OllamaGenerateResponseModel currentResponsePart) { message = message + currentResponsePart.getResponse(); streamHandler.accept(message); } diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java new file mode 100644 index 0000000..1151e9b --- /dev/null +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/generate/OllamaStreamHandler.java @@ -0,0 +1,7 @@ +package io.github.amithkoujalgi.ollama4j.core.models.generate; + +import java.util.function.Consumer; + +public interface OllamaStreamHandler extends Consumer { + void accept(String message); +} diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java index cc6c7f8..9184edf 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaChatEndpointCaller.java @@ -1,12 +1,12 @@ package io.github.amithkoujalgi.ollama4j.core.models.request; import com.fasterxml.jackson.core.JsonProcessingException; -import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler; import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; 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 org.slf4j.Logger; diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java index d3d71e4..54457ae 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/request/OllamaGenerateEndpointCaller.java @@ -1,12 +1,12 @@ package io.github.amithkoujalgi.ollama4j.core.models.request; import com.fasterxml.jackson.core.JsonProcessingException; -import io.github.amithkoujalgi.ollama4j.core.OllamaStreamHandler; import io.github.amithkoujalgi.ollama4j.core.exceptions.OllamaBaseException; import io.github.amithkoujalgi.ollama4j.core.models.BasicAuth; 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 org.slf4j.Logger;