Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Usage#getCompletionTokens instead of deprecated Usage#getGenerationTokens

Browse Source
This commit is contained in:
Ilayaperumal Gopinathan
2025-01-29 10:58:57 +00:00
parent 78a58a15e8
commit 14ec6b2dc0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/proxy/DeepSeekWithOpenAiChatModelIT.java
View File

@@ -128,11 +128,11 @@ class DeepSeekWithOpenAiChatModelIT {
var referenceTokenUsage = this.chatModel.call(prompt).getMetadata().getUsage();
assertThat(streamingTokenUsage.getPromptTokens()).isGreaterThan(0);
assertThat(streamingTokenUsage.getGenerationTokens()).isGreaterThan(0);
assertThat(streamingTokenUsage.getCompletionTokens()).isGreaterThan(0);
assertThat(streamingTokenUsage.getTotalTokens()).isGreaterThan(0);
assertThat(streamingTokenUsage.getPromptTokens()).isEqualTo(referenceTokenUsage.getPromptTokens());
assertThat(streamingTokenUsage.getGenerationTokens()).isEqualTo(referenceTokenUsage.getGenerationTokens());
assertThat(streamingTokenUsage.getCompletionTokens()).isEqualTo(referenceTokenUsage.getCompletionTokens());
assertThat(streamingTokenUsage.getTotalTokens()).isEqualTo(referenceTokenUsage.getTotalTokens());
}
@@ -316,7 +316,7 @@ class DeepSeekWithOpenAiChatModelIT {
assertThat(response.getMetadata().getId()).isNotEmpty();
assertThat(response.getMetadata().getModel()).containsIgnoringCase(model);
assertThat(response.getMetadata().getUsage().getPromptTokens()).isPositive();
assertThat(response.getMetadata().getUsage().getGenerationTokens()).isPositive();
assertThat(response.getMetadata().getUsage().getCompletionTokens()).isPositive();
assertThat(response.getMetadata().getUsage().getTotalTokens()).isPositive();
}

2
spring-ai-core/src/test/java/org/springframework/ai/chat/metadata/DefaultUsageTests.java
View File

@@ -184,7 +184,7 @@ public class DefaultUsageTests {
assertThat(deserialized.getPromptTokens()).isEqualTo(usage.getPromptTokens());
assertThat(deserialized.getCompletionTokens()).isEqualTo(usage.getCompletionTokens());
assertThat(deserialized.getTotalTokens()).isEqualTo(usage.getTotalTokens());
assertThat(deserialized.getGenerationTokens()).isEqualTo(usage.getGenerationTokens());
assertThat(deserialized.getCompletionTokens()).isEqualTo(usage.getCompletionTokens());
@SuppressWarnings("unchecked")
Map<String, Object> deserializedMap = (Map<String, Object>) deserialized.getNativeUsage();