Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/relay/adaptor/ali/chat.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func aliModelMatches(meta *meta.Meta, match func(string) bool) bool {
if meta == nil {
return false
}
return utils.FirstMatchingModelName(meta.OriginModel, meta.ActualModel, match) != ""
return utils.FirstMatchingModelName(match, meta.OriginModel, meta.ActualModel) != ""
}

func isAliQwen3Model(meta *meta.Meta) bool {
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/anthropic/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ func openAIConvertRequest(
claudeRequest.OutputConfig = nil
}
} else if utils.FirstMatchingModelName(
meta.OriginModel,
meta.ActualModel,
func(modelName string) bool {
return strings.Contains(strings.ToLower(modelName), "think")
},
meta.OriginModel,
meta.ActualModel,
) != "" {
thinkingType := relaymodel.ClaudeThinkingTypeEnabled
if shouldAutoUseAdaptiveThinking(resolvedModel) {
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/anthropic/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ func shouldAutoUseAdaptiveThinking(model string) bool {

func ResolveModelName(originModel, actualModel string) string {
if modelName := relayutils.FirstMatchingModelName(
originModel,
actualModel,
func(modelName string) bool {
modelName = strings.ToLower(modelName)
return strings.Contains(modelName, "claude") || strings.Contains(modelName, "mythos")
},
originModel,
actualModel,
); modelName != "" {
return modelName
}
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/baidu/adaptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ func (a *Adaptor) GetRequestURL(
}

if endpointModel := utils.FirstMatchingModelName(
meta.OriginModel,
meta.ActualModel,
func(modelName string) bool {
_, ok := modelEndpointMap[modelName]
return ok
},
meta.OriginModel,
meta.ActualModel,
); endpointModel != "" {
modelName = endpointModel
}
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/doubao/chat.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ func ConvertChatCompletionsRequest(
}

if utils.FirstMatchingModelName(
meta.OriginModel,
meta.ActualModel,
func(modelName string) bool {
return strings.HasPrefix(strings.ToLower(modelName), "deepseek-reasoner")
},
meta.OriginModel,
meta.ActualModel,
) != "" {
callbacks = append(callbacks, patchDeepseekReasonerSystemPrompt)
}
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/doubao/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ func featureModel(meta *meta.Meta) string {
}

if modelName := utils.FirstMatchingModelName(
meta.OriginModel,
meta.ActualModel,
func(modelName string) bool {
modelName = strings.ToLower(modelName)
return strings.HasPrefix(modelName, "bot-") || strings.Contains(modelName, "vision")
},
meta.OriginModel,
meta.ActualModel,
); modelName != "" {
return modelName
}
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/gemini/adaptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ func requestVersionModel(meta *meta.Meta) string {
}

if modelName := utils.FirstMatchingModelName(
meta.OriginModel,
meta.ActualModel,
func(modelName string) bool {
_, ok := v1ModelMap[modelName]
return ok
},
meta.OriginModel,
meta.ActualModel,
); modelName != "" {
return modelName
}
Expand Down
4 changes: 2 additions & 2 deletions core/relay/adaptor/gemini/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ func resolveGeminiFeatureModel(meta *meta.Meta) string {
}

if modelName := utils.FirstMatchingModelName(
meta.OriginModel,
meta.ActualModel,
func(modelName string) bool {
return strings.Contains(strings.ToLower(modelName), "gemini")
},
meta.OriginModel,
meta.ActualModel,
); modelName != "" {
return modelName
}
Expand Down
Loading
Loading