oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1590 from yyhhyyyyyy/fix/openrouter-custom-ratio-billing

Browse Source 
fix: prevent OpenRouter cache calculation with custom model ratios
This commit is contained in:
Calcium-Ion
2025-08-15 15:02:57 +08:00
committed by GitHub
parent 1cb63063f7 039b00d695
commit 5a2dad2e16
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
service/quota.go
View File

@@ -38,6 +38,14 @@ type QuotaInfo struct {
GroupRatio float64 GroupRatio float64
} }
func hasCustomModelRatio(modelName string, currentRatio float64) bool {
defaultRatio, exists := ratio_setting.GetDefaultModelRatioMap()[modelName]
if !exists {
return true
}
return currentRatio != defaultRatio
}
func calculateAudioQuota(info QuotaInfo) int { func calculateAudioQuota(info QuotaInfo) int {
if info.UsePrice { if info.UsePrice {
modelPrice := decimal.NewFromFloat(info.ModelPrice) modelPrice := decimal.NewFromFloat(info.ModelPrice)
@@ -246,9 +254,10 @@ func PostClaudeConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo,
if relayInfo.ChannelType == constant.ChannelTypeOpenRouter { if relayInfo.ChannelType == constant.ChannelTypeOpenRouter {
promptTokens -= cacheTokens promptTokens -= cacheTokens
if cacheCreationTokens == 0 && relayInfo.PriceData.CacheCreationRatio != 1 && usage.Cost != 0 { isUsingCustomSettings := relayInfo.PriceData.UsePrice || hasCustomModelRatio(modelName, relayInfo.PriceData.ModelRatio)
if cacheCreationTokens == 0 && relayInfo.PriceData.CacheCreationRatio != 1 && usage.Cost != 0 && !isUsingCustomSettings {
maybeCacheCreationTokens := CalcOpenRouterCacheCreateTokens(*usage, relayInfo.PriceData) maybeCacheCreationTokens := CalcOpenRouterCacheCreateTokens(*usage, relayInfo.PriceData)
if promptTokens >= maybeCacheCreationTokens { if maybeCacheCreationTokens >= 0 && promptTokens >= maybeCacheCreationTokens {
cacheCreationTokens = maybeCacheCreationTokens cacheCreationTokens = maybeCacheCreationTokens
} }
} }