Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions internal/transformer/convert/claude_openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ func OpenAIStreamToClaude(event []byte, ctx *transformer.StreamContext) ([]byte,
var result []byte
emitText, emitThinking := makeThinkEmitters(ctx, &result)
flushThinkTaggedStream(ctx, emitText, emitThinking)
hadToolCall := ctx.ToolBlockStarted
// Close any open content blocks before message_stop
if ctx.ThinkingBlockStarted {
result = append(result, buildClaudeEvent("content_block_stop", map[string]interface{}{"index": ctx.ThinkingIndex})...)
Expand All @@ -464,8 +465,12 @@ func OpenAIStreamToClaude(event []byte, ctx *transformer.StreamContext) ([]byte,
}
// Send message_delta with stop_reason if not sent
if !ctx.FinishReasonSent {
stopReason := "end_turn"
if hadToolCall {
stopReason = "tool_use"
}
result = append(result, buildClaudeEvent("message_delta", map[string]interface{}{
"delta": map[string]interface{}{"stop_reason": "end_turn", "stop_sequence": nil},
"delta": map[string]interface{}{"stop_reason": stopReason, "stop_sequence": nil},
"usage": map[string]interface{}{"output_tokens": 0},
})...)
}
Expand Down Expand Up @@ -611,6 +616,7 @@ func OpenAIStreamToClaude(event []byte, ctx *transformer.StreamContext) ([]byte,

// Finish
if choice.FinishReason != nil {
hadToolCall := ctx.ToolBlockStarted
if ctx.ThinkingBlockStarted {
result = append(result, buildClaudeEvent("content_block_stop", map[string]interface{}{"index": ctx.ThinkingIndex})...)
ctx.ThinkingBlockStarted = false
Expand All @@ -624,7 +630,8 @@ func OpenAIStreamToClaude(event []byte, ctx *transformer.StreamContext) ([]byte,
ctx.ToolBlockStarted = false
}
stopReason := "end_turn"
if *choice.FinishReason == "tool_calls" {
// Some OpenAI-compatible providers (Gemini) end tool calls with "stop".
if *choice.FinishReason == "tool_calls" || (*choice.FinishReason == "stop" && hadToolCall) {
stopReason = "tool_use"
}
result = append(result, buildClaudeEvent("message_delta", map[string]interface{}{
Expand Down
48 changes: 48 additions & 0 deletions internal/transformer/convert/claude_openai_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,3 +435,51 @@ func TestClaudeReqToOpenAIThinkingOnly(t *testing.T) {
}
}
}

func streamToClaude(t *testing.T, chunks []string) string {
t.Helper()
ctx := transformer.NewStreamContext()
ctx.ModelName = "claude-3-sonnet-20240229"
var all []string
for _, chunk := range chunks {
events, err := OpenAIStreamToClaude([]byte(chunk), ctx)
if err != nil {
t.Fatalf("OpenAIStreamToClaude failed: %v", err)
}
if events != nil {
all = append(all, string(events))
}
}
return strings.Join(all, "")
}

// Gemini's OpenAI-compatible endpoint ends tool calls with finish_reason "stop".
func TestOpenAIStreamToClaudeStopWithToolCallReportsToolUse(t *testing.T) {
events := streamToClaude(t, []string{
`data: {"id":"1","choices":[{"index":0,"delta":{"role":"assistant","tool_calls":[{"id":"call_1","type":"function","function":{"name":"get_weather","arguments":"{\"city\":\"Paris\"}"}}]},"finish_reason":"stop"}]}`,
`data: [DONE]`,
})

assertContains(t, events, `"stop_reason":"tool_use"`, "Expected stop_reason tool_use for a tool call finished with \"stop\"")
if strings.Contains(events, `"stop_reason":"end_turn"`) {
t.Error("stop_reason end_turn must not be sent when the message has a tool_use block")
}
}

func TestOpenAIStreamToClaudeStopWithoutToolCallReportsEndTurn(t *testing.T) {
events := streamToClaude(t, []string{
`data: {"id":"1","choices":[{"index":0,"delta":{"role":"assistant","content":"Hello!"},"finish_reason":"stop"}]}`,
`data: [DONE]`,
})

assertContains(t, events, `"stop_reason":"end_turn"`, "Expected stop_reason end_turn for a plain text reply")
}

func TestOpenAIStreamToClaudeDoneWithToolCallAndNoFinishReasonReportsToolUse(t *testing.T) {
events := streamToClaude(t, []string{
`data: {"id":"1","choices":[{"index":0,"delta":{"role":"assistant","tool_calls":[{"id":"call_1","type":"function","function":{"name":"get_weather","arguments":"{}"}}]}}]}`,
`data: [DONE]`,
})

assertContains(t, events, `"stop_reason":"tool_use"`, "Expected stop_reason tool_use when the stream ends after a tool call")
}
Loading