Skip to content

fix(go/plugins/compat-oai): Pass tool call ID if available #3248

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
hugoaguirre merged 2 commits into from
Aug 5, 2025
Merged

fix(go/plugins/compat-oai): Pass tool call ID if available #3248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1df9b21
fix(go/plugins/compat-oai): Pass tool call ID if available
kingsleyzhong Jul 18, 2025
79dffdb
Messed up diff
kingsleyzhong Jul 18, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions go/plugins/compat_oai/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,14 @@ func (g *ModelGenerator) WithMessages(messages []*ai.Message) *ModelGenerator {
if !p.IsToolResponse() {
continue
}
// Use the captured tool call ID (Ref) if available, otherwise fall back to tool name
toolCallID := p.ToolResponse.Ref
if toolCallID == "" {
toolCallID = p.ToolResponse.Name
}

tm := openai.ToolMessage(
// NOTE: Temporarily set its name instead of its ref (i.e. call_xxxxx) since it's not defined in the ai.ToolResponse struct.
p.ToolResponse.Name,
toolCallID,
anyToJSONString(p.ToolResponse.Output),
)
oaiMessages = append(oaiMessages, tm)
Expand Down Expand Up @@ -346,6 +351,7 @@ func (g *ModelGenerator) generateComplete(ctx context.Context) (*ai.ModelRespons
var toolRequestParts []*ai.Part
for _, toolCall := range choice.Message.ToolCalls {
toolRequestParts = append(toolRequestParts, ai.NewToolRequestPart(&ai.ToolRequest{
Ref: toolCall.ID,
Name: toolCall.Function.Name,
Input: jsonStringToMap(toolCall.Function.Arguments),
}))
Expand Down Expand Up @@ -374,9 +380,13 @@ func convertToolCalls(content []*ai.Part) []openai.ChatCompletionMessageToolCall
}

func convertToolCall(part *ai.Part) openai.ChatCompletionMessageToolCallParam {
toolCallID := part.ToolRequest.Ref
if toolCallID == "" {
toolCallID = part.ToolRequest.Name
}

param := openai.ChatCompletionMessageToolCallParam{
// NOTE: Temporarily set its name instead of its ref (i.e. call_xxxxx) since it's not defined in the ai.ToolRequest struct.
ID: (part.ToolRequest.Name),
ID: (toolCallID),
Function: (openai.ChatCompletionMessageToolCallFunctionParam{
Name: (part.ToolRequest.Name),
}),
Expand Down
Loading