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

feat: optimize channel retrieval by respecting original model names

Browse Source
This commit is contained in:
RedwindA
2025-08-07 21:58:15 +08:00
parent 0257918571
commit 7f4056abc9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
model/channel_cache.go
View File

@@ -129,8 +129,6 @@ func CacheGetRandomSatisfiedChannel(c *gin.Context, group string, model string,
} }
func getRandomSatisfiedChannel(group string, model string, retry int) (*Channel, error) { func getRandomSatisfiedChannel(group string, model string, retry int) (*Channel, error) {
model = ratio_setting.FormatMatchingModelName(model)
// if memory cache is disabled, get channel directly from database // if memory cache is disabled, get channel directly from database
if !common.MemoryCacheEnabled { if !common.MemoryCacheEnabled {
return GetRandomSatisfiedChannel(group, model, retry) return GetRandomSatisfiedChannel(group, model, retry)
@@ -138,8 +136,16 @@ func getRandomSatisfiedChannel(group string, model string, retry int) (*Channel,
channelSyncLock.RLock() channelSyncLock.RLock()
defer channelSyncLock.RUnlock() defer channelSyncLock.RUnlock()
// First, try to find channels with the exact model name.
channels := group2model2channels[group][model] channels := group2model2channels[group][model]
// If no channels found, try to find channels with the normalized model name.
if len(channels) == 0 {
normalizedModel := ratio_setting.FormatMatchingModelName(model)
channels = group2model2channels[group][normalizedModel]
}
if len(channels) == 0 { if len(channels) == 0 {
return nil, nil return nil, nil
} }