fix(openai): normalize gpt-5.4-xhigh compat mapping
This commit is contained in:
103
backend/internal/service/openai_compat_model.go
Normal file
103
backend/internal/service/openai_compat_model.go
Normal file
@@ -0,0 +1,103 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/pkg/apicompat"
|
||||
)
|
||||
|
||||
func NormalizeOpenAICompatRequestedModel(model string) string {
|
||||
trimmed := strings.TrimSpace(model)
|
||||
if trimmed == "" {
|
||||
return ""
|
||||
}
|
||||
|
||||
normalized, _, ok := splitOpenAICompatReasoningModel(trimmed)
|
||||
if !ok || normalized == "" {
|
||||
return trimmed
|
||||
}
|
||||
return normalized
|
||||
}
|
||||
|
||||
func applyOpenAICompatModelNormalization(req *apicompat.AnthropicRequest) {
|
||||
if req == nil {
|
||||
return
|
||||
}
|
||||
|
||||
originalModel := strings.TrimSpace(req.Model)
|
||||
if originalModel == "" {
|
||||
return
|
||||
}
|
||||
|
||||
normalizedModel, derivedEffort, hasReasoningSuffix := splitOpenAICompatReasoningModel(originalModel)
|
||||
if hasReasoningSuffix && normalizedModel != "" {
|
||||
req.Model = normalizedModel
|
||||
}
|
||||
|
||||
if req.OutputConfig != nil && strings.TrimSpace(req.OutputConfig.Effort) != "" {
|
||||
return
|
||||
}
|
||||
|
||||
claudeEffort := openAIReasoningEffortToClaudeOutputEffort(derivedEffort)
|
||||
if claudeEffort == "" {
|
||||
return
|
||||
}
|
||||
|
||||
if req.OutputConfig == nil {
|
||||
req.OutputConfig = &apicompat.AnthropicOutputConfig{}
|
||||
}
|
||||
req.OutputConfig.Effort = claudeEffort
|
||||
}
|
||||
|
||||
func splitOpenAICompatReasoningModel(model string) (normalizedModel string, reasoningEffort string, ok bool) {
|
||||
trimmed := strings.TrimSpace(model)
|
||||
if trimmed == "" {
|
||||
return "", "", false
|
||||
}
|
||||
|
||||
modelID := trimmed
|
||||
if strings.Contains(modelID, "/") {
|
||||
parts := strings.Split(modelID, "/")
|
||||
modelID = parts[len(parts)-1]
|
||||
}
|
||||
modelID = strings.TrimSpace(modelID)
|
||||
if !strings.HasPrefix(strings.ToLower(modelID), "gpt-") {
|
||||
return trimmed, "", false
|
||||
}
|
||||
|
||||
parts := strings.FieldsFunc(strings.ToLower(modelID), func(r rune) bool {
|
||||
switch r {
|
||||
case '-', '_', ' ':
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
})
|
||||
if len(parts) == 0 {
|
||||
return trimmed, "", false
|
||||
}
|
||||
|
||||
last := strings.NewReplacer("-", "", "_", "", " ", "").Replace(parts[len(parts)-1])
|
||||
switch last {
|
||||
case "none", "minimal":
|
||||
case "low", "medium", "high":
|
||||
reasoningEffort = last
|
||||
case "xhigh", "extrahigh":
|
||||
reasoningEffort = "xhigh"
|
||||
default:
|
||||
return trimmed, "", false
|
||||
}
|
||||
|
||||
return normalizeCodexModel(modelID), reasoningEffort, true
|
||||
}
|
||||
|
||||
func openAIReasoningEffortToClaudeOutputEffort(effort string) string {
|
||||
switch strings.TrimSpace(effort) {
|
||||
case "low", "medium", "high":
|
||||
return effort
|
||||
case "xhigh":
|
||||
return "max"
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user