mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-12 15:21:09 +00:00
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
23 lines
704 B
Go
23 lines
704 B
Go
package oaichat
|
|
|
|
import (
|
|
"github.com/QuantumNous/new-api/service/relayconvert/internal/matcher"
|
|
"github.com/QuantumNous/new-api/setting/model_setting"
|
|
)
|
|
|
|
func ShouldChatCompletionsUseResponsesPolicy(policy model_setting.ChatCompletionsToResponsesPolicy, channelID int, channelType int, model string) bool {
|
|
if !policy.IsChannelEnabled(channelID, channelType) {
|
|
return false
|
|
}
|
|
return matcher.MatchAnyRegex(policy.ModelPatterns, model)
|
|
}
|
|
|
|
func ShouldChatCompletionsUseResponsesGlobal(channelID int, channelType int, model string) bool {
|
|
return ShouldChatCompletionsUseResponsesPolicy(
|
|
model_setting.GetGlobalSettings().ChatCompletionsToResponsesPolicy,
|
|
channelID,
|
|
channelType,
|
|
model,
|
|
)
|
|
}
|