* 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
377 lines
12 KiB
Go
377 lines
12 KiB
Go
package claude
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func commonPointer[T any](value T) *T {
|
|
return &value
|
|
}
|
|
|
|
func TestResponseOpenAI2ClaudeToolUseInputIsObject(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
args string
|
|
want map[string]interface{}
|
|
}{
|
|
{name: "object", args: `{"q":"x"}`, want: map[string]interface{}{"q": "x"}},
|
|
{name: "empty", args: "", want: map[string]interface{}{}},
|
|
{name: "invalid", args: "{", want: map[string]interface{}{}},
|
|
{name: "null", args: "null", want: map[string]interface{}{}},
|
|
{name: "array", args: `["x"]`, want: map[string]interface{}{}},
|
|
{name: "string", args: `"x"`, want: map[string]interface{}{}},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
msg := dto.Message{Role: "assistant"}
|
|
msg.SetToolCalls([]dto.ToolCallRequest{
|
|
{
|
|
ID: "call_1",
|
|
Type: "function",
|
|
Function: dto.FunctionRequest{
|
|
Name: "lookup",
|
|
Arguments: tt.args,
|
|
},
|
|
},
|
|
})
|
|
resp := relayconvert.ResponseOpenAI2Claude(&dto.OpenAITextResponse{
|
|
Id: "chatcmpl_1",
|
|
Model: "gpt-test",
|
|
Choices: []dto.OpenAITextResponseChoice{
|
|
{Message: msg, FinishReason: "tool_calls"},
|
|
},
|
|
}, nil)
|
|
|
|
require.Len(t, resp.Content, 1)
|
|
assert.Equal(t, "tool_use", resp.Content[0].Type)
|
|
assert.Equal(t, tt.want, resp.Content[0].Input)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestFormatClaudeResponseInfo_MessageStart(t *testing.T) {
|
|
claudeInfo := &ClaudeResponseInfo{
|
|
Usage: &dto.Usage{},
|
|
}
|
|
claudeResponse := &dto.ClaudeResponse{
|
|
Type: "message_start",
|
|
Message: &dto.ClaudeMediaMessage{
|
|
Id: "msg_123",
|
|
Model: "claude-3-5-sonnet",
|
|
Usage: &dto.ClaudeUsage{
|
|
InputTokens: 100,
|
|
OutputTokens: 1,
|
|
CacheCreationInputTokens: 50,
|
|
CacheReadInputTokens: 30,
|
|
},
|
|
},
|
|
}
|
|
|
|
ok := FormatClaudeResponseInfo(claudeResponse, nil, claudeInfo)
|
|
if !ok {
|
|
t.Fatal("expected true")
|
|
}
|
|
if claudeInfo.Usage.PromptTokens != 100 {
|
|
t.Errorf("PromptTokens = %d, want 100", claudeInfo.Usage.PromptTokens)
|
|
}
|
|
if claudeInfo.Usage.PromptTokensDetails.CachedTokens != 30 {
|
|
t.Errorf("CachedTokens = %d, want 30", claudeInfo.Usage.PromptTokensDetails.CachedTokens)
|
|
}
|
|
if claudeInfo.Usage.PromptTokensDetails.CachedCreationTokens != 50 {
|
|
t.Errorf("CachedCreationTokens = %d, want 50", claudeInfo.Usage.PromptTokensDetails.CachedCreationTokens)
|
|
}
|
|
if claudeInfo.ResponseId != "msg_123" {
|
|
t.Errorf("ResponseId = %s, want msg_123", claudeInfo.ResponseId)
|
|
}
|
|
if claudeInfo.Model != "claude-3-5-sonnet" {
|
|
t.Errorf("Model = %s, want claude-3-5-sonnet", claudeInfo.Model)
|
|
}
|
|
}
|
|
|
|
func TestFormatClaudeResponseInfo_MessageDelta_FullUsage(t *testing.T) {
|
|
// message_start 先积累 usage
|
|
claudeInfo := &ClaudeResponseInfo{
|
|
Usage: &dto.Usage{
|
|
PromptTokens: 100,
|
|
PromptTokensDetails: dto.InputTokenDetails{
|
|
CachedTokens: 30,
|
|
CachedCreationTokens: 50,
|
|
},
|
|
CompletionTokens: 1,
|
|
},
|
|
}
|
|
|
|
// message_delta 带完整 usage(原生 Anthropic 场景)
|
|
claudeResponse := &dto.ClaudeResponse{
|
|
Type: "message_delta",
|
|
Usage: &dto.ClaudeUsage{
|
|
InputTokens: 100,
|
|
OutputTokens: 200,
|
|
CacheCreationInputTokens: 50,
|
|
CacheReadInputTokens: 30,
|
|
},
|
|
}
|
|
|
|
ok := FormatClaudeResponseInfo(claudeResponse, nil, claudeInfo)
|
|
if !ok {
|
|
t.Fatal("expected true")
|
|
}
|
|
if claudeInfo.Usage.PromptTokens != 100 {
|
|
t.Errorf("PromptTokens = %d, want 100", claudeInfo.Usage.PromptTokens)
|
|
}
|
|
if claudeInfo.Usage.CompletionTokens != 200 {
|
|
t.Errorf("CompletionTokens = %d, want 200", claudeInfo.Usage.CompletionTokens)
|
|
}
|
|
if claudeInfo.Usage.TotalTokens != 300 {
|
|
t.Errorf("TotalTokens = %d, want 300", claudeInfo.Usage.TotalTokens)
|
|
}
|
|
if !claudeInfo.Done {
|
|
t.Error("expected Done = true")
|
|
}
|
|
}
|
|
|
|
func TestFormatClaudeResponseInfo_MessageDelta_OnlyOutputTokens(t *testing.T) {
|
|
// 模拟 Bedrock: message_start 已积累 usage
|
|
claudeInfo := &ClaudeResponseInfo{
|
|
Usage: &dto.Usage{
|
|
PromptTokens: 100,
|
|
PromptTokensDetails: dto.InputTokenDetails{
|
|
CachedTokens: 30,
|
|
CachedCreationTokens: 50,
|
|
},
|
|
CompletionTokens: 1,
|
|
ClaudeCacheCreation5mTokens: 10,
|
|
ClaudeCacheCreation1hTokens: 20,
|
|
},
|
|
}
|
|
|
|
// Bedrock 的 message_delta 只有 output_tokens,缺少 input_tokens 和 cache 字段
|
|
claudeResponse := &dto.ClaudeResponse{
|
|
Type: "message_delta",
|
|
Usage: &dto.ClaudeUsage{
|
|
OutputTokens: 200,
|
|
// InputTokens, CacheCreationInputTokens, CacheReadInputTokens 都是 0
|
|
},
|
|
}
|
|
|
|
ok := FormatClaudeResponseInfo(claudeResponse, nil, claudeInfo)
|
|
if !ok {
|
|
t.Fatal("expected true")
|
|
}
|
|
// PromptTokens 应保持 message_start 的值(因为 message_delta 的 InputTokens=0,不更新)
|
|
if claudeInfo.Usage.PromptTokens != 100 {
|
|
t.Errorf("PromptTokens = %d, want 100", claudeInfo.Usage.PromptTokens)
|
|
}
|
|
if claudeInfo.Usage.CompletionTokens != 200 {
|
|
t.Errorf("CompletionTokens = %d, want 200", claudeInfo.Usage.CompletionTokens)
|
|
}
|
|
if claudeInfo.Usage.TotalTokens != 300 {
|
|
t.Errorf("TotalTokens = %d, want 300", claudeInfo.Usage.TotalTokens)
|
|
}
|
|
// cache 字段应保持 message_start 的值
|
|
if claudeInfo.Usage.PromptTokensDetails.CachedTokens != 30 {
|
|
t.Errorf("CachedTokens = %d, want 30", claudeInfo.Usage.PromptTokensDetails.CachedTokens)
|
|
}
|
|
if claudeInfo.Usage.PromptTokensDetails.CachedCreationTokens != 50 {
|
|
t.Errorf("CachedCreationTokens = %d, want 50", claudeInfo.Usage.PromptTokensDetails.CachedCreationTokens)
|
|
}
|
|
if claudeInfo.Usage.ClaudeCacheCreation5mTokens != 10 {
|
|
t.Errorf("ClaudeCacheCreation5mTokens = %d, want 10", claudeInfo.Usage.ClaudeCacheCreation5mTokens)
|
|
}
|
|
if claudeInfo.Usage.ClaudeCacheCreation1hTokens != 20 {
|
|
t.Errorf("ClaudeCacheCreation1hTokens = %d, want 20", claudeInfo.Usage.ClaudeCacheCreation1hTokens)
|
|
}
|
|
if !claudeInfo.Done {
|
|
t.Error("expected Done = true")
|
|
}
|
|
}
|
|
|
|
func TestFormatClaudeResponseInfo_NilClaudeInfo(t *testing.T) {
|
|
claudeResponse := &dto.ClaudeResponse{Type: "message_start"}
|
|
ok := FormatClaudeResponseInfo(claudeResponse, nil, nil)
|
|
if ok {
|
|
t.Error("expected false for nil claudeInfo")
|
|
}
|
|
}
|
|
|
|
func TestFormatClaudeResponseInfo_ContentBlockDelta(t *testing.T) {
|
|
text := "hello"
|
|
claudeInfo := &ClaudeResponseInfo{
|
|
Usage: &dto.Usage{},
|
|
ResponseText: strings.Builder{},
|
|
}
|
|
claudeResponse := &dto.ClaudeResponse{
|
|
Type: "content_block_delta",
|
|
Delta: &dto.ClaudeMediaMessage{
|
|
Text: &text,
|
|
},
|
|
}
|
|
|
|
ok := FormatClaudeResponseInfo(claudeResponse, nil, claudeInfo)
|
|
if !ok {
|
|
t.Fatal("expected true")
|
|
}
|
|
if claudeInfo.ResponseText.String() != "hello" {
|
|
t.Errorf("ResponseText = %q, want %q", claudeInfo.ResponseText.String(), "hello")
|
|
}
|
|
}
|
|
|
|
func TestBuildOpenAIStyleUsageFromClaudeUsage(t *testing.T) {
|
|
usage := &dto.Usage{
|
|
PromptTokens: 100,
|
|
CompletionTokens: 20,
|
|
PromptTokensDetails: dto.InputTokenDetails{
|
|
CachedTokens: 30,
|
|
CachedCreationTokens: 50,
|
|
},
|
|
ClaudeCacheCreation5mTokens: 10,
|
|
ClaudeCacheCreation1hTokens: 20,
|
|
UsageSemantic: "anthropic",
|
|
}
|
|
|
|
openAIUsage := buildOpenAIStyleUsageFromClaudeUsage(usage)
|
|
|
|
if openAIUsage.PromptTokens != 180 {
|
|
t.Fatalf("PromptTokens = %d, want 180", openAIUsage.PromptTokens)
|
|
}
|
|
if openAIUsage.InputTokens != 180 {
|
|
t.Fatalf("InputTokens = %d, want 180", openAIUsage.InputTokens)
|
|
}
|
|
if openAIUsage.TotalTokens != 200 {
|
|
t.Fatalf("TotalTokens = %d, want 200", openAIUsage.TotalTokens)
|
|
}
|
|
if openAIUsage.UsageSemantic != "openai" {
|
|
t.Fatalf("UsageSemantic = %s, want openai", openAIUsage.UsageSemantic)
|
|
}
|
|
if openAIUsage.UsageSource != "anthropic" {
|
|
t.Fatalf("UsageSource = %s, want anthropic", openAIUsage.UsageSource)
|
|
}
|
|
}
|
|
|
|
func TestBuildOpenAIStyleUsageFromClaudeUsagePreservesCacheCreationRemainder(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
cachedCreationTokens int
|
|
cacheCreationTokens5m int
|
|
cacheCreationTokens1h int
|
|
expectedTotalInputToken int
|
|
}{
|
|
{
|
|
name: "prefers aggregate when it includes remainder",
|
|
cachedCreationTokens: 50,
|
|
cacheCreationTokens5m: 10,
|
|
cacheCreationTokens1h: 20,
|
|
expectedTotalInputToken: 180,
|
|
},
|
|
{
|
|
name: "falls back to split tokens when aggregate missing",
|
|
cachedCreationTokens: 0,
|
|
cacheCreationTokens5m: 10,
|
|
cacheCreationTokens1h: 20,
|
|
expectedTotalInputToken: 160,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
usage := &dto.Usage{
|
|
PromptTokens: 100,
|
|
CompletionTokens: 20,
|
|
PromptTokensDetails: dto.InputTokenDetails{
|
|
CachedTokens: 30,
|
|
CachedCreationTokens: tt.cachedCreationTokens,
|
|
},
|
|
ClaudeCacheCreation5mTokens: tt.cacheCreationTokens5m,
|
|
ClaudeCacheCreation1hTokens: tt.cacheCreationTokens1h,
|
|
UsageSemantic: "anthropic",
|
|
}
|
|
|
|
openAIUsage := buildOpenAIStyleUsageFromClaudeUsage(usage)
|
|
|
|
if openAIUsage.PromptTokens != tt.expectedTotalInputToken {
|
|
t.Fatalf("PromptTokens = %d, want %d", openAIUsage.PromptTokens, tt.expectedTotalInputToken)
|
|
}
|
|
if openAIUsage.InputTokens != tt.expectedTotalInputToken {
|
|
t.Fatalf("InputTokens = %d, want %d", openAIUsage.InputTokens, tt.expectedTotalInputToken)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestBuildOpenAIStyleUsageFromClaudeUsageDefaultsAggregateCacheCreationTo5m(t *testing.T) {
|
|
usage := &dto.Usage{
|
|
PromptTokens: 100,
|
|
CompletionTokens: 20,
|
|
PromptTokensDetails: dto.InputTokenDetails{
|
|
CachedTokens: 30,
|
|
CachedCreationTokens: 50,
|
|
},
|
|
UsageSemantic: "anthropic",
|
|
}
|
|
|
|
openAIUsage := buildOpenAIStyleUsageFromClaudeUsage(usage)
|
|
|
|
require.Equal(t, 50, openAIUsage.ClaudeCacheCreation5mTokens)
|
|
require.Equal(t, 0, openAIUsage.ClaudeCacheCreation1hTokens)
|
|
}
|
|
|
|
func TestOpenAIChatRequestToClaudeMessages_ClaudeOpus48HighUsesAdaptiveThinking(t *testing.T) {
|
|
request := dto.GeneralOpenAIRequest{
|
|
Model: "claude-opus-4-8-high",
|
|
Temperature: commonPointer(0.7),
|
|
TopP: commonPointer(0.9),
|
|
TopK: commonPointer(40),
|
|
Messages: []dto.Message{
|
|
{
|
|
Role: "user",
|
|
Content: "hello",
|
|
},
|
|
},
|
|
}
|
|
|
|
claudeRequest, err := relayconvert.OpenAIChatRequestToClaudeMessages(nil, &relaycommon.RelayInfo{}, request)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "claude-opus-4-8", claudeRequest.Model)
|
|
require.NotNil(t, claudeRequest.Thinking)
|
|
require.Equal(t, "adaptive", claudeRequest.Thinking.Type)
|
|
require.Equal(t, "summarized", claudeRequest.Thinking.Display)
|
|
require.JSONEq(t, `{"effort":"high"}`, string(claudeRequest.OutputConfig))
|
|
require.Nil(t, claudeRequest.Temperature)
|
|
require.Nil(t, claudeRequest.TopP)
|
|
require.Nil(t, claudeRequest.TopK)
|
|
}
|
|
|
|
func TestOpenAIChatRequestToClaudeMessages_ClaudeOpus48ThinkingUsesAdaptiveHighEffort(t *testing.T) {
|
|
request := dto.GeneralOpenAIRequest{
|
|
Model: "claude-opus-4-8-thinking",
|
|
Temperature: commonPointer(0.7),
|
|
TopP: commonPointer(0.9),
|
|
TopK: commonPointer(40),
|
|
Messages: []dto.Message{
|
|
{
|
|
Role: "user",
|
|
Content: "hello",
|
|
},
|
|
},
|
|
}
|
|
|
|
claudeRequest, err := relayconvert.OpenAIChatRequestToClaudeMessages(nil, &relaycommon.RelayInfo{}, request)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "claude-opus-4-8", claudeRequest.Model)
|
|
require.NotNil(t, claudeRequest.Thinking)
|
|
require.Equal(t, "adaptive", claudeRequest.Thinking.Type)
|
|
require.Equal(t, "summarized", claudeRequest.Thinking.Display)
|
|
require.JSONEq(t, `{"effort":"high"}`, string(claudeRequest.OutputConfig))
|
|
require.Nil(t, claudeRequest.Temperature)
|
|
require.Nil(t, claudeRequest.TopP)
|
|
require.Nil(t, claudeRequest.TopK)
|
|
}
|