Skip to content

chore(google genai): return the actual model version used for chat #4152

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

Merged
merged 1 commit into from
Aug 15, 2025
Merged

chore(google genai): return the actual model version used for chat #4152

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
10 changes: 6 additions & 4 deletions ...-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@ private ChatResponse internalCall(Prompt prompt, ChatResponse previousChatRespon
Usage currentUsage = (usage.isPresent()) ? new DefaultUsage(usage.get().promptTokenCount().orElse(0),
usage.get().candidatesTokenCount().orElse(0)) : new EmptyUsage();
Usage cumulativeUsage = UsageCalculator.getCumulativeUsage(currentUsage, previousChatResponse);
ChatResponse chatResponse = new ChatResponse(generations, toChatResponseMetadata(cumulativeUsage));
ChatResponse chatResponse = new ChatResponse(generations,
toChatResponseMetadata(cumulativeUsage, generateContentResponse.modelVersion().get()));

observationContext.setResponse(chatResponse);
return chatResponse;
Expand Down Expand Up @@ -531,7 +532,8 @@ public Flux<ChatResponse> internalStream(Prompt prompt, ChatResponse previousCha
var usage = response.usageMetadata();
Usage currentUsage = usage.isPresent() ? getDefaultUsage(usage.get()) : new EmptyUsage();
Usage cumulativeUsage = UsageCalculator.getCumulativeUsage(currentUsage, previousChatResponse);
ChatResponse chatResponse = new ChatResponse(generations, toChatResponseMetadata(cumulativeUsage));
ChatResponse chatResponse = new ChatResponse(generations,
toChatResponseMetadata(cumulativeUsage, response.modelVersion().get()));
return Flux.just(chatResponse);
});

Expand Down Expand Up @@ -626,8 +628,8 @@ protected List<Generation> responseCandidateToGeneration(Candidate candidate) {
}
}

private ChatResponseMetadata toChatResponseMetadata(Usage usage) {
return ChatResponseMetadata.builder().usage(usage).build();
private ChatResponseMetadata toChatResponseMetadata(Usage usage, String modelVersion) {
return ChatResponseMetadata.builder().usage(usage).model(modelVersion).build();
}

private DefaultUsage getDefaultUsage(com.google.genai.types.GenerateContentResponseUsageMetadata usageMetadata) {
Expand Down