seewe/sub2api
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-10-14 12:02:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7613 from yujunkim/fix/openai-free-fast-missing-pricing

Browse Source 
fix(billing): keep zero-cost usage log when Free Fast has no pricing
This commit is contained in:
Wesley Liddick
2026-09-28 09:53:26 +08:00
committed by GitHub
parent 11608c51f0 3c5ea297ff
commit dc4874a2f1
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/service/openai_gateway_record_usage_test.go
+45
View File
@@ -3210,6 +3210,51 @@ func TestOpenAIGatewayServiceRecordUsage_FreeOpenAIFastChargesStandard(t *testin
require.InDelta(t, standardTotal*0.5, usageRepo.lastLog.ActualCost, 1e-10)
}
func TestOpenAIGatewayServiceRecordUsage_FreeOpenAIFastMissingPricingRecordsZeroCostUsageLog(t *testing.T) {
usageRepo := &openAIRecordUsageLogRepoStub{inserted: true}
svc := newOpenAIRecordUsageServiceForTest(
usageRepo,
&openAIRecordUsageUserRepoStub{},
&openAIRecordUsageSubRepoStub{},
nil,
)
svc.resolver = NewModelPricingResolver(nil, svc.billingService)
groupID := int64(78)
serviceTier := "priority"
apiKey := &APIKey{
ID: 1021,
GroupID: &groupID,
Group: &Group{
ID: groupID, Platform: PlatformOpenAI, Status: StatusActive,
Hydrated: true, RateMultiplier: 1, FreeOpenAIFast: true,
},
}
err := svc.RecordUsage(context.Background(), &OpenAIRecordUsageInput{
Result: &OpenAIForwardResult{
RequestID: "resp_free_fast_missing_pricing",
ServiceTier: &serviceTier,
Usage: OpenAIUsage{InputTokens: 1200, OutputTokens: 300},
Model: "pricing-missing-test-model",
Duration: time.Second,
},
APIKey: apiKey,
User: &User{ID: 2021},
Account: &Account{ID: 3021, Platform: PlatformOpenAI, Type: AccountTypeAPIKey},
})
require.NoError(t, err)
require.Equal(t, 1, usageRepo.calls)
require.NotNil(t, usageRepo.lastLog)
require.Equal(t, "resp_free_fast_missing_pricing", usageRepo.lastLog.RequestID)
require.Equal(t, 1200, usageRepo.lastLog.InputTokens)
require.Equal(t, 300, usageRepo.lastLog.OutputTokens)
require.NotNil(t, usageRepo.lastLog.ServiceTier)
require.Equal(t, "priority", *usageRepo.lastLog.ServiceTier)
require.Zero(t, usageRepo.lastLog.TotalCost)
require.Zero(t, usageRepo.lastLog.ActualCost)
}
func TestGroupBillsOpenAIFastAtStandardRequiresOpenAIAccount(t *testing.T) {
apiKey := &APIKey{Group: &Group{Platform: PlatformComposite, FreeOpenAIFast: true}}
backend/internal/service/openai_gateway_usage.go
+4 -2
View File
@@ -314,10 +314,12 @@ func (s *OpenAIGatewayService) RecordUsage(ctx context.Context, input *OpenAIRec
longContextBillingGate,
pricingAt,
)
if standardErr != nil {
if standardErr != nil && !isUsagePricingUnavailableError(standardErr) {
return standardErr
}
if cost != nil && standardCost != nil {
// Missing pricing already fell back to a zero-cost log above; keep that
// usage row instead of dropping it on the Standard re-evaluation.
if standardErr == nil && cost != nil && standardCost != nil {
cost.ActualCost = standardCost.ActualCost
}
}