Skip to content

Commit 8e17a15

Browse files
authored
chore(google genai): return the actual model version used for chat (#4152)
Signed-off-by: Gareth Evans <[email protected]>
1 parent fef454b commit 8e17a15

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ private ChatResponse internalCall(Prompt prompt, ChatResponse previousChatRespon
417417
Usage currentUsage = (usage.isPresent()) ? new DefaultUsage(usage.get().promptTokenCount().orElse(0),
418418
usage.get().candidatesTokenCount().orElse(0)) : new EmptyUsage();
419419
Usage cumulativeUsage = UsageCalculator.getCumulativeUsage(currentUsage, previousChatResponse);
420-
ChatResponse chatResponse = new ChatResponse(generations, toChatResponseMetadata(cumulativeUsage));
420+
ChatResponse chatResponse = new ChatResponse(generations,
421+
toChatResponseMetadata(cumulativeUsage, generateContentResponse.modelVersion().get()));
421422

422423
observationContext.setResponse(chatResponse);
423424
return chatResponse;
@@ -531,7 +532,8 @@ public Flux<ChatResponse> internalStream(Prompt prompt, ChatResponse previousCha
531532
var usage = response.usageMetadata();
532533
Usage currentUsage = usage.isPresent() ? getDefaultUsage(usage.get()) : new EmptyUsage();
533534
Usage cumulativeUsage = UsageCalculator.getCumulativeUsage(currentUsage, previousChatResponse);
534-
ChatResponse chatResponse = new ChatResponse(generations, toChatResponseMetadata(cumulativeUsage));
535+
ChatResponse chatResponse = new ChatResponse(generations,
536+
toChatResponseMetadata(cumulativeUsage, response.modelVersion().get()));
535537
return Flux.just(chatResponse);
536538
});
537539

@@ -626,8 +628,8 @@ protected List<Generation> responseCandidateToGeneration(Candidate candidate) {
626628
}
627629
}
628630

629-
private ChatResponseMetadata toChatResponseMetadata(Usage usage) {
630-
return ChatResponseMetadata.builder().usage(usage).build();
631+
private ChatResponseMetadata toChatResponseMetadata(Usage usage, String modelVersion) {
632+
return ChatResponseMetadata.builder().usage(usage).model(modelVersion).build();
631633
}
632634

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

0 commit comments

Comments
 (0)