mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-13 07:40:56 +00:00
Feat/auto group (#6590)
* 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
This commit is contained in:
+55
-3
@@ -3,9 +3,12 @@ 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 {
|
||||
@@ -42,18 +45,67 @@ func GroupInUserUsableGroups(userGroup, groupName string) bool {
|
||||
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 {
|
||||
groups := GetUserUsableGroups(userGroup)
|
||||
autoGroups := make([]string, 0)
|
||||
seen := make(map[string]struct{})
|
||||
for _, group := range setting.GetAutoGroups() {
|
||||
if _, ok := groups[group]; ok {
|
||||
autoGroups = append(autoGroups, group)
|
||||
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{})
|
||||
|
||||
Reference in New Issue
Block a user