Calcium-Ion
0ab0202060
* 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
119 lines
3.9 KiB
Go
119 lines
3.9 KiB
Go
package controller
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/setting"
|
|
"github.com/QuantumNous/new-api/setting/ratio_setting"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestChannelOwnerNameUsesAdaptorChannelName(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
channelType int
|
|
expected string
|
|
}{
|
|
{
|
|
name: "openai",
|
|
channelType: constant.ChannelTypeOpenAI,
|
|
expected: "openai",
|
|
},
|
|
{
|
|
name: "codex",
|
|
channelType: constant.ChannelTypeCodex,
|
|
expected: "codex",
|
|
},
|
|
{
|
|
name: "openrouter",
|
|
channelType: constant.ChannelTypeOpenRouter,
|
|
expected: "openrouter",
|
|
},
|
|
{
|
|
name: "azure fallback",
|
|
channelType: constant.ChannelTypeAzure,
|
|
expected: "azure",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
require.Equal(t, tt.expected, channelOwnerName(tt.channelType))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestBuildOpenAIModelOverridesOwnedBy(t *testing.T) {
|
|
modelItem := buildOpenAIModel("gpt-5.4", map[string]string{"gpt-5.4": "openai"})
|
|
require.Equal(t, "gpt-5.4", modelItem.Id)
|
|
require.Equal(t, "openai", modelItem.OwnedBy)
|
|
}
|
|
|
|
func TestBuildOpenAIModelFallsBackToCustomForUnknownModels(t *testing.T) {
|
|
modelItem := buildOpenAIModel("custom-test-model", nil)
|
|
require.Equal(t, "custom-test-model", modelItem.Id)
|
|
require.Equal(t, "custom", modelItem.OwnedBy)
|
|
}
|
|
|
|
func TestGetModelListGroupsUsesUserGroupWhenTokenGroupIsEmpty(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
common.SetContextKey(ctx, constant.ContextKeyUserGroup, "default")
|
|
|
|
groups, err := getModelListGroups(ctx)
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, "default", groups.userGroup)
|
|
require.Empty(t, groups.tokenGroup)
|
|
require.Equal(t, []string{"default"}, groups.ownerGroups)
|
|
}
|
|
|
|
func TestGetModelListGroupsUsesExplicitTokenGroup(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
common.SetContextKey(ctx, constant.ContextKeyUserGroup, "default")
|
|
common.SetContextKey(ctx, constant.ContextKeyTokenGroup, "vip")
|
|
|
|
groups, err := getModelListGroups(ctx)
|
|
require.NoError(t, err)
|
|
|
|
require.Equal(t, "default", groups.userGroup)
|
|
require.Equal(t, "vip", groups.tokenGroup)
|
|
require.Equal(t, []string{"vip"}, groups.ownerGroups)
|
|
}
|
|
|
|
func TestGetModelListGroupsUsesFilteredTokenAutoGroupsSnapshot(t *testing.T) {
|
|
originalMax := setting.GetMaxTokenAutoGroups()
|
|
originalUsableGroups := setting.UserUsableGroups2JSONString()
|
|
originalRatios := ratio_setting.GroupRatio2JSONString()
|
|
require.NoError(t, setting.UpdateMaxTokenAutoGroups("1"))
|
|
require.NoError(t, setting.UpdateUserUsableGroupsByJSONString(`{"default":"Default","vip":"VIP"}`))
|
|
require.NoError(t, ratio_setting.UpdateGroupRatioByJSONString(`{"default":1,"vip":1}`))
|
|
t.Cleanup(func() {
|
|
require.NoError(t, setting.UpdateMaxTokenAutoGroups(fmt.Sprintf("%d", originalMax)))
|
|
require.NoError(t, setting.UpdateUserUsableGroupsByJSONString(originalUsableGroups))
|
|
require.NoError(t, ratio_setting.UpdateGroupRatioByJSONString(originalRatios))
|
|
})
|
|
|
|
gin.SetMode(gin.TestMode)
|
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
common.SetContextKey(ctx, constant.ContextKeyUserGroup, "default")
|
|
common.SetContextKey(ctx, constant.ContextKeyTokenGroup, "auto")
|
|
common.SetContextKey(ctx, constant.ContextKeyTokenAutoGroups, []string{"vip", "default"})
|
|
|
|
groups, err := getModelListGroups(ctx)
|
|
require.NoError(t, err)
|
|
require.Equal(t, []string{"vip"}, groups.ownerGroups)
|
|
|
|
common.SetContextKey(ctx, constant.ContextKeyTokenAutoGroups, []string{"vip"})
|
|
require.NoError(t, setting.UpdateUserUsableGroupsByJSONString(`{"default":"Default"}`))
|
|
groups, err = getModelListGroups(ctx)
|
|
require.NoError(t, err)
|
|
require.Empty(t, groups.ownerGroups)
|
|
}
|