Skip to content

Commit 092eb6c

Browse files
lambochenlambochen
committed
internalToolExecutionEnabled set default value is Integer.MAX_VALUE
Signed-off-by: lambochen <[email protected]>
1 parent 670d691 commit 092eb6c

File tree

11 files changed

+22
-20
lines changed

11 files changed

+22
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
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 internalToolExecutionMaxAttempts;
84+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
8585

8686
@JsonIgnore
8787
private Map<String, Object> toolContext = new HashMap<>();

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

Lines changed: 2 additions & 2 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 internalToolExecutionMaxAttempts;
205+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
206206

207207
/**
208208
* Whether to include token usage information in streaming chat completion responses.
@@ -679,7 +679,7 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
679679
return this;
680680
}
681681

682-
public Builder InternalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
682+
public Builder internalToolExecutionMaxIterations(@Nullable Integer internalToolExecutionMaxIterations) {
683683
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxIterations);
684684
return this;
685685
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public class DeepSeekChatOptions implements ToolCallingChatOptions {
124124
private Boolean internalToolExecutionEnabled;
125125

126126
@JsonIgnore
127-
private Integer internalToolExecutionMaxAttempts;
127+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
128128

129129
/**
130130
* Tool Function Callbacks to register with the ChatModel.
@@ -301,7 +301,7 @@ public Integer getInternalToolExecutionMaxAttempts() {
301301

302302
@Override
303303
@JsonIgnore
304-
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
304+
public void setInternalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
305305
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
306306
}
307307

@@ -506,7 +506,7 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut
506506
return this;
507507
}
508508

509-
public Builder internalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
509+
public Builder internalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
510510
this.options.setInternalToolExecutionMaxAttempts(internalToolExecutionMaxAttempts);
511511
return this;
512512
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public class MiniMaxChatOptions implements ToolCallingChatOptions {
155155
private Boolean internalToolExecutionEnabled;
156156

157157
@JsonIgnore
158-
private Integer internalToolExecutionMaxAttempts;
158+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
159159

160160
// @formatter:on
161161

@@ -395,7 +395,8 @@ public int hashCode() {
395395
result = prime * result + ((this.toolNames == null) ? 0 : this.toolNames.hashCode());
396396
result = prime * result
397397
+ ((this.internalToolExecutionEnabled == null) ? 0 : this.internalToolExecutionEnabled.hashCode());
398-
result = prime * result + ((this.internalToolExecutionMaxAttempts == null) ? 0
398+
result = prime * result + ((this.internalToolExecutionMaxAttempts == null)
399+
? ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS
399400
: this.internalToolExecutionMaxAttempts.hashCode());
400401
result = prime * result + ((this.toolContext == null) ? 0 : this.toolContext.hashCode());
401402
return result;

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

Lines changed: 2 additions & 2 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 internalToolExecutionMaxAttempts;
161+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
162162

163163
@JsonIgnore
164164
private Map<String, Object> toolContext = new HashMap<>();
@@ -358,7 +358,7 @@ public Integer getInternalToolExecutionMaxAttempts() {
358358
}
359359

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public class OllamaOptions implements ToolCallingChatOptions, EmbeddingOptions {
323323
private Boolean internalToolExecutionEnabled;
324324

325325
@JsonIgnore
326-
private Integer internalToolExecutionMaxAttempts;
326+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
327327

328328
/**
329329
* Tool Function Callbacks to register with the ChatModel.
@@ -757,7 +757,7 @@ public Integer getInternalToolExecutionMaxAttempts() {
757757
}
758758

759759
@Override
760-
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
760+
public void setInternalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
761761
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
762762
}
763763

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public class OpenAiChatOptions implements ToolCallingChatOptions {
220220
private Boolean internalToolExecutionEnabled;
221221

222222
@JsonIgnore
223-
private Integer internalToolExecutionMaxAttempts;
223+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
224224

225225
/**
226226
* Optional HTTP headers to be added to the chat completion request.
@@ -515,7 +515,7 @@ public Integer getInternalToolExecutionMaxAttempts() {
515515
}
516516

517517
@Override
518-
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
518+
public void setInternalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
519519
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
520520
}
521521

‎models/spring-ai-vertex-ai-gemini/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public class VertexAiGeminiChatOptions implements ToolCallingChatOptions {
128128
private Boolean internalToolExecutionEnabled;
129129

130130
@JsonIgnore
131-
private Integer internalToolExecutionMaxAttempts;
131+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
132132

133133
@JsonIgnore
134134
private Map<String, Object> toolContext = new HashMap<>();
@@ -291,7 +291,7 @@ public Integer getInternalToolExecutionMaxAttempts() {
291291
}
292292

293293
@Override
294-
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
294+
public void setInternalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
295295
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
296296
}
297297

‎models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatOptions.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class ZhiPuAiChatOptions implements ToolCallingChatOptions {
127127
private Boolean internalToolExecutionEnabled;
128128

129129
@JsonIgnore
130-
private Integer internalToolExecutionMaxAttempts;
130+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
131131

132132
@JsonIgnore
133133
private Map<String, Object> toolContext = new HashMap<>();
@@ -152,6 +152,7 @@ public static ZhiPuAiChatOptions fromOptions(ZhiPuAiChatOptions fromOptions) {
152152
.toolCallbacks(fromOptions.getToolCallbacks())
153153
.toolNames(fromOptions.getToolNames())
154154
.internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled())
155+
.internalToolExecutionMaxAttempts(fromOptions.getInternalToolExecutionMaxAttempts())
155156
.toolContext(fromOptions.getToolContext())
156157
.build();
157158
}
@@ -317,7 +318,7 @@ public Integer getInternalToolExecutionMaxAttempts() {
317318
}
318319

319320
@Override
320-
public void setInternalToolExecutionMaxAttempts(Integer internalToolExecutionMaxAttempts) {
321+
public void setInternalToolExecutionMaxAttempts(@Nullable Integer internalToolExecutionMaxAttempts) {
321322
this.internalToolExecutionMaxAttempts = internalToolExecutionMaxAttempts;
322323
}
323324

‎spring-ai-model/src/main/java/org/springframework/ai/model/tool/DefaultToolCallingChatOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class DefaultToolCallingChatOptions implements ToolCallingChatOptions {
4848
private Boolean internalToolExecutionEnabled;
4949

5050
@Nullable
51-
private Integer internalToolExecutionMaxAttempts;
51+
private Integer internalToolExecutionMaxAttempts = ToolCallingChatOptions.DEFAULT_TOOL_EXECUTION_MAX_ATTEMPTS;
5252

5353
@Nullable
5454
private String model;

0 commit comments

Comments
 (0)