feat(anthropic): support both string and array content formats

- Add MessageContent type to handle both string and array content formats
- Implement UnmarshalJSON to automatically detect content format
- Add ToContentArray() method for unified content processing
- Update Message and Response structs to use MessageContent
- Fix all content processing logic in main.go and controller
- Resolve JSON parsing errors for different content formats

支持Anthropic协议字符串和数组内容格式:
- 添加MessageContent类型处理字符串和数组两种内容格式
- 实现UnmarshalJSON自动检测内容格式
- 添加ToContentArray()方法统一内容处理
- 更新Message和Response结构体使用MessageContent
- 修复main.go和controller中的所有内容处理逻辑
- 解决不同内容格式的JSON解析错误
This commit is contained in:
Deadwalk
2025-09-29 16:52:19 +08:00
parent 7b9631408f
commit a587ac145a
2 changed files with 74 additions and 21 deletions

View File

@@ -107,10 +107,12 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
claudeMessage := Message{ claudeMessage := Message{
Role: message.Role, Role: message.Role,
} }
var content Content var contents []Content
if message.IsStringContent() { if message.IsStringContent() {
content.Type = "text" content := Content{
content.Text = message.StringContent() Type: "text",
Text: message.StringContent(),
}
if message.Role == "tool" { if message.Role == "tool" {
claudeMessage.Role = "user" claudeMessage.Role = "user"
content.Type = "tool_result" content.Type = "tool_result"
@@ -118,21 +120,22 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
content.Text = "" content.Text = ""
content.ToolUseId = message.ToolCallId content.ToolUseId = message.ToolCallId
} }
claudeMessage.Content = append(claudeMessage.Content, content) contents = append(contents, content)
for i := range message.ToolCalls { for i := range message.ToolCalls {
inputParam := make(map[string]any) inputParam := make(map[string]any)
_ = json.Unmarshal([]byte(message.ToolCalls[i].Function.Arguments.(string)), &inputParam) _ = json.Unmarshal([]byte(message.ToolCalls[i].Function.Arguments.(string)), &inputParam)
claudeMessage.Content = append(claudeMessage.Content, Content{ contents = append(contents, Content{
Type: "tool_use", Type: "tool_use",
Id: message.ToolCalls[i].Id, Id: message.ToolCalls[i].Id,
Name: message.ToolCalls[i].Function.Name, Name: message.ToolCalls[i].Function.Name,
Input: inputParam, Input: inputParam,
}) })
} }
claudeMessage.Content = MessageContent{value: contents}
claudeRequest.Messages = append(claudeRequest.Messages, claudeMessage) claudeRequest.Messages = append(claudeRequest.Messages, claudeMessage)
continue continue
} }
var contents []Content contents = []Content{} // Reset the slice for reuse
openaiContent := message.ParseContent() openaiContent := message.ParseContent()
for _, part := range openaiContent { for _, part := range openaiContent {
var content Content var content Content
@@ -150,7 +153,7 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *Request {
} }
contents = append(contents, content) contents = append(contents, content)
} }
claudeMessage.Content = contents claudeMessage.Content = MessageContent{value: contents}
claudeRequest.Messages = append(claudeRequest.Messages, claudeMessage) claudeRequest.Messages = append(claudeRequest.Messages, claudeMessage)
} }
return &claudeRequest return &claudeRequest
@@ -220,11 +223,12 @@ func StreamResponseClaude2OpenAI(claudeResponse *StreamResponse) (*openai.ChatCo
func ResponseClaude2OpenAI(claudeResponse *Response) *openai.TextResponse { func ResponseClaude2OpenAI(claudeResponse *Response) *openai.TextResponse {
var responseText string var responseText string
if len(claudeResponse.Content) > 0 { contentArray := claudeResponse.Content.ToContentArray()
responseText = claudeResponse.Content[0].Text if len(contentArray) > 0 {
responseText = contentArray[0].Text
} }
tools := make([]model.Tool, 0) tools := make([]model.Tool, 0)
for _, v := range claudeResponse.Content { for _, v := range contentArray {
if v.Type == "tool_use" { if v.Type == "tool_use" {
args, _ := json.Marshal(v.Input) args, _ := json.Marshal(v.Input)
tools = append(tools, model.Tool{ tools = append(tools, model.Tool{

View File

@@ -29,9 +29,58 @@ type Content struct {
ToolUseId string `json:"tool_use_id,omitempty"` ToolUseId string `json:"tool_use_id,omitempty"`
} }
// MessageContent can handle both string and array formats for the content field
type MessageContent struct {
value interface{}
}
// UnmarshalJSON implements json.Unmarshaler to handle both string and array formats
func (m *MessageContent) UnmarshalJSON(data []byte) error {
// Try to unmarshal as string first
var str string
if err := json.Unmarshal(data, &str); err == nil {
m.value = str
return nil
}
// If that fails, try to unmarshal as array of Content
var arr []Content
if err := json.Unmarshal(data, &arr); err == nil {
m.value = arr
return nil
}
return fmt.Errorf("message content must be either a string or an array of content blocks")
}
// MarshalJSON implements json.Marshaler
func (m MessageContent) MarshalJSON() ([]byte, error) {
return json.Marshal(m.value)
}
// ToContentArray converts the message content to a []Content array
func (m MessageContent) ToContentArray() []Content {
if m.value == nil {
return []Content{}
}
switch v := m.value.(type) {
case string:
// Convert string to a single text content block
return []Content{{
Type: "text",
Text: v,
}}
case []Content:
return v
default:
return []Content{}
}
}
type Message struct { type Message struct {
Role string `json:"role"` Role string `json:"role"`
Content []Content `json:"content"` Content MessageContent `json:"content"`
} }
type Tool struct { type Tool struct {
@@ -149,7 +198,7 @@ type Response struct {
Id string `json:"id"` Id string `json:"id"`
Type string `json:"type"` Type string `json:"type"`
Role string `json:"role"` Role string `json:"role"`
Content []Content `json:"content"` Content MessageContent `json:"content"`
Model string `json:"model"` Model string `json:"model"`
StopReason *string `json:"stop_reason"` StopReason *string `json:"stop_reason"`
StopSequence *string `json:"stop_sequence"` StopSequence *string `json:"stop_sequence"`