Skip to content

fix(spring-ai-openai): Prevent out-of-range errors when merging tool calls #4229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix(spring-ai-openai): Prevent out-of-range errors when merging tool calls #4229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd331a3
fix(spring-ai-openai): Prevent out-of-range errors when merging tool …
xfl12345 Aug 25, 2025
9ad1b79
style(spring-ai-openai): To pass spring-javaformat lint
xfl12345 Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ai/src/main/java/org/springframework/ai/openai/api/OpenAiStreamFunctionCallingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@ private ChatCompletionMessage merge(ChatCompletionMessage previous, ChatCompleti

List<ToolCall> toolCalls = new ArrayList<>();
ToolCall lastPreviousTooCall = null;
if (previous.toolCalls() != null) {
if (previous.toolCalls() != null && !previous.toolCalls().isEmpty()) {
lastPreviousTooCall = previous.toolCalls().get(previous.toolCalls().size() - 1);
if (previous.toolCalls().size() > 1) {
toolCalls.addAll(previous.toolCalls().subList(0, previous.toolCalls().size() - 1));
}
}
if (current.toolCalls() != null && current.toolCalls().size() > 0) {
if (current.toolCalls() != null && !current.toolCalls().isEmpty()) {
if (current.toolCalls().size() > 1) {
throw new IllegalStateException("Currently only one tool call is supported per message!");
}
Expand Down
Loading