Calcium-Ion
c36418c863
* 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
35 lines
1.2 KiB
Go
35 lines
1.2 KiB
Go
package dto
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGeminiChatResponseUsageMetadataPresence(t *testing.T) {
|
|
var missing GeminiChatResponse
|
|
require.NoError(t, common.Unmarshal([]byte(`{"candidates":[]}`), &missing))
|
|
assert.False(t, missing.HasUsageMetadata)
|
|
assert.Nil(t, missing.GetUsageMetadata())
|
|
|
|
var empty GeminiChatResponse
|
|
require.NoError(t, common.Unmarshal([]byte(`{"candidates":[],"usageMetadata":{}}`), &empty))
|
|
assert.True(t, empty.HasUsageMetadata)
|
|
require.NotNil(t, empty.GetUsageMetadata())
|
|
assert.False(t, HasGeminiUsageMetadataTokens(empty.GetUsageMetadata()))
|
|
|
|
var populated GeminiChatResponse
|
|
require.NoError(t, common.Unmarshal([]byte(`{"candidates":[],"usageMetadata":{"promptTokenCount":3}}`), &populated))
|
|
assert.True(t, populated.HasUsageMetadata)
|
|
require.NotNil(t, populated.GetUsageMetadata())
|
|
assert.True(t, HasGeminiUsageMetadataTokens(populated.GetUsageMetadata()))
|
|
}
|
|
|
|
func TestGeminiChatResponseMarshalKeepsUsageMetadataField(t *testing.T) {
|
|
data, err := common.Marshal(GeminiChatResponse{})
|
|
require.NoError(t, err)
|
|
assert.Contains(t, string(data), `"usageMetadata"`)
|
|
}
|