mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-10 22:20:25 +00:00
Calcium-Ion
bbd97446c2
Deferred follow-ups from the relaykit-tools review cycle, verified by live end-to-end billing tests: - billing: normalize Gemini modality keys consistently between stream merge and settlement (case/whitespace variants no longer drop independent audio/image pricing) and sum duplicate modality entries on both paths - billing: sync legacy flat Claude cache-creation fields from the CacheCreation sub-object (including zeroing) and fall back to flat fields only when the snapshot never carried a sub-object, closing a stale 1h-cache overcharge path in cascaded deployments - relay: move Chat-to-Claude and Chat-to-Gemini stream conversion state from gin.Context onto RelayInfo and reset it with SendResponseCount in InitChannelMeta, so channel retries start clean while per-request state (stream error collection, conversion diagnostics, channel chain, billing accumulators) survives - relay: Claude channel now serves Gemini-format clients (request via registry conversion, response and stream composed through the Chat pivot), removing the last unimplemented conversion direction - relaykit: recognize legacy pseudo tool names (googleSearch, codeExecution, urlContext) in the toolconv decode stage and drop the string-matching bypass in the Chat-to-Gemini converter; native Gemini tool output is restored and non-Gemini targets follow standard loss diagnostics - relaykit: attach upstream Gemini usage (with billing_usage sidecar) to intermediate stream chunks so converted Claude streams report upstream truth from message_start, and preserve the sidecar through Claude stream usage merges; billing settlement unchanged - billing: clamp negative Total-Prompt completion derivation, OR the Estimated flag across cross-dialect snapshot replacement, and fill canonical OpenAI prompt details via field-wise merge
122 lines
4.6 KiB
Go
122 lines
4.6 KiB
Go
package dto
|
|
|
|
import (
|
|
"testing"
|
|
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestNewGeminiChatBillingUsageRequiresTokenContent(t *testing.T) {
|
|
require.Nil(t, NewGeminiChatBillingUsage(nil))
|
|
require.Nil(t, NewGeminiChatBillingUsage(&GeminiUsageMetadata{}))
|
|
|
|
billingUsage := NewGeminiChatBillingUsage(&GeminiUsageMetadata{PromptTokenCount: 1})
|
|
require.NotNil(t, billingUsage)
|
|
require.NotNil(t, billingUsage.GeminiUsageMetadata)
|
|
assert.Equal(t, BillingUsageSourceGeminiChat, billingUsage.Source)
|
|
assert.Equal(t, BillingUsageSemanticGemini, billingUsage.Semantic)
|
|
assert.False(t, billingUsage.Estimated)
|
|
}
|
|
|
|
func TestNewClaudeMessagesBillingUsageRequiresTokenContent(t *testing.T) {
|
|
require.Nil(t, NewClaudeMessagesBillingUsage(nil))
|
|
require.Nil(t, NewClaudeMessagesBillingUsage(&ClaudeUsage{}))
|
|
require.Nil(t, NewClaudeMessagesBillingUsage(&ClaudeUsage{CacheCreation: &ClaudeCacheCreationUsage{}}))
|
|
|
|
billingUsage := NewClaudeMessagesBillingUsage(&ClaudeUsage{InputTokens: 1})
|
|
require.NotNil(t, billingUsage)
|
|
require.NotNil(t, billingUsage.ClaudeUsage)
|
|
assert.Equal(t, BillingUsageSourceClaudeMessages, billingUsage.Source)
|
|
assert.Equal(t, BillingUsageSemanticAnthropic, billingUsage.Semantic)
|
|
|
|
cacheOnly := NewClaudeMessagesBillingUsage(&ClaudeUsage{
|
|
CacheCreation: &ClaudeCacheCreationUsage{Ephemeral5mInputTokens: 4},
|
|
})
|
|
require.NotNil(t, cacheOnly)
|
|
}
|
|
|
|
func TestNewOpenAIChatBillingUsageRequiresTokenContent(t *testing.T) {
|
|
require.Nil(t, NewOpenAIChatBillingUsage(nil))
|
|
require.Nil(t, NewOpenAIChatBillingUsage(&Usage{}))
|
|
|
|
billingUsage := NewOpenAIChatBillingUsage(&Usage{PromptTokens: 1})
|
|
require.NotNil(t, billingUsage)
|
|
require.NotNil(t, billingUsage.OpenAIUsage)
|
|
assert.Equal(t, BillingUsageSourceOAIChat, billingUsage.Source)
|
|
assert.Equal(t, BillingUsageSemanticOpenAI, billingUsage.Semantic)
|
|
assert.Equal(t, 1, billingUsage.OpenAIUsage.PromptTokens)
|
|
}
|
|
|
|
func TestNewEstimatedGeminiChatBillingUsage(t *testing.T) {
|
|
billingUsage := NewEstimatedGeminiChatBillingUsage(&Usage{
|
|
PromptTokens: 11,
|
|
CompletionTokens: 7,
|
|
})
|
|
|
|
require.NotNil(t, billingUsage)
|
|
require.NotNil(t, billingUsage.GeminiUsageMetadata)
|
|
assert.True(t, billingUsage.Estimated)
|
|
assert.Equal(t, 11, billingUsage.GeminiUsageMetadata.PromptTokenCount)
|
|
assert.Equal(t, 7, billingUsage.GeminiUsageMetadata.CandidatesTokenCount)
|
|
assert.Equal(t, 18, billingUsage.GeminiUsageMetadata.TotalTokenCount)
|
|
}
|
|
|
|
func TestCanonicalGeminiUsageClampsNegativeCompletionFromTotalMinusPrompt(t *testing.T) {
|
|
usage, ok := NewGeminiChatBillingUsage(&GeminiUsageMetadata{
|
|
PromptTokenCount: 50,
|
|
TotalTokenCount: 30,
|
|
}).CanonicalUsage()
|
|
require.True(t, ok)
|
|
assert.Equal(t, 0, usage.CompletionTokens)
|
|
}
|
|
|
|
func TestCanonicalOpenAIUsageMergesInputTokenDetailsFieldwise(t *testing.T) {
|
|
usage, ok := NewOpenAIResponsesBillingUsage(&Usage{
|
|
PromptTokens: 10,
|
|
PromptTokensDetails: InputTokenDetails{
|
|
CachedTokens: 8,
|
|
TextTokens: 12,
|
|
ImageTokens: 4,
|
|
AudioTokens: 3,
|
|
},
|
|
InputTokensDetails: &InputTokenDetails{
|
|
CachedTokens: 5,
|
|
CachedCreationTokens: 7,
|
|
TextTokens: 2,
|
|
},
|
|
}).CanonicalUsage()
|
|
require.True(t, ok)
|
|
assert.Equal(t, 8, usage.PromptTokensDetails.CachedTokens)
|
|
assert.Equal(t, 12, usage.PromptTokensDetails.TextTokens)
|
|
assert.Equal(t, 4, usage.PromptTokensDetails.ImageTokens)
|
|
assert.Equal(t, 3, usage.PromptTokensDetails.AudioTokens)
|
|
assert.Equal(t, 7, usage.PromptTokensDetails.CachedCreationTokens)
|
|
}
|
|
|
|
func TestBillingUsageJSONUsesProtocolNamedFields(t *testing.T) {
|
|
billingUsage := &BillingUsage{
|
|
OpenAIUsage: &Usage{PromptTokens: 1, BillingUsage: NewClaudeMessagesBillingUsage(&ClaudeUsage{InputTokens: 9})},
|
|
ClaudeUsage: &ClaudeUsage{InputTokens: 2, BillingUsage: NewOpenAIChatBillingUsage(&Usage{PromptTokens: 8})},
|
|
GeminiUsageMetadata: &GeminiUsageMetadata{PromptTokenCount: 3, BillingUsage: NewOpenAIChatBillingUsage(&Usage{PromptTokens: 7})},
|
|
}
|
|
|
|
data, err := kitutil.Marshal(billingUsage)
|
|
require.NoError(t, err)
|
|
|
|
assert.Contains(t, string(data), `"openai_usage"`)
|
|
assert.Contains(t, string(data), `"claude_usage"`)
|
|
assert.Contains(t, string(data), `"gemini_usage_metadata"`)
|
|
assert.NotContains(t, string(data), `"usage":`)
|
|
assert.NotContains(t, string(data), `"usage_metadata"`)
|
|
|
|
clone := CloneBillingUsage(billingUsage)
|
|
require.NotNil(t, clone.OpenAIUsage)
|
|
require.NotNil(t, clone.ClaudeUsage)
|
|
require.NotNil(t, clone.GeminiUsageMetadata)
|
|
assert.Nil(t, clone.OpenAIUsage.BillingUsage)
|
|
assert.Nil(t, clone.ClaudeUsage.BillingUsage)
|
|
assert.Nil(t, clone.GeminiUsageMetadata.BillingUsage)
|
|
}
|