oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/alpha' into alpha

Browse Source
This commit is contained in:
t0ng7u
2025-08-08 14:50:08 +08:00
parent 1690b05629 563825492e
commit 7d869c9af1
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
relay/channel/openai/adaptor.go
View File

@@ -67,7 +67,7 @@ func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayIn
if err != nil { if err != nil {
return nil, err return nil, err
} }
if info.SupportStreamOptions { if info.SupportStreamOptions && info.IsStream {
aiRequest.StreamOptions = &dto.StreamOptions{ aiRequest.StreamOptions = &dto.StreamOptions{
IncludeUsage: true, IncludeUsage: true,
} }
@@ -188,6 +188,7 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
if len(request.Usage) == 0 { if len(request.Usage) == 0 {
request.Usage = json.RawMessage(`{"include":true}`) request.Usage = json.RawMessage(`{"include":true}`)
} }
// 适配 OpenRouter 的 thinking 后缀
if strings.HasSuffix(info.UpstreamModelName, "-thinking") { if strings.HasSuffix(info.UpstreamModelName, "-thinking") {
info.UpstreamModelName = strings.TrimSuffix(info.UpstreamModelName, "-thinking") info.UpstreamModelName = strings.TrimSuffix(info.UpstreamModelName, "-thinking")
request.Model = info.UpstreamModelName request.Model = info.UpstreamModelName
@@ -195,7 +196,7 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
reasoning := map[string]any{ reasoning := map[string]any{
"enabled": true, "enabled": true,
} }
if request.ReasoningEffort != "" { if request.ReasoningEffort != "" && request.ReasoningEffort != "none" {
reasoning["effort"] = request.ReasoningEffort reasoning["effort"] = request.ReasoningEffort
} }
marshal, err := common.Marshal(reasoning) marshal, err := common.Marshal(reasoning)
@@ -204,6 +205,23 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
} }
request.Reasoning = marshal request.Reasoning = marshal
} }
} else {
if len(request.Reasoning) == 0 {
// 适配 OpenAI 的 ReasoningEffort 格式
if request.ReasoningEffort != "" {
reasoning := map[string]any{
"enabled": true,
}
if request.ReasoningEffort != "none" {
reasoning["effort"] = request.ReasoningEffort
marshal, err := common.Marshal(reasoning)
if err != nil {
return nil, fmt.Errorf("error marshalling reasoning: %w", err)
}
request.Reasoning = marshal
}
}
}
} }
} }
if strings.HasPrefix(request.Model, "o") || strings.HasPrefix(request.Model, "gpt-5") { if strings.HasPrefix(request.Model, "o") || strings.HasPrefix(request.Model, "gpt-5") {

3
relay/channel/openai/relay-openai.go
View File

@@ -180,6 +180,9 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
if err != nil { if err != nil {
return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError) return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
} }
if common.DebugEnabled {
println("upstream response body:", string(responseBody))
}
err = common.Unmarshal(responseBody, &simpleResponse) err = common.Unmarshal(responseBody, &simpleResponse)
if err != nil { if err != nil {
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError) return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)

24
service/convert.go
View File

@@ -401,22 +401,26 @@ func ResponseOpenAI2Claude(openAIResponse *dto.OpenAITextResponse, info *relayco
} }
for _, choice := range openAIResponse.Choices { for _, choice := range openAIResponse.Choices {
stopReason = stopReasonOpenAI2Claude(choice.FinishReason) stopReason = stopReasonOpenAI2Claude(choice.FinishReason)
claudeContent := dto.ClaudeMediaMessage{}
if choice.FinishReason == "tool_calls" { if choice.FinishReason == "tool_calls" {
claudeContent.Type = "tool_use" for _, toolUse := range choice.Message.ParseToolCalls() {
claudeContent.Id = choice.Message.ToolCallId claudeContent := dto.ClaudeMediaMessage{}
claudeContent.Name = choice.Message.ParseToolCalls()[0].Function.Name claudeContent.Type = "tool_use"
var mapParams map[string]interface{} claudeContent.Id = toolUse.ID
if err := json.Unmarshal([]byte(choice.Message.ParseToolCalls()[0].Function.Arguments), &mapParams); err == nil { claudeContent.Name = toolUse.Function.Name
claudeContent.Input = mapParams var mapParams map[string]interface{}
} else { if err := common.Unmarshal([]byte(toolUse.Function.Arguments), &mapParams); err == nil {
claudeContent.Input = choice.Message.ParseToolCalls()[0].Function.Arguments claudeContent.Input = mapParams
} else {
claudeContent.Input = toolUse.Function.Arguments
}
contents = append(contents, claudeContent)
} }
} else { } else {
claudeContent := dto.ClaudeMediaMessage{}
claudeContent.Type = "text" claudeContent.Type = "text"
claudeContent.SetText(choice.Message.StringContent()) claudeContent.SetText(choice.Message.StringContent())
contents = append(contents, claudeContent)
} }
contents = append(contents, claudeContent)
} }
claudeResponse.Content = contents claudeResponse.Content = contents
claudeResponse.StopReason = stopReason claudeResponse.StopReason = stopReason