diff --git a/internal/quota/test/argon_usage_stats_test.go b/internal/quota/test/argon_usage_stats_test.go index b15fc45c4..81e92d018 100644 --- a/internal/quota/test/argon_usage_stats_test.go +++ b/internal/quota/test/argon_usage_stats_test.go @@ -16,88 +16,131 @@ import ( ) func TestAntigravityRefreshKeepsUndisplayableArgonEvidence(t *testing.T) { - // Ultra 是合成契约:无效 Argon 不显示,但不能因组被过滤而混入 Gemini。 + // 两种 Ultra 都通过真实订阅归一化路径;无效独立组不能因过滤或回退而丢失证据。 argonByName := `{"displayName":"Gemini 4 Argon","buckets":[{"bucketId":"other","window":"weekly"}]}` argonByID := `{"displayName":"Unrecognized","buckets":[{"bucketId":"gemini-argon-wtu-weekly","remainingFraction":"NaN"}]}` - for _, tc := range []struct { - name string - argon string - fallback bool - wantTokens int64 - wantCost float64 - }{ - {name: "missing fraction recognized by name", argon: argonByName, wantTokens: 100, wantCost: .5}, - {name: "non-finite fraction recognized by ID", argon: argonByID, wantTokens: 100, wantCost: .5}, - {name: "evidence survives empty endpoint fallback", argon: argonByID, fallback: true, wantTokens: 100, wantCost: .5}, - {name: "no Argon group Ultra shared pool", wantTokens: 400, wantCost: 2}, + for _, tier := range []struct{ id, name, plan string }{ + {id: "g1-ultra-tier", name: "Ultra", plan: "ultra"}, + {id: "g1-ultra-lite-tier", name: "Google AI Ultra", plan: "ultra-lite"}, } { - t.Run(tc.name, func(t *testing.T) { - db := openQuotaTestDB(t) - seedUsageIdentity(t, db, entities.UsageIdentity{Identity: "argon-auth", Provider: "antigravity", Type: "antigravity", AuthType: entities.UsageIdentityAuthTypeCredential, ProjectID: new("project-123")}) - now := time.Now().Truncate(time.Second) - if err := db.Create(&[]entities.UsageEvent{ - {EventKey: "gemini", AuthIndex: "argon-auth", Model: "gemini-3-flash", Timestamp: now.Add(-time.Hour), TotalTokens: 100, CostUSD: floatPtr(.5), CostAvailable: boolPtr(true)}, - {EventKey: "argon", AuthIndex: "argon-auth", Model: "gemini-4-argon-high", Timestamp: now.Add(-time.Hour), TotalTokens: 300, CostUSD: floatPtr(1.5), CostAvailable: boolPtr(true)}, - }).Error; err != nil { - t.Fatal(err) - } - gemini := fmt.Sprintf(`{"displayName":"Gemini Models","buckets":[{"bucketId":"gemini-5h","window":"5h","remainingFraction":0.5,"resetTime":%q}]}`, now.Add(time.Hour).Format(time.RFC3339)) - groups := gemini - if tc.argon != "" { - groups += "," + tc.argon - } - responses := []*apicall.Response{quotaAPIResponse(200, `{"groups":[`+groups+`]}`)} - if tc.fallback { - responses = []*apicall.Response{quotaAPIResponse(200, `{"groups":[`+tc.argon+`]}`), quotaAPIResponse(200, `{"groups":[`+gemini+`]}`)} - } - caller := &antigravityRecordingCaller{quota: recordingManagementCaller{responses: responses}, subscription: recordingManagementCaller{responses: []*apicall.Response{quotaAPIResponse(200, `{"paidTier":{"id":"g1-ultra-tier","name":"Ultra"}}`)}}} - configs := DefaultProviderConfigs() - service := newQuotaRefreshService(t, db, NewProviderRegistry(map[string]ProviderHandler{"antigravity": NewAntigravityProvider(caller, configs.Antigravity, configs.AntigravitySubscriptions[:1])})) - if _, err := service.Refresh(context.Background(), RefreshRequest{AuthIndexes: []string{"argon-auth"}, Source: RefreshSourceManual}); err != nil { - t.Fatal(err) - } - task := waitForRefreshTask(t, service, "argon-auth", RefreshTaskStatusCompleted) - if task.Quota == nil || len(task.Quota.Quota) != 1 { - t.Fatalf("invalid Argon must not create a bar: %+v", task.Quota) - } - row := findQuotaRow(t, task.Quota.Quota, "bucket.antigravity-gemini-models.gemini-5h") - assertWindowUsage(t, row, tc.wantTokens, tc.wantCost) - encoded, err := json.Marshal(task.Quota) - if err != nil { - t.Fatal(err) - } - serialized := strings.ToLower(string(encoded)) - if strings.Contains(serialized, "separateargon") || strings.Contains(serialized, "gemini-4-argon") { - t.Fatalf("internal Argon evidence must not be serialized: %s", encoded) + t.Run(tier.plan, func(t *testing.T) { + for _, tc := range []struct { + name string + argon string + fallback bool + wantTokens int64 + wantCost float64 + }{ + {name: "missing fraction recognized by name", argon: argonByName, wantTokens: 100, wantCost: .5}, + {name: "non-finite fraction recognized by ID", argon: argonByID, wantTokens: 100, wantCost: .5}, + {name: "evidence survives empty endpoint fallback", argon: argonByID, fallback: true, wantTokens: 100, wantCost: .5}, + {name: "no Argon group shared pool", wantTokens: 400, wantCost: 2}, + } { + t.Run(tc.name, func(t *testing.T) { + db := openQuotaTestDB(t) + seedUsageIdentity(t, db, entities.UsageIdentity{Identity: "argon-auth", Provider: "antigravity", Type: "antigravity", AuthType: entities.UsageIdentityAuthTypeCredential, ProjectID: new("project-123")}) + now := time.Now().Truncate(time.Second) + if err := db.Create(&[]entities.UsageEvent{ + {EventKey: "gemini", AuthIndex: "argon-auth", Model: "gemini-3-flash", Timestamp: now.Add(-5 * time.Minute), TotalTokens: 100, CostUSD: floatPtr(.5), CostAvailable: boolPtr(true)}, + {EventKey: "argon", AuthIndex: "argon-auth", Model: "gemini-4-argon-high", Timestamp: now.Add(-5 * time.Minute), TotalTokens: 300, CostUSD: floatPtr(1.5), CostAvailable: boolPtr(true)}, + {EventKey: "older-argon", AuthIndex: "argon-auth", Model: "gemini-4-argon-high", Timestamp: now.Add(-24 * time.Hour), TotalTokens: 60, CostUSD: floatPtr(.25), CostAvailable: boolPtr(true)}, + }).Error; err != nil { + t.Fatal(err) + } + // 长窗口从小时聚合读取旧事件;直接插入事件的测试须同时准备对应聚合。 + if err := db.Create(&entities.UsageOverviewHourlyStat{ + BucketStart: now.Add(-24 * time.Hour).Truncate(time.Hour), AuthIndex: "argon-auth", Model: "gemini-4-argon-high", + TotalTokens: 60, CostUSD: floatPtr(.25), UnavailableCostCount: intPtr(0), CreatedAt: now, UpdatedAt: now, + }).Error; err != nil { + t.Fatal(err) + } + fiveHourReset := now.Add(time.Hour).Format(time.RFC3339) + weeklyReset := now.Add(24 * time.Hour).Format(time.RFC3339) + gemini := fmt.Sprintf(`{"displayName":"Gemini Models","buckets":[{"bucketId":"gemini-5h","window":"5h","remainingFraction":0.5,"resetTime":%q},{"bucketId":"gemini-weekly","window":"weekly","remainingFraction":0.75,"resetTime":%q}]}`, fiveHourReset, weeklyReset) + groups := gemini + if tc.argon != "" { + groups += "," + tc.argon + } + responses := []*apicall.Response{quotaAPIResponse(200, `{"groups":[`+groups+`]}`)} + if tc.fallback { + responses = []*apicall.Response{quotaAPIResponse(200, `{"groups":[`+tc.argon+`]}`), quotaAPIResponse(200, `{"groups":[`+gemini+`]}`)} + } + subscription := fmt.Sprintf(`{"paidTier":{"id":%q,"name":%q}}`, tier.id, tier.name) + caller := &antigravityRecordingCaller{quota: recordingManagementCaller{responses: responses}, subscription: recordingManagementCaller{responses: []*apicall.Response{quotaAPIResponse(200, subscription)}}} + configs := DefaultProviderConfigs() + service := newQuotaRefreshService(t, db, NewProviderRegistry(map[string]ProviderHandler{"antigravity": NewAntigravityProvider(caller, configs.Antigravity, configs.AntigravitySubscriptions[:1])})) + if _, err := service.Refresh(context.Background(), RefreshRequest{AuthIndexes: []string{"argon-auth"}, Source: RefreshSourceManual}); err != nil { + t.Fatal(err) + } + task := waitForRefreshTask(t, service, "argon-auth", RefreshTaskStatusCompleted) + if task.Quota == nil || len(task.Quota.Quota) != 2 { + t.Fatalf("invalid or absent Argon must not create a bar: %+v", task.Quota) + } + gotSubscription := task.Quota.Subscription + if gotSubscription == nil || gotSubscription.Provider != "antigravity" || gotSubscription.Plan != tier.plan || gotSubscription.TierID != tier.id || gotSubscription.TierName != tier.name { + t.Fatalf("unexpected normalized subscription: %+v", gotSubscription) + } + fiveHour := findQuotaRow(t, task.Quota.Quota, "bucket.antigravity-gemini-models.gemini-5h") + weekly := findQuotaRow(t, task.Quota.Quota, "bucket.antigravity-gemini-models.gemini-weekly") + if fiveHour.RemainingFraction == nil || *fiveHour.RemainingFraction != .5 || fiveHour.ResetAt != fiveHourReset || weekly.RemainingFraction == nil || *weekly.RemainingFraction != .75 || weekly.ResetAt != weeklyReset { + t.Fatalf("official quota and reset must be preserved: 5h=%+v weekly=%+v", fiveHour, weekly) + } + assertWindowUsage(t, fiveHour, tc.wantTokens, tc.wantCost) + weeklyTokens, weeklyCost := tc.wantTokens, tc.wantCost + if tc.argon == "" { + weeklyTokens += 60 + weeklyCost += .25 + } + assertWindowUsage(t, weekly, weeklyTokens, weeklyCost) + encoded, err := json.Marshal(task.Quota) + if err != nil { + t.Fatal(err) + } + serialized := strings.ToLower(string(encoded)) + if strings.Contains(serialized, "separateargon") || strings.Contains(serialized, "gemini-4-argon") { + t.Fatalf("internal Argon evidence must not be serialized: %s", encoded) + } + }) } }) } } func TestAttachWindowUsageStatsAntigravityArgonPools(t *testing.T) { - // Ultra 的共享池行为是基于公开描述的合成契约用例,不是 Ultra 实际捕获。 + // 只验证已知套餐的归属契约;测试数据均为合成事件。 for _, tc := range []struct { - name string - plan string - geminiName string - claudeGPTName string - dedicated bool - argonUsage bool - argonAvailable bool - wantGemini int64 - wantGeminiCost float64 - wantArgon int64 - wantArgonCost float64 - wantMissing bool - missingArgon bool + name string + plan string + subscriptionProvider string + tierName string + geminiName string + claudeGPTName string + dedicated bool + argonUsage bool + argonAvailable bool + unknownUsage bool + wantGemini int64 + wantGeminiCost float64 + wantArgon int64 + wantArgonCost float64 + wantMissing bool + missingGemini bool + missingArgon bool }{ {name: "dedicated Pro", plan: "pro", dedicated: true, argonUsage: true, argonAvailable: true, wantGemini: 100, wantGeminiCost: .5, wantArgon: 300, wantArgonCost: 1.5}, {name: "legacy names retain grouped stats with Argon", plan: "pro", geminiName: "Gemini Future Models", claudeGPTName: "GPT and Claude models", dedicated: true, argonUsage: true, argonAvailable: true, wantGemini: 100, wantGeminiCost: .5, wantArgon: 300, wantArgonCost: 1.5}, {name: "dedicated takes precedence over Ultra", plan: "ultra", dedicated: true, argonUsage: true, argonAvailable: true, wantGemini: 100, wantGeminiCost: .5, wantArgon: 300, wantArgonCost: 1.5}, - {name: "synthetic Ultra shared pool", plan: "ultra", argonUsage: true, argonAvailable: true, wantGemini: 400, wantGeminiCost: 2}, + {name: "dedicated takes precedence over Ultra Lite", plan: "ultra-lite", dedicated: true, argonUsage: true, argonAvailable: true, wantGemini: 100, wantGeminiCost: .5, wantArgon: 300, wantArgonCost: 1.5}, + {name: "Ultra shared pool", plan: "ultra", argonUsage: true, argonAvailable: true, wantGemini: 400, wantGeminiCost: 2}, + {name: "Ultra Lite shared pool", plan: "ultra-lite", argonUsage: true, argonAvailable: true, wantGemini: 400, wantGeminiCost: 2}, + {name: "Ultra Lite case and whitespace", plan: " Ultra-Lite ", subscriptionProvider: " AntiGravity ", argonUsage: true, argonAvailable: true, wantGemini: 400, wantGeminiCost: 2}, + {name: "Free missing group is uncertain", plan: "free", argonUsage: true, argonAvailable: true, wantMissing: true}, {name: "Pro missing group is uncertain", plan: "pro", argonUsage: true, argonAvailable: true, wantMissing: true}, + {name: "unknown tier name cannot imply Ultra", plan: "unknown", tierName: "Google AI Ultra", argonUsage: true, argonAvailable: true, wantMissing: true}, {name: "missing plan is uncertain", argonUsage: true, argonAvailable: true, wantMissing: true}, - {name: "Ultra Lite is uncertain", plan: "ultra-lite", argonUsage: true, argonAvailable: true, wantMissing: true}, + {name: "other provider Ultra Lite is uncertain", plan: "ultra-lite", subscriptionProvider: "codex", argonUsage: true, argonAvailable: true, wantMissing: true}, + {name: "Ultra Lite with unknown model is incomplete", plan: "ultra-lite", argonUsage: true, argonAvailable: true, unknownUsage: true, wantMissing: true}, + {name: "Ultra Lite with unavailable Argon cost", plan: "ultra-lite", argonUsage: true, missingGemini: true}, {name: "uncertain without Argon usage", plan: "pro", wantGemini: 100, wantGeminiCost: .5}, {name: "real zero in dedicated group", plan: "pro", dedicated: true, wantGemini: 100, wantGeminiCost: .5}, {name: "unavailable Argon cost", plan: "pro", dedicated: true, argonUsage: true, wantGemini: 100, wantGeminiCost: .5, missingArgon: true}, @@ -114,6 +157,9 @@ func TestAttachWindowUsageStatsAntigravityArgonPools(t *testing.T) { if tc.argonUsage { events = append(events, entities.UsageEvent{EventKey: "argon", AuthIndex: "argon-auth", Model: "gemini-4-argon-high", Timestamp: now.Add(-time.Hour), TotalTokens: 300, CostUSD: floatPtr(1.5), CostAvailable: boolPtr(tc.argonAvailable)}) } + if tc.unknownUsage { + events = append(events, entities.UsageEvent{EventKey: "unknown", AuthIndex: "argon-auth", Model: "future-model", Timestamp: now.Add(-time.Hour), TotalTokens: 10, CostUSD: floatPtr(.1), CostAvailable: boolPtr(true)}) + } if err := db.Create(&events).Error; err != nil { t.Fatal(err) } @@ -137,23 +183,36 @@ func TestAttachWindowUsageStatsAntigravityArgonPools(t *testing.T) { } response := CheckResponse{ID: "argon-auth", Quota: NormalizeQuotaRows(ProviderOutput{Provider: "antigravity", Result: AntigravityResult{Quota: &AntigravityQuotaPayload{Groups: groups}}})} if tc.plan != "" { - response.Subscription = &SubscriptionInfo{Provider: "antigravity", Plan: tc.plan} + provider := tc.subscriptionProvider + if provider == "" { + provider = "antigravity" + } + response.Subscription = &SubscriptionInfo{Provider: provider, Plan: tc.plan, TierName: tc.tierName} } response = attachWindowUsageStats(service, context.Background(), "argon-auth", response, now) if len(response.Quota) != len(groups) { t.Fatalf("unexpected quota rows: %+v", response.Quota) } gemini := findQuotaRow(t, response.Quota, "bucket.antigravity-gemini-models.gemini-weekly") - if gemini.RemainingFraction == nil || *gemini.RemainingFraction != .4 { - t.Fatalf("official quota must remain visible: %+v", gemini) + if gemini.RemainingFraction == nil || *gemini.RemainingFraction != .4 || gemini.ResetAt != reset { + t.Fatalf("official quota and reset must remain visible: %+v", gemini) } + claude := findQuotaRow(t, response.Quota, "bucket.antigravity-claude-and-gpt-models.claude-weekly") if tc.wantMissing { - if gemini.WindowUsageTokens != nil || gemini.WindowUsageCost != nil { - t.Fatalf("uncertain Argon attribution must not yield estimates: %+v", gemini) + for _, row := range []QuotaRow{gemini, claude} { + if row.WindowUsageTokens != nil || row.WindowUsageCost != nil { + t.Fatalf("incomplete attribution must not yield group estimates: %+v", row) + } } } else { - assertWindowUsage(t, gemini, tc.wantGemini, tc.wantGeminiCost) - assertWindowUsage(t, findQuotaRow(t, response.Quota, "bucket.antigravity-claude-and-gpt-models.claude-weekly"), 40, .2) + if tc.missingGemini { + if gemini.WindowUsageTokens != nil || gemini.WindowUsageCost != nil { + t.Fatalf("unavailable shared cost must not produce a partial pair: %+v", gemini) + } + } else { + assertWindowUsage(t, gemini, tc.wantGemini, tc.wantGeminiCost) + } + assertWindowUsage(t, claude, 40, .2) } if tc.dedicated { argon := findQuotaRow(t, response.Quota, "bucket.antigravity-gemini-4-argon.gemini-argon-wtu-weekly") diff --git a/internal/quota/test/subscription_test.go b/internal/quota/test/subscription_test.go index 5a8fcd5f3..4fbf49eb2 100644 --- a/internal/quota/test/subscription_test.go +++ b/internal/quota/test/subscription_test.go @@ -177,6 +177,7 @@ func TestNormalizeAntigravitySubscription(t *testing.T) { {name: "free", subscription: "a.AntigravitySubscriptionPayload{CurrentTier: "a.GeminiCliUserTier{ID: "free-tier", Name: "Free"}}, wantPlan: "free", wantTierID: "free-tier", wantTierName: "Free"}, {name: "ultra lite", subscription: "a.AntigravitySubscriptionPayload{CurrentTier: "a.GeminiCliUserTier{ID: "g1-ultra-lite-tier", Name: "Ultra Lite"}}, wantPlan: "ultra-lite", wantTierID: "g1-ultra-lite-tier", wantTierName: "Ultra Lite"}, {name: "unknown id", subscription: "a.AntigravitySubscriptionPayload{CurrentTier: "a.GeminiCliUserTier{ID: "future-tier", Name: "Future"}}, wantPlan: "unknown", wantTierID: "future-tier", wantTierName: "Future"}, + {name: "Ultra name does not infer unknown id", subscription: "a.AntigravitySubscriptionPayload{CurrentTier: "a.GeminiCliUserTier{ID: "future-tier", Name: "Google AI Ultra"}}, wantPlan: "unknown", wantTierID: "future-tier", wantTierName: "Google AI Ultra"}, {name: "name only", subscription: "a.AntigravitySubscriptionPayload{CurrentTier: "a.GeminiCliUserTier{Name: "Preview"}}, wantPlan: "unknown", wantTierName: "Preview"}, {name: "missing tiers", subscription: "a.AntigravitySubscriptionPayload{}}, {name: "missing subscription"}, diff --git a/internal/quota/test/usage_stats_test.go b/internal/quota/test/usage_stats_test.go index 97d450504..276747f7f 100644 --- a/internal/quota/test/usage_stats_test.go +++ b/internal/quota/test/usage_stats_test.go @@ -429,7 +429,7 @@ func TestAttachWindowUsageStatsCachesFailedAntigravityGroupWindowQuery(t *testin resetAt := now.Add(2 * time.Hour) windowSeconds := int64(5 * time.Hour / time.Second) provider := &failOnceGroupedUsageStatsProvider{} - response := CheckResponse{ID: "antigravity-auth", Quota: []QuotaRow{ + response := CheckResponse{ID: "antigravity-auth", Subscription: &SubscriptionInfo{Provider: "antigravity", Plan: "ultra-lite"}, Quota: []QuotaRow{ { Key: "bucket.antigravity-gemini-models.gemini-5h", Scope: "quota_group", GroupKey: "antigravity-gemini-models", Window: &QuotaWindow{Seconds: &windowSeconds}, ResetAt: timeutil.FormatStorageTime(resetAt), diff --git a/internal/quota/usage_stats.go b/internal/quota/usage_stats.go index f1e13c846..e65751b8c 100644 --- a/internal/quota/usage_stats.go +++ b/internal/quota/usage_stats.go @@ -161,7 +161,7 @@ func antigravityQuotaUsageGroupKey(row QuotaRow) (string, bool) { } func antigravityArgonUsageGroupKey(response CheckResponse) string { - // 独立组优先;只有明确 Ultra 才按公开描述把 Argon 合并进 Gemini。 + // 独立组证据优先;没有时仅两种明确的 Ultra 套餐把 Argon 合并进 Gemini。 if response.antigravityHasSeparateArgon { return antigravityArgonGroupKey } @@ -170,8 +170,11 @@ func antigravityArgonUsageGroupKey(response CheckResponse) string { return antigravityArgonGroupKey } } - if response.Subscription != nil && strings.EqualFold(strings.TrimSpace(response.Subscription.Provider), "antigravity") && strings.EqualFold(strings.TrimSpace(response.Subscription.Plan), "ultra") { - return antigravityGeminiGroupKey + if response.Subscription != nil && strings.EqualFold(strings.TrimSpace(response.Subscription.Provider), "antigravity") { + plan := strings.TrimSpace(response.Subscription.Plan) + if strings.EqualFold(plan, "ultra") || strings.EqualFold(plan, "ultra-lite") { + return antigravityGeminiGroupKey + } } return "" }