* 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
177 lines
5.6 KiB
Go
177 lines
5.6 KiB
Go
package gemini
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"github.com/tidwall/gjson"
|
|
)
|
|
|
|
func TestConvertOpenAIResponsesRequestToGeminiInstructionsAndInput(t *testing.T) {
|
|
got := mustConvertResponsesToGemini(t, dto.OpenAIResponsesRequest{
|
|
Model: "gemini-test",
|
|
Instructions: mustGeminiRawMessage(t, "system rules"),
|
|
Input: mustGeminiRawMessage(t, "hello"),
|
|
})
|
|
|
|
require.NotNil(t, got.SystemInstructions)
|
|
require.Len(t, got.SystemInstructions.Parts, 1)
|
|
assert.Equal(t, "system rules", got.SystemInstructions.Parts[0].Text)
|
|
require.Len(t, got.Contents, 1)
|
|
assert.Equal(t, "user", got.Contents[0].Role)
|
|
require.Len(t, got.Contents[0].Parts, 1)
|
|
assert.Equal(t, "hello", got.Contents[0].Parts[0].Text)
|
|
}
|
|
|
|
func TestConvertOpenAIResponsesRequestToGeminiFunctionToolAndChoice(t *testing.T) {
|
|
got := mustConvertResponsesToGemini(t, dto.OpenAIResponsesRequest{
|
|
Model: "gemini-test",
|
|
Input: mustGeminiRawMessage(t, "lookup weather"),
|
|
Tools: mustGeminiRawMessage(t, []map[string]any{
|
|
{
|
|
"type": "function",
|
|
"name": "lookup",
|
|
"description": "Lookup data",
|
|
"parameters": map[string]any{
|
|
"type": "object",
|
|
"properties": map[string]any{
|
|
"q": map[string]any{"type": "string"},
|
|
},
|
|
},
|
|
},
|
|
{"type": "custom", "name": "freeform"},
|
|
}),
|
|
ToolChoice: mustGeminiRawMessage(t, map[string]any{
|
|
"type": "function",
|
|
"name": "lookup",
|
|
}),
|
|
})
|
|
|
|
tools := got.GetTools()
|
|
require.Len(t, tools, 1)
|
|
assert.Equal(t, "lookup", gjson.GetBytes(got.Tools, "0.functionDeclarations.0.name").String())
|
|
assert.Equal(t, "Lookup data", gjson.GetBytes(got.Tools, "0.functionDeclarations.0.description").String())
|
|
require.NotNil(t, got.ToolConfig)
|
|
require.NotNil(t, got.ToolConfig.FunctionCallingConfig)
|
|
assert.Equal(t, dto.FunctionCallingConfigMode("ANY"), got.ToolConfig.FunctionCallingConfig.Mode)
|
|
assert.Equal(t, []string{"lookup"}, got.ToolConfig.FunctionCallingConfig.AllowedFunctionNames)
|
|
}
|
|
|
|
func TestConvertOpenAIResponsesRequestToGeminiFunctionCallConversation(t *testing.T) {
|
|
got := mustConvertResponsesToGemini(t, dto.OpenAIResponsesRequest{
|
|
Model: "gemini-test",
|
|
Input: mustGeminiRawMessage(t, []map[string]any{
|
|
{
|
|
"role": "assistant",
|
|
"content": []map[string]any{
|
|
{"type": "output_text", "text": "I will call."},
|
|
},
|
|
},
|
|
{
|
|
"type": "function_call",
|
|
"call_id": "call_1",
|
|
"name": "lookup",
|
|
"arguments": map[string]any{"q": "x"},
|
|
},
|
|
{
|
|
"type": "function_call_output",
|
|
"call_id": "call_1",
|
|
"output": map[string]any{"ok": true},
|
|
},
|
|
}),
|
|
Tools: mustGeminiRawMessage(t, []map[string]any{
|
|
{"type": "function", "name": "lookup", "parameters": map[string]any{"type": "object"}},
|
|
}),
|
|
})
|
|
|
|
require.Len(t, got.Contents, 2)
|
|
assert.Equal(t, "model", got.Contents[0].Role)
|
|
require.Len(t, got.Contents[0].Parts, 2)
|
|
require.NotNil(t, got.Contents[0].Parts[0].FunctionCall)
|
|
assert.Equal(t, "lookup", got.Contents[0].Parts[0].FunctionCall.FunctionName)
|
|
assert.Equal(t, map[string]interface{}{"q": "x"}, got.Contents[0].Parts[0].FunctionCall.Arguments)
|
|
assert.Equal(t, "I will call.", got.Contents[0].Parts[1].Text)
|
|
|
|
assert.Equal(t, "user", got.Contents[1].Role)
|
|
require.Len(t, got.Contents[1].Parts, 1)
|
|
require.NotNil(t, got.Contents[1].Parts[0].FunctionResponse)
|
|
assert.Equal(t, "lookup", got.Contents[1].Parts[0].FunctionResponse.Name)
|
|
assert.Equal(t, map[string]interface{}{"ok": true}, got.Contents[1].Parts[0].FunctionResponse.Response)
|
|
}
|
|
|
|
func TestConvertOpenAIResponsesRequestToGeminiSkipsCustomToolCalls(t *testing.T) {
|
|
got := mustConvertResponsesToGemini(t, dto.OpenAIResponsesRequest{
|
|
Model: "gemini-test",
|
|
Input: mustGeminiRawMessage(t, []map[string]any{
|
|
{
|
|
"role": "assistant",
|
|
"content": []map[string]any{
|
|
{"type": "output_text", "text": "before custom"},
|
|
},
|
|
},
|
|
{
|
|
"type": "custom_tool_call",
|
|
"call_id": "call_custom",
|
|
"name": "apply_patch",
|
|
"input": "patch body",
|
|
},
|
|
{
|
|
"type": "custom_tool_call_output",
|
|
"call_id": "call_custom",
|
|
"output": "ok",
|
|
},
|
|
{
|
|
"type": "function_call_output",
|
|
"call_id": "call_custom",
|
|
"output": "legacy custom output",
|
|
},
|
|
{
|
|
"role": "user",
|
|
"content": "next turn",
|
|
},
|
|
}),
|
|
Tools: mustGeminiRawMessage(t, []map[string]any{
|
|
{"type": "custom", "name": "apply_patch"},
|
|
{"type": "unknown", "name": "unknown"},
|
|
}),
|
|
})
|
|
|
|
assert.Empty(t, got.GetTools())
|
|
require.Len(t, got.Contents, 2)
|
|
assert.Equal(t, "model", got.Contents[0].Role)
|
|
require.Len(t, got.Contents[0].Parts, 1)
|
|
assert.Equal(t, "before custom", got.Contents[0].Parts[0].Text)
|
|
assert.Nil(t, got.Contents[0].Parts[0].FunctionCall)
|
|
|
|
assert.Equal(t, "user", got.Contents[1].Role)
|
|
require.Len(t, got.Contents[1].Parts, 1)
|
|
assert.Equal(t, "next turn", got.Contents[1].Parts[0].Text)
|
|
assert.Nil(t, got.Contents[1].Parts[0].FunctionResponse)
|
|
}
|
|
|
|
func mustConvertResponsesToGemini(t *testing.T, req dto.OpenAIResponsesRequest) *dto.GeminiChatRequest {
|
|
t.Helper()
|
|
info := &relaycommon.RelayInfo{
|
|
OriginModelName: req.Model,
|
|
ChannelMeta: &relaycommon.ChannelMeta{
|
|
UpstreamModelName: req.Model,
|
|
},
|
|
}
|
|
got, err := (&Adaptor{}).ConvertOpenAIResponsesRequest(nil, info, req)
|
|
require.NoError(t, err)
|
|
geminiReq, ok := got.(*dto.GeminiChatRequest)
|
|
require.True(t, ok)
|
|
return geminiReq
|
|
}
|
|
|
|
func mustGeminiRawMessage(t *testing.T, value any) []byte {
|
|
t.Helper()
|
|
raw, err := common.Marshal(value)
|
|
require.NoError(t, err)
|
|
return raw
|
|
}
|