Skip to content

GH-4933: Always using current model name when merging two OllamaApi.C… #5052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jorander wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-4933: Always using current model name when merging two OllamaApi.C… #5052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static boolean isStreamingDone(OllamaApi.ChatResponse ollamaChatResponse)

public static ChatResponse merge(ChatResponse previous, ChatResponse current) {

String model = merge(previous.model(), current.model());
String model = (current.model() != null ? current.model() : previous.model());
Instant createdAt = merge(previous.createdAt(), current.createdAt());
OllamaApi.Message message = merge(previous.message(), current.message());
String doneReason = (current.doneReason() != null ? current.doneReason() : previous.doneReason());
Expand Down Expand Up @@ -122,16 +122,6 @@ private static Long merge(Long previous, Long current) {
return previous + current;
}

private static String merge(String previous, String current) {
if (previous == null) {
return current;
}
if (current == null) {
return previous;
}
return previous + current;
}

private static String mergeContent(OllamaApi.Message previous, OllamaApi.Message current) {
if (previous == null || previous.content() == null) {
return (current != null ? current.content() : null);
Expand Down
3 changes: 1 addition & 2 deletions ...pring-ai-ollama/src/test/java/org/springframework/ai/ollama/api/OllamaApiHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void mergeWhenBothResponsesHaveValuesShouldMergeCorrectly() {

OllamaApi.ChatResponse result = OllamaApiHelper.merge(previous, current);

assertThat(result.model()).isEqualTo("previous-modelcurrent-model");
assertThat(result.model()).isEqualTo("current-model");
assertThat(result.createdAt()).isEqualTo(currentCreatedAt);
assertThat(result.message().content()).isEqualTo("Previous contentCurrent content");
assertThat(result.message().thinking()).isEqualTo("Previous thinkingCurrent thinking");
Expand Down Expand Up @@ -187,7 +187,6 @@ void mergeStringsShouldConcatenate() {

OllamaApi.ChatResponse result = OllamaApiHelper.merge(previous, current);

assertThat(result.model()).isEqualTo("model1model2");
assertThat(result.message().content()).isEqualTo("Hello World");
assertThat(result.message().thinking()).isEqualTo("Thinking");
assertThat(result.message().toolName()).isEqualTo("ToolBox");
Expand Down