* 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
138 lines
3.4 KiB
Go
138 lines
3.4 KiB
Go
package minimax
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
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/gin-gonic/gin"
|
|
)
|
|
|
|
func TestGetRequestURLForImageGeneration(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
info := &relaycommon.RelayInfo{
|
|
RelayMode: relayconstant.RelayModeImagesGenerations,
|
|
ChannelMeta: &relaycommon.ChannelMeta{
|
|
ChannelBaseUrl: "https://api.minimax.chat",
|
|
},
|
|
}
|
|
|
|
got, err := GetRequestURL(info)
|
|
if err != nil {
|
|
t.Fatalf("GetRequestURL returned error: %v", err)
|
|
}
|
|
|
|
want := "https://api.minimax.chat/v1/image_generation"
|
|
if got != want {
|
|
t.Fatalf("GetRequestURL() = %q, want %q", got, want)
|
|
}
|
|
}
|
|
|
|
func TestConvertImageRequest(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
adaptor := &Adaptor{}
|
|
info := &relaycommon.RelayInfo{
|
|
RelayMode: relayconstant.RelayModeImagesGenerations,
|
|
OriginModelName: "image-01",
|
|
}
|
|
request := dto.ImageRequest{
|
|
Model: "image-01",
|
|
Prompt: "a red fox in snowfall",
|
|
Size: "1536x1024",
|
|
ResponseFormat: "url",
|
|
N: uintPtr(2),
|
|
}
|
|
|
|
got, err := adaptor.ConvertImageRequest(gin.CreateTestContextOnly(httptest.NewRecorder(), gin.New()), info, request)
|
|
if err != nil {
|
|
t.Fatalf("ConvertImageRequest returned error: %v", err)
|
|
}
|
|
|
|
body, err := json.Marshal(got)
|
|
if err != nil {
|
|
t.Fatalf("json.Marshal returned error: %v", err)
|
|
}
|
|
|
|
var payload map[string]any
|
|
if err := json.Unmarshal(body, &payload); err != nil {
|
|
t.Fatalf("json.Unmarshal returned error: %v", err)
|
|
}
|
|
|
|
if payload["model"] != "image-01" {
|
|
t.Fatalf("model = %#v, want %q", payload["model"], "image-01")
|
|
}
|
|
if payload["prompt"] != request.Prompt {
|
|
t.Fatalf("prompt = %#v, want %q", payload["prompt"], request.Prompt)
|
|
}
|
|
if payload["n"] != float64(2) {
|
|
t.Fatalf("n = %#v, want 2", payload["n"])
|
|
}
|
|
if payload["aspect_ratio"] != "3:2" {
|
|
t.Fatalf("aspect_ratio = %#v, want %q", payload["aspect_ratio"], "3:2")
|
|
}
|
|
if payload["response_format"] != "url" {
|
|
t.Fatalf("response_format = %#v, want %q", payload["response_format"], "url")
|
|
}
|
|
}
|
|
|
|
func TestDoResponseForImageGeneration(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
gin.SetMode(gin.TestMode)
|
|
recorder := httptest.NewRecorder()
|
|
c, _ := gin.CreateTestContext(recorder)
|
|
|
|
info := &relaycommon.RelayInfo{
|
|
RelayMode: relayconstant.RelayModeImagesGenerations,
|
|
StartTime: time.Unix(1700000000, 0),
|
|
}
|
|
resp := &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Header: make(http.Header),
|
|
Body: httptest.NewRecorder().Result().Body,
|
|
}
|
|
resp.Body = ioNopCloser(`{"data":{"image_urls":["https://example.com/minimax.png"]}}`)
|
|
|
|
adaptor := &Adaptor{}
|
|
usage, err := adaptor.DoResponse(c, resp, info)
|
|
if err != nil {
|
|
t.Fatalf("DoResponse returned error: %v", err)
|
|
}
|
|
if usage == nil {
|
|
t.Fatalf("DoResponse returned nil usage")
|
|
}
|
|
|
|
body := recorder.Body.String()
|
|
if !strings.Contains(body, `"url":"https://example.com/minimax.png"`) {
|
|
t.Fatalf("response body = %s, want OpenAI image response with image URL", body)
|
|
}
|
|
if strings.Contains(body, `"image_urls"`) {
|
|
t.Fatalf("response body = %s, should not expose raw MiniMax image_urls payload", body)
|
|
}
|
|
}
|
|
|
|
type nopReadCloser struct {
|
|
*strings.Reader
|
|
}
|
|
|
|
func (n nopReadCloser) Close() error {
|
|
return nil
|
|
}
|
|
|
|
func ioNopCloser(body string) nopReadCloser {
|
|
return nopReadCloser{Reader: strings.NewReader(body)}
|
|
}
|
|
|
|
func uintPtr(v uint) *uint {
|
|
return &v
|
|
}
|