chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 04:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(translator): separate tool calls from content in OpenAI Claude requests

Browse Source
This commit is contained in:
Luis Pater
2025-11-08 17:57:46 +08:00
parent d745f07044
commit 1afbc4dd96
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/translator/openai/claude/openai_claude_request.go
View File

@@ -133,27 +133,16 @@ func ConvertClaudeRequestToOpenAI(modelName string, inputRawJSON []byte, stream
return true return true
}) })
// Create main message if there's text content or tool calls // Emit text/image content as one message
if len(contentItems) > 0 || len(toolCalls) > 0 { if len(contentItems) > 0 {
msgJSON := `{"role":"","content":""}` msgJSON := `{"role":"","content":""}`
msgJSON, _ = sjson.Set(msgJSON, "role", role) msgJSON, _ = sjson.Set(msgJSON, "role", role)
// Set content contentArrayJSON := "[]"
if len(contentItems) > 0 { for _, contentItem := range contentItems {
contentArrayJSON := "[]" contentArrayJSON, _ = sjson.SetRaw(contentArrayJSON, "-1", contentItem)
for _, contentItem := range contentItems {
contentArrayJSON, _ = sjson.SetRaw(contentArrayJSON, "-1", contentItem)
}
msgJSON, _ = sjson.SetRaw(msgJSON, "content", contentArrayJSON)
} else {
msgJSON, _ = sjson.Set(msgJSON, "content", "")
}
// Set tool calls for assistant messages
if role == "assistant" && len(toolCalls) > 0 {
toolCallsJSON, _ := json.Marshal(toolCalls)
msgJSON, _ = sjson.SetRaw(msgJSON, "tool_calls", string(toolCallsJSON))
} }
msgJSON, _ = sjson.SetRaw(msgJSON, "content", contentArrayJSON)
contentValue := gjson.Get(msgJSON, "content") contentValue := gjson.Get(msgJSON, "content")
hasContent := false hasContent := false
@@ -168,11 +157,19 @@ func ConvertClaudeRequestToOpenAI(modelName string, inputRawJSON []byte, stream
hasContent = contentValue.Raw != "" && contentValue.Raw != "null" hasContent = contentValue.Raw != "" && contentValue.Raw != "null"
} }
if hasContent || len(toolCalls) != 0 { if hasContent {
messagesJSON, _ = sjson.Set(messagesJSON, "-1", gjson.Parse(msgJSON).Value()) messagesJSON, _ = sjson.Set(messagesJSON, "-1", gjson.Parse(msgJSON).Value())
} }
} }
// Emit tool calls in a separate assistant message
if role == "assistant" && len(toolCalls) > 0 {
toolCallMsgJSON := `{"role":"assistant","tool_calls":[]}`
toolCallsJSON, _ := json.Marshal(toolCalls)
toolCallMsgJSON, _ = sjson.SetRaw(toolCallMsgJSON, "tool_calls", string(toolCallsJSON))
messagesJSON, _ = sjson.Set(messagesJSON, "-1", gjson.Parse(toolCallMsgJSON).Value())
}
} else if contentResult.Exists() && contentResult.Type == gjson.String { } else if contentResult.Exists() && contentResult.Type == gjson.String {
// Simple string content // Simple string content
msgJSON := `{"role":"","content":""}` msgJSON := `{"role":"","content":""}`