* refactor: consolidate relay protocol converters * refactor relayconvert text converters * feat: refine relay converters and advanced custom routing * refactor: enhance logging and add thought signature handling for Gemini requests * refactor: enhance channel cache and pricing endpoint handling for advanced custom models * feat: preserve billing usage semantics * feat: add protocol-aware billing usage * Delete useless files * chore: update action versions in workflow files * chore: update Docker action versions in workflow files * fix: harden billing usage settlement and hot-path route matching - estimate Gemini completion tokens locally when billable usageMetadata is prompt-only but output content was received (e.g. client aborts the stream before the final chunk), and rebuild the attached billing_usage as estimated so settlement does not bill zero output tokens - guard NewClaudeMessagesBillingUsage against all-zero ClaudeUsage, matching the OpenAI/Gemini constructors, so a zero billing_usage cannot override a non-zero top-level usage during settlement - cache compiled advanced-custom route model regexes; they run on the request hot path and were recompiled per request - move the effectiveBillingUsage remap to PostTextConsumeQuota only, and document that calculateTextQuotaSummary expects remapped usage - document the updatePricingLock -> channelSyncLock lock ordering that InitChannelCache/CacheUpdateChannel rely on, and the aux-struct pitfall in GeminiChatResponse.UnmarshalJSON
138 lines
5.1 KiB
Go
138 lines
5.1 KiB
Go
package relayconvert
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/types"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestLookupBuiltinTextConverters(t *testing.T) {
|
|
tests := []struct {
|
|
id string
|
|
from types.RelayFormat
|
|
to types.RelayFormat
|
|
quality TextConverterQuality
|
|
reqSteps []string
|
|
respSteps []string
|
|
reqDirect bool
|
|
respDirect bool
|
|
respAlias string
|
|
streamDirect bool
|
|
}{
|
|
{id: ConverterClaudeMessagesToOpenAIChat, from: types.RelayFormatClaude, to: types.RelayFormatOpenAI, quality: TextConverterQualityFair, reqDirect: true, respDirect: true, respAlias: ResponseConverterClaudeMessagesToOAIChat},
|
|
{id: ConverterOpenAIChatToClaudeMessages, from: types.RelayFormatOpenAI, to: types.RelayFormatClaude, quality: TextConverterQualityFair, reqDirect: true, respDirect: true, respAlias: ResponseConverterOAIChatToClaudeMessages},
|
|
{id: ConverterGeminiContentToOpenAIChat, from: types.RelayFormatGemini, to: types.RelayFormatOpenAI, quality: TextConverterQualityFair, reqDirect: true, respDirect: true, respAlias: ResponseConverterGeminiChatToOAIChat},
|
|
{id: ConverterOpenAIChatToGeminiContent, from: types.RelayFormatOpenAI, to: types.RelayFormatGemini, quality: TextConverterQualityFair, reqDirect: true, respDirect: true, respAlias: ResponseConverterOAIChatToGeminiChat},
|
|
{id: ConverterOpenAIChatToOpenAIResponses, from: types.RelayFormatOpenAI, to: types.RelayFormatOpenAIResponses, quality: TextConverterQualityGood, reqDirect: true, respDirect: true, respAlias: ResponseConverterOAIChatToOAIResponses, streamDirect: true},
|
|
{id: ConverterOpenAIResponsesToOpenAIChat, from: types.RelayFormatOpenAIResponses, to: types.RelayFormatOpenAI, quality: TextConverterQualityGood, reqDirect: true, respDirect: true, respAlias: ResponseConverterOAIResponsesToOAIChat, streamDirect: true},
|
|
{
|
|
id: requestConverterClaudeToGemini,
|
|
from: types.RelayFormatClaude,
|
|
to: types.RelayFormatGemini,
|
|
quality: TextConverterQualityDiscouraged,
|
|
reqSteps: []string{
|
|
ConverterClaudeMessagesToOpenAIChat,
|
|
ConverterOpenAIChatToGeminiContent,
|
|
},
|
|
respSteps: []string{
|
|
ConverterClaudeMessagesToOpenAIChat,
|
|
ConverterOpenAIChatToGeminiContent,
|
|
},
|
|
respAlias: responseConverterClaudeToGemini,
|
|
},
|
|
{
|
|
id: requestConverterClaudeToResponses,
|
|
from: types.RelayFormatClaude,
|
|
to: types.RelayFormatOpenAIResponses,
|
|
quality: TextConverterQualityFair,
|
|
reqSteps: []string{
|
|
ConverterClaudeMessagesToOpenAIChat,
|
|
ConverterOpenAIChatToOpenAIResponses,
|
|
},
|
|
respSteps: []string{
|
|
ConverterClaudeMessagesToOpenAIChat,
|
|
ConverterOpenAIChatToOpenAIResponses,
|
|
},
|
|
respAlias: responseConverterClaudeToResponses,
|
|
},
|
|
{
|
|
id: requestConverterGeminiToClaude,
|
|
from: types.RelayFormatGemini,
|
|
to: types.RelayFormatClaude,
|
|
quality: TextConverterQualityDiscouraged,
|
|
reqSteps: []string{
|
|
ConverterGeminiContentToOpenAIChat,
|
|
ConverterOpenAIChatToClaudeMessages,
|
|
},
|
|
respSteps: []string{
|
|
ConverterGeminiContentToOpenAIChat,
|
|
ConverterOpenAIChatToClaudeMessages,
|
|
},
|
|
respAlias: responseConverterGeminiToClaude,
|
|
},
|
|
{
|
|
id: requestConverterGeminiToResponses,
|
|
from: types.RelayFormatGemini,
|
|
to: types.RelayFormatOpenAIResponses,
|
|
quality: TextConverterQualityFair,
|
|
reqSteps: []string{
|
|
ConverterGeminiContentToOpenAIChat,
|
|
ConverterOpenAIChatToOpenAIResponses,
|
|
},
|
|
respSteps: []string{
|
|
ConverterGeminiContentToOpenAIChat,
|
|
ConverterOpenAIChatToOpenAIResponses,
|
|
},
|
|
respAlias: responseConverterGeminiToResponses,
|
|
},
|
|
{
|
|
id: requestConverterResponsesToClaude,
|
|
from: types.RelayFormatOpenAIResponses,
|
|
to: types.RelayFormatClaude,
|
|
quality: TextConverterQualityFair,
|
|
reqDirect: true,
|
|
respSteps: []string{
|
|
ConverterOpenAIResponsesToOpenAIChat,
|
|
ConverterOpenAIChatToClaudeMessages,
|
|
},
|
|
respAlias: responseConverterResponsesToClaude,
|
|
},
|
|
{
|
|
id: ConverterOpenAIResponsesToGemini,
|
|
from: types.RelayFormatOpenAIResponses,
|
|
to: types.RelayFormatGemini,
|
|
quality: TextConverterQualityFair,
|
|
reqDirect: true,
|
|
respSteps: []string{
|
|
ConverterOpenAIResponsesToOpenAIChat,
|
|
ConverterOpenAIChatToGeminiContent,
|
|
},
|
|
respAlias: responseConverterResponsesToGemini,
|
|
},
|
|
}
|
|
|
|
require.Len(t, textConverters, len(tests))
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.id, func(t *testing.T) {
|
|
spec, ok := LookupTextConverter(tt.id)
|
|
require.True(t, ok)
|
|
assert.Equal(t, tt.id, spec.ID)
|
|
assert.Equal(t, tt.from, spec.From)
|
|
assert.Equal(t, tt.to, spec.To)
|
|
assert.Equal(t, tt.quality, spec.Quality)
|
|
assert.Equal(t, tt.reqSteps, spec.Req.StepConverters)
|
|
assert.Equal(t, tt.respSteps, spec.Resp.StepConverters)
|
|
assert.Equal(t, tt.reqDirect, spec.Req.Convert != nil)
|
|
assert.Equal(t, tt.respDirect, spec.Resp.Convert != nil)
|
|
assert.Equal(t, tt.streamDirect, spec.Resp.NewStreamState != nil && spec.Resp.ConvertStreamChunk != nil && spec.Resp.FinalizeStream != nil)
|
|
|
|
aliasSpec, ok := LookupTextConverter(tt.respAlias)
|
|
require.True(t, ok)
|
|
assert.Equal(t, tt.id, aliasSpec.ID)
|
|
})
|
|
}
|
|
}
|