Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat: Allow skip channel id

Browse Source
This commit is contained in:
Martial BE 2024-04-28 11:22:43 +08:00
parent 317e0a6370
commit bc11c65c78
No known key found for this signature in database
GPG Key ID: D06C32DF0EDB9084
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
middleware/auth.go
View File

@ -108,16 +108,20 @@ func tokenAuth(c *gin.Context, key string) {
c.Set("chat_cache", token.ChatCache) c.Set("chat_cache", token.ChatCache)
if len(parts) > 1 { if len(parts) > 1 {
if model.IsAdmin(token.UserId) { if model.IsAdmin(token.UserId) {
channelId := common.String2Int(parts[1]) if strings.HasPrefix(parts[1], "!") {
if channelId == 0 { channelId := common.String2Int(parts[1][1:])
abortWithMessage(c, http.StatusForbidden, "无效的渠道 Id") c.Set("skip_channel_id", channelId)
return } else {
channelId := common.String2Int(parts[1])
if channelId == 0 {
abortWithMessage(c, http.StatusForbidden, "无效的渠道 Id")
return
}
c.Set("specific_channel_id", channelId)
if len(parts) == 3 && parts[2] == "ignore" {
c.Set("specific_channel_id_ignore", true)
}
} }
c.Set("specific_channel_id", channelId)
if len(parts) == 3 && parts[2] == "ignore" {
c.Set("specific_channel_id_ignore", true)
}
} else { } else {
abortWithMessage(c, http.StatusForbidden, "普通用户不支持指定渠道") abortWithMessage(c, http.StatusForbidden, "普通用户不支持指定渠道")
return return

9
model/balancer.go
View File

@ -35,12 +35,15 @@ func (cc *ChannelsChooser) Cooldowns(channelId int) bool {
return true return true
} }
func (cc *ChannelsChooser) balancer(channelIds []int) *Channel { func (cc *ChannelsChooser) balancer(channelIds []int, skipChannelId int) *Channel {
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
totalWeight := 0 totalWeight := 0
validChannels := make([]*ChannelChoice, 0, len(channelIds)) validChannels := make([]*ChannelChoice, 0, len(channelIds))
for _, channelId := range channelIds { for _, channelId := range channelIds {
if skipChannelId > 0 && channelId == skipChannelId {
continue
}
if choice, ok := cc.Channels[channelId]; ok && choice.CooldownsTime < nowTime { if choice, ok := cc.Channels[channelId]; ok && choice.CooldownsTime < nowTime {
weight := int(*choice.Channel.Weight) weight := int(*choice.Channel.Weight)
totalWeight += weight totalWeight += weight
@ -68,7 +71,7 @@ func (cc *ChannelsChooser) balancer(channelIds []int) *Channel {
return nil return nil
} }
func (cc *ChannelsChooser) Next(group, modelName string) (*Channel, error) { func (cc *ChannelsChooser) Next(group, modelName string, skipChannelId int) (*Channel, error) {
cc.RLock() cc.RLock()
defer cc.RUnlock() defer cc.RUnlock()
if _, ok := cc.Rule[group]; !ok { if _, ok := cc.Rule[group]; !ok {
@ -89,7 +92,7 @@ func (cc *ChannelsChooser) Next(group, modelName string) (*Channel, error) {
} }
for _, priority := range channelsPriority { for _, priority := range channelsPriority {
channel := cc.balancer(priority) channel := cc.balancer(priority, skipChannelId)
if channel != nil { if channel != nil {
return channel, nil return channel, nil
} }

3
relay/common.go
View File

@ -100,7 +100,8 @@ func fetchChannelById(channelId int) (*model.Channel, error) {
func fetchChannelByModel(c *gin.Context, modelName string) (*model.Channel, error) { func fetchChannelByModel(c *gin.Context, modelName string) (*model.Channel, error) {
group := c.GetString("group") group := c.GetString("group")
channel, err := model.ChannelGroup.Next(group, modelName) skip_channel_id := c.GetInt("skip_channel_id")
channel, err := model.ChannelGroup.Next(group, modelName, skip_channel_id)
if err != nil { if err != nil {
message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", group, modelName) message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", group, modelName)
if channel != nil { if channel != nil {