Skip to content

fix: 未设置价格模型不会被拉取，除非设置自用模式 #2222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Calcium-Ion merged 1 commit into from
Nov 13, 2025
Merged

fix: 未设置价格模型不会被拉取，除非设置自用模式 #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions controller/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"github.com/QuantumNous/new-api/relay/channel/moonshot"
relaycommon "github.com/QuantumNous/new-api/relay/common"
"github.com/QuantumNous/new-api/service"
"github.com/QuantumNous/new-api/setting/operation_setting"
"github.com/QuantumNous/new-api/setting/ratio_setting"
"github.com/gin-gonic/gin"
"github.com/samber/lo"
)
Expand Down Expand Up @@ -109,6 +111,17 @@ func init() {
func ListModels(c *gin.Context, modelType int) {
userOpenAiModels := make([]dto.OpenAIModels, 0)

acceptUnsetRatioModel := operation_setting.SelfUseModeEnabled
if !acceptUnsetRatioModel {
userId := c.GetInt("id")
if userId > 0 {
userSettings, _ := model.GetUserSetting(userId, false)
if userSettings.AcceptUnsetRatioModel {
acceptUnsetRatioModel = true
}
}
}
Comment on lines +114 to +123

@coderabbitai coderabbitai Bot Nov 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Consider logging the error from GetUserSetting.

The error from GetUserSetting is currently ignored. While the default behavior (treating as AcceptUnsetRatioModel=false) is safe, logging the error would help with debugging user setting retrieval issues.

Apply this diff to log the error:

 	if !acceptUnsetRatioModel {
 		userId := c.GetInt("id")
 		if userId > 0 {
-			userSettings, _ := model.GetUserSetting(userId, false)
+			userSettings, err := model.GetUserSetting(userId, false)
+			if err != nil {
+				common.SysLog(fmt.Sprintf("failed to get user setting for user %d: %v", userId, err))
+			}
 			if userSettings.AcceptUnsetRatioModel {
 				acceptUnsetRatioModel = true
 			}
🤖 Prompt for AI Agents 
In controller/model.go around lines 114 to 123, the call to model.GetUserSetting
ignores its error; update the code to capture the returned error, and if non-nil
log it with context (including the userId) before continuing with the safe
default. Specifically, change the assignment to userSettings, err :=
model.GetUserSetting(userId, false), then if err != nil call the request/logger
(e.g. c.Logger.Errorf or the project’s logger) to record a clear message and the
error value, and only set acceptUnsetRatioModel if err == nil and
userSettings.AcceptUnsetRatioModel is true.


modelLimitEnable := common.GetContextKeyBool(c, constant.ContextKeyTokenModelLimitEnabled)
if modelLimitEnable {
s, ok := common.GetContextKey(c, constant.ContextKeyTokenModelLimit)
Expand All @@ -119,6 +132,12 @@ func ListModels(c *gin.Context, modelType int) {
tokenModelLimit = map[string]bool{}
}
for allowModel, _ := range tokenModelLimit {
if !acceptUnsetRatioModel {
_, _, exist := ratio_setting.GetModelRatioOrPrice(allowModel)
if !exist {
continue
}
}
if oaiModel, ok := openAIModelsMap[allowModel]; ok {
oaiModel.SupportedEndpointTypes = model.GetModelSupportEndpointTypes(allowModel)
userOpenAiModels = append(userOpenAiModels, oaiModel)
Expand Down Expand Up @@ -161,6 +180,12 @@ func ListModels(c *gin.Context, modelType int) {
models = model.GetGroupEnabledModels(group)
}
for _, modelName := range models {
if !acceptUnsetRatioModel {
_, _, exist := ratio_setting.GetModelRatioOrPrice(modelName)
if !exist {
continue
}
}
if oaiModel, ok := openAIModelsMap[modelName]; ok {
oaiModel.SupportedEndpointTypes = model.GetModelSupportEndpointTypes(modelName)
userOpenAiModels = append(userOpenAiModels, oaiModel)
Expand All @@ -175,6 +200,7 @@ func ListModels(c *gin.Context, modelType int) {
}
}
}

switch modelType {
case constant.ChannelTypeAnthropic:
useranthropicModels := make([]dto.AnthropicModel, len(userOpenAiModels))
Expand Down
13 changes: 13 additions & 0 deletions setting/ratio_setting/model_ratio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,3 +823,16 @@ func FormatMatchingModelName(name string) string {
}
return name
}

// result: 倍率or价格， usePrice， exist
func GetModelRatioOrPrice(model string) (float64, bool, bool) { // price or ratio
price, usePrice := GetModelPrice(model, false)
if usePrice {
return price, true, true
}
modelRatio, success, _ := GetModelRatio(model)
if success {
return modelRatio, false, true
}
return 37.5, false, false
}