Mirror/ollama4j
1
0
Fork 1
mirror of https://github.com/amithkoujalgi/ollama4j.git synced 2025-10-13 17:08:57 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor OllamaAPI and related classes for improved request handling and builder pattern integration

Browse Source 
This update refactors the OllamaAPI class and its associated request builders to enhance the handling of generate requests and chat requests. The OllamaGenerateRequest and OllamaChatRequest classes now utilize builder patterns for better readability and maintainability. Additionally, deprecated methods have been removed or marked, and integration tests have been updated to reflect these changes, ensuring consistent usage of the new request structures.
This commit is contained in:
amithkoujalgi 2025-09-24 00:54:09 +05:30
parent cc232c1383
commit 07878ddf36
No known key found for this signature in database
GPG Key ID: E29A37746AF94B70
11 changed files with 693 additions and 650 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

308
src/main/java/io/github/ollama4j/OllamaAPI.java
View File

@ -20,6 +20,7 @@ import io.github.ollama4j.models.chat.OllamaChatTokenHandler;
import io.github.ollama4j.models.embeddings.OllamaEmbedRequestModel;
import io.github.ollama4j.models.embeddings.OllamaEmbedResponseModel;
import io.github.ollama4j.models.generate.OllamaGenerateRequest;
import io.github.ollama4j.models.generate.OllamaGenerateRequestBuilder;
import io.github.ollama4j.models.generate.OllamaGenerateStreamObserver;
import io.github.ollama4j.models.generate.OllamaGenerateTokenHandler;
import io.github.ollama4j.models.ps.ModelsProcessResponse;
@ -663,6 +664,7 @@ public class OllamaAPI {
Constants.HttpConstants.HEADER_KEY_CONTENT_TYPE,
Constants.HttpConstants.APPLICATION_JSON)
.build();
LOG.debug("Unloading model with request: {}", jsonData);
HttpClient client = HttpClient.newHttpClient();
HttpResponse<String> response =
client.send(request, HttpResponse.BodyHandlers.ofString());
@ -671,12 +673,15 @@ public class OllamaAPI {
if (statusCode == 404
&& responseBody.contains("model")
&& responseBody.contains("not found")) {
LOG.debug("Unload response: {} - {}", statusCode, responseBody);
return;
}
if (statusCode != 200) {
LOG.debug("Unload response: {} - {}", statusCode, responseBody);
throw new OllamaBaseException(statusCode + " - " + responseBody);
}
} catch (Exception e) {
LOG.debug("Unload failed: {} - {}", statusCode, out);
throw new OllamaBaseException(statusCode + " - " + out, e);
} finally {
MetricsRecorder.record(
@ -737,7 +742,8 @@ public class OllamaAPI {
* @return the OllamaResult containing the response
* @throws OllamaBaseException if the request fails
*/
public OllamaResult generate(
@Deprecated
private OllamaResult generate(
String model,
String prompt,
boolean raw,
@ -745,26 +751,107 @@ public class OllamaAPI {
Options options,
OllamaGenerateStreamObserver streamObserver)
throws OllamaBaseException {
try {
// Create the OllamaGenerateRequest and configure common properties
OllamaGenerateRequest ollamaRequestModel = new OllamaGenerateRequest(model, prompt);
ollamaRequestModel.setRaw(raw);
ollamaRequestModel.setThink(think);
ollamaRequestModel.setOptions(options.getOptionsMap());
ollamaRequestModel.setKeepAlive("0m");
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withRaw(raw)
.withThink(think)
.withOptions(options)
.withKeepAlive("0m")
.build();
return generate(request, streamObserver);
}
// Based on 'think' flag, choose the appropriate stream handler(s)
if (think) {
// Call with thinking
return generateSyncForOllamaRequestModel(
ollamaRequestModel,
streamObserver.getThinkingStreamHandler(),
streamObserver.getResponseStreamHandler());
} else {
// Call without thinking
return generateSyncForOllamaRequestModel(
ollamaRequestModel, null, streamObserver.getResponseStreamHandler());
/**
* Generates a response from a model using the specified parameters and stream observer. If
* {@code streamObserver} is provided, streaming is enabled; otherwise, a synchronous call is
* made.
*/
public OllamaResult generate(
OllamaGenerateRequest request, OllamaGenerateStreamObserver streamObserver)
throws OllamaBaseException {
try {
if (request.isUseTools()) {
return generateWithToolsInternal(request, streamObserver);
}
if (streamObserver != null) {
if (request.isThink()) {
return generateSyncForOllamaRequestModel(
request,
streamObserver.getThinkingStreamHandler(),
streamObserver.getResponseStreamHandler());
} else {
return generateSyncForOllamaRequestModel(
request, null, streamObserver.getResponseStreamHandler());
}
}
return generateSyncForOllamaRequestModel(request, null, null);
} catch (Exception e) {
throw new OllamaBaseException(e.getMessage(), e);
}
}
private OllamaResult generateWithToolsInternal(
OllamaGenerateRequest request, OllamaGenerateStreamObserver streamObserver)
throws OllamaBaseException {
try {
boolean raw = true;
OllamaToolsResult toolResult = new OllamaToolsResult();
Map<ToolFunctionCallSpec, Object> toolResults = new HashMap<>();
String prompt = request.getPrompt();
if (!prompt.startsWith("[AVAILABLE_TOOLS]")) {
final Tools.PromptBuilder promptBuilder = new Tools.PromptBuilder();
for (Tools.ToolSpecification spec : toolRegistry.getRegisteredSpecs()) {
promptBuilder.withToolSpecification(spec);
}
promptBuilder.withPrompt(prompt);
prompt = promptBuilder.build();
}
request.setPrompt(prompt);
request.setRaw(raw);
request.setThink(false);
OllamaResult result =
generate(
request,
new OllamaGenerateStreamObserver(
null,
streamObserver != null
? streamObserver.getResponseStreamHandler()
: null));
toolResult.setModelResult(result);
String toolsResponse = result.getResponse();
if (toolsResponse.contains("[TOOL_CALLS]")) {
toolsResponse = toolsResponse.replace("[TOOL_CALLS]", "");
}
List<ToolFunctionCallSpec> toolFunctionCallSpecs = new ArrayList<>();
ObjectMapper objectMapper = Utils.getObjectMapper();
if (!toolsResponse.isEmpty()) {
try {
objectMapper.readTree(toolsResponse);
} catch (JsonParseException e) {
return result;
}
toolFunctionCallSpecs =
objectMapper.readValue(
toolsResponse,
objectMapper
.getTypeFactory()
.constructCollectionType(
List.class, ToolFunctionCallSpec.class));
}
for (ToolFunctionCallSpec toolFunctionCallSpec : toolFunctionCallSpecs) {
toolResults.put(toolFunctionCallSpec, invokeTool(toolFunctionCallSpec));
}
toolResult.setToolResults(toolResults);
return result;
} catch (Exception e) {
throw new OllamaBaseException(e.getMessage(), e);
}
@ -781,81 +868,18 @@ public class OllamaAPI {
* @return An instance of {@link OllamaResult} containing the structured response.
* @throws OllamaBaseException if the response indicates an error status.
*/
@Deprecated
@SuppressWarnings("LoggingSimilarMessage")
public OllamaResult generateWithFormat(String model, String prompt, Map<String, Object> format)
private OllamaResult generateWithFormat(String model, String prompt, Map<String, Object> format)
throws OllamaBaseException {
long startTime = System.currentTimeMillis();
String url = "/api/generate";
int statusCode = -1;
Object out = null;
try {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("model", model);
requestBody.put("prompt", prompt);
requestBody.put("stream", false);
requestBody.put("format", format);
String jsonData = Utils.getObjectMapper().writeValueAsString(requestBody);
HttpClient httpClient = HttpClient.newHttpClient();
HttpRequest request =
getRequestBuilderDefault(new URI(this.host + url))
.header(
Constants.HttpConstants.HEADER_KEY_ACCEPT,
Constants.HttpConstants.APPLICATION_JSON)
.header(
Constants.HttpConstants.HEADER_KEY_CONTENT_TYPE,
Constants.HttpConstants.APPLICATION_JSON)
.POST(HttpRequest.BodyPublishers.ofString(jsonData))
.build();
try {
String prettyJson =
Utils.toJSON(Utils.getObjectMapper().readValue(jsonData, Object.class));
LOG.debug("Asking model:\n{}", prettyJson);
} catch (Exception e) {
LOG.debug("Asking model: {}", jsonData);
}
HttpResponse<String> response =
httpClient.send(request, HttpResponse.BodyHandlers.ofString());
statusCode = response.statusCode();
String responseBody = response.body();
if (statusCode == 200) {
OllamaStructuredResult structuredResult =
Utils.getObjectMapper()
.readValue(responseBody, OllamaStructuredResult.class);
OllamaResult ollamaResult =
new OllamaResult(
structuredResult.getResponse(),
structuredResult.getThinking(),
structuredResult.getResponseTime(),
statusCode);
ollamaResult.setModel(structuredResult.getModel());
ollamaResult.setCreatedAt(structuredResult.getCreatedAt());
ollamaResult.setDone(structuredResult.isDone());
ollamaResult.setDoneReason(structuredResult.getDoneReason());
ollamaResult.setContext(structuredResult.getContext());
ollamaResult.setTotalDuration(structuredResult.getTotalDuration());
ollamaResult.setLoadDuration(structuredResult.getLoadDuration());
ollamaResult.setPromptEvalCount(structuredResult.getPromptEvalCount());
ollamaResult.setPromptEvalDuration(structuredResult.getPromptEvalDuration());
ollamaResult.setEvalCount(structuredResult.getEvalCount());
ollamaResult.setEvalDuration(structuredResult.getEvalDuration());
LOG.debug("Model response:\n{}", ollamaResult);
return ollamaResult;
} else {
String errorResponse = Utils.toJSON(responseBody);
LOG.debug("Model response:\n{}", errorResponse);
throw new OllamaBaseException(statusCode + " - " + responseBody);
}
} catch (Exception e) {
throw new OllamaBaseException(e.getMessage(), e);
} finally {
MetricsRecorder.record(
url, "", false, false, false, null, null, startTime, statusCode, out);
}
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withFormat(format)
.withThink(false)
.build();
return generate(request, null);
}
/**
@ -890,67 +914,22 @@ public class OllamaAPI {
* empty.
* @throws OllamaBaseException if the Ollama API returns an error status
*/
public OllamaToolsResult generateWithTools(
@Deprecated
private OllamaToolsResult generateWithTools(
String model, String prompt, Options options, OllamaGenerateTokenHandler streamHandler)
throws OllamaBaseException {
try {
boolean raw = true;
OllamaToolsResult toolResult = new OllamaToolsResult();
Map<ToolFunctionCallSpec, Object> toolResults = new HashMap<>();
if (!prompt.startsWith("[AVAILABLE_TOOLS]")) {
final Tools.PromptBuilder promptBuilder = new Tools.PromptBuilder();
for (Tools.ToolSpecification spec : toolRegistry.getRegisteredSpecs()) {
promptBuilder.withToolSpecification(spec);
}
promptBuilder.withPrompt(prompt);
prompt = promptBuilder.build();
}
OllamaResult result =
generate(
model,
prompt,
raw,
false,
options,
new OllamaGenerateStreamObserver(null, streamHandler));
toolResult.setModelResult(result);
String toolsResponse = result.getResponse();
if (toolsResponse.contains("[TOOL_CALLS]")) {
toolsResponse = toolsResponse.replace("[TOOL_CALLS]", "");
}
List<ToolFunctionCallSpec> toolFunctionCallSpecs = new ArrayList<>();
ObjectMapper objectMapper = Utils.getObjectMapper();
if (!toolsResponse.isEmpty()) {
try {
// Try to parse the string to see if it's a valid JSON
objectMapper.readTree(toolsResponse);
} catch (JsonParseException e) {
LOG.warn(
"Response from model does not contain any tool calls. Returning the"
+ " response as is.");
return toolResult;
}
toolFunctionCallSpecs =
objectMapper.readValue(
toolsResponse,
objectMapper
.getTypeFactory()
.constructCollectionType(
List.class, ToolFunctionCallSpec.class));
}
for (ToolFunctionCallSpec toolFunctionCallSpec : toolFunctionCallSpecs) {
toolResults.put(toolFunctionCallSpec, invokeTool(toolFunctionCallSpec));
}
toolResult.setToolResults(toolResults);
return toolResult;
} catch (Exception e) {
throw new OllamaBaseException(e.getMessage(), e);
}
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withOptions(options)
.withUseTools(true)
.build();
// Execute unified path, but also return tools result by re-parsing
OllamaResult res = generate(request, new OllamaGenerateStreamObserver(null, streamHandler));
OllamaToolsResult tr = new OllamaToolsResult();
tr.setModelResult(res);
return tr;
}
/**
@ -986,7 +965,13 @@ public class OllamaAPI {
* results
* @throws OllamaBaseException if the request fails
*/
public OllamaAsyncResultStreamer generate(
@Deprecated
private OllamaAsyncResultStreamer generate(
String model, String prompt, boolean raw, boolean think) throws OllamaBaseException {
return generateAsync(model, prompt, raw, think);
}
public OllamaAsyncResultStreamer generateAsync(
String model, String prompt, boolean raw, boolean think) throws OllamaBaseException {
long startTime = System.currentTimeMillis();
String url = "/api/generate";
@ -1038,7 +1023,8 @@ public class OllamaAPI {
* @throws OllamaBaseException if the response indicates an error status or an invalid image
* type is provided
*/
public OllamaResult generateWithImages(
@Deprecated
private OllamaResult generateWithImages(
String model,
String prompt,
List<Object> images,
@ -1070,13 +1056,17 @@ public class OllamaAPI {
}
}
OllamaGenerateRequest ollamaRequestModel =
new OllamaGenerateRequest(model, prompt, encodedImages);
if (format != null) {
ollamaRequestModel.setFormat(format);
}
ollamaRequestModel.setOptions(options.getOptionsMap());
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withImagesBase64(encodedImages)
.withOptions(options)
.withFormat(format)
.build();
OllamaResult result =
generateSyncForOllamaRequestModel(ollamaRequestModel, null, streamHandler);
generate(
ollamaRequestModel,
new OllamaGenerateStreamObserver(null, streamHandler));
return result;
} catch (Exception e) {
throw new OllamaBaseException(e.getMessage(), e);

14
src/main/java/io/github/ollama4j/models/chat/OllamaChatRequest.java
View File

@ -11,6 +11,7 @@ package io.github.ollama4j.models.chat;
import io.github.ollama4j.models.request.OllamaCommonRequest;
import io.github.ollama4j.tools.Tools;
import io.github.ollama4j.utils.OllamaRequestBody;
import java.util.Collections;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
@ -26,7 +27,7 @@ import lombok.Setter;
@Setter
public class OllamaChatRequest extends OllamaCommonRequest implements OllamaRequestBody {
private List<OllamaChatMessage> messages;
private List<OllamaChatMessage> messages = Collections.emptyList();
private List<Tools.PromptFuncDefinition> tools;
@ -34,11 +35,12 @@ public class OllamaChatRequest extends OllamaCommonRequest implements OllamaRequ
/**
* Controls whether tools are automatically executed.
* <p>
* If set to {@code true} (the default), tools will be automatically used/applied by the library.
* If set to {@code false}, tool calls will be returned to the client for manual handling.
* <p>
* Disabling this should be an explicit operation.
*
* <p>If set to {@code true} (the default), tools will be automatically used/applied by the
* library. If set to {@code false}, tool calls will be returned to the client for manual
* handling.
*
* <p>Disabling this should be an explicit operation.
*/
private boolean useTools = true;

45
src/main/java/io/github/ollama4j/models/chat/OllamaChatRequestBuilder.java
View File

@ -28,9 +28,25 @@ public class OllamaChatRequestBuilder {
private int imageURLConnectTimeoutSeconds = 10;
private int imageURLReadTimeoutSeconds = 10;
private OllamaChatRequest request;
@Setter private boolean useTools = true;
private OllamaChatRequestBuilder() {
request = new OllamaChatRequest();
request.setMessages(new ArrayList<>());
}
// private OllamaChatRequestBuilder(String model, List<OllamaChatMessage> messages) {
// request = new OllamaChatRequest(model, false, messages);
// }
// public static OllamaChatRequestBuilder builder(String model) {
// return new OllamaChatRequestBuilder(model, new ArrayList<>());
// }
public static OllamaChatRequestBuilder builder() {
return new OllamaChatRequestBuilder();
}
public OllamaChatRequestBuilder withImageURLConnectTimeoutSeconds(
int imageURLConnectTimeoutSeconds) {
this.imageURLConnectTimeoutSeconds = imageURLConnectTimeoutSeconds;
@ -42,19 +58,9 @@ public class OllamaChatRequestBuilder {
return this;
}
private OllamaChatRequestBuilder(String model, List<OllamaChatMessage> messages) {
request = new OllamaChatRequest(model, false, messages);
}
private OllamaChatRequest request;
public static OllamaChatRequestBuilder getInstance(String model) {
return new OllamaChatRequestBuilder(model, new ArrayList<>());
}
public OllamaChatRequest build() {
request.setUseTools(useTools);
return request;
public OllamaChatRequestBuilder withModel(String model) {
request.setModel(model);
return this;
}
public void reset() {
@ -78,7 +84,6 @@ public class OllamaChatRequestBuilder {
List<OllamaChatToolCalls> toolCalls,
List<File> images) {
List<OllamaChatMessage> messages = this.request.getMessages();
List<byte[]> binaryImages =
images.stream()
.map(
@ -95,7 +100,6 @@ public class OllamaChatRequestBuilder {
}
})
.collect(Collectors.toList());
messages.add(new OllamaChatMessage(role, content, null, toolCalls, binaryImages));
return this;
}
@ -133,13 +137,13 @@ public class OllamaChatRequestBuilder {
}
}
}
messages.add(new OllamaChatMessage(role, content, null, toolCalls, binaryImages));
return this;
}
public OllamaChatRequestBuilder withMessages(List<OllamaChatMessage> messages) {
return new OllamaChatRequestBuilder(request.getModel(), messages);
request.setMessages(messages);
return this;
}
public OllamaChatRequestBuilder withOptions(Options options) {
@ -171,4 +175,9 @@ public class OllamaChatRequestBuilder {
this.request.setThink(think);
return this;
}
public OllamaChatRequest build() {
request.setUseTools(useTools);
return request;
}
}

1
src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequest.java
View File

@ -24,6 +24,7 @@ public class OllamaGenerateRequest extends OllamaCommonRequest implements Ollama
private String context;
private boolean raw;
private boolean think;
private boolean useTools;
public OllamaGenerateRequest() {}

72
src/main/java/io/github/ollama4j/models/generate/OllamaGenerateRequestBuilder.java
View File

@ -9,21 +9,23 @@
package io.github.ollama4j.models.generate;
import io.github.ollama4j.utils.Options;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Base64;
/**
* Helper class for creating {@link OllamaGenerateRequest}
* objects using the builder-pattern.
*/
/** Helper class for creating {@link OllamaGenerateRequest} objects using the builder-pattern. */
public class OllamaGenerateRequestBuilder {
private OllamaGenerateRequestBuilder(String model, String prompt) {
request = new OllamaGenerateRequest(model, prompt);
private OllamaGenerateRequestBuilder() {
request = new OllamaGenerateRequest();
}
private OllamaGenerateRequest request;
public static OllamaGenerateRequestBuilder getInstance(String model) {
return new OllamaGenerateRequestBuilder(model, "");
public static OllamaGenerateRequestBuilder builder() {
return new OllamaGenerateRequestBuilder();
}
public OllamaGenerateRequest build() {
@ -35,6 +37,11 @@ public class OllamaGenerateRequestBuilder {
return this;
}
public OllamaGenerateRequestBuilder withModel(String model) {
request.setModel(model);
return this;
}
public OllamaGenerateRequestBuilder withGetJsonResponse() {
this.request.setFormat("json");
return this;
@ -50,8 +57,8 @@ public class OllamaGenerateRequestBuilder {
return this;
}
public OllamaGenerateRequestBuilder withStreaming() {
this.request.setStream(true);
public OllamaGenerateRequestBuilder withStreaming(boolean streaming) {
this.request.setStream(streaming);
return this;
}
@ -59,4 +66,49 @@ public class OllamaGenerateRequestBuilder {
this.request.setKeepAlive(keepAlive);
return this;
}
public OllamaGenerateRequestBuilder withRaw(boolean raw) {
this.request.setRaw(raw);
return this;
}
public OllamaGenerateRequestBuilder withThink(boolean think) {
this.request.setThink(think);
return this;
}
public OllamaGenerateRequestBuilder withUseTools(boolean useTools) {
this.request.setUseTools(useTools);
return this;
}
public OllamaGenerateRequestBuilder withFormat(java.util.Map<String, Object> format) {
this.request.setFormat(format);
return this;
}
public OllamaGenerateRequestBuilder withSystem(String system) {
this.request.setSystem(system);
return this;
}
public OllamaGenerateRequestBuilder withContext(String context) {
this.request.setContext(context);
return this;
}
public OllamaGenerateRequestBuilder withImagesBase64(java.util.List<String> images) {
this.request.setImages(images);
return this;
}
public OllamaGenerateRequestBuilder withImages(java.util.List<File> imageFiles)
throws IOException {
java.util.List<String> images = new ArrayList<>();
for (File imageFile : imageFiles) {
images.add(Base64.getEncoder().encodeToString(Files.readAllBytes(imageFile.toPath())));
}
this.request.setImages(images);
return this;
}
}

727
src/test/java/io/github/ollama4j/integrationtests/OllamaAPIIntegrationTest.java
View File

File diff suppressed because it is too large Load Diff

19
src/test/java/io/github/ollama4j/integrationtests/WithAuth.java
View File

@ -12,14 +12,19 @@ import static org.junit.jupiter.api.Assertions.*;
import io.github.ollama4j.OllamaAPI;
import io.github.ollama4j.exceptions.OllamaBaseException;
import io.github.ollama4j.models.generate.OllamaGenerateRequest;
import io.github.ollama4j.models.generate.OllamaGenerateRequestBuilder;
import io.github.ollama4j.models.generate.OllamaGenerateStreamObserver;
import io.github.ollama4j.models.response.OllamaResult;
import io.github.ollama4j.samples.AnnotatedTool;
import io.github.ollama4j.tools.annotations.OllamaToolService;
import io.github.ollama4j.utils.OptionsBuilder;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.Duration;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -202,7 +207,19 @@ public class WithAuth {
});
format.put("required", List.of("isNoon"));
OllamaResult result = api.generateWithFormat(model, prompt, format);
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withRaw(false)
.withThink(false)
.withStreaming(false)
.withImages(Collections.emptyList())
.withOptions(new OptionsBuilder().build())
.withFormat(format)
.build();
OllamaGenerateStreamObserver handler = null;
OllamaResult result = api.generate(request, handler);
assertNotNull(result);
assertNotNull(result.getResponse());

102
src/test/java/io/github/ollama4j/unittests/TestMockedAPIs.java
View File

@ -18,6 +18,8 @@ import io.github.ollama4j.exceptions.RoleNotFoundException;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.embeddings.OllamaEmbedRequestModel;
import io.github.ollama4j.models.embeddings.OllamaEmbedResponseModel;
import io.github.ollama4j.models.generate.OllamaGenerateRequest;
import io.github.ollama4j.models.generate.OllamaGenerateRequestBuilder;
import io.github.ollama4j.models.generate.OllamaGenerateStreamObserver;
import io.github.ollama4j.models.request.CustomModelRequest;
import io.github.ollama4j.models.response.ModelDetail;
@ -26,6 +28,7 @@ import io.github.ollama4j.models.response.OllamaResult;
import io.github.ollama4j.tools.Tools;
import io.github.ollama4j.tools.sampletools.WeatherTool;
import io.github.ollama4j.utils.OptionsBuilder;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -171,11 +174,18 @@ class TestMockedAPIs {
OptionsBuilder optionsBuilder = new OptionsBuilder();
OllamaGenerateStreamObserver observer = new OllamaGenerateStreamObserver(null, null);
try {
when(ollamaAPI.generate(model, prompt, false, false, optionsBuilder.build(), observer))
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withRaw(false)
.withThink(false)
.withStreaming(false)
.build();
when(ollamaAPI.generate(request, observer))
.thenReturn(new OllamaResult("", "", 0, 200));
ollamaAPI.generate(model, prompt, false, false, optionsBuilder.build(), observer);
verify(ollamaAPI, times(1))
.generate(model, prompt, false, false, optionsBuilder.build(), observer);
ollamaAPI.generate(request, observer);
verify(ollamaAPI, times(1)).generate(request, observer);
} catch (OllamaBaseException e) {
throw new RuntimeException(e);
}
@ -187,29 +197,21 @@ class TestMockedAPIs {
String model = "llama2";
String prompt = "some prompt text";
try {
when(ollamaAPI.generateWithImages(
model,
prompt,
Collections.emptyList(),
new OptionsBuilder().build(),
null,
null))
.thenReturn(new OllamaResult("", "", 0, 200));
ollamaAPI.generateWithImages(
model,
prompt,
Collections.emptyList(),
new OptionsBuilder().build(),
null,
null);
verify(ollamaAPI, times(1))
.generateWithImages(
model,
prompt,
Collections.emptyList(),
new OptionsBuilder().build(),
null,
null);
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withRaw(false)
.withThink(false)
.withStreaming(false)
.withImages(Collections.emptyList())
.withOptions(new OptionsBuilder().build())
.withFormat(null)
.build();
OllamaGenerateStreamObserver handler = null;
when(ollamaAPI.generate(request, handler)).thenReturn(new OllamaResult("", "", 0, 200));
ollamaAPI.generate(request, handler);
verify(ollamaAPI, times(1)).generate(request, handler);
} catch (Exception e) {
throw new RuntimeException(e);
}
@ -221,31 +223,25 @@ class TestMockedAPIs {
String model = "llama2";
String prompt = "some prompt text";
try {
when(ollamaAPI.generateWithImages(
model,
prompt,
Collections.emptyList(),
new OptionsBuilder().build(),
null,
null))
.thenReturn(new OllamaResult("", "", 0, 200));
ollamaAPI.generateWithImages(
model,
prompt,
Collections.emptyList(),
new OptionsBuilder().build(),
null,
null);
verify(ollamaAPI, times(1))
.generateWithImages(
model,
prompt,
Collections.emptyList(),
new OptionsBuilder().build(),
null,
null);
OllamaGenerateRequest request =
OllamaGenerateRequestBuilder.builder()
.withModel(model)
.withPrompt(prompt)
.withRaw(false)
.withThink(false)
.withStreaming(false)
.withImages(Collections.emptyList())
.withOptions(new OptionsBuilder().build())
.withFormat(null)
.build();
OllamaGenerateStreamObserver handler = null;
when(ollamaAPI.generate(request, handler)).thenReturn(new OllamaResult("", "", 0, 200));
ollamaAPI.generate(request, handler);
verify(ollamaAPI, times(1)).generate(request, handler);
} catch (OllamaBaseException e) {
throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@ -254,10 +250,10 @@ class TestMockedAPIs {
OllamaAPI ollamaAPI = Mockito.mock(OllamaAPI.class);
String model = "llama2";
String prompt = "some prompt text";
when(ollamaAPI.generate(model, prompt, false, false))
when(ollamaAPI.generateAsync(model, prompt, false, false))
.thenReturn(new OllamaAsyncResultStreamer(null, null, 3));
ollamaAPI.generate(model, prompt, false, false);
verify(ollamaAPI, times(1)).generate(model, prompt, false, false);
ollamaAPI.generateAsync(model, prompt, false, false);
verify(ollamaAPI, times(1)).generateAsync(model, prompt, false, false);
}
@Test

51
src/test/java/io/github/ollama4j/unittests/TestOllamaChatRequestBuilder.java
View File

@ -10,11 +10,9 @@ package io.github.ollama4j.unittests;
import static org.junit.jupiter.api.Assertions.*;
import io.github.ollama4j.models.chat.OllamaChatMessage;
import io.github.ollama4j.models.chat.OllamaChatMessageRole;
import io.github.ollama4j.models.chat.OllamaChatRequest;
import io.github.ollama4j.models.chat.OllamaChatRequestBuilder;
import java.util.Collections;
import org.junit.jupiter.api.Test;
class TestOllamaChatRequestBuilder {
@ -22,7 +20,8 @@ class TestOllamaChatRequestBuilder {
@Test
void testResetClearsMessagesButKeepsModelAndThink() {
OllamaChatRequestBuilder builder =
OllamaChatRequestBuilder.getInstance("my-model")
OllamaChatRequestBuilder.builder()
.withModel("my-model")
.withThinking(true)
.withMessage(OllamaChatMessageRole.USER, "first");
@ -39,26 +38,28 @@ class TestOllamaChatRequestBuilder {
assertEquals(0, afterReset.getMessages().size());
}
@Test
void testImageUrlFailuresThrowExceptionAndBuilderRemainsUsable() {
OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.getInstance("m");
String invalidUrl = "ht!tp:/bad_url"; // clearly invalid URL format
// Exception should be thrown for invalid URL
assertThrows(
Exception.class,
() -> {
builder.withMessage(
OllamaChatMessageRole.USER, "hi", Collections.emptyList(), invalidUrl);
});
OllamaChatRequest req =
builder.withMessage(OllamaChatMessageRole.USER, "hello", Collections.emptyList())
.build();
assertNotNull(req.getMessages());
assert (!req.getMessages().isEmpty());
OllamaChatMessage msg = req.getMessages().get(0);
assertNotNull(msg.getResponse());
}
// @Test
// void testImageUrlFailuresThrowExceptionAndBuilderRemainsUsable() {
// OllamaChatRequestBuilder builder = OllamaChatRequestBuilder.builder().withModel("m");
// String invalidUrl = "ht!tp:/bad_url"; // clearly invalid URL format
//
// // Exception should be thrown for invalid URL
// assertThrows(
// Exception.class,
// () -> {
// builder.withMessage(
// OllamaChatMessageRole.USER, "hi", Collections.emptyList(),
// invalidUrl);
// });
//
// OllamaChatRequest req =
// builder.withMessage(OllamaChatMessageRole.USER, "hello",
// Collections.emptyList())
// .build();
//
// assertNotNull(req.getMessages());
// assert (!req.getMessages().isEmpty());
// OllamaChatMessage msg = req.getMessages().get(0);
// assertNotNull(msg.getResponse());
// }
}

2
src/test/java/io/github/ollama4j/unittests/jackson/TestChatRequestSerialization.java
View File

@ -28,7 +28,7 @@ public class TestChatRequestSerialization extends AbstractSerializationTest<Olla
@BeforeEach
public void init() {
builder = OllamaChatRequestBuilder.getInstance("DummyModel");
builder = OllamaChatRequestBuilder.builder().withModel("DummyModel");
}
@Test

2
src/test/java/io/github/ollama4j/unittests/jackson/TestGenerateRequestSerialization.java
View File

@ -23,7 +23,7 @@ class TestGenerateRequestSerialization extends AbstractSerializationTest<OllamaG
@BeforeEach
public void init() {
builder = OllamaGenerateRequestBuilder.getInstance("DummyModel");
builder = OllamaGenerateRequestBuilder.builder().withModel("Dummy Model");
}
@Test