mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-12 15:21:09 +00:00
Calcium-Ion
0ed497f066
* feat(relaykit): preserve hosted tools across conversions - add protocol-neutral hosted-tool DTOs, conversion metadata, and loss policies - bridge citations, grounding metadata, and hosted-tool stream lifecycles - document the public conversion behavior and channel policy controls * refactor(relaykit): normalize reasoning and thinking intent - centralize provider-neutral reasoning intent, effort, and budget mappings - parse model suffixes at the host entry boundary while preserving provider-owned tails - keep adaptive Claude thinking and explicit zero-token compatibility consistent * fix(billing): preserve authoritative usage across relay hops - carry native BillingUsage sidecars through direct and streamed protocol bridges - merge partial and terminal usage monotonically with safe fallback settlement - retain cache metadata, penultimate usage, and per-call Gemini tool surcharges * feat(relay): bridge Responses with Claude and Gemini protocols - add direct request, response, and stream converters across supported relay formats - expose Claude count_tokens and Chat-to-Responses compatibility endpoints - carry conversion diagnostics through the host while retaining the curated public goldens * fix(relay): wire relaykit conversions into host channels - connect handlers, adaptors, and channel settings to the standalone conversion layer - keep model mapping, pricing identity, retries, and provider-specific suffix behavior aligned - ignore local audit artifacts and retain focused public regression coverage
68 lines
1.7 KiB
Go
68 lines
1.7 KiB
Go
package dto
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMergeClaudeUsageCacheCreationReplacesWholeObject(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
merged := mergeClaudeUsageNonZero(
|
|
&ClaudeUsage{
|
|
CacheCreation: &ClaudeCacheCreationUsage{Ephemeral1hInputTokens: 1000},
|
|
},
|
|
&ClaudeUsage{
|
|
CacheCreation: &ClaudeCacheCreationUsage{
|
|
Ephemeral5mInputTokens: 1000,
|
|
Ephemeral1hInputTokens: 0,
|
|
},
|
|
},
|
|
)
|
|
|
|
require.NotNil(t, merged.CacheCreation)
|
|
assert.Equal(t, 1000, merged.CacheCreation.Ephemeral5mInputTokens)
|
|
assert.Equal(t, 0, merged.CacheCreation.Ephemeral1hInputTokens)
|
|
}
|
|
|
|
func TestMergeGeminiUsageMetadataCandidatesAndThoughtsReplacedAsPair(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
merged := MergeGeminiUsageMetadataNonZero(
|
|
&GeminiUsageMetadata{
|
|
PromptTokenCount: 10,
|
|
ThoughtsTokenCount: 100,
|
|
},
|
|
&GeminiUsageMetadata{
|
|
PromptTokenCount: 10,
|
|
CandidatesTokenCount: 150,
|
|
ThoughtsTokenCount: 0,
|
|
TotalTokenCount: 160,
|
|
},
|
|
)
|
|
require.NotNil(t, merged)
|
|
assert.Equal(t, 150, merged.CandidatesTokenCount)
|
|
assert.Equal(t, 0, merged.ThoughtsTokenCount)
|
|
|
|
billing := NewGeminiChatBillingUsage(merged)
|
|
usage, ok := billing.CanonicalUsage()
|
|
require.True(t, ok)
|
|
assert.Equal(t, 150, usage.CompletionTokens)
|
|
}
|
|
|
|
func TestMergeUsageNonZeroKeepsPositiveValuesAndTakesMaxTotal(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
merged := MergeUsageNonZero(
|
|
&Usage{PromptTokens: 10, CompletionTokens: 5, TotalTokens: 15},
|
|
&Usage{PromptTokens: 0, CompletionTokens: 0, TotalTokens: 20},
|
|
)
|
|
|
|
require.NotNil(t, merged)
|
|
assert.Equal(t, 10, merged.PromptTokens)
|
|
assert.Equal(t, 5, merged.CompletionTokens)
|
|
assert.Equal(t, 20, merged.TotalTokens)
|
|
}
|