* 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
821 lines
26 KiB
Go
821 lines
26 KiB
Go
package advancedcustom
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
relayconstant "github.com/QuantumNous/new-api/relay/constant"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/setting/model_setting"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestAdaptorUsesExactRouteAndQueryAuth(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/messages",
|
|
UpstreamPath: "https://upstream.example/v1/chat/completions?existing=1",
|
|
Converter: relayconvert.ConverterClaudeMessagesToOpenAIChat,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeQuery,
|
|
Name: "api_key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.RequestURLPath = "/v1/messages?client=1"
|
|
|
|
requestURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "https", parsedURL.Scheme)
|
|
assert.Equal(t, "upstream.example", parsedURL.Host)
|
|
assert.Equal(t, "/v1/chat/completions", parsedURL.Path)
|
|
assert.Equal(t, "1", parsedURL.Query().Get("existing"))
|
|
assert.Equal(t, "sk-test", parsedURL.Query().Get("api_key"))
|
|
}
|
|
|
|
func TestAdaptorJoinsUpstreamPathWithChannelBaseURL(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/proxy/v1/chat/completions?existing=1",
|
|
Converter: relayconvert.ConverterNone,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeQuery,
|
|
Name: "api_key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.ChannelBaseUrl = "https://gateway.example/base"
|
|
|
|
requestURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "https", parsedURL.Scheme)
|
|
assert.Equal(t, "gateway.example", parsedURL.Host)
|
|
assert.Equal(t, "/base/proxy/v1/chat/completions", parsedURL.Path)
|
|
assert.Equal(t, "1", parsedURL.Query().Get("existing"))
|
|
assert.Equal(t, "sk-test", parsedURL.Query().Get("api_key"))
|
|
}
|
|
|
|
func TestAdaptorReturnsErrorWhenUpstreamPathNeedsMissingBaseURL(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
Converter: relayconvert.ConverterNone,
|
|
},
|
|
},
|
|
})
|
|
info.ChannelBaseUrl = ""
|
|
|
|
_, err := adaptor.GetRequestURL(info)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "base URL is required")
|
|
}
|
|
|
|
func TestAdaptorSetupRequestHeaderUsesDefaultBearerAuth(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "https://upstream.example/v1/chat/completions",
|
|
Converter: relayconvert.ConverterNone,
|
|
},
|
|
},
|
|
})
|
|
c := advancedCustomGinContext("/v1/chat/completions")
|
|
header := http.Header{}
|
|
|
|
require.NoError(t, adaptor.SetupRequestHeader(c, &header, info))
|
|
assert.Equal(t, "Bearer sk-test", header.Get("Authorization"))
|
|
}
|
|
|
|
func TestAdaptorSetupRequestHeaderUsesConfiguredHeaderAuth(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "https://upstream.example/v1/chat/completions",
|
|
Converter: relayconvert.ConverterNone,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeHeader,
|
|
Name: "x-api-key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
c := advancedCustomGinContext("/v1/chat/completions")
|
|
header := http.Header{}
|
|
|
|
require.NoError(t, adaptor.SetupRequestHeader(c, &header, info))
|
|
assert.Empty(t, header.Get("Authorization"))
|
|
assert.Equal(t, "sk-test", header.Get("x-api-key"))
|
|
}
|
|
|
|
func TestAdaptorSetupRequestHeaderAddsClaudeDefaultHeaders(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/messages",
|
|
UpstreamPath: "https://api.anthropic.com/v1/messages",
|
|
Converter: relayconvert.ConverterNone,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeHeader,
|
|
Name: "x-api-key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.RelayFormat = types.RelayFormatClaude
|
|
c := advancedCustomGinContext("/v1/messages")
|
|
header := http.Header{}
|
|
|
|
require.NoError(t, adaptor.SetupRequestHeader(c, &header, info))
|
|
assert.Equal(t, "sk-test", header.Get("x-api-key"))
|
|
assert.Equal(t, "2023-06-01", header.Get("anthropic-version"))
|
|
}
|
|
|
|
func TestAdaptorReturnsErrorWhenNoRouteMatchesPath(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/messages",
|
|
UpstreamPath: "https://upstream.example/v1/chat/completions",
|
|
Converter: relayconvert.ConverterClaudeMessagesToOpenAIChat,
|
|
},
|
|
},
|
|
})
|
|
info.RequestURLPath = "/v1/chat/completions"
|
|
|
|
_, err := adaptor.GetRequestURL(info)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "does not support request path")
|
|
}
|
|
|
|
func TestAdaptorReplacesModelPlaceholderInRouteURL(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "https://generativelanguage.googleapis.com/v1beta/models/{model}:generateContent",
|
|
Converter: relayconvert.ConverterOpenAIChatToGeminiContent,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeQuery,
|
|
Name: "key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.UpstreamModelName = "gemini-2.5-flash"
|
|
|
|
requestURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "/v1beta/models/gemini-2.5-flash:generateContent", parsedURL.Path)
|
|
assert.Equal(t, "sk-test", parsedURL.Query().Get("key"))
|
|
assert.Empty(t, parsedURL.Query().Get("alt"))
|
|
}
|
|
|
|
func TestAdaptorSwitchesGeminiGenerateContentURLForStream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "https://generativelanguage.googleapis.com/v1beta/models/{model}:generateContent?existing=1",
|
|
Converter: relayconvert.ConverterOpenAIChatToGeminiContent,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeQuery,
|
|
Name: "key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.UpstreamModelName = "gemini-2.5-pro"
|
|
info.IsStream = true
|
|
|
|
requestURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "/v1beta/models/gemini-2.5-pro:streamGenerateContent", parsedURL.Path)
|
|
assert.Equal(t, "sse", parsedURL.Query().Get("alt"))
|
|
assert.Equal(t, "1", parsedURL.Query().Get("existing"))
|
|
assert.Equal(t, "sk-test", parsedURL.Query().Get("key"))
|
|
}
|
|
|
|
func TestAdaptorMatchesGeminiIncomingPathTemplate(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
requestURLPath string
|
|
wantRequestPath string
|
|
}{
|
|
{
|
|
name: "generate content",
|
|
requestURLPath: "/v1beta/models/gemini-2.5-flash:generateContent",
|
|
wantRequestPath: "/v1/chat/completions",
|
|
},
|
|
{
|
|
name: "stream generate content",
|
|
requestURLPath: "/v1beta/models/gemini-2.5-flash:streamGenerateContent?alt=sse",
|
|
wantRequestPath: "/v1/chat/completions",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1beta/models/{model}:generateContent",
|
|
UpstreamPath: "https://upstream.example/v1/chat/completions",
|
|
Converter: relayconvert.ConverterGeminiContentToOpenAIChat,
|
|
},
|
|
},
|
|
})
|
|
info.RequestURLPath = tt.requestURLPath
|
|
|
|
requestURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, tt.wantRequestPath, parsedURL.Path)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestAdaptorBuildModelListRequestUsesConfiguredRouteAuth(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/models",
|
|
UpstreamPath: "/provider/models",
|
|
Converter: relayconvert.ConverterNone,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeHeader,
|
|
Name: "x-api-key",
|
|
Value: "token {api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.RequestURLPath = "/v1/models"
|
|
|
|
requestURL, header, err := adaptor.BuildModelListRequest(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "fallback.example", parsedURL.Host)
|
|
assert.Equal(t, "/provider/models", parsedURL.Path)
|
|
assert.Equal(t, "token sk-test", header.Get("x-api-key"))
|
|
assert.Empty(t, header.Get("Authorization"))
|
|
}
|
|
|
|
func TestAdaptorBuildModelListRequestUsesConfiguredQueryAuth(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/models",
|
|
UpstreamPath: "https://upstream.example/v1/models?existing=1",
|
|
Converter: relayconvert.ConverterNone,
|
|
Auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeQuery,
|
|
Name: "key",
|
|
Value: "{api_key}",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
info.RequestURLPath = "/v1/models"
|
|
|
|
requestURL, header, err := adaptor.BuildModelListRequest(info)
|
|
require.NoError(t, err)
|
|
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "upstream.example", parsedURL.Host)
|
|
assert.Equal(t, "/v1/models", parsedURL.Path)
|
|
assert.Equal(t, "1", parsedURL.Query().Get("existing"))
|
|
assert.Equal(t, "sk-test", parsedURL.Query().Get("key"))
|
|
assert.Empty(t, header.Get("Authorization"))
|
|
}
|
|
|
|
func TestAdaptorBuildModelListRequestDefaultAndNoAuth(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
auth *dto.AdvancedCustomRouteAuth
|
|
wantAuthorization string
|
|
}{
|
|
{
|
|
name: "default bearer",
|
|
wantAuthorization: "Bearer sk-test",
|
|
},
|
|
{
|
|
name: "no authentication",
|
|
auth: &dto.AdvancedCustomRouteAuth{
|
|
Type: dto.AdvancedCustomAuthTypeNone,
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: dto.AdvancedCustomModelListPath,
|
|
UpstreamPath: "/provider/models",
|
|
Auth: tt.auth,
|
|
},
|
|
},
|
|
})
|
|
info.RequestURLPath = "/unrelated/path"
|
|
|
|
requestURL, header, err := (&Adaptor{}).BuildModelListRequest(info)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "https://fallback.example/provider/models", requestURL)
|
|
assert.Equal(t, tt.wantAuthorization, header.Get("Authorization"))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestAdaptorBuildModelListRequestDoesNotReuseRelayRoute(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/chat",
|
|
},
|
|
{
|
|
IncomingPath: dto.AdvancedCustomModelListPath,
|
|
UpstreamPath: "/provider/models",
|
|
},
|
|
},
|
|
})
|
|
|
|
chatURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "https://fallback.example/chat", chatURL)
|
|
|
|
modelURL, header, err := adaptor.BuildModelListRequest(info)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "https://fallback.example/provider/models", modelURL)
|
|
assert.Equal(t, "Bearer sk-test", header.Get("Authorization"))
|
|
}
|
|
|
|
func TestAdaptorBuildModelListRequestRequiresConfiguredRoute(t *testing.T) {
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
},
|
|
},
|
|
})
|
|
|
|
_, _, err := (&Adaptor{}).BuildModelListRequest(info)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "does not configure a /v1/models route")
|
|
}
|
|
|
|
func TestAdaptorConvertsResponsesRequestToOpenAIChatUpstream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
Converter: relayconvert.ConverterOpenAIResponsesToOpenAIChat,
|
|
},
|
|
},
|
|
})
|
|
info.RelayMode = relayconstant.RelayModeResponses
|
|
info.RequestURLPath = "/v1/responses"
|
|
gin.SetMode(gin.TestMode)
|
|
recorder := httptest.NewRecorder()
|
|
c, _ := gin.CreateTestContext(recorder)
|
|
c.Request = httptest.NewRequest(http.MethodPost, "/v1/responses", nil)
|
|
c.Request.Header.Set("Content-Type", "application/json")
|
|
|
|
converted, err := adaptor.ConvertOpenAIResponsesRequest(c, info, dto.OpenAIResponsesRequest{
|
|
Model: "gpt-test",
|
|
Instructions: mustAdvancedCustomRawMessage(t, "system rules"),
|
|
Input: mustAdvancedCustomRawMessage(t, "hello"),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
chatReq, ok := converted.(*dto.GeneralOpenAIRequest)
|
|
require.True(t, ok)
|
|
assert.Equal(t, "gpt-test", chatReq.Model)
|
|
require.Len(t, chatReq.Messages, 2)
|
|
assert.Equal(t, "system", chatReq.Messages[0].Role)
|
|
assert.Equal(t, "system rules", chatReq.Messages[0].StringContent())
|
|
assert.Equal(t, "user", chatReq.Messages[1].Role)
|
|
assert.Equal(t, "hello", chatReq.Messages[1].StringContent())
|
|
|
|
requestURL, err := adaptor.GetRequestURL(info)
|
|
require.NoError(t, err)
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "/v1/chat/completions", parsedURL.Path)
|
|
}
|
|
|
|
func TestAdaptorSelectsDuplicateResponsesRoutesByModel(t *testing.T) {
|
|
config := &dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
Converter: relayconvert.ConverterOpenAIResponsesToOpenAIChat,
|
|
Models: []string{"gpt-test"},
|
|
},
|
|
{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: relayconvert.ConverterOpenAIResponsesToGemini,
|
|
Models: []string{"gemini-test"},
|
|
},
|
|
},
|
|
}
|
|
|
|
chatAdaptor := &Adaptor{}
|
|
chatInfo := advancedCustomRelayInfo(config)
|
|
chatInfo.RelayFormat = types.RelayFormatOpenAIResponses
|
|
chatInfo.RelayMode = relayconstant.RelayModeResponses
|
|
chatInfo.RequestURLPath = "/v1/responses"
|
|
chatInfo.OriginModelName = "gpt-test"
|
|
chatInfo.UpstreamModelName = "gpt-test"
|
|
chatConverted, err := chatAdaptor.ConvertOpenAIResponsesRequest(advancedCustomGinContext("/v1/responses"), chatInfo, dto.OpenAIResponsesRequest{
|
|
Model: "gpt-test",
|
|
Input: mustAdvancedCustomRawMessage(t, "hello"),
|
|
})
|
|
require.NoError(t, err)
|
|
_, ok := chatConverted.(*dto.GeneralOpenAIRequest)
|
|
require.True(t, ok)
|
|
|
|
geminiAdaptor := &Adaptor{}
|
|
geminiInfo := advancedCustomRelayInfo(config)
|
|
geminiInfo.RelayFormat = types.RelayFormatOpenAIResponses
|
|
geminiInfo.RelayMode = relayconstant.RelayModeResponses
|
|
geminiInfo.RequestURLPath = "/v1/responses"
|
|
geminiInfo.OriginModelName = "gemini-test"
|
|
geminiInfo.UpstreamModelName = "gemini-test"
|
|
geminiInfo.IsStream = true
|
|
geminiConverted, err := geminiAdaptor.ConvertOpenAIResponsesRequest(advancedCustomGinContext("/v1/responses"), geminiInfo, dto.OpenAIResponsesRequest{
|
|
Model: "gemini-test",
|
|
Input: mustAdvancedCustomRawMessage(t, "hello"),
|
|
})
|
|
require.NoError(t, err)
|
|
_, ok = geminiConverted.(*dto.GeminiChatRequest)
|
|
require.True(t, ok)
|
|
|
|
requestURL, err := geminiAdaptor.GetRequestURL(geminiInfo)
|
|
require.NoError(t, err)
|
|
parsedURL, err := url.Parse(requestURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "/v1beta/models/gemini-test:streamGenerateContent", parsedURL.Path)
|
|
assert.Equal(t, "sse", parsedURL.Query().Get("alt"))
|
|
}
|
|
|
|
func TestAdaptorResponsesToGeminiUsesResponsesBridge(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: relayconvert.ConverterOpenAIResponsesToGemini,
|
|
Models: []string{"gemini-test"},
|
|
},
|
|
},
|
|
})
|
|
info.RelayFormat = types.RelayFormatOpenAIResponses
|
|
info.RelayMode = relayconstant.RelayModeResponses
|
|
info.RequestURLPath = "/v1/responses"
|
|
info.OriginModelName = "gemini-test"
|
|
info.UpstreamModelName = "gemini-test"
|
|
gin.SetMode(gin.TestMode)
|
|
recorder := httptest.NewRecorder()
|
|
c, _ := gin.CreateTestContext(recorder)
|
|
c.Request = httptest.NewRequest(http.MethodPost, "/v1/responses", nil)
|
|
c.Request.Header.Set("Content-Type", "application/json")
|
|
|
|
payload := dto.GeminiChatResponse{
|
|
Candidates: []dto.GeminiChatCandidate{
|
|
{
|
|
Content: dto.GeminiChatContent{
|
|
Role: "model",
|
|
Parts: []dto.GeminiPart{
|
|
{Text: "hello"},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
UsageMetadata: dto.GeminiUsageMetadata{
|
|
PromptTokenCount: 2,
|
|
CandidatesTokenCount: 3,
|
|
TotalTokenCount: 5,
|
|
},
|
|
}
|
|
body, err := common.Marshal(payload)
|
|
require.NoError(t, err)
|
|
|
|
usage, newAPIError := adaptor.DoResponse(c, &http.Response{
|
|
Body: io.NopCloser(bytes.NewReader(body)),
|
|
}, info)
|
|
require.Nil(t, newAPIError)
|
|
require.NotNil(t, usage)
|
|
|
|
got := recorder.Body.String()
|
|
assert.Contains(t, got, `"object":"response"`)
|
|
assert.Contains(t, got, `"type":"output_text"`)
|
|
assert.Contains(t, got, `"text":"hello"`)
|
|
assert.NotContains(t, got, `"candidates"`)
|
|
}
|
|
|
|
func TestAdaptorResponsesToGeminiAddsThoughtSignatureForFunctionCallHistory(t *testing.T) {
|
|
geminiSettings := model_setting.GetGeminiSettings()
|
|
originalThoughtSignatureEnabled := geminiSettings.FunctionCallThoughtSignatureEnabled
|
|
geminiSettings.FunctionCallThoughtSignatureEnabled = true
|
|
t.Cleanup(func() {
|
|
geminiSettings.FunctionCallThoughtSignatureEnabled = originalThoughtSignatureEnabled
|
|
})
|
|
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: relayconvert.ConverterOpenAIResponsesToGemini,
|
|
Models: []string{"gemini-test"},
|
|
},
|
|
},
|
|
})
|
|
info.RelayFormat = types.RelayFormatOpenAIResponses
|
|
info.RelayMode = relayconstant.RelayModeResponses
|
|
info.RequestURLPath = "/v1/responses"
|
|
info.OriginModelName = "gemini-test"
|
|
info.UpstreamModelName = "gemini-test"
|
|
|
|
converted, err := adaptor.ConvertOpenAIResponsesRequest(advancedCustomGinContext("/v1/responses"), info, dto.OpenAIResponsesRequest{
|
|
Model: "gemini-test",
|
|
Input: mustAdvancedCustomRawMessage(t, []map[string]any{
|
|
{
|
|
"role": "user",
|
|
"content": "hi",
|
|
},
|
|
{
|
|
"type": "function_call",
|
|
"call_id": "call_1",
|
|
"name": "glob",
|
|
"arguments": map[string]any{"query": "*"},
|
|
},
|
|
{
|
|
"type": "function_call_output",
|
|
"call_id": "call_1",
|
|
"output": []map[string]any{{"path": "report.md"}},
|
|
},
|
|
}),
|
|
Tools: mustAdvancedCustomRawMessage(t, []map[string]any{
|
|
{"type": "function", "name": "glob", "parameters": map[string]any{"type": "object"}},
|
|
}),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
geminiReq, ok := converted.(*dto.GeminiChatRequest)
|
|
require.True(t, ok)
|
|
require.Len(t, geminiReq.Contents, 3)
|
|
require.Len(t, geminiReq.Contents[1].Parts, 1)
|
|
require.NotNil(t, geminiReq.Contents[1].Parts[0].FunctionCall)
|
|
assert.NotEmpty(t, geminiReq.Contents[1].Parts[0].ThoughtSignature)
|
|
require.Len(t, geminiReq.Contents[2].Parts, 1)
|
|
require.NotNil(t, geminiReq.Contents[2].Parts[0].FunctionResponse)
|
|
assert.Empty(t, geminiReq.Contents[2].Parts[0].ThoughtSignature)
|
|
}
|
|
|
|
func TestAdaptorConvertsOpenAIChatRequestToResponsesUpstream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/responses",
|
|
Converter: relayconvert.ConverterOpenAIChatToOpenAIResponses,
|
|
},
|
|
},
|
|
})
|
|
c := advancedCustomGinContext("/v1/chat/completions")
|
|
|
|
converted, err := adaptor.ConvertOpenAIRequest(c, info, &dto.GeneralOpenAIRequest{
|
|
Model: "gpt-test",
|
|
Messages: []dto.Message{
|
|
{Role: "user", Content: "hello"},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
responsesReq, ok := converted.(*dto.OpenAIResponsesRequest)
|
|
require.True(t, ok)
|
|
assert.Equal(t, "gpt-test", responsesReq.Model)
|
|
assert.NotEmpty(t, responsesReq.Input)
|
|
}
|
|
|
|
func TestAdaptorConvertsOpenAIChatRequestToClaudeUpstream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/messages",
|
|
Converter: relayconvert.ConverterOpenAIChatToClaudeMessages,
|
|
},
|
|
},
|
|
})
|
|
c := advancedCustomGinContext("/v1/chat/completions")
|
|
|
|
converted, err := adaptor.ConvertOpenAIRequest(c, info, &dto.GeneralOpenAIRequest{
|
|
Model: "claude-test",
|
|
Messages: []dto.Message{
|
|
{Role: "user", Content: "hello"},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
claudeReq, ok := converted.(*dto.ClaudeRequest)
|
|
require.True(t, ok)
|
|
assert.Equal(t, "claude-test", claudeReq.Model)
|
|
require.Len(t, claudeReq.Messages, 1)
|
|
assert.Equal(t, "user", claudeReq.Messages[0].Role)
|
|
}
|
|
|
|
func TestAdaptorConvertsOpenAIChatRequestToGeminiUpstream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: relayconvert.ConverterOpenAIChatToGeminiContent,
|
|
},
|
|
},
|
|
})
|
|
info.UpstreamModelName = "gemini-2.5-flash"
|
|
c := advancedCustomGinContext("/v1/chat/completions")
|
|
|
|
converted, err := adaptor.ConvertOpenAIRequest(c, info, &dto.GeneralOpenAIRequest{
|
|
Model: "gemini-2.5-flash",
|
|
Messages: []dto.Message{
|
|
{Role: "user", Content: "hello"},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
geminiReq, ok := converted.(*dto.GeminiChatRequest)
|
|
require.True(t, ok)
|
|
require.Len(t, geminiReq.Contents, 1)
|
|
assert.Equal(t, "user", geminiReq.Contents[0].Role)
|
|
}
|
|
|
|
func TestAdaptorConvertsClaudeRequestToOpenAIChatUpstream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1/messages",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
Converter: relayconvert.ConverterClaudeMessagesToOpenAIChat,
|
|
},
|
|
},
|
|
})
|
|
info.RelayFormat = types.RelayFormatClaude
|
|
info.RequestURLPath = "/v1/messages"
|
|
c := advancedCustomGinContext("/v1/messages")
|
|
|
|
converted, err := adaptor.ConvertClaudeRequest(c, info, &dto.ClaudeRequest{
|
|
Model: "gpt-test",
|
|
Messages: []dto.ClaudeMessage{
|
|
{Role: "user", Content: "hello"},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
chatReq, ok := converted.(*dto.GeneralOpenAIRequest)
|
|
require.True(t, ok)
|
|
assert.Equal(t, "gpt-test", chatReq.Model)
|
|
require.Len(t, chatReq.Messages, 1)
|
|
assert.Equal(t, "user", chatReq.Messages[0].Role)
|
|
}
|
|
|
|
func TestAdaptorConvertsGeminiRequestToOpenAIChatUpstream(t *testing.T) {
|
|
adaptor := &Adaptor{}
|
|
info := advancedCustomRelayInfo(&dto.AdvancedCustomConfig{
|
|
Routes: []dto.AdvancedCustomRoute{
|
|
{
|
|
IncomingPath: "/v1beta/models/{model}:generateContent",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
Converter: relayconvert.ConverterGeminiContentToOpenAIChat,
|
|
},
|
|
},
|
|
})
|
|
info.RelayFormat = types.RelayFormatGemini
|
|
info.RequestURLPath = "/v1beta/models/gemini-2.5-flash:generateContent"
|
|
info.UpstreamModelName = "gpt-test"
|
|
c := advancedCustomGinContext("/v1beta/models/gemini-2.5-flash:generateContent")
|
|
|
|
converted, err := adaptor.ConvertGeminiRequest(c, info, &dto.GeminiChatRequest{
|
|
Contents: []dto.GeminiChatContent{
|
|
{
|
|
Role: "user",
|
|
Parts: []dto.GeminiPart{
|
|
{Text: "hello"},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
chatReq, ok := converted.(*dto.GeneralOpenAIRequest)
|
|
require.True(t, ok)
|
|
assert.Equal(t, "gpt-test", chatReq.Model)
|
|
require.Len(t, chatReq.Messages, 1)
|
|
assert.Equal(t, "user", chatReq.Messages[0].Role)
|
|
}
|
|
|
|
func advancedCustomRelayInfo(config *dto.AdvancedCustomConfig) *relaycommon.RelayInfo {
|
|
return &relaycommon.RelayInfo{
|
|
RelayFormat: types.RelayFormatOpenAI,
|
|
RelayMode: relayconstant.RelayModeChatCompletions,
|
|
RequestURLPath: "/v1/chat/completions",
|
|
OriginModelName: "gpt-test",
|
|
ChannelMeta: &relaycommon.ChannelMeta{
|
|
ApiKey: "sk-test",
|
|
ChannelBaseUrl: "https://fallback.example",
|
|
ChannelType: constant.ChannelTypeAdvancedCustom,
|
|
UpstreamModelName: "gpt-test",
|
|
ChannelOtherSettings: dto.ChannelOtherSettings{
|
|
AdvancedCustom: config,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func advancedCustomGinContext(path string) *gin.Context {
|
|
gin.SetMode(gin.TestMode)
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
c.Request = httptest.NewRequest(http.MethodPost, path, nil)
|
|
c.Request.Header.Set("Content-Type", "application/json")
|
|
return c
|
|
}
|
|
|
|
func mustAdvancedCustomRawMessage(t *testing.T, value any) []byte {
|
|
t.Helper()
|
|
raw, err := common.Marshal(value)
|
|
require.NoError(t, err)
|
|
return raw
|
|
}
|