Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d4a470a6
authored
Mar 25, 2026
by
Seefs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: restore pre-3400 OpenRouter billing semantics
parent
9f61407b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
12 deletions
+14
-12
service/text_quota.go
+5
-4
service/text_quota_test.go
+9
-8
No files found.
service/text_quota.go
View file @
d4a470a6
...
...
@@ -113,8 +113,9 @@ func calculateTextQuotaSummary(ctx *gin.Context, relayInfo *relaycommon.RelayInf
summary
.
ImageTokens
=
usage
.
PromptTokensDetails
.
ImageTokens
summary
.
AudioTokens
=
usage
.
PromptTokensDetails
.
AudioTokens
legacyClaudeDerived
:=
isLegacyClaudeDerivedOpenAIUsage
(
relayInfo
,
usage
)
isOpenRouter
:=
relayInfo
.
ChannelMeta
!=
nil
&&
relayInfo
.
ChannelType
==
constant
.
ChannelTypeOpenRouter
isOpenRouterClaudeBilling
:=
isOpenRouter
&&
summary
.
IsClaudeUsageSemantic
isOpenRouterClaudeBilling
:=
relayInfo
.
ChannelMeta
!=
nil
&&
relayInfo
.
ChannelType
==
constant
.
ChannelTypeOpenRouter
&&
summary
.
IsClaudeUsageSemantic
if
isOpenRouterClaudeBilling
{
summary
.
PromptTokens
-=
summary
.
CacheTokens
...
...
@@ -199,7 +200,7 @@ func calculateTextQuotaSummary(ctx *gin.Context, relayInfo *relaycommon.RelayInf
var
cachedTokensWithRatio
decimal
.
Decimal
if
!
dCacheTokens
.
IsZero
()
{
if
!
summary
.
IsClaudeUsageSemantic
&&
!
legacyClaudeDerived
&&
!
isOpenRouter
{
if
!
summary
.
IsClaudeUsageSemantic
&&
!
legacyClaudeDerived
{
baseTokens
=
baseTokens
.
Sub
(
dCacheTokens
)
}
cachedTokensWithRatio
=
dCacheTokens
.
Mul
(
dCacheRatio
)
...
...
@@ -208,7 +209,7 @@ func calculateTextQuotaSummary(ctx *gin.Context, relayInfo *relaycommon.RelayInf
var
cachedCreationTokensWithRatio
decimal
.
Decimal
hasSplitCacheCreationTokens
:=
summary
.
CacheCreationTokens5m
>
0
||
summary
.
CacheCreationTokens1h
>
0
if
!
dCachedCreationTokens
.
IsZero
()
||
hasSplitCacheCreationTokens
{
if
!
summary
.
IsClaudeUsageSemantic
&&
!
legacyClaudeDerived
&&
!
isOpenRouter
{
if
!
summary
.
IsClaudeUsageSemantic
&&
!
legacyClaudeDerived
{
baseTokens
=
baseTokens
.
Sub
(
dCachedCreationTokens
)
cachedCreationTokensWithRatio
=
dCachedCreationTokens
.
Mul
(
dCacheCreationRatio
)
}
else
{
...
...
service/text_quota_test.go
View file @
d4a470a6
...
...
@@ -206,7 +206,7 @@ func TestCalculateTextQuotaSummaryHandlesLegacyClaudeDerivedOpenAIUsage(t *testi
require
.
Equal
(
t
,
1624
,
summary
.
Quota
)
}
func
TestCalculateTextQuotaSummary
DoesNotSubtractOpenRouterCacheTokensFromPrompt
(
t
*
testing
.
T
)
{
func
TestCalculateTextQuotaSummary
SeparatesOpenRouterCacheReadFromPromptBilling
(
t
*
testing
.
T
)
{
gin
.
SetMode
(
gin
.
TestMode
)
w
:=
httptest
.
NewRecorder
()
ctx
,
_
:=
gin
.
CreateTestContext
(
w
)
...
...
@@ -236,13 +236,14 @@ func TestCalculateTextQuotaSummaryDoesNotSubtractOpenRouterCacheTokensFromPrompt
summary
:=
calculateTextQuotaSummary
(
ctx
,
relayInfo
,
usage
)
// OpenRouter usage is already normalized. prompt_tokens should stay intact.
// quota = 2604 + 2432*0.1 + 383 = 3230.2 => 3230
// OpenRouter OpenAI-format display keeps prompt_tokens as total input,
// but billing still separates normal input from cache read tokens.
// quota = (2604 - 2432) + 2432*0.1 + 383 = 798.2 => 798
require
.
Equal
(
t
,
2604
,
summary
.
PromptTokens
)
require
.
Equal
(
t
,
3230
,
summary
.
Quota
)
require
.
Equal
(
t
,
798
,
summary
.
Quota
)
}
func
TestCalculateTextQuotaSummary
DoesNotSubtractOpenRouterCacheCreationTokensFromPrompt
(
t
*
testing
.
T
)
{
func
TestCalculateTextQuotaSummary
SeparatesOpenRouterCacheCreationFromPromptBilling
(
t
*
testing
.
T
)
{
gin
.
SetMode
(
gin
.
TestMode
)
w
:=
httptest
.
NewRecorder
()
ctx
,
_
:=
gin
.
CreateTestContext
(
w
)
...
...
@@ -271,10 +272,10 @@ func TestCalculateTextQuotaSummaryDoesNotSubtractOpenRouterCacheCreationTokensFr
summary
:=
calculateTextQuotaSummary
(
ctx
,
relayInfo
,
usage
)
//
OpenRouter usage is already normalized. prompt_tokens should stay intact
.
// quota =
2604 + 100*1.25 + 383 = 31
12
//
prompt_tokens is still logged as total input, but cache creation is billed separately
.
// quota =
(2604 - 100) + 100*1.25 + 383 = 30
12
require
.
Equal
(
t
,
2604
,
summary
.
PromptTokens
)
require
.
Equal
(
t
,
3
1
12
,
summary
.
Quota
)
require
.
Equal
(
t
,
3
0
12
,
summary
.
Quota
)
}
func
TestCalculateTextQuotaSummaryKeepsPrePRClaudeOpenRouterBilling
(
t
*
testing
.
T
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment