From 7a504fd67dda031052f2a4ca5dd56aa9f1e921c8 Mon Sep 17 00:00:00 2001 From: rinfx Date: Mon, 24 Nov 2025 16:14:00 +0800 Subject: [PATCH] remove omitempty for toolcall index (#3148) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 澄潭 --- plugins/wasm-go/extensions/ai-proxy/provider/bedrock.go | 9 +++------ plugins/wasm-go/extensions/ai-proxy/provider/model.go | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/wasm-go/extensions/ai-proxy/provider/bedrock.go b/plugins/wasm-go/extensions/ai-proxy/provider/bedrock.go index 4e84a758a..034c78ea9 100644 --- a/plugins/wasm-go/extensions/ai-proxy/provider/bedrock.go +++ b/plugins/wasm-go/extensions/ai-proxy/provider/bedrock.go @@ -107,9 +107,8 @@ func (b *bedrockProvider) convertEventFromBedrockToOpenAI(ctx wrapper.HttpContex chatChoice.Delta.Content = nil chatChoice.Delta.ToolCalls = []toolCall{ { - Id: bedrockEvent.Start.ToolUse.ToolUseID, - Index: 0, - Type: "function", + Id: bedrockEvent.Start.ToolUse.ToolUseID, + Type: "function", Function: functionCall{ Name: bedrockEvent.Start.ToolUse.Name, Arguments: "", @@ -138,8 +137,7 @@ func (b *bedrockProvider) convertEventFromBedrockToOpenAI(ctx wrapper.HttpContex if bedrockEvent.Delta.ToolUse != nil { chatChoice.Delta.ToolCalls = []toolCall{ { - Index: 0, - Type: "function", + Type: "function", Function: functionCall{ Arguments: bedrockEvent.Delta.ToolUse.Input, }, @@ -168,7 +166,6 @@ func (b *bedrockProvider) convertEventFromBedrockToOpenAI(ctx wrapper.HttpContex TotalTokens: bedrockEvent.Usage.TotalTokens, } } - openAIFormattedChunkBytes, _ := json.Marshal(openAIFormattedChunk) var openAIChunk strings.Builder openAIChunk.WriteString(ssePrefix) diff --git a/plugins/wasm-go/extensions/ai-proxy/provider/model.go b/plugins/wasm-go/extensions/ai-proxy/provider/model.go index 630d18c3d..3a11a279b 100644 --- a/plugins/wasm-go/extensions/ai-proxy/provider/model.go +++ b/plugins/wasm-go/extensions/ai-proxy/provider/model.go @@ -393,7 +393,7 @@ func (m *chatMessage) ParseContent() []chatMessageContent { } type toolCall struct { - Index int `json:"index,omitempty"` + Index int `json:"index"` Id string `json:"id,omitempty"` Type string `json:"type"` Function functionCall `json:"function"`