Skip to content

Commit 28abaa6

Browse files
lambochenlambochen
committed
ChatOptions: internalToolExecutionMaxIterations rename to toolExecutionMaxIterations
Signed-off-by: lambochen <[email protected]>
1 parent 3d4b4be commit 28abaa6

File tree

39 files changed

+224
-240
lines changed

39 files changed

+224
-240
lines changed

‎models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatModel.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,8 @@ Prompt buildRequestPrompt(Prompt prompt) {
468468
requestOptions.setInternalToolExecutionEnabled(
469469
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionEnabled(),
470470
this.defaultOptions.getInternalToolExecutionEnabled()));
471-
requestOptions.setInternalToolExecutionMaxIterations(
472-
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionMaxIterations(),
473-
defaultOptions.getInternalToolExecutionMaxIterations()));
471+
requestOptions.setToolExecutionMaxIterations(ModelOptionsUtils.mergeOption(
472+
runtimeOptions.getToolExecutionMaxIterations(), defaultOptions.getToolExecutionMaxIterations()));
474473
requestOptions.setToolNames(ToolCallingChatOptions.mergeToolNames(runtimeOptions.getToolNames(),
475474
this.defaultOptions.getToolNames()));
476475
requestOptions.setToolCallbacks(ToolCallingChatOptions.mergeToolCallbacks(runtimeOptions.getToolCallbacks(),
@@ -481,8 +480,7 @@ Prompt buildRequestPrompt(Prompt prompt) {
481480
else {
482481
requestOptions.setHttpHeaders(this.defaultOptions.getHttpHeaders());
483482
requestOptions.setInternalToolExecutionEnabled(this.defaultOptions.getInternalToolExecutionEnabled());
484-
requestOptions
485-
.setInternalToolExecutionMaxIterations(this.defaultOptions.getInternalToolExecutionMaxIterations());
483+
requestOptions.setToolExecutionMaxIterations(this.defaultOptions.getToolExecutionMaxIterations());
486484
requestOptions.setToolNames(this.defaultOptions.getToolNames());
487485
requestOptions.setToolCallbacks(this.defaultOptions.getToolCallbacks());
488486
requestOptions.setToolContext(this.defaultOptions.getToolContext());

‎models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public class AnthropicChatOptions implements ToolCallingChatOptions {
8181
private Boolean internalToolExecutionEnabled;
8282

8383
@JsonIgnore
84-
private Integer internalToolExecutionMaxIterations = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ITERATIONS;
84+
private Integer toolExecutionMaxIterations = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ITERATIONS;
8585

8686
@JsonIgnore
8787
private Map<String, Object> toolContext = new HashMap<>();
@@ -113,7 +113,7 @@ public static AnthropicChatOptions fromOptions(AnthropicChatOptions fromOptions)
113113
fromOptions.getToolCallbacks() != null ? new ArrayList<>(fromOptions.getToolCallbacks()) : null)
114114
.toolNames(fromOptions.getToolNames() != null ? new HashSet<>(fromOptions.getToolNames()) : null)
115115
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
116-
.internalToolExecutionMaxIterations(fromOptions.getInternalToolExecutionMaxIterations())
116+
.toolExecutionMaxIterations(fromOptions.getToolExecutionMaxIterations())
117117
.toolContext(fromOptions.getToolContext() != null ? new HashMap<>(fromOptions.getToolContext()) : null)
118118
.httpHeaders(fromOptions.getHttpHeaders() != null ? new HashMap<>(fromOptions.getHttpHeaders()) : null)
119119
.build();
@@ -232,13 +232,13 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
232232
}
233233

234234
@Override
235-
public Integer getInternalToolExecutionMaxIterations() {
236-
return this.internalToolExecutionMaxIterations;
235+
public Integer getToolExecutionMaxIterations() {
236+
return this.toolExecutionMaxIterations;
237237
}
238238

239239
@Override
240-
public void setInternalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
241-
this.internalToolExecutionMaxIterations = internalToolExecutionMaxIterations;
240+
public void setToolExecutionMaxIterations(@Nullable Integer toolExecutionMaxIterations) {
241+
this.toolExecutionMaxIterations = toolExecutionMaxIterations;
242242
}
243243

244244
@Override
@@ -296,7 +296,7 @@ public boolean equals(Object o) {
296296
&& Objects.equals(this.toolCallbacks, that.toolCallbacks)
297297
&& Objects.equals(this.toolNames, that.toolNames)
298298
&& Objects.equals(this.internalToolExecutionEnabled, that.internalToolExecutionEnabled)
299-
&& Objects.equals(this.internalToolExecutionMaxIterations, that.internalToolExecutionMaxIterations)
299+
&& Objects.equals(this.toolExecutionMaxIterations, that.toolExecutionMaxIterations)
300300
&& Objects.equals(this.toolContext, that.toolContext)
301301
&& Objects.equals(this.httpHeaders, that.httpHeaders);
302302
}
@@ -305,7 +305,7 @@ public boolean equals(Object o) {
305305
public int hashCode() {
306306
return Objects.hash(this.model, this.maxTokens, this.metadata, this.stopSequences, this.temperature, this.topP,
307307
this.topK, this.thinking, this.toolCallbacks, this.toolNames, this.internalToolExecutionEnabled,
308-
this.internalToolExecutionMaxIterations, this.toolContext, this.httpHeaders);
308+
this.toolExecutionMaxIterations, this.toolContext, this.httpHeaders);
309309
}
310310

311311
public static class Builder {
@@ -390,8 +390,8 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
390390
return this;
391391
}
392392

393-
public Builder internalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
394-
this.options.setInternalToolExecutionMaxIterations(internalToolExecutionMaxIterations);
393+
public Builder toolExecutionMaxIterations(@Nullable Integer toolExecutionMaxIterations) {
394+
this.options.setToolExecutionMaxIterations(toolExecutionMaxIterations);
395395
return this;
396396
}
397397

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ void testBuilderWithAllFields() {
4444
.topP(0.8)
4545
.topK(50)
4646
.metadata(new Metadata("userId_123"))
47-
.internalToolExecutionMaxIterations(3)
47+
.toolExecutionMaxIterations(3)
4848
.build();
4949

5050
assertThat(options)
5151
.extracting("model", "maxTokens", "stopSequences", "temperature", "topP", "topK", "metadata",
52-
"internalToolExecutionMaxIterations")
52+
"toolExecutionMaxIterations")
5353
.containsExactly("test-model", 100, List.of("stop1", "stop2"), 0.7, 0.8, 50, new Metadata("userId_123"), 3);
5454
}
5555

@@ -64,7 +64,7 @@ void testCopy() {
6464
.topK(50)
6565
.metadata(new Metadata("userId_123"))
6666
.toolContext(Map.of("key1", "value1"))
67-
.internalToolExecutionMaxIterations(3)
67+
.toolExecutionMaxIterations(3)
6868
.build();
6969

7070
AnthropicChatOptions copied = original.copy();
@@ -74,7 +74,7 @@ void testCopy() {
7474
assertThat(copied.getStopSequences()).isNotSameAs(original.getStopSequences());
7575
assertThat(copied.getToolContext()).isNotSameAs(original.getToolContext());
7676

77-
assertThat(copied.getInternalToolExecutionMaxIterations()).isEqualTo(3);
77+
assertThat(copied.getToolExecutionMaxIterations()).isEqualTo(3);
7878
}
7979

8080
@Test
@@ -87,7 +87,7 @@ void testSetters() {
8787
options.setTopP(0.8);
8888
options.setStopSequences(List.of("stop1", "stop2"));
8989
options.setMetadata(new Metadata("userId_123"));
90-
options.setInternalToolExecutionMaxIterations(3);
90+
options.setToolExecutionMaxIterations(3);
9191

9292
assertThat(options.getModel()).isEqualTo("test-model");
9393
assertThat(options.getMaxTokens()).isEqualTo(100);
@@ -96,7 +96,7 @@ void testSetters() {
9696
assertThat(options.getTopP()).isEqualTo(0.8);
9797
assertThat(options.getStopSequences()).isEqualTo(List.of("stop1", "stop2"));
9898
assertThat(options.getMetadata()).isEqualTo(new Metadata("userId_123"));
99-
assertThat(options.getInternalToolExecutionMaxIterations()).isEqualTo(3);
99+
assertThat(options.getToolExecutionMaxIterations()).isEqualTo(3);
100100
}
101101

102102
@Test
@@ -109,7 +109,7 @@ void testDefaultValues() {
109109
assertThat(options.getTopP()).isNull();
110110
assertThat(options.getStopSequences()).isNull();
111111
assertThat(options.getMetadata()).isNull();
112-
assertThat(options.getInternalToolExecutionMaxIterations())
112+
assertThat(options.getToolExecutionMaxIterations())
113113
.isEqualTo(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ITERATIONS);
114114
}
115115

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatModel.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -692,9 +692,9 @@ Prompt buildRequestPrompt(Prompt prompt) {
692692
requestOptions.setInternalToolExecutionEnabled(
693693
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionEnabled(),
694694
this.defaultOptions.getInternalToolExecutionEnabled()));
695-
runtimeOptions.setInternalToolExecutionMaxIterations(
696-
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionMaxIterations(),
697-
this.defaultOptions.getInternalToolExecutionMaxIterations()));
695+
runtimeOptions.setToolExecutionMaxIterations(
696+
ModelOptionsUtils.mergeOption(runtimeOptions.getToolExecutionMaxIterations(),
697+
this.defaultOptions.getToolExecutionMaxIterations()));
698698
requestOptions.setStreamUsage(ModelOptionsUtils.mergeOption(runtimeOptions.getStreamUsage(),
699699
this.defaultOptions.getStreamUsage()));
700700
requestOptions.setToolNames(ToolCallingChatOptions.mergeToolNames(runtimeOptions.getToolNames(),
@@ -706,8 +706,7 @@ Prompt buildRequestPrompt(Prompt prompt) {
706706
}
707707
else {
708708
requestOptions.setInternalToolExecutionEnabled(this.defaultOptions.getInternalToolExecutionEnabled());
709-
requestOptions
710-
.setInternalToolExecutionMaxIterations(this.defaultOptions.getInternalToolExecutionMaxIterations());
709+
requestOptions.setToolExecutionMaxIterations(this.defaultOptions.getToolExecutionMaxIterations());
711710
requestOptions.setStreamUsage(this.defaultOptions.getStreamUsage());
712711
requestOptions.setToolNames(this.defaultOptions.getToolNames());
713712
requestOptions.setToolCallbacks(this.defaultOptions.getToolCallbacks());

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public class AzureOpenAiChatOptions implements ToolCallingChatOptions {
202202
private Boolean internalToolExecutionEnabled;
203203

204204
@JsonIgnore
205-
private Integer internalToolExecutionMaxIterations = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ITERATIONS;
205+
private Integer toolExecutionMaxIterations = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ITERATIONS;
206206

207207
/**
208208
* Whether to include token usage information in streaming chat completion responses.
@@ -262,13 +262,13 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
262262
}
263263

264264
@Override
265-
public Integer getInternalToolExecutionMaxIterations() {
266-
return this.internalToolExecutionMaxIterations;
265+
public Integer getToolExecutionMaxIterations() {
266+
return this.toolExecutionMaxIterations;
267267
}
268268

269269
@Override
270-
public void setInternalToolExecutionMaxIterations(Integer internalToolExecutionMaxIterations) {
271-
this.internalToolExecutionMaxIterations = internalToolExecutionMaxIterations;
270+
public void setToolExecutionMaxIterations(Integer toolExecutionMaxIterations) {
271+
this.toolExecutionMaxIterations = toolExecutionMaxIterations;
272272
}
273273

274274
public static Builder builder() {
@@ -298,7 +298,7 @@ public static AzureOpenAiChatOptions fromOptions(AzureOpenAiChatOptions fromOpti
298298
.enhancements(fromOptions.getEnhancements())
299299
.toolContext(fromOptions.getToolContext() != null ? new HashMap<>(fromOptions.getToolContext()) : null)
300300
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
301-
.internalToolExecutionMaxIterations(fromOptions.getInternalToolExecutionMaxIterations())
301+
.toolExecutionMaxIterations(fromOptions.getToolExecutionMaxIterations())
302302
.streamOptions(fromOptions.getStreamOptions())
303303
.toolCallbacks(
304304
fromOptions.getToolCallbacks() != null ? new ArrayList<>(fromOptions.getToolCallbacks()) : null)
@@ -519,7 +519,7 @@ public boolean equals(Object o) {
519519
&& Objects.equals(this.toolCallbacks, that.toolCallbacks)
520520
&& Objects.equals(this.toolNames, that.toolNames)
521521
&& Objects.equals(this.internalToolExecutionEnabled, that.internalToolExecutionEnabled)
522-
&& Objects.equals(this.internalToolExecutionMaxIterations, that.internalToolExecutionMaxIterations)
522+
&& Objects.equals(this.toolExecutionMaxIterations, that.toolExecutionMaxIterations)
523523
&& Objects.equals(this.logprobs, that.logprobs) && Objects.equals(this.topLogProbs, that.topLogProbs)
524524
&& Objects.equals(this.enhancements, that.enhancements)
525525
&& Objects.equals(this.streamOptions, that.streamOptions)
@@ -534,10 +534,10 @@ public boolean equals(Object o) {
534534
@Override
535535
public int hashCode() {
536536
return Objects.hash(this.logitBias, this.user, this.n, this.stop, this.deploymentName, this.responseFormat,
537-
this.toolCallbacks, this.toolNames, this.internalToolExecutionEnabled,
538-
this.internalToolExecutionMaxIterations, this.seed, this.logprobs, this.topLogProbs, this.enhancements,
539-
this.streamOptions, this.reasoningEffort, this.enableStreamUsage, this.toolContext, this.maxTokens,
540-
this.frequencyPenalty, this.presencePenalty, this.temperature, this.topP);
537+
this.toolCallbacks, this.toolNames, this.internalToolExecutionEnabled, this.toolExecutionMaxIterations,
538+
this.seed, this.logprobs, this.topLogProbs, this.enhancements, this.streamOptions, this.reasoningEffort,
539+
this.enableStreamUsage, this.toolContext, this.maxTokens, this.frequencyPenalty, this.presencePenalty,
540+
this.temperature, this.topP);
541541
}
542542

543543
public static class Builder {
@@ -680,8 +680,8 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
680680
return this;
681681
}
682682

683-
public Builder internalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
684-
this.options.setInternalToolExecutionMaxIterations(internalToolExecutionMaxIterations);
683+
public Builder toolExecutionMaxIterations(@Nullable Integer toolExecutionMaxIterations) {
684+
this.options.setToolExecutionMaxIterations(toolExecutionMaxIterations);
685685
return this;
686686
}
687687

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ void testBuilderWithAllFields() {
6767
.topLogprobs(5)
6868
.enhancements(enhancements)
6969
.streamOptions(streamOptions)
70-
.internalToolExecutionMaxIterations(3)
70+
.toolExecutionMaxIterations(3)
7171
.build();
7272

7373
assertThat(options)
7474
.extracting("deploymentName", "frequencyPenalty", "logitBias", "maxTokens", "n", "presencePenalty", "stop",
7575
"temperature", "topP", "user", "responseFormat", "streamUsage", "reasoningEffort", "seed",
76-
"logprobs", "topLogProbs", "enhancements", "streamOptions", "internalToolExecutionMaxIterations")
76+
"logprobs", "topLogProbs", "enhancements", "streamOptions", "toolExecutionMaxIterations")
7777
.containsExactly("test-deployment", 0.5, Map.of("token1", 1, "token2", -1), 200, 2, 0.8,
7878
List.of("stop1", "stop2"), 0.7, 0.9, "test-user", responseFormat, true, "low", 12345L, true, 5,
7979
enhancements, streamOptions, 3);
@@ -110,7 +110,7 @@ void testCopy() {
110110
.topLogprobs(5)
111111
.enhancements(enhancements)
112112
.streamOptions(streamOptions)
113-
.internalToolExecutionMaxIterations(3)
113+
.toolExecutionMaxIterations(3)
114114
.build();
115115

116116
AzureOpenAiChatOptions copiedOptions = originalOptions.copy();
@@ -120,7 +120,7 @@ void testCopy() {
120120
assertThat(copiedOptions.getStop()).isNotSameAs(originalOptions.getStop());
121121
assertThat(copiedOptions.getToolContext()).isNotSameAs(originalOptions.getToolContext());
122122

123-
assertThat(copiedOptions.getInternalToolExecutionMaxIterations()).isEqualTo(3);
123+
assertThat(copiedOptions.getToolExecutionMaxIterations()).isEqualTo(3);
124124
}
125125

126126
@Test
@@ -151,7 +151,7 @@ void testSetters() {
151151
options.setTopLogProbs(5);
152152
options.setEnhancements(enhancements);
153153
options.setStreamOptions(streamOptions);
154-
options.setInternalToolExecutionMaxIterations(3);
154+
options.setToolExecutionMaxIterations(3);
155155

156156
assertThat(options.getDeploymentName()).isEqualTo("test-deployment");
157157
options.setModel("test-model");
@@ -175,7 +175,7 @@ void testSetters() {
175175
assertThat(options.getEnhancements()).isEqualTo(enhancements);
176176
assertThat(options.getStreamOptions()).isEqualTo(streamOptions);
177177
assertThat(options.getModel()).isEqualTo("test-model");
178-
assertThat(options.getInternalToolExecutionMaxIterations()).isEqualTo(3);
178+
assertThat(options.getToolExecutionMaxIterations()).isEqualTo(3);
179179
}
180180

181181
@Test
@@ -201,7 +201,7 @@ void testDefaultValues() {
201201
assertThat(options.getEnhancements()).isNull();
202202
assertThat(options.getStreamOptions()).isNull();
203203
assertThat(options.getModel()).isNull();
204-
assertThat(options.getInternalToolExecutionMaxIterations())
204+
assertThat(options.getToolExecutionMaxIterations())
205205
.isEqualTo(ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ITERATIONS);
206206
}
207207

‎models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ Prompt buildRequestPrompt(Prompt prompt) {
321321
.internalToolExecutionEnabled(runtimeOptions.getInternalToolExecutionEnabled() != null
322322
? runtimeOptions.getInternalToolExecutionEnabled()
323323
: this.defaultOptions.getInternalToolExecutionEnabled())
324-
.internalToolExecutionMaxIterations(
325-
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionMaxIterations(),
326-
this.defaultOptions.getInternalToolExecutionMaxIterations()))
324+
.toolExecutionMaxIterations(
325+
ModelOptionsUtils.mergeOption(runtimeOptions.getToolExecutionMaxIterations(),
326+
this.defaultOptions.getToolExecutionMaxIterations()))
327327
.build();
328328
}
329329

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,9 @@ Prompt buildRequestPrompt(Prompt prompt) {
419419
requestOptions.setInternalToolExecutionEnabled(
420420
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionEnabled(),
421421
this.defaultOptions.getInternalToolExecutionEnabled()));
422-
requestOptions.setInternalToolExecutionMaxIterations(
423-
ModelOptionsUtils.mergeOption(runtimeOptions.getInternalToolExecutionMaxIterations(),
424-
this.defaultOptions.getInternalToolExecutionMaxIterations()));
422+
requestOptions.setToolExecutionMaxIterations(
423+
ModelOptionsUtils.mergeOption(runtimeOptions.getToolExecutionMaxIterations(),
424+
this.defaultOptions.getToolExecutionMaxIterations()));
425425
requestOptions.setToolNames(ToolCallingChatOptions.mergeToolNames(runtimeOptions.getToolNames(),
426426
this.defaultOptions.getToolNames()));
427427
requestOptions.setToolCallbacks(ToolCallingChatOptions.mergeToolCallbacks(runtimeOptions.getToolCallbacks(),
@@ -431,8 +431,7 @@ Prompt buildRequestPrompt(Prompt prompt) {
431431
}
432432
else {
433433
requestOptions.setInternalToolExecutionEnabled(this.defaultOptions.getInternalToolExecutionEnabled());
434-
requestOptions
435-
.setInternalToolExecutionMaxIterations(this.defaultOptions.getInternalToolExecutionMaxIterations());
434+
requestOptions.setToolExecutionMaxIterations(this.defaultOptions.getToolExecutionMaxIterations());
436435
requestOptions.setToolNames(this.defaultOptions.getToolNames());
437436
requestOptions.setToolCallbacks(this.defaultOptions.getToolCallbacks());
438437
requestOptions.setToolContext(this.defaultOptions.getToolContext());

0 commit comments

Comments
 (0)