total quota fix #1124
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
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
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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2690,6 +2690,7 @@ export async function getProviderLimitUsage(providerId: number): Promise< | |||||
| costDaily: { current: number; limit: number | null; resetAt?: Date }; | ||||||
| costWeekly: { current: number; limit: number | null; resetAt: Date }; | ||||||
| costMonthly: { current: number; limit: number | null; resetAt: Date }; | ||||||
| limitTotalUsd: { current: number; limit: number | null }; | ||||||
| concurrentSessions: { current: number; limit: number }; | ||||||
| }> | ||||||
| > { | ||||||
|
|
@@ -2713,7 +2714,9 @@ export async function getProviderLimitUsage(providerId: number): Promise< | |||||
| getTimeRangeForPeriodWithMode, | ||||||
| } = await import("@/lib/rate-limit/time-utils"); | ||||||
| const { RateLimitService } = await import("@/lib/rate-limit"); | ||||||
| const { sumProviderCostInTimeRange, sumProviderTotalCost } = await import( | ||||||
| "@/repository/statistics" | ||||||
| ); | ||||||
| const limit5hResetMode = provider.limit5hResetMode ?? "rolling"; | ||||||
|
|
||||||
| // 计算各周期的时间范围 | ||||||
|
|
@@ -2732,15 +2735,23 @@ export async function getProviderLimitUsage(providerId: number): Promise< | |||||
| ]); | ||||||
|
|
||||||
| // 获取金额消费（直接查询数据库，确保配额显示与 DB 一致） | ||||||
| const [cost5h, costDaily, costWeekly, costMonthly, totalCost, concurrentSessions] = | ||||||
| await Promise.all([ | ||||||
| limit5hResetMode === "fixed" | ||||||
| ? RateLimitService.getCurrentCost( | ||||||
| providerId, | ||||||
| "provider", | ||||||
| "5h", | ||||||
| undefined, | ||||||
| limit5hResetMode | ||||||
| ) | ||||||
| : sumProviderCostInTimeRange(providerId, range5h.startTime, range5h.endTime), | ||||||
| sumProviderCostInTimeRange(providerId, rangeDaily.startTime, rangeDaily.endTime), | ||||||
| sumProviderCostInTimeRange(providerId, rangeWeekly.startTime, rangeWeekly.endTime), | ||||||
| sumProviderCostInTimeRange(providerId, rangeMonthly.startTime, rangeMonthly.endTime), | ||||||
| sumProviderTotalCost(providerId), | ||||||
| SessionTracker.getProviderSessionCount(providerId), | ||||||
| ]); | ||||||
|
|
||||||
| // 获取重置时间信息 | ||||||
| const resetDaily = await getResetInfoWithMode( | ||||||
|
|
@@ -2779,6 +2790,10 @@ export async function getProviderLimitUsage(providerId: number): Promise< | |||||
| limit: provider.limitMonthlyUsd, | ||||||
| resetAt: resetMonthly.resetAt!, | ||||||
| }, | ||||||
| limitTotalUsd: { | ||||||
| current: totalCost, | ||||||
| limit: provider.limitTotalUsd ?? null, | ||||||
| }, | ||||||
| concurrentSessions: { | ||||||
| current: concurrentSessions, | ||||||
| limit: provider.limitConcurrentSessions || 0, | ||||||
|
|
@@ -2800,6 +2815,7 @@ export type ProviderLimitUsageData = { | |||||
| costDaily: { current: number; limit: number | null; resetAt?: Date }; | ||||||
| costWeekly: { current: number; limit: number | null; resetAt: Date }; | ||||||
| costMonthly: { current: number; limit: number | null; resetAt: Date }; | ||||||
| limitTotalUsd: { current: number; limit: number | null }; | ||||||
| concurrentSessions: { current: number; limit: number }; | ||||||
| }; | ||||||
|
|
||||||
|
|
@@ -2820,6 +2836,7 @@ export async function getProviderLimitUsageBatch( | |||||
| limitDailyUsd?: number | null; | ||||||
| limitWeeklyUsd?: number | null; | ||||||
| limitMonthlyUsd?: number | null; | ||||||
| limitTotalUsd?: number | null; | ||||||
| limitConcurrentSessions?: number | null; | ||||||
|
Comment on lines
+2839
to
2840
Contributor
There was a problem hiding this comment. The limitTotalUsd?: number | null;
totalCostResetAt?: Date | null;
limitConcurrentSessions?: number | null; |
||||||
| }> | ||||||
| ): Promise<Map<number, ProviderLimitUsageData>> { | ||||||
|
|
@@ -2845,7 +2862,9 @@ export async function getProviderLimitUsageBatch( | |||||
| getTimeRangeForPeriodWithMode, | ||||||
| } = await import("@/lib/rate-limit/time-utils"); | ||||||
| const { RateLimitService } = await import("@/lib/rate-limit"); | ||||||
| const { sumProviderCostInTimeRange, sumProviderTotalCost } = await import( | ||||||
| "@/repository/statistics" | ||||||
| ); | ||||||
|
|
||||||
| const providerIds = providers.map((p) => p.id); | ||||||
|
|
||||||
|
|
@@ -2871,7 +2890,7 @@ export async function getProviderLimitUsageBatch( | |||||
| ); | ||||||
|
|
||||||
| // 并行查询该供应商的各周期消费（直接查询数据库） | ||||||
| const [cost5h, resetAt5h, costDaily, costWeekly, costMonthly, totalCost] = await Promise.all([ | ||||||
| limit5hResetMode === "fixed" | ||||||
| ? RateLimitService.getCurrentCost( | ||||||
| provider.id, | ||||||
|
|
@@ -2887,6 +2906,7 @@ export async function getProviderLimitUsageBatch( | |||||
| sumProviderCostInTimeRange(provider.id, rangeDaily.startTime, rangeDaily.endTime), | ||||||
| sumProviderCostInTimeRange(provider.id, rangeWeekly.startTime, rangeWeekly.endTime), | ||||||
| sumProviderCostInTimeRange(provider.id, rangeMonthly.startTime, rangeMonthly.endTime), | ||||||
| sumProviderTotalCost(provider.id), | ||||||
|
Contributor
There was a problem hiding this comment. Similar to
Suggested change
Comment on lines
2906
to
+2909
There was a problem hiding this comment.
|
||||||
| ]); | ||||||
|
|
||||||
| const sessionCount = sessionCountMap.get(provider.id) || 0; | ||||||
|
|
@@ -2926,6 +2946,10 @@ export async function getProviderLimitUsageBatch( | |||||
| limit: provider.limitMonthlyUsd ?? null, | ||||||
| resetAt: resetMonthly.resetAt!, | ||||||
| }, | ||||||
| limitTotalUsd: { | ||||||
| current: totalCost, | ||||||
| limit: provider.limitTotalUsd ?? null, | ||||||
| }, | ||||||
| concurrentSessions: { | ||||||
| current: sessionCount, | ||||||
| limit: provider.limitConcurrentSessions || 0, | ||||||
|
|
||||||
|
Contributor
There was a problem hiding this comment. [HIGH] [ERROR-NO-USER-FEEDBACK] Current-usage tooltip hidden when total limit is exactly Why this is a problem: The condition Suggested fix: |
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.
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.
sumProviderTotalCostis invoked without the provider’s reset marker, so this path always sums lifetime ledger rows even afterresetProviderTotalUsageupdatesproviders.total_cost_reset_at. That makes quota usage shown by this action diverge from enforcement (RateLimitService.checkTotalCostLimit(..., { resetAt })), and providers can appear over the total cap immediately after an admin reset. Passprovider.totalCostResetAtto the total-cost aggregation here (and in the batch variant) to keep displayed usage consistent with runtime limit checks.Useful? React with 👍 / 👎.