add UT for internalToolCallingExecutionMaxAttempts in some options

Signed-off-by: lambochen <[email protected]>

Author: lambochen

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatOptionsTests.java

@@ -44,10 +44,12 @@ void testBuilderWithAllFields() {
 			.topP(0.8)
 			.topK(50)
 			.metadata(new Metadata("userId_123"))
+			.internalToolExecutionMaxAttempts(3)
 			.build();
 
-		assertThat(options).extracting("model", "maxTokens", "stopSequences", "temperature", "topP", "topK", "metadata")
-			.containsExactly("test-model", 100, List.of("stop1", "stop2"), 0.7, 0.8, 50, new Metadata("userId_123"));
+		assertThat(options).extracting("model", "maxTokens", "stopSequences", "temperature", "topP", "topK", "metadata",
+						"internalToolExecutionMaxAttempts")
+			.containsExactly("test-model", 100, List.of("stop1", "stop2"), 0.7, 0.8, 50, new Metadata("userId_123"), 3);
 	}
 
 	@Test
@@ -84,6 +86,7 @@ void testSetters() {
 		options.setTopP(0.8);
 		options.setStopSequences(List.of("stop1", "stop2"));
 		options.setMetadata(new Metadata("userId_123"));
+		options.setInternalToolExecutionMaxAttempts(3);
 
 		assertThat(options.getModel()).isEqualTo("test-model");
 		assertThat(options.getMaxTokens()).isEqualTo(100);
@@ -92,6 +95,7 @@ void testSetters() {
 		assertThat(options.getTopP()).isEqualTo(0.8);
 		assertThat(options.getStopSequences()).isEqualTo(List.of("stop1", "stop2"));
 		assertThat(options.getMetadata()).isEqualTo(new Metadata("userId_123"));
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
 	}
 
 	@Test

models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptionsTests.java

@@ -24,13 +24,15 @@
 import com.azure.ai.openai.models.AzureChatOCREnhancementConfiguration;
 import com.azure.ai.openai.models.ChatCompletionStreamOptions;
 import org.junit.jupiter.api.Test;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link AzureOpenAiChatOptions}.
  *
  * @author Alexandros Pappas
+ * @author lambochen
  */
 class AzureOpenAiChatOptionsTests {
 
@@ -65,15 +67,17 @@ void testBuilderWithAllFields() {
 			.topLogprobs(5)
 			.enhancements(enhancements)
 			.streamOptions(streamOptions)
+			.internalToolExecutionMaxAttempts(3)
 			.build();
 
 		assertThat(options)
 			.extracting("deploymentName", "frequencyPenalty", "logitBias", "maxTokens", "n", "presencePenalty", "stop",
 					"temperature", "topP", "user", "responseFormat", "streamUsage", "reasoningEffort", "seed",
-					"logprobs", "topLogProbs", "enhancements", "streamOptions")
+					"logprobs", "topLogProbs", "enhancements", "streamOptions",
+					"internalToolExecutionMaxAttempts")
 			.containsExactly("test-deployment", 0.5, Map.of("token1", 1, "token2", -1), 200, 2, 0.8,
 					List.of("stop1", "stop2"), 0.7, 0.9, "test-user", responseFormat, true, "low", 12345L, true, 5,
-					enhancements, streamOptions);
+					enhancements, streamOptions, 3);
 	}
 
 	@Test
@@ -107,6 +111,7 @@ void testCopy() {
 			.topLogprobs(5)
 			.enhancements(enhancements)
 			.streamOptions(streamOptions)
+			.internalToolExecutionMaxAttempts(3)
 			.build();
 
 		AzureOpenAiChatOptions copiedOptions = originalOptions.copy();
@@ -115,6 +120,8 @@ void testCopy() {
 		// Ensure deep copy
 		assertThat(copiedOptions.getStop()).isNotSameAs(originalOptions.getStop());
 		assertThat(copiedOptions.getToolContext()).isNotSameAs(originalOptions.getToolContext());
+
+		assertThat(copiedOptions.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
 	}
 
 	@Test
@@ -145,6 +152,7 @@ void testSetters() {
 		options.setTopLogProbs(5);
 		options.setEnhancements(enhancements);
 		options.setStreamOptions(streamOptions);
+		options.setInternalToolExecutionMaxAttempts(3);
 
 		assertThat(options.getDeploymentName()).isEqualTo("test-deployment");
 		options.setModel("test-model");
@@ -168,6 +176,7 @@ void testSetters() {
 		assertThat(options.getEnhancements()).isEqualTo(enhancements);
 		assertThat(options.getStreamOptions()).isEqualTo(streamOptions);
 		assertThat(options.getModel()).isEqualTo("test-model");
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
 	}
 
 	@Test
@@ -193,6 +202,7 @@ void testDefaultValues() {
 		assertThat(options.getEnhancements()).isNull();
 		assertThat(options.getStreamOptions()).isNull();
 		assertThat(options.getModel()).isNull();
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS);
 	}
 
 }

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java

@@ -348,7 +348,9 @@ public int hashCode() {
 		return Objects.hash(this.model, this.frequencyPenalty, this.logprobs, this.topLogprobs,
 				this.maxTokens,  this.presencePenalty, this.responseFormat,
 				this.stop, this.temperature, this.topP, this.tools, this.toolChoice,
-				this.toolCallbacks, this.toolNames, this.internalToolExecutionEnabled, this.toolContext);
+				this.toolCallbacks, this.toolNames,
+				this.internalToolExecutionEnabled, this.internalToolExecutionMaxAttempts,
+				this.toolContext);
 	}
 
 

models/spring-ai-deepseek/src/test/java/org/springframework/ai/deepseek/DeepSeekChatOptionsTest.java

@@ -0,0 +1,38 @@
+package org.springframework.ai.deepseek;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author lambochen
+ */
+class DeepSeekChatOptionsTest {
+
+	@Test
+	void fromOptions() {
+		var original = new DeepSeekChatOptions();
+		original.setInternalToolExecutionMaxAttempts(3);
+
+		var copy = DeepSeekChatOptions.fromOptions(original);
+		assertNotSame(original, copy);
+		assertSame(original.getInternalToolExecutionMaxAttempts(), copy.getInternalToolExecutionMaxAttempts());
+	}
+
+	@Test
+	void optionsDefault() {
+		var options = new DeepSeekChatOptions();
+
+		assertEquals(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS, options.getInternalToolExecutionMaxAttempts());
+	}
+
+	@Test
+	void optionsBuilder() {
+		var options = DeepSeekChatOptions.builder()
+				.internalToolExecutionMaxAttempts(3)
+				.build();
+
+		assertEquals(3, options.getInternalToolExecutionMaxAttempts());
+	}
+}

models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/chat/MiniMaxChatOptionsTests.java

@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.chat.messages.AssistantMessage;
@@ -116,4 +117,27 @@ void testToolCallingStream() {
 		assertThat(content).contains("15");
 	}
 
+	@Test
+	void testOptionsDefaultValue() {
+		var options = new MiniMaxChatOptions();
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS);
+	}
+
+	@Test
+	void testOptionsSetter() {
+		var options = new MiniMaxChatOptions();
+		options.setInternalToolExecutionMaxAttempts(3);
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
+	}
+
+	@Test
+	void testOptionsBuilder() {
+		var options = MiniMaxChatOptions.builder()
+				.internalToolExecutionMaxAttempts(3)
+				.build();
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
+	}
+
 }

models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatOptions.java

@@ -389,8 +389,9 @@ public MistralAiChatOptions copy() {
 	public int hashCode() {
 		return Objects.hash(this.model, this.temperature, this.topP, this.maxTokens, this.safePrompt, this.randomSeed,
 				this.responseFormat, this.stop, this.frequencyPenalty, this.presencePenalty, this.n, this.tools,
-				this.toolChoice, this.toolCallbacks, this.tools, this.internalToolExecutionEnabled,
-				this.internalToolExecutionMaxAttempts, this.toolContext);
+				this.toolChoice, this.toolCallbacks, this.tools,
+				this.internalToolExecutionEnabled, this.internalToolExecutionMaxAttempts,
+				this.toolContext);
 	}
 
 	@Override

models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatOptionsTests.java

@@ -0,0 +1,37 @@
+package org.springframework.ai.mistralai;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author lambochen
+ */
+class MistralAiChatOptionsTests {
+
+	@Test
+	void testOptionsDefault() {
+		var options = new MistralAiChatOptions();
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS);
+	}
+
+	@Test
+	void testOptionsCustom() {
+		var options = new MistralAiChatOptions();
+
+		options.setInternalToolExecutionMaxAttempts(3);
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
+	}
+
+	@Test
+	void testBuilder() {
+		var options = MistralAiChatOptions.builder()
+			.internalToolExecutionMaxAttempts(3)
+			.build();
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
+	}
+}

models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/chat/ZhiPuAiChatOptionsTests.java

@@ -0,0 +1,36 @@
+package org.springframework.ai.zhipuai.chat;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
+import org.springframework.ai.zhipuai.ZhiPuAiChatOptions;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+/**
+ * @author lambochen
+ */
+class ZhiPuAiChatOptionsTests {
+
+	@Test
+	void testDefaultValue() {
+		var options = new ZhiPuAiChatOptions();
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS);
+	}
+
+	@Test
+	void testSetter() {
+		var options = new ZhiPuAiChatOptions();
+		options.setInternalToolExecutionMaxAttempts(3);
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
+	}
+
+	@Test
+	void testBuilder() {
+		var options = ZhiPuAiChatOptions.builder()
+			.internalToolExecutionMaxAttempts(3)
+			.build();
+
+		assertThat(options.getInternalToolExecutionMaxAttempts()).isEqualTo(3);
+	}
+}