-
Notifications
You must be signed in to change notification settings - Fork 11.1k
fix: claude affinity cache counter #2980
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Calcium-Ion
merged 3 commits into
QuantumNous:main
from
seefs001:fix/channel-affinity-claude
Feb 22, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/QuantumNous/new-api/types" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestRelayInfoGetFinalRequestRelayFormatPrefersExplicitFinal(t *testing.T) { | ||
| info := &RelayInfo{ | ||
| RelayFormat: types.RelayFormatOpenAI, | ||
| RequestConversionChain: []types.RelayFormat{types.RelayFormatOpenAI, types.RelayFormatClaude}, | ||
| FinalRequestRelayFormat: types.RelayFormatOpenAIResponses, | ||
| } | ||
|
|
||
| require.Equal(t, types.RelayFormat(types.RelayFormatOpenAIResponses), info.GetFinalRequestRelayFormat()) | ||
| } | ||
|
|
||
| func TestRelayInfoGetFinalRequestRelayFormatFallsBackToConversionChain(t *testing.T) { | ||
| info := &RelayInfo{ | ||
| RelayFormat: types.RelayFormatOpenAI, | ||
| RequestConversionChain: []types.RelayFormat{types.RelayFormatOpenAI, types.RelayFormatClaude}, | ||
| } | ||
|
|
||
| require.Equal(t, types.RelayFormat(types.RelayFormatClaude), info.GetFinalRequestRelayFormat()) | ||
| } | ||
|
|
||
| func TestRelayInfoGetFinalRequestRelayFormatFallsBackToRelayFormat(t *testing.T) { | ||
| info := &RelayInfo{ | ||
| RelayFormat: types.RelayFormatGemini, | ||
| } | ||
|
|
||
| require.Equal(t, types.RelayFormat(types.RelayFormatGemini), info.GetFinalRequestRelayFormat()) | ||
| } | ||
|
|
||
| func TestRelayInfoGetFinalRequestRelayFormatNilReceiver(t *testing.T) { | ||
| var info *RelayInfo | ||
| require.Equal(t, types.RelayFormat(""), info.GetFinalRequestRelayFormat()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http/httptest" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/QuantumNous/new-api/dto" | ||
| "github.com/QuantumNous/new-api/types" | ||
| "github.com/gin-gonic/gin" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func buildChannelAffinityStatsContextForTest(ruleName, usingGroup, keyFP string) *gin.Context { | ||
| rec := httptest.NewRecorder() | ||
| ctx, _ := gin.CreateTestContext(rec) | ||
| setChannelAffinityContext(ctx, channelAffinityMeta{ | ||
| CacheKey: fmt.Sprintf("test:%s:%s:%s", ruleName, usingGroup, keyFP), | ||
| TTLSeconds: 600, | ||
| RuleName: ruleName, | ||
| UsingGroup: usingGroup, | ||
| KeyFingerprint: keyFP, | ||
| }) | ||
| return ctx | ||
| } | ||
|
|
||
| func TestObserveChannelAffinityUsageCacheByRelayFormat_ClaudeMode(t *testing.T) { | ||
| ruleName := fmt.Sprintf("rule_%d", time.Now().UnixNano()) | ||
| usingGroup := "default" | ||
| keyFP := fmt.Sprintf("fp_%d", time.Now().UnixNano()) | ||
| ctx := buildChannelAffinityStatsContextForTest(ruleName, usingGroup, keyFP) | ||
|
|
||
| usage := &dto.Usage{ | ||
| PromptTokens: 100, | ||
| CompletionTokens: 40, | ||
| TotalTokens: 140, | ||
| PromptTokensDetails: dto.InputTokenDetails{ | ||
| CachedTokens: 30, | ||
| }, | ||
| } | ||
|
|
||
| ObserveChannelAffinityUsageCacheByRelayFormat(ctx, usage, types.RelayFormatClaude) | ||
| stats := GetChannelAffinityUsageCacheStats(ruleName, usingGroup, keyFP) | ||
|
|
||
| require.EqualValues(t, 1, stats.Total) | ||
| require.EqualValues(t, 1, stats.Hit) | ||
| require.EqualValues(t, 100, stats.PromptTokens) | ||
| require.EqualValues(t, 40, stats.CompletionTokens) | ||
| require.EqualValues(t, 140, stats.TotalTokens) | ||
| require.EqualValues(t, 30, stats.CachedTokens) | ||
| require.Equal(t, cacheTokenRateModeCachedOverPromptPlusCached, stats.CachedTokenRateMode) | ||
| } | ||
|
|
||
| func TestObserveChannelAffinityUsageCacheByRelayFormat_MixedMode(t *testing.T) { | ||
| ruleName := fmt.Sprintf("rule_%d", time.Now().UnixNano()) | ||
| usingGroup := "default" | ||
| keyFP := fmt.Sprintf("fp_%d", time.Now().UnixNano()) | ||
| ctx := buildChannelAffinityStatsContextForTest(ruleName, usingGroup, keyFP) | ||
|
|
||
| openAIUsage := &dto.Usage{ | ||
| PromptTokens: 100, | ||
| PromptTokensDetails: dto.InputTokenDetails{ | ||
| CachedTokens: 10, | ||
| }, | ||
| } | ||
| claudeUsage := &dto.Usage{ | ||
| PromptTokens: 80, | ||
| PromptTokensDetails: dto.InputTokenDetails{ | ||
| CachedTokens: 20, | ||
| }, | ||
| } | ||
|
|
||
| ObserveChannelAffinityUsageCacheByRelayFormat(ctx, openAIUsage, types.RelayFormatOpenAI) | ||
| ObserveChannelAffinityUsageCacheByRelayFormat(ctx, claudeUsage, types.RelayFormatClaude) | ||
| stats := GetChannelAffinityUsageCacheStats(ruleName, usingGroup, keyFP) | ||
|
|
||
| require.EqualValues(t, 2, stats.Total) | ||
| require.EqualValues(t, 2, stats.Hit) | ||
| require.EqualValues(t, 180, stats.PromptTokens) | ||
| require.EqualValues(t, 30, stats.CachedTokens) | ||
| require.Equal(t, cacheTokenRateModeMixed, stats.CachedTokenRateMode) | ||
| } | ||
|
|
||
| func TestObserveChannelAffinityUsageCacheByRelayFormat_UnsupportedModeKeepsEmpty(t *testing.T) { | ||
| ruleName := fmt.Sprintf("rule_%d", time.Now().UnixNano()) | ||
| usingGroup := "default" | ||
| keyFP := fmt.Sprintf("fp_%d", time.Now().UnixNano()) | ||
| ctx := buildChannelAffinityStatsContextForTest(ruleName, usingGroup, keyFP) | ||
|
|
||
| usage := &dto.Usage{ | ||
| PromptTokens: 100, | ||
| PromptTokensDetails: dto.InputTokenDetails{ | ||
| CachedTokens: 25, | ||
| }, | ||
| } | ||
|
|
||
| ObserveChannelAffinityUsageCacheByRelayFormat(ctx, usage, types.RelayFormatGemini) | ||
| stats := GetChannelAffinityUsageCacheStats(ruleName, usingGroup, keyFP) | ||
|
|
||
| require.EqualValues(t, 1, stats.Total) | ||
| require.EqualValues(t, 1, stats.Hit) | ||
| require.EqualValues(t, 25, stats.CachedTokens) | ||
| require.Equal(t, "", stats.CachedTokenRateMode) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nil-check for
usagedoesn't prevent nil-pointer dereference below.The guard at line 239 only protects
ObserveChannelAffinityUsageCacheByRelayFormat, but execution continues to line 244 whereusage.PromptTokensis accessed unconditionally. Ifusageis nil, this will panic.Either return early when
usage == nil(consistent with how the rest of the function usesusage), or wrap the entire function body after the observe call.🐛 Proposed fix
func PostClaudeConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usage *dto.Usage) { + if usage == nil { + return + } + ObserveChannelAffinityUsageCacheByRelayFormat(ctx, usage, relayInfo.GetFinalRequestRelayFormat()) - if usage != nil { - ObserveChannelAffinityUsageCacheByRelayFormat(ctx, usage, relayInfo.GetFinalRequestRelayFormat()) - } useTimeSeconds := time.Now().Unix() - relayInfo.StartTime.Unix() promptTokens := usage.PromptTokens📝 Committable suggestion
🤖 Prompt for AI Agents