Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,13 @@ public ChatResponse chat(List<Msg> messages, GenerateOptions options) {
@Override
protected Flux<ChatResponse> doStream(
List<Msg> messages, List<ToolSchema> tools, GenerateOptions options) {
GenerateOptions effectiveOptions =
options != null ? options : GenerateOptions.builder().build();
return streamWithHttpClient(
messages,
tools,
options.getToolChoice(),
OllamaOptions.fromGenerateOptions(options),
effectiveOptions.getToolChoice(),
OllamaOptions.fromGenerateOptions(effectiveOptions),
true);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,39 @@ void testStreamChatRequest() {
assertEquals("POST", request.getMethod());
}

@Test
@DisplayName("Should handle streaming chat request with null options")
void testStreamChatRequestWithNullOptions() {
String part1 =
"{\"model\":\""
+ TEST_MODEL_NAME
+ "\",\"message\":{\"role\":\"assistant\",\"content\":\"Hello\"},\"done\":false}";
String part2 =
"{\"model\":\""
+ TEST_MODEL_NAME
+ "\",\"done\":true,\"total_duration\":100,\"eval_count\":1}";

when(httpTransport.stream(any(HttpRequest.class))).thenReturn(Flux.just(part1, part2));

Flux<ChatResponse> flux =
model.stream(
List.of(Msg.builder().role(MsgRole.USER).textContent("Hi").build()),
null,
null);

List<ChatResponse> responses = flux.collectList().block();

assertNotNull(responses);
assertEquals(2, responses.size());
ContentBlock content = responses.get(0).getContent().get(0);
assertTrue(content instanceof TextBlock);
assertEquals("Hello", ((TextBlock) content).getText());

ArgumentCaptor<HttpRequest> captor = ArgumentCaptor.forClass(HttpRequest.class);
verify(httpTransport).stream(captor.capture());
assertEquals("POST", captor.getValue().getMethod());
}

@Test
@DisplayName("Integration Test: Real connection to local Ollama")
void testRealConnection() {
Expand Down
Loading