Skip to content

Fixed an issue where tool calls could not function properly when using the new version of Ollama. #3372

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

Closed
wants to merge 1 commit into from
Closed

Fixed an issue where tool calls could not function properly when using the new version of Ollama. #3372

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
22 changes: 13 additions & 9 deletions models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaChatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
* @author Jihoon Kim
* @author Alexandros Pappas
* @author Ilayaperumal Gopinathan
* @author Sun Yuhan
* @since 1.0.0
*/
public class OllamaChatModel implements ChatModel {
Expand Down Expand Up @@ -170,18 +171,21 @@ static ChatResponseMetadata from(OllamaApi.ChatResponse response, ChatResponse p
Duration totalDuration = response.getTotalDuration();

if (previousChatResponse != null && previousChatResponse.getMetadata() != null) {
if (previousChatResponse.getMetadata().get(METADATA_EVAL_DURATION) != null) {
evalDuration = evalDuration.plus(previousChatResponse.getMetadata().get(METADATA_EVAL_DURATION));
Object metadataEvalDuration = previousChatResponse.getMetadata().get(METADATA_EVAL_DURATION);
if (metadataEvalDuration != null && evalDuration != null) {
evalDuration = evalDuration.plus((Duration) metadataEvalDuration);
}
if (previousChatResponse.getMetadata().get(METADATA_PROMPT_EVAL_DURATION) != null) {
promptEvalDuration = promptEvalDuration
.plus(previousChatResponse.getMetadata().get(METADATA_PROMPT_EVAL_DURATION));
Object metadataPromptEvalDuration = previousChatResponse.getMetadata().get(METADATA_PROMPT_EVAL_DURATION);
if (metadataPromptEvalDuration != null && promptEvalDuration != null) {
promptEvalDuration = promptEvalDuration.plus((Duration) metadataPromptEvalDuration);
}
if (previousChatResponse.getMetadata().get(METADATA_LOAD_DURATION) != null) {
loadDuration = loadDuration.plus(previousChatResponse.getMetadata().get(METADATA_LOAD_DURATION));
Object metadataLoadDuration = previousChatResponse.getMetadata().get(METADATA_LOAD_DURATION);
if (metadataLoadDuration != null && loadDuration != null) {
loadDuration = loadDuration.plus((Duration) metadataLoadDuration);
}
if (previousChatResponse.getMetadata().get(METADATA_TOTAL_DURATION) != null) {
totalDuration = totalDuration.plus(previousChatResponse.getMetadata().get(METADATA_TOTAL_DURATION));
Object metadataTotalDuration = previousChatResponse.getMetadata().get(METADATA_TOTAL_DURATION);
if (metadataTotalDuration != null && totalDuration != null) {
totalDuration = totalDuration.plus((Duration) metadataTotalDuration);
}
if (previousChatResponse.getMetadata().getUsage() != null) {
promptTokens += previousChatResponse.getMetadata().getUsage().getPromptTokens();
Expand Down
27 changes: 25 additions & 2 deletions ...ls/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
import org.springframework.ai.ollama.management.ModelManagementOptions;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.*;

/**
* @author Jihoon Kim
Expand Down Expand Up @@ -146,4 +145,28 @@ void buildChatResponseMetadataAggregationWithNonEmptyMetadata() {
assertEquals(promptEvalCount + 66, (Integer) metadata.get("prompt-eval-count"));
}

@Test
void buildChatResponseMetadataAggregationWithNonEmptyMetadataButEmptyEval() {

OllamaApi.ChatResponse response = new OllamaApi.ChatResponse("model", Instant.now(), null, null, null, null,
null, null, null, null, null);

ChatResponse previousChatResponse = ChatResponse.builder()
.generations(List.of())
.metadata(ChatResponseMetadata.builder()
.usage(new DefaultUsage(66, 99))
.keyValue("eval-duration", Duration.ofSeconds(2))
.keyValue("prompt-eval-duration", Duration.ofSeconds(2))
.build())
.build();

ChatResponseMetadata metadata = OllamaChatModel.from(response, previousChatResponse);

assertNull(metadata.get("eval-duration"));
assertNull(metadata.get("prompt-eval-duration"));
assertEquals(Integer.valueOf(99), metadata.get("eval-count"));
assertEquals(Integer.valueOf(66), metadata.get("prompt-eval-count"));

}

}