Skip to content

Commit 33847aa

Browse files
lambochenlambochen
committed
rename internalToolExecutionMaxAttempts
Signed-off-by: lambochen <[email protected]>
1 parent 72bceab commit 33847aa

File tree

12 files changed

+163
-92
lines changed

12 files changed

+163
-92
lines changed

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

Lines changed: 5 additions & 5 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;
84+
private Integer internalToolExecutionMaxAttempts;
8585

8686
@JsonIgnore
8787
private Map<String, Object> toolContext = new HashMap<>();
@@ -231,13 +231,13 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
231231
}
232232

233233
@Override
234-
public Integer getInternalToolExecutionMaxIterations() {
235-
return this.internalToolExecutionMaxIterations;
234+
public Integer getInternalToolExecutionMaxAttempts() {
235+
return this.internalToolExecutionMaxAttempts;
236236
}
237237

238238
@Override
239-
public void setInternalToolExecutionMaxIterations(Integer internalToolExecutionMaxIterations) {
240-
this.internalToolExecutionMaxIterations = internalToolExecutionMaxIterations;
239+
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
240+
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
241241
}
242242

243243
@Override

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

Lines changed: 8 additions & 8 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;
205+
private Integer internalToolExecutionMaxAttempts;
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 getInternalToolExecutionMaxAttempts() {
266+
return this.internalToolExecutionMaxAttempts;
267267
}
268268

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

274274
public static Builder builder() {
@@ -518,7 +518,7 @@ public boolean equals(Object o) {
518518
&& Objects.equals(this.toolCallbacks, that.toolCallbacks)
519519
&& Objects.equals(this.toolNames, that.toolNames)
520520
&& Objects.equals(this.internalToolExecutionEnabled, that.internalToolExecutionEnabled)
521-
&& Objects.equals(this.internalToolExecutionMaxIterations, that.internalToolExecutionMaxIterations)
521+
&& Objects.equals(this.internalToolExecutionMaxAttempts, that.internalToolExecutionMaxAttempts)
522522
&& Objects.equals(this.logprobs, that.logprobs) && Objects.equals(this.topLogProbs, that.topLogProbs)
523523
&& Objects.equals(this.enhancements, that.enhancements)
524524
&& Objects.equals(this.streamOptions, that.streamOptions)
@@ -534,7 +534,7 @@ public boolean equals(Object o) {
534534
public int hashCode() {
535535
return Objects.hash(this.logitBias, this.user, this.n, this.stop, this.deploymentName, this.responseFormat,
536536
this.toolCallbacks, this.toolNames, this.internalToolExecutionEnabled,
537-
this.internalToolExecutionMaxIterations, this.seed, this.logprobs, this.topLogProbs, this.enhancements,
537+
this.internalToolExecutionMaxAttempts, this.seed, this.logprobs, this.topLogProbs, this.enhancements,
538538
this.streamOptions, this.reasoningEffort, this.enableStreamUsage, this.toolContext, this.maxTokens,
539539
this.frequencyPenalty, this.presencePenalty, this.temperature, this.topP);
540540
}
@@ -680,7 +680,7 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
680680
}
681681

682682
public Builder InternalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
683-
this.options.setInternalToolExecutionMaxIterations(internalToolExecutionMaxIterations);
683+
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxIterations);
684684
return this;
685685
}
686686

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ public class DeepSeekChatOptions implements ToolCallingChatOptions {
123123
@JsonIgnore
124124
private Boolean internalToolExecutionEnabled;
125125

126+
@JsonIgnore
127+
private Integer internalToolExecutionMaxAttempts;
128+
126129
/**
127130
* Tool Function Callbacks to register with the ChatModel.
128131
* For Prompt Options the toolCallbacks are automatically enabled for the duration of the prompt execution.
@@ -292,14 +295,14 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
292295

293296
@Override
294297
@JsonIgnore
295-
public Integer getInternalToolExecutionMaxIterations() {
296-
return 0;
298+
public Integer getInternalToolExecutionMaxAttempts() {
299+
return this.internalToolExecutionMaxAttempts;
297300
}
298301

299302
@Override
300303
@JsonIgnore
301-
public void setInternalToolExecutionMaxIterations(Integer internalToolExecutionMaxIterations) {
302-
304+
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
305+
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
303306
}
304307

305308
public Boolean getLogprobs() {
@@ -370,7 +373,9 @@ public boolean equals(Object o) {
370373
&& Objects.equals(this.toolCallbacks, other.toolCallbacks)
371374
&& Objects.equals(this.toolNames, other.toolNames)
372375
&& Objects.equals(this.toolContext, other.toolContext)
373-
&& Objects.equals(this.internalToolExecutionEnabled, other.internalToolExecutionEnabled);
376+
&& Objects.equals(this.internalToolExecutionEnabled, other.internalToolExecutionEnabled)
377+
&& Objects.equals(this.internalToolExecutionMaxAttempts, other.internalToolExecutionMaxAttempts)
378+
;
374379
}
375380

376381
public static DeepSeekChatOptions fromOptions(DeepSeekChatOptions fromOptions) {
@@ -391,6 +396,7 @@ public static DeepSeekChatOptions fromOptions(DeepSeekChatOptions fromOptions) {
391396
fromOptions.getToolCallbacks() != null ? new ArrayList<>(fromOptions.getToolCallbacks()) : null)
392397
.toolNames(fromOptions.getToolNames() != null ? new HashSet<>(fromOptions.getToolNames()) : null)
393398
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
399+
.internalToolExecutionMaxAttempts(fromOptions.getInternalToolExecutionMaxAttempts())
394400
.toolContext(fromOptions.getToolContext() != null ? new HashMap<>(fromOptions.getToolContext()) : null)
395401
.build();
396402
}
@@ -500,6 +506,11 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
500506
return this;
501507
}
502508

509+
public Builder internalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
510+
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxAttempts);
511+
return this;
512+
}
513+
503514
public Builder toolContext(Map<String, Object> toolContext) {
504515
if (this.options.toolContext == null) {
505516
this.options.toolContext = toolContext;

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,8 @@ public class MiniMaxChatOptions implements ToolCallingChatOptions {
154154
@JsonIgnore
155155
private Boolean internalToolExecutionEnabled;
156156

157-
/**
158-
* The maximum number of iterations for tool execution.
159-
*/
160157
@JsonIgnore
161-
private Integer internalToolExecutionMaxIterations;
158+
private Integer internalToolExecutionMaxAttempts;
162159

163160
// @formatter:on
164161

@@ -183,6 +180,7 @@ public static MiniMaxChatOptions fromOptions(MiniMaxChatOptions fromOptions) {
183180
.toolCallbacks(fromOptions.getToolCallbacks())
184181
.toolNames(fromOptions.getToolNames())
185182
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
183+
.internalToolExecutionMaxAttempts(fromOptions.getInternalToolExecutionMaxAttempts())
186184
.toolContext(fromOptions.getToolContext())
187185
.build();
188186
}
@@ -357,13 +355,13 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
357355
}
358356

359357
@Override
360-
public Integer getInternalToolExecutionMaxIterations() {
361-
return 0;
358+
public Integer getInternalToolExecutionMaxAttempts() {
359+
return this.internalToolExecutionMaxAttempts;
362360
}
363361

364362
@Override
365-
public void setInternalToolExecutionMaxIterations(Integer internalToolExecutionMaxIterations) {
366-
363+
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
364+
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
367365
}
368366

369367
@Override
@@ -397,6 +395,8 @@ public int hashCode() {
397395
result = prime * result + ((this.toolNames == null) ? 0 : this.toolNames.hashCode());
398396
result = prime * result
399397
+ ((this.internalToolExecutionEnabled == null) ? 0 : this.internalToolExecutionEnabled.hashCode());
398+
result = prime * result
399+
+ ((this.internalToolExecutionMaxAttempts == null) ? 0 : this.internalToolExecutionMaxAttempts.hashCode());
400400
result = prime * result + ((this.toolContext == null) ? 0 : this.toolContext.hashCode());
401401
return result;
402402
}
@@ -526,6 +526,15 @@ else if (!this.internalToolExecutionEnabled.equals(other.internalToolExecutionEn
526526
return false;
527527
}
528528

529+
if (this.internalToolExecutionMaxAttempts == null) {
530+
if (other.internalToolExecutionMaxAttempts != null) {
531+
return false;
532+
}
533+
}
534+
else if (!this.internalToolExecutionMaxAttempts.equals(other.internalToolExecutionMaxAttempts)) {
535+
return false;
536+
}
537+
529538
if (this.toolNames == null) {
530539
if (other.toolNames != null) {
531540
return false;
@@ -666,6 +675,11 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
666675
return this;
667676
}
668677

678+
public Builder internalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
679+
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxAttempts);
680+
return this;
681+
}
682+
669683
public Builder toolContext(Map<String, Object> toolContext) {
670684
if (this.options.toolContext == null) {
671685
this.options.toolContext = toolContext;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public class MistralAiChatOptions implements ToolCallingChatOptions {
158158
private Boolean internalToolExecutionEnabled;
159159

160160
@JsonIgnore
161-
private Integer internalToolExecutionMaxIterations;
161+
private Integer internalToolExecutionMaxAttempts;
162162

163163
@JsonIgnore
164164
private Map<String, Object> toolContext = new HashMap<>();
@@ -184,7 +184,7 @@ public static MistralAiChatOptions fromOptions(MistralAiChatOptions fromOptions)
184184
.toolCallbacks(fromOptions.getToolCallbacks())
185185
.toolNames(fromOptions.getToolNames())
186186
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
187-
.internalToolExecutionMaxIterations(fromOptions.getInternalToolExecutionMaxIterations())
187+
.internalToolExecutionMaxAttempts(fromOptions.getInternalToolExecutionMaxAttempts())
188188
.toolContext(fromOptions.getToolContext())
189189
.build();
190190
}
@@ -353,13 +353,13 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
353353
}
354354

355355
@Override
356-
public Integer getInternalToolExecutionMaxIterations() {
357-
return this.internalToolExecutionMaxIterations;
356+
public Integer getInternalToolExecutionMaxAttempts() {
357+
return this.internalToolExecutionMaxAttempts;
358358
}
359359

360360
@Override
361-
public void setInternalToolExecutionMaxIterations(Integer internalToolExecutionMaxIterations) {
362-
this.internalToolExecutionMaxIterations = internalToolExecutionMaxIterations;
361+
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
362+
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
363363
}
364364

365365
@Override
@@ -390,7 +390,7 @@ public int hashCode() {
390390
return Objects.hash(this.model, this.temperature, this.topP, this.maxTokens, this.safePrompt, this.randomSeed,
391391
this.responseFormat, this.stop, this.frequencyPenalty, this.presencePenalty, this.n, this.tools,
392392
this.toolChoice, this.toolCallbacks, this.tools, this.internalToolExecutionEnabled,
393-
this.internalToolExecutionMaxIterations, this.toolContext);
393+
this.internalToolExecutionMaxAttempts, this.toolContext);
394394
}
395395

396396
@Override
@@ -416,7 +416,7 @@ public boolean equals(Object obj) {
416416
&& Objects.equals(this.toolCallbacks, other.toolCallbacks)
417417
&& Objects.equals(this.toolNames, other.toolNames)
418418
&& Objects.equals(this.internalToolExecutionEnabled, other.internalToolExecutionEnabled)
419-
&& Objects.equals(this.internalToolExecutionMaxIterations, other.internalToolExecutionMaxIterations)
419+
&& Objects.equals(this.internalToolExecutionMaxAttempts, other.internalToolExecutionMaxAttempts)
420420
&& Objects.equals(this.toolContext, other.toolContext);
421421
}
422422

@@ -522,8 +522,8 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
522522
return this;
523523
}
524524

525-
public Builder internalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
526-
this.options.setInternalToolExecutionMaxIterations(internalToolExecutionMaxIterations);
525+
public Builder internalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
526+
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxAttempts);
527527
return this;
528528
}
529529

‎models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaOptions.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,9 @@ public class OllamaOptions implements ToolCallingChatOptions, EmbeddingOptions {
321321

322322
@JsonIgnore
323323
private Boolean internalToolExecutionEnabled;
324+
324325
@JsonIgnore
325-
private Integer internalToolExecutionMaxIterations;
326+
private Integer internalToolExecutionMaxAttempts;
326327

327328
/**
328329
* Tool Function Callbacks to register with the ChatModel.
@@ -400,7 +401,7 @@ public static OllamaOptions fromOptions(OllamaOptions fromOptions) {
400401
.stop(fromOptions.getStop())
401402
.toolNames(fromOptions.getToolNames())
402403
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
403-
.internalToolExecutionMaxIterations(fromOptions.getInternalToolExecutionMaxIterations())
404+
.internalToolExecutionMaxAttempts(fromOptions.getInternalToolExecutionMaxAttempts())
404405
.toolCallbacks(fromOptions.getToolCallbacks())
405406
.toolContext(fromOptions.getToolContext()).build();
406407
}
@@ -751,13 +752,13 @@ public void setInternalToolExecutionEnabled(@Nullable Boolean internalToolExecut
751752
}
752753

753754
@Override
754-
public Integer getInternalToolExecutionMaxIterations() {
755-
return this.internalToolExecutionMaxIterations;
755+
public Integer getInternalToolExecutionMaxAttempts() {
756+
return this.internalToolExecutionMaxAttempts;
756757
}
757758

758759
@Override
759-
public void setInternalToolExecutionMaxIterations(Integer internalToolExecutionMaxIterations) {
760-
this.internalToolExecutionMaxIterations = internalToolExecutionMaxIterations;
760+
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
761+
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
761762
}
762763

763764
@Override
@@ -823,7 +824,7 @@ public boolean equals(Object o) {
823824
&& Objects.equals(this.penalizeNewline, that.penalizeNewline) && Objects.equals(this.stop, that.stop)
824825
&& Objects.equals(this.toolCallbacks, that.toolCallbacks)
825826
&& Objects.equals(this.internalToolExecutionEnabled, that.internalToolExecutionEnabled)
826-
&& Objects.equals(this.internalToolExecutionMaxIterations, that.internalToolExecutionMaxIterations)
827+
&& Objects.equals(this.internalToolExecutionMaxAttempts, that.internalToolExecutionMaxAttempts)
827828
&& Objects.equals(this.toolNames, that.toolNames) && Objects.equals(this.toolContext, that.toolContext);
828829
}
829830

@@ -835,7 +836,7 @@ public int hashCode() {
835836
this.topP, this.minP, this.tfsZ, this.typicalP, this.repeatLastN, this.temperature, this.repeatPenalty,
836837
this.presencePenalty, this.frequencyPenalty, this.mirostat, this.mirostatTau, this.mirostatEta,
837838
this.penalizeNewline, this.stop, this.toolCallbacks, this.toolNames, this.internalToolExecutionEnabled,
838-
this.internalToolExecutionMaxIterations, this.toolContext);
839+
this.internalToolExecutionMaxAttempts, this.toolContext);
839840
}
840841

841842
public static class Builder {
@@ -1044,8 +1045,8 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
10441045
return this;
10451046
}
10461047

1047-
public Builder internalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
1048-
this.options.setInternalToolExecutionMaxIterations(internalToolExecutionMaxIterations);
1048+
public Builder internalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
1049+
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxAttempts);
10491050
return this;
10501051
}
10511052

0 commit comments

Comments
 (0)