feat: Add Claude 3.7 Sonnet thinking mode support

This commit is contained in:
MartialBE
2025-02-25 14:10:43 +08:00
parent 92918e3751
commit 4f212be45c
4 changed files with 139 additions and 92 deletions

View File

@@ -109,6 +109,7 @@ var defaultModelRatio = map[string]float64{
"claude-3-5-sonnet-20240620": 1.5, "claude-3-5-sonnet-20240620": 1.5,
"claude-3-5-sonnet-20241022": 1.5, "claude-3-5-sonnet-20241022": 1.5,
"claude-3-7-sonnet-20250219": 1.5, "claude-3-7-sonnet-20250219": 1.5,
"claude-3-7-sonnet-20250219-thinking": 1.5,
"claude-3-opus-20240229": 7.5, // $15 / 1M tokens "claude-3-opus-20240229": 7.5, // $15 / 1M tokens
"ERNIE-4.0-8K": 0.120 * RMB, "ERNIE-4.0-8K": 0.120 * RMB,
"ERNIE-3.5-8K": 0.012 * RMB, "ERNIE-3.5-8K": 0.012 * RMB,

View File

@@ -12,6 +12,7 @@ var ModelList = []string{
"claude-3-5-sonnet-20240620", "claude-3-5-sonnet-20240620",
"claude-3-5-sonnet-20241022", "claude-3-5-sonnet-20241022",
"claude-3-7-sonnet-20250219", "claude-3-7-sonnet-20250219",
"claude-3-7-sonnet-20250219-thinking",
} }
var ChannelName = "claude" var ChannelName = "claude"

View File

@@ -11,6 +11,9 @@ type ClaudeMediaMessage struct {
Usage *ClaudeUsage `json:"usage,omitempty"` Usage *ClaudeUsage `json:"usage,omitempty"`
StopReason *string `json:"stop_reason,omitempty"` StopReason *string `json:"stop_reason,omitempty"`
PartialJson string `json:"partial_json,omitempty"` PartialJson string `json:"partial_json,omitempty"`
Thinking string `json:"thinking,omitempty"`
Signature string `json:"signature,omitempty"`
Delta string `json:"delta,omitempty"`
// tool_calls // tool_calls
Id string `json:"id,omitempty"` Id string `json:"id,omitempty"`
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
@@ -57,6 +60,12 @@ type ClaudeRequest struct {
Stream bool `json:"stream,omitempty"` Stream bool `json:"stream,omitempty"`
Tools []Tool `json:"tools,omitempty"` Tools []Tool `json:"tools,omitempty"`
ToolChoice any `json:"tool_choice,omitempty"` ToolChoice any `json:"tool_choice,omitempty"`
Thinking *Thinking `json:"thinking,omitempty"`
}
type Thinking struct {
Type string `json:"type,omitempty"`
BudgetTokens int `json:"budget_tokens,omitempty"`
} }
type ClaudeError struct { type ClaudeError struct {

View File

@@ -92,6 +92,25 @@ func RequestOpenAI2ClaudeMessage(textRequest dto.GeneralOpenAIRequest) (*ClaudeR
Stream: textRequest.Stream, Stream: textRequest.Stream,
Tools: claudeTools, Tools: claudeTools,
} }
if strings.HasSuffix(textRequest.Model, "-thinking") {
if claudeRequest.MaxTokens == 0 {
claudeRequest.MaxTokens = 8192
}
// 因为BudgetTokens 必须大于1024
if claudeRequest.MaxTokens < 1280 {
claudeRequest.MaxTokens = 1280
}
// BudgetTokens 为 max_tokens 的 80%
claudeRequest.Thinking = &Thinking{
Type: "enabled",
BudgetTokens: int(float64(claudeRequest.MaxTokens) * 0.8),
}
claudeRequest.Model = strings.TrimSuffix(textRequest.Model, "-thinking")
}
if claudeRequest.MaxTokens == 0 { if claudeRequest.MaxTokens == 0 {
claudeRequest.MaxTokens = 4096 claudeRequest.MaxTokens = 4096
} }
@@ -308,12 +327,20 @@ func StreamResponseClaude2OpenAI(reqMode int, claudeResponse *ClaudeResponse) (*
if claudeResponse.Delta != nil { if claudeResponse.Delta != nil {
choice.Index = claudeResponse.Index choice.Index = claudeResponse.Index
choice.Delta.SetContentString(claudeResponse.Delta.Text) choice.Delta.SetContentString(claudeResponse.Delta.Text)
if claudeResponse.Delta.Type == "input_json_delta" { switch claudeResponse.Delta.Type {
case "input_json_delta":
tools = append(tools, dto.ToolCall{ tools = append(tools, dto.ToolCall{
Function: dto.FunctionCall{ Function: dto.FunctionCall{
Arguments: claudeResponse.Delta.PartialJson, Arguments: claudeResponse.Delta.PartialJson,
}, },
}) })
case "signature_delta":
// 加密的不处理
signatureContent := "\n"
choice.Delta.ReasoningContent = &signatureContent
case "thinking_delta":
thinkingContent := claudeResponse.Delta.Thinking
choice.Delta.ReasoningContent = &thinkingContent
} }
} }
} else if claudeResponse.Type == "message_delta" { } else if claudeResponse.Type == "message_delta" {
@@ -352,6 +379,8 @@ func ResponseClaude2OpenAI(reqMode int, claudeResponse *ClaudeResponse) *dto.Ope
responseText = claudeResponse.Content[0].Text responseText = claudeResponse.Content[0].Text
} }
tools := make([]dto.ToolCall, 0) tools := make([]dto.ToolCall, 0)
thinkingContent := ""
if reqMode == RequestModeCompletion { if reqMode == RequestModeCompletion {
content, _ := json.Marshal(strings.TrimPrefix(claudeResponse.Completion, " ")) content, _ := json.Marshal(strings.TrimPrefix(claudeResponse.Completion, " "))
choice := dto.OpenAITextResponseChoice{ choice := dto.OpenAITextResponseChoice{
@@ -367,7 +396,8 @@ func ResponseClaude2OpenAI(reqMode int, claudeResponse *ClaudeResponse) *dto.Ope
} else { } else {
fullTextResponse.Id = claudeResponse.Id fullTextResponse.Id = claudeResponse.Id
for _, message := range claudeResponse.Content { for _, message := range claudeResponse.Content {
if message.Type == "tool_use" { switch message.Type {
case "tool_use":
args, _ := json.Marshal(message.Input) args, _ := json.Marshal(message.Input)
tools = append(tools, dto.ToolCall{ tools = append(tools, dto.ToolCall{
ID: message.Id, ID: message.Id,
@@ -377,6 +407,11 @@ func ResponseClaude2OpenAI(reqMode int, claudeResponse *ClaudeResponse) *dto.Ope
Arguments: string(args), Arguments: string(args),
}, },
}) })
case "thinking":
// 加密的不管, 只输出明文的推理过程
thinkingContent = message.Thinking
case "text":
responseText = message.Text
} }
} }
} }
@@ -391,6 +426,7 @@ func ResponseClaude2OpenAI(reqMode int, claudeResponse *ClaudeResponse) *dto.Ope
if len(tools) > 0 { if len(tools) > 0 {
choice.Message.SetToolCalls(tools) choice.Message.SetToolCalls(tools)
} }
choice.Message.ReasoningContent = thinkingContent
fullTextResponse.Model = claudeResponse.Model fullTextResponse.Model = claudeResponse.Model
choices = append(choices, choice) choices = append(choices, choice)
fullTextResponse.Choices = choices fullTextResponse.Choices = choices