Skip to content

Commit 9e61417

Browse files
committed
reformat code
Signed-off-by: Feng Xie<[email protected]> Signed-off-by: yxloveforever <[email protected]>
1 parent 53f76d6 commit 9e61417

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ public ToolExecutionResult executeToolCalls(Prompt prompt, ChatResponse chatResp
129129
Assert.notNull(chatResponse, "chatResponse cannot be null");
130130

131131
Optional<Generation> toolCallGeneration = chatResponse.getResults()
132-
.stream()
133-
.filter(g -> !CollectionUtils.isEmpty(g.getOutput().getToolCalls()))
134-
.findFirst();
132+
.stream()
133+
.filter(g -> !CollectionUtils.isEmpty(g.getOutput().getToolCalls()))
134+
.findFirst();
135135

136136
if (toolCallGeneration.isEmpty()) {
137137
throw new IllegalStateException("No tool call requested by the chat model");
@@ -148,12 +148,13 @@ public ToolExecutionResult executeToolCalls(Prompt prompt, ChatResponse chatResp
148148
assistantMessage, internalToolExecutionResult.toolResponseMessage());
149149

150150
return ToolExecutionResult.builder()
151-
.conversationHistory(conversationHistory)
152-
.returnDirect(internalToolExecutionResult.returnDirect())
153-
.build();
151+
.conversationHistory(conversationHistory)
152+
.returnDirect(internalToolExecutionResult.returnDirect())
153+
.build();
154154
}
155155

156-
private AssistantMessage safelyMergeAssistantMessageIfEmptyToolCallPresent(Optional<Generation> toolCallGeneration) {
156+
private AssistantMessage safelyMergeAssistantMessageIfEmptyToolCallPresent(
157+
Optional<Generation> toolCallGeneration) {
157158
if (toolCallGeneration.isEmpty()) {
158159
throw new IllegalStateException("No tool call requested by the chat model");
159160
}
@@ -166,19 +167,19 @@ private AssistantMessage safelyMergeAssistantMessageIfEmptyToolCallPresent(Optio
166167
for (AssistantMessage.ToolCall toolCall : reversedToolCalls) {
167168
args.append(toolCall.arguments());
168169
if (StringUtils.hasText(toolCall.name())) {
169-
AssistantMessage.ToolCall newToolCall = new AssistantMessage.ToolCall(
170-
toolCall.id(), toolCall.type(), toolCall.name(), args.toString());
170+
AssistantMessage.ToolCall newToolCall = new AssistantMessage.ToolCall(toolCall.id(), toolCall.type(),
171+
toolCall.name(), args.toString());
171172
newToolCalls.add(newToolCall);
172173
args = new StringBuilder();
173174
}
174175
}
175176
Collections.reverse(newToolCalls);
176177
return AssistantMessage.builder()
177-
.content(assistantMessage.getText())
178-
.toolCalls(newToolCalls)
179-
.media(assistantMessage.getMedia())
180-
.properties(assistantMessage.getMetadata())
181-
.build();
178+
.content(assistantMessage.getText())
179+
.toolCalls(newToolCalls)
180+
.media(assistantMessage.getMedia())
181+
.properties(assistantMessage.getMetadata())
182+
.build();
182183
}
183184

184185
private static ToolContext buildToolContext(Prompt prompt, AssistantMessage assistantMessage) {

spring-ai-model/src/test/java/org/springframework/ai/model/tool/DefaultToolCallingManagerTest.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ void shouldHandleMultipleGenerationsWithToolCallsWhenNameIsEmpty() {
429429
@Override
430430
public ToolDefinition getToolDefinition() {
431431
return DefaultToolDefinition.builder()
432-
.name("multiGenTool")
433-
.description("Tool for multiple generations")
434-
.inputSchema("{}")
435-
.build();
432+
.name("multiGenTool")
433+
.description("Tool for multiple generations")
434+
.inputSchema("{}")
435+
.build();
436436
}
437437

438438
@Override
@@ -452,16 +452,16 @@ public String call(String toolInput) {
452452
AssistantMessage.ToolCall toolCall3 = new AssistantMessage.ToolCall("3", "function", "", "{}");
453453

454454
AssistantMessage assistantMessage1 = AssistantMessage.builder()
455-
.content("")
456-
.properties(Map.of())
457-
.toolCalls(List.of(toolCall1))
458-
.build();
455+
.content("")
456+
.properties(Map.of())
457+
.toolCalls(List.of(toolCall1))
458+
.build();
459459

460460
AssistantMessage assistantMessage2 = AssistantMessage.builder()
461-
.content("")
462-
.properties(Map.of())
463-
.toolCalls(List.of(toolCall2, toolCall3))
464-
.build();
461+
.content("")
462+
.properties(Map.of())
463+
.toolCalls(List.of(toolCall2, toolCall3))
464+
.build();
465465

466466
Generation generation1 = new Generation(assistantMessage1);
467467
Generation generation2 = new Generation(assistantMessage2);
@@ -471,9 +471,9 @@ public String call(String toolInput) {
471471
Prompt prompt = new Prompt(List.of(new UserMessage("test multiple generations")));
472472

473473
DefaultToolCallingManager manager = DefaultToolCallingManager.builder()
474-
.observationRegistry(ObservationRegistry.NOOP)
475-
.toolCallbackResolver(toolName -> "multiGenTool".equals(toolName) ? toolCallback : null)
476-
.build();
474+
.observationRegistry(ObservationRegistry.NOOP)
475+
.toolCallbackResolver(toolName -> "multiGenTool".equals(toolName) ? toolCallback : null)
476+
.build();
477477

478478
assertThatNoException().isThrownBy(() -> manager.executeToolCalls(prompt, chatResponse));
479479
}

0 commit comments

Comments
 (0)