Calcium-Ion
86ac0f7745
* 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
99 lines
3.3 KiB
Go
99 lines
3.3 KiB
Go
package openai
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"mime/multipart"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
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"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// TestConvertImageEditRequestMultipart verifies that ConvertImageRequest
|
|
// re-serializes multipart image edit requests with all fields (including
|
|
// stream) and the file intact, both when the form was already parsed and when
|
|
// it must be re-parsed from the reusable body.
|
|
func TestConvertImageEditRequestMultipart(t *testing.T) {
|
|
gin.SetMode(gin.TestMode)
|
|
|
|
newMultipartContext := func(t *testing.T, prompt string) *gin.Context {
|
|
var body bytes.Buffer
|
|
writer := multipart.NewWriter(&body)
|
|
require.NoError(t, writer.WriteField("model", "gpt-image-1"))
|
|
require.NoError(t, writer.WriteField("prompt", prompt))
|
|
require.NoError(t, writer.WriteField("stream", "true"))
|
|
require.NoError(t, writer.WriteField("partial_images", "3"))
|
|
part, err := writer.CreateFormFile("image", "input.png")
|
|
require.NoError(t, err)
|
|
_, err = part.Write([]byte("fake image"))
|
|
require.NoError(t, err)
|
|
require.NoError(t, writer.Close())
|
|
|
|
c, _ := gin.CreateTestContext(httptest.NewRecorder())
|
|
c.Request = httptest.NewRequest(http.MethodPost, "/v1/images/edits", &body)
|
|
c.Request.Header.Set("Content-Type", writer.FormDataContentType())
|
|
return c
|
|
}
|
|
|
|
convertAndReplay := func(t *testing.T, c *gin.Context, prompt string) {
|
|
info := &relaycommon.RelayInfo{
|
|
RelayMode: relayconstant.RelayModeImagesEdits,
|
|
}
|
|
request := dto.ImageRequest{
|
|
Model: "gpt-image-1",
|
|
Prompt: prompt,
|
|
Stream: common.GetPointer(true),
|
|
}
|
|
|
|
converted, err := (&Adaptor{}).ConvertImageRequest(c, info, request)
|
|
require.NoError(t, err)
|
|
convertedBody, ok := converted.(*bytes.Buffer)
|
|
require.True(t, ok)
|
|
|
|
replayedRequest := httptest.NewRequest(http.MethodPost, "/v1/images/edits", bytes.NewReader(convertedBody.Bytes()))
|
|
replayedRequest.Header.Set("Content-Type", c.Request.Header.Get("Content-Type"))
|
|
require.NoError(t, replayedRequest.ParseMultipartForm(32<<20))
|
|
|
|
require.Equal(t, "gpt-image-1", replayedRequest.PostForm.Get("model"))
|
|
require.Equal(t, prompt, replayedRequest.PostForm.Get("prompt"))
|
|
require.Equal(t, "true", replayedRequest.PostForm.Get("stream"))
|
|
require.Equal(t, "3", replayedRequest.PostForm.Get("partial_images"))
|
|
require.Len(t, replayedRequest.MultipartForm.File["image"], 1)
|
|
|
|
file, err := replayedRequest.MultipartForm.File["image"][0].Open()
|
|
require.NoError(t, err)
|
|
defer file.Close()
|
|
fileBytes, err := io.ReadAll(file)
|
|
require.NoError(t, err)
|
|
require.Equal(t, []byte("fake image"), fileBytes)
|
|
}
|
|
|
|
t.Run("with pre-parsed form", func(t *testing.T) {
|
|
prompt := "edit this image"
|
|
c := newMultipartContext(t, prompt)
|
|
require.NoError(t, c.Request.ParseMultipartForm(32<<20))
|
|
|
|
convertAndReplay(t, c, prompt)
|
|
})
|
|
|
|
t.Run("re-parses reusable body when form is missing", func(t *testing.T) {
|
|
prompt := "edit without pre-parsed form"
|
|
c := newMultipartContext(t, prompt)
|
|
|
|
storage, err := common.GetBodyStorage(c)
|
|
require.NoError(t, err)
|
|
c.Request.Body = io.NopCloser(storage)
|
|
c.Request.MultipartForm = nil
|
|
c.Request.PostForm = nil
|
|
|
|
convertAndReplay(t, c, prompt)
|
|
})
|
|
}
|