Skip to content

Fix/aws non empty text #3080

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
Calcium-Ion merged 1 commit into from
Mar 2, 2026
Merged

Fix/aws non empty text #3080

Show file tree
Hide file tree
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
82 changes: 66 additions & 16 deletions relay/channel/claude/relay-claude.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,12 +404,15 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
return &claudeRequest, nil
}

func StreamResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.ChatCompletionsStreamResponse {
func StreamResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse, claudeInfo *ClaudeResponseInfo) *dto.ChatCompletionsStreamResponse {
var response dto.ChatCompletionsStreamResponse
response.Object = "chat.completion.chunk"
response.Model = claudeResponse.Model
response.Choices = make([]dto.ChatCompletionsStreamResponseChoice, 0)
tools := make([]dto.ToolCallResponse, 0)
if claudeInfo != nil && claudeInfo.ToolCallStreamStates == nil {
claudeInfo.ToolCallStreamStates = make(map[int]*ToolCallStreamState)
}
fcIdx := 0
if claudeResponse.Index != nil {
fcIdx = *claudeResponse.Index - 1
Expand All @@ -433,6 +436,13 @@ func StreamResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.ChatCo
choice.Delta.SetContentString(*claudeResponse.ContentBlock.Text)
}
if claudeResponse.ContentBlock.Type == "tool_use" {
if claudeInfo != nil {
claudeInfo.ToolCallStreamStates[fcIdx] = &ToolCallStreamState{
ID: claudeResponse.ContentBlock.Id,
Name: claudeResponse.ContentBlock.Name,
}
return nil
}
Comment on lines +439 to +445

@coderabbitai coderabbitai Bot Mar 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Key tool-call index and state keying collision on normalized index

ToolCallStreamStates is keyed by fcIdx, which is derived from the upstream Index field using floor-to-zero normalization (line 418-421: approximately fcIdx = max(0, Index - 1)). Since Anthropic's content_block.index is zero-based and can emit sequential indexes (0, 1, 2...) for multiple tool_use blocks in a single response, the normalization causes a collision: both Index 0 and Index 1 map to fcIdx 0, causing the state for the first block to be overwritten. This breaks stop emission, which may use incorrect tool metadata.

Use raw Index directly as the key for ToolCallStreamStates, or if normalization is required for another reason, store the raw index separately in ToolCallStreamState for use during finalization.

Affects: lines 439-444 and 494-499

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@relay/channel/claude/relay-claude.go` around lines 439 - 444, The current
keying into claudeInfo.ToolCallStreamStates uses the normalized fcIdx (derived
via max(0, Index-1)), which collapses zero/one indexes and causes state
collisions; update the code to use the raw Anthropic index (e.g.,
claudeResponse.ContentBlock.Index) as the map key instead of fcIdx, or
alternatively add a field (e.g., RawIndex) to ToolCallStreamState and store the
raw index there while mapping by the raw index, ensuring ToolCallStreamStates,
ToolCallStreamState, claudeInfo, and claudeResponse.ContentBlock.Id/Name are
updated accordingly so each tool_use block keeps a unique state.

tools = append(tools, dto.ToolCallResponse{
Index: common.GetPointer(fcIdx),
ID: claudeResponse.ContentBlock.Id,
Expand All @@ -451,19 +461,28 @@ func StreamResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.ChatCo
choice.Delta.Content = claudeResponse.Delta.Text
switch claudeResponse.Delta.Type {
case "input_json_delta":
arguments := "{}"
if claudeResponse.Delta.PartialJson != nil {
if partial := strings.TrimSpace(*claudeResponse.Delta.PartialJson); partial != "" {
arguments = partial
}
if claudeResponse.Delta.PartialJson == nil {
return nil
}
tools = append(tools, dto.ToolCallResponse{
arguments := *claudeResponse.Delta.PartialJson
if strings.TrimSpace(arguments) == "" {
return nil
}
toolCall := dto.ToolCallResponse{
Type: "function",
Index: common.GetPointer(fcIdx),
Function: dto.FunctionResponse{
Arguments: arguments,
},
})
}
if claudeInfo != nil {
if state, ok := claudeInfo.ToolCallStreamStates[fcIdx]; ok {
state.Emitted = true
toolCall.ID = state.ID
toolCall.Function.Name = state.Name
}
}
tools = append(tools, toolCall)
case "signature_delta":
// 加密的不处理
signatureContent := "\n"
Expand All @@ -472,6 +491,27 @@ func StreamResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.ChatCo
choice.Delta.ReasoningContent = claudeResponse.Delta.Thinking
}
}
} else if claudeResponse.Type == "content_block_stop" {
if claudeInfo == nil {
return nil
}
state, ok := claudeInfo.ToolCallStreamStates[fcIdx]
if !ok {
return nil
}
delete(claudeInfo.ToolCallStreamStates, fcIdx)
if state.Emitted {
return nil
}
tools = append(tools, dto.ToolCallResponse{
ID: state.ID,
Type: "function",
Index: common.GetPointer(fcIdx),
Function: dto.FunctionResponse{
Name: state.Name,
Arguments: "{}",
},
})
} else if claudeResponse.Type == "message_delta" {
if claudeResponse.Delta != nil && claudeResponse.Delta.StopReason != nil {
finishReason := stopReasonClaude2OpenAI(*claudeResponse.Delta.StopReason)
Expand Down Expand Up @@ -556,12 +596,19 @@ func ResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.OpenAITextRe
}

type ClaudeResponseInfo struct {
ResponseId string
Created int64
Model string
ResponseText strings.Builder
Usage *dto.Usage
Done bool
ResponseId string
Created int64
Model string
ResponseText strings.Builder
Usage *dto.Usage
Done bool
ToolCallStreamStates map[int]*ToolCallStreamState
}

type ToolCallStreamState struct {
ID string
Name string
Emitted bool
}

func buildMessageDeltaPatchUsage(claudeResponse *dto.ClaudeResponse, claudeInfo *ClaudeResponseInfo) *dto.ClaudeUsage {
Expand Down Expand Up @@ -694,7 +741,7 @@ func FormatClaudeResponseInfo(claudeResponse *dto.ClaudeResponse, oaiResponse *d

// 判断是否完整
claudeInfo.Done = true
} else if claudeResponse.Type == "content_block_start" {
} else if claudeResponse.Type == "content_block_start" || claudeResponse.Type == "content_block_stop" {
} else {
return false
}
Expand Down Expand Up @@ -739,7 +786,10 @@ func HandleStreamResponseData(c *gin.Context, info *relaycommon.RelayInfo, claud
}
helper.ClaudeChunkData(c, claudeResponse, data)
} else if info.RelayFormat == types.RelayFormatOpenAI {
response := StreamResponseClaude2OpenAI(&claudeResponse)
response := StreamResponseClaude2OpenAI(&claudeResponse, claudeInfo)
if response == nil {
return nil
}

if !FormatClaudeResponseInfo(&claudeResponse, response, claudeInfo) {
return nil
Expand Down
73 changes: 65 additions & 8 deletions relay/channel/claude/relay_claude_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestRequestOpenAI2ClaudeMessage_AssistantToolCallWithMalformedArguments(t *
assert.Empty(t, inputObj)
}

func TestStreamResponseClaude2OpenAI_EmptyInputJSONDeltaFallback(t *testing.T) {
func TestStreamResponseClaude2OpenAI_EmptyInputJSONDeltaIgnored(t *testing.T) {
empty := ""
resp := &dto.ClaudeResponse{
Type: "content_block_delta",
Expand All @@ -227,12 +227,8 @@ func TestStreamResponseClaude2OpenAI_EmptyInputJSONDeltaFallback(t *testing.T) {
},
}

chunk := StreamResponseClaude2OpenAI(resp)
require.NotNil(t, chunk)
require.Len(t, chunk.Choices, 1)
require.NotNil(t, chunk.Choices[0].Delta.ToolCalls)
require.Len(t, chunk.Choices[0].Delta.ToolCalls, 1)
assert.Equal(t, "{}", chunk.Choices[0].Delta.ToolCalls[0].Function.Arguments)
chunk := StreamResponseClaude2OpenAI(resp, &ClaudeResponseInfo{})
require.Nil(t, chunk)
}

func TestStreamResponseClaude2OpenAI_NonEmptyInputJSONDeltaPreserved(t *testing.T) {
Expand All @@ -246,10 +242,71 @@ func TestStreamResponseClaude2OpenAI_NonEmptyInputJSONDeltaPreserved(t *testing.
},
}

chunk := StreamResponseClaude2OpenAI(resp)
chunk := StreamResponseClaude2OpenAI(resp, &ClaudeResponseInfo{})
require.NotNil(t, chunk)
require.Len(t, chunk.Choices, 1)
require.NotNil(t, chunk.Choices[0].Delta.ToolCalls)
require.Len(t, chunk.Choices[0].Delta.ToolCalls, 1)
assert.Equal(t, partial, chunk.Choices[0].Delta.ToolCalls[0].Function.Arguments)
}

func TestStreamResponseClaude2OpenAI_NoArgToolEmitsObjectAtStop(t *testing.T) {
claudeInfo := &ClaudeResponseInfo{}
start := &dto.ClaudeResponse{
Type: "content_block_start",
Index: func() *int { v := 1; return &v }(),
ContentBlock: &dto.ClaudeMediaMessage{
Type: "tool_use",
Id: "toolu_1",
Name: "get_current_time",
},
}
stop := &dto.ClaudeResponse{
Type: "content_block_stop",
Index: func() *int { v := 1; return &v }(),
}

startChunk := StreamResponseClaude2OpenAI(start, claudeInfo)
require.Nil(t, startChunk)

stopChunk := StreamResponseClaude2OpenAI(stop, claudeInfo)
require.NotNil(t, stopChunk)
require.Len(t, stopChunk.Choices, 1)
require.Len(t, stopChunk.Choices[0].Delta.ToolCalls, 1)
assert.Equal(t, "toolu_1", stopChunk.Choices[0].Delta.ToolCalls[0].ID)
assert.Equal(t, "get_current_time", stopChunk.Choices[0].Delta.ToolCalls[0].Function.Name)
assert.Equal(t, "{}", stopChunk.Choices[0].Delta.ToolCalls[0].Function.Arguments)
}

func TestStreamResponseClaude2OpenAI_ArgToolKeepsIDNameOnDelta(t *testing.T) {
claudeInfo := &ClaudeResponseInfo{}
start := &dto.ClaudeResponse{
Type: "content_block_start",
Index: func() *int { v := 1; return &v }(),
ContentBlock: &dto.ClaudeMediaMessage{
Type: "tool_use",
Id: "toolu_2",
Name: "search_notes",
},
}
partial := `{"query":"today"}`
delta := &dto.ClaudeResponse{
Type: "content_block_delta",
Index: func() *int { v := 1; return &v }(),
Delta: &dto.ClaudeMediaMessage{
Type: "input_json_delta",
PartialJson: &partial,
},
}

startChunk := StreamResponseClaude2OpenAI(start, claudeInfo)
require.Nil(t, startChunk)

deltaChunk := StreamResponseClaude2OpenAI(delta, claudeInfo)
require.NotNil(t, deltaChunk)
require.Len(t, deltaChunk.Choices, 1)
require.Len(t, deltaChunk.Choices[0].Delta.ToolCalls, 1)
assert.Equal(t, "toolu_2", deltaChunk.Choices[0].Delta.ToolCalls[0].ID)
assert.Equal(t, "search_notes", deltaChunk.Choices[0].Delta.ToolCalls[0].Function.Name)
assert.Equal(t, partial, deltaChunk.Choices[0].Delta.ToolCalls[0].Function.Arguments)
}