* feat(token): support custom auto group order * feat(keys): enhance auto group presentation * fix(keys): rework Auto flow border and compact inherited order The Auto group highlight previously tinted the whole control surface with a gradient and animated only a 1px top sweep, which read as a background color rather than a flowing border. Replace it with a border-only effect: an aria-hidden, pointer-events-none overlay whose conic gradient is masked down to a thin ring hugging the rounded perimeter, so the highlight travels around all four edges and corners every 3.2s. The interior stays neutral with a restrained static primary border and glow; prefers-reduced-motion hides the moving layer while keeping the static emphasis. The inherited global Auto order also rendered as spacious two-line rows with circular sequence markers, wasting drawer space. Render it as a compact wrapping strip of one-line chips (index, name, ratio badge) with descriptions kept accessible via title and sr-only text, scrolling only past a much smaller max height. Custom add/remove/reorder editing, empty-array inheritance semantics, and the submit payload are unchanged. * fix(keys): preserve Auto inheritance and unify effects * refactor(keys): temporarily disable AutoGroupBadge in api-key-group-cell
134 lines
3.9 KiB
Go
134 lines
3.9 KiB
Go
package service
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/setting"
|
|
"github.com/QuantumNous/new-api/setting/ratio_setting"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func GetUserUsableGroups(userGroup string) map[string]string {
|
|
groupsCopy := setting.GetUserUsableGroupsCopy()
|
|
if userGroup != "" {
|
|
specialSettings, b := ratio_setting.GetGroupRatioSetting().GroupSpecialUsableGroup.Get(userGroup)
|
|
if b {
|
|
// 处理特殊可用分组
|
|
for specialGroup, desc := range specialSettings {
|
|
if strings.HasPrefix(specialGroup, "-:") {
|
|
// 移除分组
|
|
groupToRemove := strings.TrimPrefix(specialGroup, "-:")
|
|
delete(groupsCopy, groupToRemove)
|
|
} else if strings.HasPrefix(specialGroup, "+:") {
|
|
// 添加分组
|
|
groupToAdd := strings.TrimPrefix(specialGroup, "+:")
|
|
groupsCopy[groupToAdd] = desc
|
|
} else {
|
|
// 直接添加分组
|
|
groupsCopy[specialGroup] = desc
|
|
}
|
|
}
|
|
}
|
|
// 如果userGroup不在UserUsableGroups中,返回UserUsableGroups + userGroup
|
|
if _, ok := groupsCopy[userGroup]; !ok {
|
|
groupsCopy[userGroup] = "用户分组"
|
|
}
|
|
}
|
|
return groupsCopy
|
|
}
|
|
|
|
func GroupInUserUsableGroups(userGroup, groupName string) bool {
|
|
_, ok := GetUserUsableGroups(userGroup)[groupName]
|
|
return ok
|
|
}
|
|
|
|
func IsUserSelectableGroup(userGroup, groupName string) bool {
|
|
if groupName == "" || groupName == "auto" {
|
|
return false
|
|
}
|
|
return GroupInUserUsableGroups(userGroup, groupName) && ratio_setting.ContainsGroupRatio(groupName)
|
|
}
|
|
|
|
// GetUserAutoGroup 根据用户分组获取自动分组设置
|
|
func GetUserAutoGroup(userGroup string) []string {
|
|
autoGroups := make([]string, 0)
|
|
seen := make(map[string]struct{})
|
|
for _, group := range setting.GetAutoGroups() {
|
|
if !IsUserSelectableGroup(userGroup, group) {
|
|
continue
|
|
}
|
|
if _, ok := seen[group]; ok {
|
|
continue
|
|
}
|
|
seen[group] = struct{}{}
|
|
autoGroups = append(autoGroups, group)
|
|
}
|
|
return autoGroups
|
|
}
|
|
|
|
// FilterUserTokenAutoGroups applies current permissions before the current
|
|
// per-token limit. It intentionally does not fall back to the global Auto list.
|
|
func FilterUserTokenAutoGroups(userGroup string, groups []string) []string {
|
|
maxCount := setting.GetMaxTokenAutoGroups()
|
|
filtered := make([]string, 0, min(len(groups), maxCount))
|
|
seen := make(map[string]struct{})
|
|
for _, group := range groups {
|
|
if !IsUserSelectableGroup(userGroup, group) {
|
|
continue
|
|
}
|
|
if _, ok := seen[group]; ok {
|
|
continue
|
|
}
|
|
seen[group] = struct{}{}
|
|
filtered = append(filtered, group)
|
|
if len(filtered) == maxCount {
|
|
break
|
|
}
|
|
}
|
|
return filtered
|
|
}
|
|
|
|
// GetRequestAutoGroups resolves the ordered Auto groups for the current token.
|
|
// The absence of the context value means that the token inherits the complete
|
|
// global Auto list; a present (even empty) value is an explicit token snapshot.
|
|
func GetRequestAutoGroups(c *gin.Context, userGroup string) []string {
|
|
value, ok := common.GetContextKey(c, constant.ContextKeyTokenAutoGroups)
|
|
if !ok {
|
|
return GetUserAutoGroup(userGroup)
|
|
}
|
|
groups, ok := value.([]string)
|
|
if !ok {
|
|
return []string{}
|
|
}
|
|
return FilterUserTokenAutoGroups(userGroup, groups)
|
|
}
|
|
|
|
// GetGroupsEnabledModels 按 groups 顺序获取各分组启用的模型并去重
|
|
func GetGroupsEnabledModels(groups []string) []string {
|
|
seen := make(map[string]struct{})
|
|
models := make([]string, 0)
|
|
for _, group := range groups {
|
|
for _, modelName := range model.GetGroupEnabledModels(group) {
|
|
if _, ok := seen[modelName]; !ok {
|
|
seen[modelName] = struct{}{}
|
|
models = append(models, modelName)
|
|
}
|
|
}
|
|
}
|
|
return models
|
|
}
|
|
|
|
// GetUserGroupRatio 获取用户使用某个分组的倍率
|
|
// userGroup 用户分组
|
|
// group 需要获取倍率的分组
|
|
func GetUserGroupRatio(userGroup, group string) float64 {
|
|
ratio, ok := ratio_setting.GetGroupGroupRatio(userGroup, group)
|
|
if ok {
|
|
return ratio
|
|
}
|
|
return ratio_setting.GetGroupRatio(group)
|
|
}
|