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
295 lines
9.9 KiB
Go
295 lines
9.9 KiB
Go
package model
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/dto"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func resetPricingEndpointTestTables(t *testing.T) {
|
|
t.Helper()
|
|
originalMemoryCacheEnabled := common.MemoryCacheEnabled
|
|
common.MemoryCacheEnabled = true
|
|
require.NoError(t, DB.AutoMigrate(&Channel{}, &Ability{}, &Model{}, &Vendor{}))
|
|
for _, table := range []string{"abilities", "channels", "models", "vendors"} {
|
|
require.NoError(t, DB.Exec("DELETE FROM "+table).Error)
|
|
}
|
|
InitChannelCache()
|
|
InvalidatePricingCache()
|
|
t.Cleanup(func() {
|
|
for _, table := range []string{"abilities", "channels", "models", "vendors"} {
|
|
require.NoError(t, DB.Exec("DELETE FROM "+table).Error)
|
|
}
|
|
InitChannelCache()
|
|
InvalidatePricingCache()
|
|
common.MemoryCacheEnabled = originalMemoryCacheEnabled
|
|
})
|
|
}
|
|
|
|
func insertPricingEndpointChannel(t *testing.T, channelID int, channelType int, settings dto.ChannelOtherSettings) {
|
|
t.Helper()
|
|
channel := &Channel{
|
|
Id: channelID,
|
|
Type: channelType,
|
|
Key: fmt.Sprintf("key-%d", channelID),
|
|
Status: common.ChannelStatusEnabled,
|
|
Name: fmt.Sprintf("channel-%d", channelID),
|
|
}
|
|
if settings.AdvancedCustom != nil {
|
|
channel.SetOtherSettings(settings)
|
|
}
|
|
require.NoError(t, DB.Create(channel).Error)
|
|
}
|
|
|
|
func insertPricingEndpointAbility(t *testing.T, channelID int, modelName string) {
|
|
t.Helper()
|
|
require.NoError(t, DB.Create(&Ability{
|
|
Group: "default",
|
|
Model: modelName,
|
|
ChannelId: channelID,
|
|
Enabled: true,
|
|
}).Error)
|
|
}
|
|
|
|
func pricingEndpointAdvancedCustomConfig(routes ...dto.AdvancedCustomRoute) dto.ChannelOtherSettings {
|
|
return dto.ChannelOtherSettings{
|
|
AdvancedCustom: &dto.AdvancedCustomConfig{
|
|
Routes: routes,
|
|
},
|
|
}
|
|
}
|
|
|
|
func pricingEndpointTypesByModel(t *testing.T) map[string][]constant.EndpointType {
|
|
t.Helper()
|
|
InitChannelCache()
|
|
return pricingEndpointTypesFromPricing(GetPricing())
|
|
}
|
|
|
|
func pricingEndpointTypesFromPricing(pricings []Pricing) map[string][]constant.EndpointType {
|
|
byModel := make(map[string][]constant.EndpointType)
|
|
for _, pricing := range pricings {
|
|
byModel[pricing.ModelName] = pricing.SupportedEndpointTypes
|
|
}
|
|
return byModel
|
|
}
|
|
|
|
func TestPricingAdvancedCustomUsesConfiguredEndpointTypes(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 101, constant.ChannelTypeAdvancedCustom, pricingEndpointAdvancedCustomConfig(
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
},
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: "openai_responses_to_gemini_generate_content",
|
|
Models: []string{"re:^gemini-"},
|
|
},
|
|
))
|
|
insertPricingEndpointAbility(t, 101, "gemini-2.5-flash")
|
|
insertPricingEndpointAbility(t, 101, "gpt-4o")
|
|
|
|
byModel := pricingEndpointTypesByModel(t)
|
|
|
|
assert.Equal(t, []constant.EndpointType{
|
|
constant.EndpointTypeOpenAI,
|
|
constant.EndpointTypeOpenAIResponse,
|
|
}, byModel["gemini-2.5-flash"])
|
|
assert.Equal(t, []constant.EndpointType{
|
|
constant.EndpointTypeOpenAI,
|
|
}, byModel["gpt-4o"])
|
|
}
|
|
|
|
func TestPricingModelMetadataEndpointsMergeWithAdvancedCustomInference(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 103, constant.ChannelTypeAdvancedCustom, pricingEndpointAdvancedCustomConfig(
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: "openai_responses_to_gemini_generate_content",
|
|
Models: []string{"re:^gemini-"},
|
|
},
|
|
))
|
|
insertPricingEndpointAbility(t, 103, "gemini-2.5-flash")
|
|
require.NoError(t, DB.Create(&Model{
|
|
ModelName: "gemini-2.5-flash",
|
|
Endpoints: `{
|
|
"openai": "/v1/chat/completions"
|
|
}`,
|
|
Status: 1,
|
|
NameRule: NameRuleExact,
|
|
}).Error)
|
|
|
|
byModel := pricingEndpointTypesByModel(t)
|
|
|
|
assert.Equal(t, []constant.EndpointType{
|
|
constant.EndpointTypeOpenAIResponse,
|
|
constant.EndpointTypeOpenAI,
|
|
}, byModel["gemini-2.5-flash"])
|
|
}
|
|
|
|
func TestPricingModelMetadataEndpointsCanProvideEndpointWithoutChannelInference(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 104, constant.ChannelTypeAdvancedCustom, pricingEndpointAdvancedCustomConfig(
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: "openai_responses_to_gemini_generate_content",
|
|
Models: []string{"re:^gemini-"},
|
|
},
|
|
))
|
|
insertPricingEndpointAbility(t, 104, "metadata-only-model")
|
|
require.NoError(t, DB.Create(&Model{
|
|
ModelName: "metadata-only-model",
|
|
Endpoints: `{
|
|
"openai": "/v1/chat/completions"
|
|
}`,
|
|
Status: 1,
|
|
NameRule: NameRuleExact,
|
|
}).Error)
|
|
|
|
byModel := pricingEndpointTypesByModel(t)
|
|
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAI}, byModel["metadata-only-model"])
|
|
}
|
|
|
|
func TestPricingAdvancedCustomMissingConfigFallsBackToChannelType(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 102, constant.ChannelTypeAdvancedCustom, dto.ChannelOtherSettings{})
|
|
insertPricingEndpointAbility(t, 102, "gpt-4o")
|
|
|
|
byModel := pricingEndpointTypesByModel(t)
|
|
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAI}, byModel["gpt-4o"])
|
|
}
|
|
|
|
func TestPricingNativeChannelEndpointTypesUnchanged(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 201, constant.ChannelTypeOpenAI, dto.ChannelOtherSettings{})
|
|
insertPricingEndpointChannel(t, 202, constant.ChannelTypeGemini, dto.ChannelOtherSettings{})
|
|
insertPricingEndpointChannel(t, 203, constant.ChannelTypeAnthropic, dto.ChannelOtherSettings{})
|
|
insertPricingEndpointAbility(t, 201, "gpt-4o")
|
|
insertPricingEndpointAbility(t, 202, "gemini-2.5-flash")
|
|
insertPricingEndpointAbility(t, 203, "claude-3-5-sonnet")
|
|
|
|
byModel := pricingEndpointTypesByModel(t)
|
|
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAI}, byModel["gpt-4o"])
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeGemini, constant.EndpointTypeOpenAI}, byModel["gemini-2.5-flash"])
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeAnthropic, constant.EndpointTypeOpenAI}, byModel["claude-3-5-sonnet"])
|
|
}
|
|
|
|
func TestInitChannelCacheInvalidatesPricingCache(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 301, constant.ChannelTypeAdvancedCustom, pricingEndpointAdvancedCustomConfig(
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
},
|
|
))
|
|
insertPricingEndpointAbility(t, 301, "gemini-3.5-flash")
|
|
InitChannelCache()
|
|
|
|
initial := pricingEndpointTypesByModel(t)
|
|
require.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAI}, initial["gemini-3.5-flash"])
|
|
|
|
var channel Channel
|
|
require.NoError(t, DB.First(&channel, "id = ?", 301).Error)
|
|
channel.SetOtherSettings(pricingEndpointAdvancedCustomConfig(
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
},
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: "openai_responses_to_gemini_generate_content",
|
|
Models: []string{"re:^gemini-"},
|
|
},
|
|
))
|
|
require.NoError(t, DB.Model(&Channel{}).Where("id = ?", 301).Update("settings", channel.OtherSettings).Error)
|
|
InitChannelCache()
|
|
|
|
updated := pricingEndpointTypesByModel(t)
|
|
assert.Equal(t, []constant.EndpointType{
|
|
constant.EndpointTypeOpenAI,
|
|
constant.EndpointTypeOpenAIResponse,
|
|
}, updated["gemini-3.5-flash"])
|
|
}
|
|
|
|
func TestInitChannelCacheInvalidatesStartupPricingBuiltBeforeChannelCache(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
insertPricingEndpointChannel(t, 302, constant.ChannelTypeAdvancedCustom, pricingEndpointAdvancedCustomConfig(
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
},
|
|
dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: "openai_responses_to_gemini_generate_content",
|
|
Models: []string{"re:^gemini-"},
|
|
},
|
|
))
|
|
insertPricingEndpointAbility(t, 302, "gemini-3.5-flash")
|
|
|
|
staleByModel := pricingEndpointTypesFromPricing(GetPricing())
|
|
require.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAI}, staleByModel["gemini-3.5-flash"])
|
|
|
|
InitChannelCache()
|
|
|
|
rebuiltByModel := pricingEndpointTypesFromPricing(GetPricing())
|
|
assert.Equal(t, []constant.EndpointType{
|
|
constant.EndpointTypeOpenAI,
|
|
constant.EndpointTypeOpenAIResponse,
|
|
}, rebuiltByModel["gemini-3.5-flash"])
|
|
}
|
|
|
|
func TestCacheUpdateChannelSyncsAdvancedCustomConfig(t *testing.T) {
|
|
resetPricingEndpointTestTables(t)
|
|
|
|
channel := &Channel{
|
|
Id: 401,
|
|
Type: constant.ChannelTypeAdvancedCustom,
|
|
Key: "key-401",
|
|
Status: common.ChannelStatusEnabled,
|
|
Name: "channel-401",
|
|
}
|
|
channel.SetOtherSettings(pricingEndpointAdvancedCustomConfig(dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/responses",
|
|
UpstreamPath: "/v1beta/models/{model}:generateContent",
|
|
Converter: "openai_responses_to_gemini_generate_content",
|
|
}))
|
|
CacheUpdateChannel(channel)
|
|
|
|
require.NotNil(t, channel2advancedCustomConfig[401])
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAIResponse}, channel2advancedCustomConfig[401].SupportedEndpointTypesForModel("gemini-3.5-flash"))
|
|
|
|
channel.SetOtherSettings(pricingEndpointAdvancedCustomConfig(dto.AdvancedCustomRoute{
|
|
IncomingPath: "/v1/chat/completions",
|
|
UpstreamPath: "/v1/chat/completions",
|
|
}))
|
|
CacheUpdateChannel(channel)
|
|
|
|
require.NotNil(t, channel2advancedCustomConfig[401])
|
|
assert.Equal(t, []constant.EndpointType{constant.EndpointTypeOpenAI}, channel2advancedCustomConfig[401].SupportedEndpointTypesForModel("gemini-3.5-flash"))
|
|
|
|
channel.Type = constant.ChannelTypeOpenAI
|
|
CacheUpdateChannel(channel)
|
|
|
|
assert.Nil(t, channel2advancedCustomConfig[401])
|
|
}
|