* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
332 lines
10 KiB
Go
332 lines
10 KiB
Go
package controller
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/pkg/billingexpr"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/QuantumNous/new-api/setting/operation_setting"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestValidateChannelProxy(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
proxy string
|
|
wantErr bool
|
|
}{
|
|
{name: "empty"},
|
|
{name: "http", proxy: "http://proxy.example:8080"},
|
|
{name: "https", proxy: "https://proxy.example:8443"},
|
|
{name: "socks5", proxy: "socks5://proxy.example"},
|
|
{name: "socks5h", proxy: "socks5h://proxy.example:1080/"},
|
|
{name: "unsupported", proxy: "ftp://proxy.example", wantErr: true},
|
|
{name: "path", proxy: "socks5://proxy.example:1080/path", wantErr: true},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
setting, err := common.Marshal(dto.ChannelSettings{Proxy: test.proxy})
|
|
require.NoError(t, err)
|
|
channel := &model.Channel{
|
|
Type: constant.ChannelTypeOpenAI,
|
|
Setting: common.GetPointer(string(setting)),
|
|
}
|
|
|
|
err = validateChannel(channel, false)
|
|
|
|
if test.wantErr {
|
|
require.ErrorContains(t, err, "invalid channel proxy")
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateChannelRequiresNewAPIBaseURL(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
baseURL *string
|
|
wantErr bool
|
|
}{
|
|
{name: "missing", wantErr: true},
|
|
{name: "blank", baseURL: common.GetPointer(" "), wantErr: true},
|
|
{name: "configured", baseURL: common.GetPointer("https://new-api.example")},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
channel := &model.Channel{
|
|
Type: constant.ChannelTypeNewAPI,
|
|
BaseURL: test.baseURL,
|
|
}
|
|
|
|
err := validateChannel(channel, false)
|
|
|
|
if test.wantErr {
|
|
require.ErrorContains(t, err, "New API channel base URL cannot be empty")
|
|
return
|
|
}
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNewAPIChannelRegistration(t *testing.T) {
|
|
apiType, ok := common.ChannelType2APIType(constant.ChannelTypeNewAPI)
|
|
|
|
require.True(t, ok)
|
|
assert.Equal(t, constant.APITypeNewAPI, apiType)
|
|
assert.Equal(t, "New API", constant.GetChannelTypeName(constant.ChannelTypeNewAPI))
|
|
require.Greater(t, len(constant.ChannelBaseURLs), constant.ChannelTypeNewAPI)
|
|
assert.Empty(t, constant.ChannelBaseURLs[constant.ChannelTypeNewAPI])
|
|
}
|
|
|
|
func TestResponsesCompactAPITypeSupport(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
apiType int
|
|
want bool
|
|
}{
|
|
{name: "OpenAI", apiType: constant.APITypeOpenAI, want: true},
|
|
{name: "Codex", apiType: constant.APITypeCodex, want: true},
|
|
{name: "Advanced Custom", apiType: constant.APITypeAdvancedCustom, want: true},
|
|
{name: "Sub2API", apiType: constant.APITypeSub2API, want: true},
|
|
{name: "New API", apiType: constant.APITypeNewAPI, want: true},
|
|
{name: "Anthropic", apiType: constant.APITypeAnthropic, want: false},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
assert.Equal(t, test.want, common.IsResponsesCompactAPIType(test.apiType))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestMultiprotocolGatewayEndpointTypes(t *testing.T) {
|
|
want := []constant.EndpointType{
|
|
constant.EndpointTypeOpenAI,
|
|
constant.EndpointTypeOpenAIResponse,
|
|
constant.EndpointTypeOpenAIResponseCompact,
|
|
constant.EndpointTypeAnthropic,
|
|
constant.EndpointTypeGemini,
|
|
constant.EndpointTypeOpenAIAlphaSearch,
|
|
}
|
|
|
|
assert.Equal(t, want, common.GetEndpointTypesByChannelType(constant.ChannelTypeNewAPI, "gpt-5"))
|
|
assert.Equal(t, want, common.GetEndpointTypesByChannelType(constant.ChannelTypeSub2API, "gpt-5"))
|
|
}
|
|
|
|
func TestCopyChannelRejectsInvalidLegacyProxySettings(t *testing.T) {
|
|
db := setupModelListControllerTestDB(t)
|
|
settingBytes, err := common.Marshal(dto.ChannelSettings{
|
|
Proxy: "socks5://proxy.example/legacy-path",
|
|
})
|
|
require.NoError(t, err)
|
|
setting := string(settingBytes)
|
|
origin := &model.Channel{
|
|
Type: constant.ChannelTypeOpenAI,
|
|
Name: "legacy proxy channel",
|
|
Key: "test-key",
|
|
Models: "gpt-test",
|
|
Group: "default",
|
|
Setting: &setting,
|
|
}
|
|
require.NoError(t, db.Create(origin).Error)
|
|
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := gin.CreateTestContext(recorder)
|
|
ctx.Params = gin.Params{{Key: "id", Value: fmt.Sprintf("%d", origin.Id)}}
|
|
ctx.Request = httptest.NewRequest(http.MethodPost, "/api/channel/copy", nil)
|
|
|
|
CopyChannel(ctx)
|
|
|
|
assert.Contains(t, recorder.Body.String(), "invalid channel settings")
|
|
var channelCount int64
|
|
require.NoError(t, db.Model(&model.Channel{}).Count(&channelCount).Error)
|
|
assert.Equal(t, int64(1), channelCount)
|
|
}
|
|
|
|
func TestDeleteChannelResetsProxyCacheWhenPreReadFails(t *testing.T) {
|
|
db := setupModelListControllerTestDB(t)
|
|
require.NoError(t, db.AutoMigrate(&model.Log{}))
|
|
service.ResetProxyClientCache()
|
|
t.Cleanup(service.ResetProxyClientCache)
|
|
|
|
proxyURL := "http://proxy.example:8080"
|
|
beforeDelete, err := service.GetHttpClientWithProxy(proxyURL)
|
|
require.NoError(t, err)
|
|
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := gin.CreateTestContext(recorder)
|
|
ctx.Params = gin.Params{{Key: "id", Value: "999999"}}
|
|
ctx.Request = httptest.NewRequest(http.MethodDelete, "/api/channel/999999", nil)
|
|
|
|
DeleteChannel(ctx)
|
|
|
|
assert.Contains(t, recorder.Body.String(), `"success":true`)
|
|
afterDelete, err := service.GetHttpClientWithProxy(proxyURL)
|
|
require.NoError(t, err)
|
|
assert.NotSame(t, beforeDelete, afterDelete)
|
|
}
|
|
|
|
func TestDeleteChannelBatchReportsAndAuditsActualDeletedCount(t *testing.T) {
|
|
db := setupModelListControllerTestDB(t)
|
|
require.NoError(t, db.AutoMigrate(&model.Log{}))
|
|
channel := &model.Channel{Name: "existing", Key: "test-key"}
|
|
require.NoError(t, db.Create(channel).Error)
|
|
|
|
requestBody, err := common.Marshal(ChannelBatch{Ids: []int{channel.Id, 999999}})
|
|
require.NoError(t, err)
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := gin.CreateTestContext(recorder)
|
|
ctx.Request = httptest.NewRequest(http.MethodDelete, "/api/channel/batch", bytes.NewReader(requestBody))
|
|
ctx.Request.Header.Set("Content-Type", "application/json")
|
|
|
|
DeleteChannelBatch(ctx)
|
|
|
|
var response struct {
|
|
Success bool `json:"success"`
|
|
Data int64 `json:"data"`
|
|
}
|
|
require.NoError(t, common.Unmarshal(recorder.Body.Bytes(), &response))
|
|
assert.True(t, response.Success)
|
|
assert.Equal(t, int64(1), response.Data)
|
|
|
|
var auditLog model.Log
|
|
require.NoError(t, db.Order("id desc").First(&auditLog).Error)
|
|
var auditData struct {
|
|
Operation struct {
|
|
Params map[string]any `json:"params"`
|
|
} `json:"op"`
|
|
}
|
|
require.NoError(t, common.UnmarshalJsonStr(auditLog.Other, &auditData))
|
|
assert.Equal(t, float64(1), auditData.Operation.Params["count"])
|
|
}
|
|
|
|
func TestSettleTestQuotaUsesTieredBilling(t *testing.T) {
|
|
info := &relaycommon.RelayInfo{
|
|
TieredBillingSnapshot: &billingexpr.BillingSnapshot{
|
|
BillingMode: "tiered_expr",
|
|
ExprString: `param("stream") == true ? tier("stream", p * 3) : tier("base", p * 2)`,
|
|
ExprHash: billingexpr.ExprHashString(`param("stream") == true ? tier("stream", p * 3) : tier("base", p * 2)`),
|
|
GroupRatio: 1,
|
|
EstimatedTier: "stream",
|
|
QuotaPerUnit: common.QuotaPerUnit,
|
|
ExprVersion: 1,
|
|
},
|
|
BillingRequestInput: &billingexpr.RequestInput{
|
|
Body: []byte(`{"stream":true}`),
|
|
},
|
|
}
|
|
|
|
quota, result := settleTestQuota(info, types.PriceData{
|
|
ModelRatio: 1,
|
|
CompletionRatio: 2,
|
|
}, &dto.Usage{
|
|
PromptTokens: 1000,
|
|
})
|
|
|
|
require.Equal(t, 1500, quota)
|
|
require.NotNil(t, result)
|
|
require.Equal(t, "stream", result.MatchedTier)
|
|
}
|
|
|
|
func TestBuildTestLogOtherInjectsTieredInfo(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
|
|
info := &relaycommon.RelayInfo{
|
|
TieredBillingSnapshot: &billingexpr.BillingSnapshot{
|
|
BillingMode: "tiered_expr",
|
|
ExprString: `tier("base", p * 2)`,
|
|
},
|
|
ChannelMeta: &relaycommon.ChannelMeta{},
|
|
}
|
|
priceData := types.PriceData{
|
|
GroupRatioInfo: types.GroupRatioInfo{GroupRatio: 1},
|
|
}
|
|
usage := &dto.Usage{
|
|
PromptTokensDetails: dto.InputTokenDetails{
|
|
CachedTokens: 12,
|
|
},
|
|
}
|
|
|
|
other := buildTestLogOther(ctx, info, priceData, usage, &billingexpr.TieredResult{
|
|
MatchedTier: "base",
|
|
})
|
|
|
|
require.Equal(t, "tiered_expr", other["billing_mode"])
|
|
require.Equal(t, "base", other["matched_tier"])
|
|
require.NotEmpty(t, other["expr_b64"])
|
|
}
|
|
|
|
func TestResolveChannelTestUserIDUsesRequestUser(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
ctx.Set("id", 2)
|
|
|
|
userID, err := resolveChannelTestUserID(ctx)
|
|
|
|
require.NoError(t, err)
|
|
require.Equal(t, 2, userID)
|
|
}
|
|
|
|
func TestSelectChannelsForAutomaticTestPassiveRecoveryOnlyUsesAutoDisabled(t *testing.T) {
|
|
channels := []*model.Channel{
|
|
{Id: 1, Status: common.ChannelStatusEnabled},
|
|
{Id: 2, Status: common.ChannelStatusAutoDisabled},
|
|
{Id: 3, Status: common.ChannelStatusManuallyDisabled},
|
|
}
|
|
|
|
selected := selectChannelsForAutomaticTest(channels, operation_setting.ChannelTestModePassiveRecovery)
|
|
|
|
require.Len(t, selected, 1)
|
|
require.Equal(t, 2, selected[0].Id)
|
|
}
|
|
|
|
func TestSelectChannelsForAutomaticTestScheduledSkipsManualDisabled(t *testing.T) {
|
|
channels := []*model.Channel{
|
|
{Id: 1, Status: common.ChannelStatusEnabled},
|
|
{Id: 2, Status: common.ChannelStatusAutoDisabled},
|
|
{Id: 3, Status: common.ChannelStatusManuallyDisabled},
|
|
}
|
|
|
|
selected := selectChannelsForAutomaticTest(channels, operation_setting.ChannelTestModeScheduledAll)
|
|
|
|
require.Len(t, selected, 2)
|
|
require.Equal(t, 1, selected[0].Id)
|
|
require.Equal(t, 2, selected[1].Id)
|
|
}
|
|
|
|
func TestTestAllChannelsRejectsExistingActiveTask(t *testing.T) {
|
|
db := setupModelListControllerTestDB(t)
|
|
require.NoError(t, db.AutoMigrate(&model.SystemTask{}, &model.SystemTaskLock{}))
|
|
|
|
existing, err := model.CreateSystemTask(model.SystemTaskTypeChannelTest, nil, nil)
|
|
require.NoError(t, err)
|
|
|
|
recorder := httptest.NewRecorder()
|
|
ctx, _ := gin.CreateTestContext(recorder)
|
|
ctx.Request = httptest.NewRequest(http.MethodPost, "/api/channel/test", nil)
|
|
|
|
TestAllChannels(ctx)
|
|
|
|
require.Equal(t, http.StatusConflict, recorder.Code)
|
|
require.Contains(t, recorder.Body.String(), existing.TaskID)
|
|
require.Contains(t, recorder.Body.String(), "已有通道测试任务正在运行或等待中")
|
|
}
|