Skip to content

fix(openai): generate fallback id for missing streaming tool calls #78

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

Merged
LIlGG merged 1 commit into from
Jul 3, 2026
Merged

fix(openai): generate fallback id for missing streaming tool calls #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 52 additions & 11 deletions ...rc/main/java/run/halo/aifoundation/provider/support/openai/OpenAiCompatibleChatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import org.springframework.ai.chat.messages.AssistantMessage;
import org.springframework.ai.chat.messages.Message;
import org.springframework.ai.chat.messages.MessageType;
Expand Down Expand Up @@ -50,6 +51,7 @@ public class OpenAiCompatibleChatModel implements ChatModel {
private static final String CHAT_COMPLETIONS_PATH = "/chat/completions";
private static final String SSE_DATA_PREFIX = "data:";
private static final String SSE_DONE = "[DONE]";
private static final String TOOL_CALL_ID_PREFIX = "call_";

private final OpenAiCompatibleChatOptions defaultOptions;
private final WebClient webClient;
Expand Down Expand Up @@ -133,34 +135,58 @@ List<AssistantMessage.ToolCall> update(JsonNode node) {
if (!node.isArray() || node.isEmpty()) {
return List.of();
}
var batchSize = node.size();
var ordinal = 0;
for (var item : node) {
var index = item.path(Fields.INDEX).asInt(toolCalls.size());
var current = toolCalls.computeIfAbsent(index, ignored -> new MutableToolCall());
var index = toolCallIndex(item, ordinal, batchSize);
var current = toolCalls.computeIfAbsent(index,
ignored -> new MutableToolCall(fallbackToolCallId(index)));
current.append(item);
ordinal++;
}
return toolCalls.values().stream()
.map(MutableToolCall::toToolCall)
.toList();
}

private int toolCallIndex(JsonNode item, int ordinal, int batchSize) {
if (item.path(Fields.INDEX).isNumber()) {
return item.path(Fields.INDEX).asInt();
}
if (batchSize > 1) {
return ordinal;
}
if (toolCalls.size() == 1) {
return toolCalls.keySet().iterator().next();
}
return toolCalls.isEmpty() ? 0 : toolCalls.size();
}
}

private final class MutableToolCall {

private String id = "";
private String id;
private String type = "function";
private String name = "";
private final StringBuilder arguments = new StringBuilder();

MutableToolCall(String fallbackId) {
this.id = fallbackId;
}

void append(JsonNode node) {
if (node.path(Fields.ID).isTextual()) {
id = node.path(Fields.ID).asText();
var nextId = textOrNull(node.path(Fields.ID));
if (hasText(nextId)) {
id = nextId;
}
if (node.path(Fields.TYPE).isTextual()) {
type = node.path(Fields.TYPE).asText();
var nextType = textOrNull(node.path(Fields.TYPE));
if (hasText(nextType)) {
type = nextType;
}
var function = node.path(Fields.FUNCTION);
if (function.path(Fields.NAME).isTextual()) {
name = function.path(Fields.NAME).asText();
var nextName = textOrNull(function.path(Fields.NAME));
if (hasText(nextName)) {
name = nextName;
}
if (function.path(Fields.ARGUMENTS).isTextual()) {
arguments.append(function.path(Fields.ARGUMENTS).asText());
Expand Down Expand Up @@ -639,18 +665,28 @@ private List<AssistantMessage.ToolCall> toolCalls(JsonNode node, ToolCallState t
return toolCallState.update(node);
}
var toolCalls = new ArrayList<AssistantMessage.ToolCall>();
var ordinal = 0;
for (var item : node) {
var function = item.path(Fields.FUNCTION);
var index = item.path(Fields.INDEX).isNumber()
? item.path(Fields.INDEX).asInt()
: ordinal;
toolCalls.add(new AssistantMessage.ToolCall(
textOrEmpty(item.path(Fields.ID)),
textOrEmpty(item.path(Fields.TYPE)),
textOrFallback(item.path(Fields.ID), fallbackToolCallId(index)),
textOrFallback(item.path(Fields.TYPE), Values.FUNCTION),
textOrEmpty(function.path(Fields.NAME)),
textOrEmpty(function.path(Fields.ARGUMENTS))
));
ordinal++;
}
return toolCalls;
}

private String fallbackToolCallId(int index) {
return TOOL_CALL_ID_PREFIX + UUID.randomUUID().toString().replace("-", "")
+ "_" + Math.max(index, 0);
}

private ChatResponseMetadata metadata(String id, String model, Usage usage, JsonNode root) {
var builder = ChatResponseMetadata.builder()
.id(id)
Expand Down Expand Up @@ -733,6 +769,11 @@ private String textOrEmpty(JsonNode node) {
return text != null ? text : "";
}

private String textOrFallback(JsonNode node, String fallback) {
var text = textOrNull(node);
return hasText(text) ? text : fallback;
}

private String textOrEmpty(String value) {
return value != null ? value : "";
}
Expand Down