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

Merge remote-tracking branch 'origin/alpha' into refactor/model-pricing

Browse Source
This commit is contained in:
t0ng7u
2025-08-05 23:19:24 +08:00
parent 327a0ca323 306a1a3f57
commit d61a862fa2
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/channel.go
View File

@@ -1107,6 +1107,10 @@ func ManageMultiKeys(c *gin.Context) {
return return
} }
lock := model.GetChannelPollingLock(channel.Id)
lock.Lock()
defer lock.Unlock()
switch request.Action { switch request.Action {
case "get_key_status": case "get_key_status":
keys := channel.GetKeys() keys := channel.GetKeys()

6
model/channel.go
View File

@@ -141,7 +141,7 @@ func (channel *Channel) GetNextEnabledKey() (string, int, *types.NewAPIError) {
return keys[selectedIdx], selectedIdx, nil return keys[selectedIdx], selectedIdx, nil
case constant.MultiKeyModePolling: case constant.MultiKeyModePolling:
// Use channel-specific lock to ensure thread-safe polling // Use channel-specific lock to ensure thread-safe polling
lock := getChannelPollingLock(channel.Id) lock := GetChannelPollingLock(channel.Id)
lock.Lock() lock.Lock()
defer lock.Unlock() defer lock.Unlock()
@@ -500,8 +500,8 @@ var channelStatusLock sync.Mutex
// channelPollingLocks stores locks for each channel.id to ensure thread-safe polling // channelPollingLocks stores locks for each channel.id to ensure thread-safe polling
var channelPollingLocks sync.Map var channelPollingLocks sync.Map
// getChannelPollingLock returns or creates a mutex for the given channel ID // GetChannelPollingLock returns or creates a mutex for the given channel ID
func getChannelPollingLock(channelId int) *sync.Mutex { func GetChannelPollingLock(channelId int) *sync.Mutex {
if lock, exists := channelPollingLocks.Load(channelId); exists { if lock, exists := channelPollingLocks.Load(channelId); exists {
return lock.(*sync.Mutex) return lock.(*sync.Mutex)
} }

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

@@ -73,9 +73,6 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
} }
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
if info.RelayFormat == relaycommon.RelayFormatClaude || info.RelayFormat == relaycommon.RelayFormatGemini {
return fmt.Sprintf("%s/v1/chat/completions", info.BaseUrl), nil
}
if info.RelayMode == relayconstant.RelayModeRealtime { if info.RelayMode == relayconstant.RelayModeRealtime {
if strings.HasPrefix(info.BaseUrl, "https://") { if strings.HasPrefix(info.BaseUrl, "https://") {
baseUrl := strings.TrimPrefix(info.BaseUrl, "https://") baseUrl := strings.TrimPrefix(info.BaseUrl, "https://")
@@ -122,6 +119,9 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
url = strings.Replace(url, "{model}", info.UpstreamModelName, -1) url = strings.Replace(url, "{model}", info.UpstreamModelName, -1)
return url, nil return url, nil
default: default:
if info.RelayFormat == relaycommon.RelayFormatClaude || info.RelayFormat == relaycommon.RelayFormatGemini {
return fmt.Sprintf("%s/v1/chat/completions", info.BaseUrl), nil
}
return relaycommon.GetFullRequestURL(info.BaseUrl, info.RequestURLPath, info.ChannelType), nil return relaycommon.GetFullRequestURL(info.BaseUrl, info.RequestURLPath, info.ChannelType), nil
} }
} }