* 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
162 lines
4.1 KiB
Go
162 lines
4.1 KiB
Go
package service
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestResetStatusCode(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
name string
|
|
statusCode int
|
|
statusCodeConfig string
|
|
expectedCode int
|
|
}{
|
|
{
|
|
name: "map string value",
|
|
statusCode: 429,
|
|
statusCodeConfig: `{"429":"503"}`,
|
|
expectedCode: 503,
|
|
},
|
|
{
|
|
name: "map int value",
|
|
statusCode: 429,
|
|
statusCodeConfig: `{"429":503}`,
|
|
expectedCode: 503,
|
|
},
|
|
{
|
|
name: "skip invalid string value",
|
|
statusCode: 429,
|
|
statusCodeConfig: `{"429":"bad-code"}`,
|
|
expectedCode: 429,
|
|
},
|
|
{
|
|
name: "skip status code 200",
|
|
statusCode: 200,
|
|
statusCodeConfig: `{"200":503}`,
|
|
expectedCode: 200,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
newAPIError := &types.NewAPIError{
|
|
StatusCode: tc.statusCode,
|
|
}
|
|
ResetStatusCode(newAPIError, tc.statusCodeConfig)
|
|
require.Equal(t, tc.expectedCode, newAPIError.StatusCode)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRelayErrorHandlerTruncatesInvalidJSONBodyInLog(t *testing.T) {
|
|
withDebugEnabled(t, false)
|
|
|
|
body := strings.Repeat("b", common.LocalLogContentLimit+256)
|
|
var logBuffer bytes.Buffer
|
|
|
|
common.LogWriterMu.Lock()
|
|
oldWriter := gin.DefaultErrorWriter
|
|
gin.DefaultErrorWriter = &logBuffer
|
|
common.LogWriterMu.Unlock()
|
|
t.Cleanup(func() {
|
|
common.LogWriterMu.Lock()
|
|
gin.DefaultErrorWriter = oldWriter
|
|
common.LogWriterMu.Unlock()
|
|
})
|
|
|
|
resp := &http.Response{
|
|
StatusCode: http.StatusInternalServerError,
|
|
Body: io.NopCloser(strings.NewReader(body)),
|
|
}
|
|
|
|
newAPIError := RelayErrorHandler(context.Background(), resp, false)
|
|
|
|
require.NotNil(t, newAPIError)
|
|
require.Equal(t, "bad response status code 500", newAPIError.Error())
|
|
require.Contains(t, logBuffer.String(), "[truncated")
|
|
require.Contains(t, logBuffer.String(), fmt.Sprintf("original_length=%d", len(body)))
|
|
require.NotContains(t, logBuffer.String(), strings.Repeat("b", common.LocalLogContentLimit+1))
|
|
}
|
|
|
|
func TestRelayErrorHandlerKeepsStructuredErrorMessage(t *testing.T) {
|
|
message := strings.Repeat("c", common.LocalLogContentLimit+256)
|
|
body := `{"message":"` + message + `"}`
|
|
resp := &http.Response{
|
|
StatusCode: http.StatusInternalServerError,
|
|
Body: io.NopCloser(strings.NewReader(body)),
|
|
}
|
|
|
|
newAPIError := RelayErrorHandler(context.Background(), resp, false)
|
|
|
|
require.NotNil(t, newAPIError)
|
|
require.Equal(t, message, newAPIError.Error())
|
|
}
|
|
|
|
func TestRelayErrorHandlerKeepsOpenAIErrorMessage(t *testing.T) {
|
|
message := strings.Repeat("d", common.LocalLogContentLimit+256)
|
|
body := `{"error":{"message":"` + message + `","type":"server_error","code":"server_error"}}`
|
|
resp := &http.Response{
|
|
StatusCode: http.StatusInternalServerError,
|
|
Body: io.NopCloser(strings.NewReader(body)),
|
|
}
|
|
|
|
newAPIError := RelayErrorHandler(context.Background(), resp, false)
|
|
|
|
require.NotNil(t, newAPIError)
|
|
require.Equal(t, message, newAPIError.Error())
|
|
}
|
|
|
|
func TestRelayErrorHandlerKeepsInvalidJSONBodyInDebugLog(t *testing.T) {
|
|
withDebugEnabled(t, true)
|
|
|
|
body := strings.Repeat("e", common.LocalLogContentLimit+256)
|
|
var logBuffer bytes.Buffer
|
|
|
|
common.LogWriterMu.Lock()
|
|
oldWriter := gin.DefaultErrorWriter
|
|
gin.DefaultErrorWriter = &logBuffer
|
|
common.LogWriterMu.Unlock()
|
|
t.Cleanup(func() {
|
|
common.LogWriterMu.Lock()
|
|
gin.DefaultErrorWriter = oldWriter
|
|
common.LogWriterMu.Unlock()
|
|
})
|
|
|
|
resp := &http.Response{
|
|
StatusCode: http.StatusInternalServerError,
|
|
Body: io.NopCloser(strings.NewReader(body)),
|
|
}
|
|
|
|
newAPIError := RelayErrorHandler(context.Background(), resp, false)
|
|
|
|
require.NotNil(t, newAPIError)
|
|
require.NotContains(t, logBuffer.String(), "[truncated")
|
|
require.Contains(t, logBuffer.String(), body)
|
|
}
|
|
|
|
func withDebugEnabled(t *testing.T, enabled bool) {
|
|
t.Helper()
|
|
|
|
oldDebug := common.DebugEnabled
|
|
common.DebugEnabled = enabled
|
|
t.Cleanup(func() {
|
|
common.DebugEnabled = oldDebug
|
|
})
|
|
}
|