diff --git a/models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java b/models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java index 6630b4227f9..4beda51c316 100644 --- a/models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java +++ b/models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatModel.java @@ -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; @@ -531,7 +532,8 @@ public Flux 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); }); @@ -626,8 +628,8 @@ protected List 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) {