1

Author: liugddx

models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatModel.java

@@ -360,8 +360,8 @@ public Flux<ChatResponse> stream(Prompt prompt) {
 	 * @return true if the generation is a tool call
 	 */
 	@Override
-	protected boolean isToolCall(Generation generation, Set<String> toolCallFinishReasons) {
-		if (!super.isToolCall(generation, toolCallFinishReasons)) {
+	protected boolean isToolCall(Generation generation, Set<String> toolCallFinishReasons, ChatResponse chatResponse) {
+		if (!super.isToolCall(generation, toolCallFinishReasons, chatResponse)) {
 			return false;
 		}
 		return generation.getOutput()

spring-ai-core/src/main/java/org/springframework/ai/chat/model/AbstractToolCallSupport.java

@@ -28,6 +28,7 @@
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.ToolResponseMessage;
 import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
+import org.springframework.ai.chat.metadata.Usage;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.function.FunctionCallbackContext;
@@ -228,24 +229,25 @@ protected boolean isToolCall(ChatResponse chatResponse, Set<String> toolCallFini
 			return false;
 		}
 
-		return generations.stream().anyMatch(g -> isToolCall(g, toolCallFinishReasons));
+		return generations.stream().anyMatch(g -> isToolCall(g, toolCallFinishReasons, chatResponse));
 	}
 
 	/**
 	 * Check if the generation is a tool call. The tool call finish reasons are used to
 	 * determine if the generation is a tool call.
 	 * @param generation the generation to check.
 	 * @param toolCallFinishReasons the tool call finish reasons to check.
+	 * @param chatResponse the chat response to check.
 	 * @return true if the generation is a tool call, false otherwise.
 	 */
-	protected boolean isToolCall(Generation generation, Set<String> toolCallFinishReasons) {
+	protected boolean isToolCall(Generation generation, Set<String> toolCallFinishReasons, ChatResponse chatResponse) {
 		var finishReason = (generation.getMetadata().getFinishReason() != null)
 				? generation.getMetadata().getFinishReason() : "";
-		ChatGenerationMetadata metadata = generation.getMetadata();
+		Usage usage = chatResponse.getMetadata().getUsage();
 		return generation.getOutput().hasToolCalls() && (toolCallFinishReasons.stream()
 			.map(s -> s.toLowerCase())
 			.toList()
-			.contains(finishReason.toLowerCase()) || metadata != null);
+			.contains(finishReason.toLowerCase()) || usage != null);
 	}
 
 	/**