feat: support independent daily/weekly/total quota limits for API Key accounts

Replace single-period-selector (三选一) with three independently configurable
quota dimensions (日/周/总) that can all be set simultaneously. Account is
paused when ANY dimension is exceeded. Periodic quotas (daily/weekly) use
lazy reset via atomic SQL — no cron job needed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
erioandClaude Opus 4.6 committed 2026-03-06 21:20:29 +08:00
1 parent d7a3c7f8a8
commit 33ab8413db
15 files changed
+252 -191

No files matched your search

@@ -2132,7 +2132,7 @@ func (r *stubAccountRepoForHandler) BulkUpdate(context.Context, []int64, service
return 0, nil return 0, nil
} }
func (r *stubAccountRepoForHandler) IncrementQuotaUsed(context.Context, int64, float64, string) error { func (r *stubAccountRepoForHandler) IncrementQuotaUsed(context.Context, int64, float64) error {
return nil return nil
} }
@@ -216,7 +216,7 @@ func (r *stubAccountRepo) BulkUpdate(ctx context.Context, ids []int64, updates s
return 0, nil return 0, nil
} }
func (r *stubAccountRepo) IncrementQuotaUsed(ctx context.Context, id int64, amount float64, _ string) error { func (r *stubAccountRepo) IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error {
return nil return nil
} }
+49 -62
View File
@@ -1676,54 +1676,53 @@ func (r *accountRepository) FindByExtraField(ctx context.Context, key string, va
return r.accountsToService(ctx, accounts) return r.accountsToService(ctx, accounts)
} }
// IncrementQuotaUsed 原子递增账号的 extra.quota_used 字段 // nowUTC is a SQL expression to generate a UTC RFC3339 timestamp string.
// period 为 "daily"/"weekly" 时,使用 CTE 原子重置+递增;为空时保持累计制。 const nowUTC = `to_char(NOW() AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')`
func (r *accountRepository) IncrementQuotaUsed(ctx context.Context, id int64, amount float64, period string) error {
var rows *sql.Rows
var err error
interval := periodToInterval(period) // IncrementQuotaUsed 原子递增账号的配额用量(总/日/周三个维度)
if interval == "" { // 日/周额度在周期过期时自动重置为 0 再递增。
// 累计制:保持原有逻辑 func (r *accountRepository) IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error {
rows, err = r.sql.QueryContext(ctx, rows, err := r.sql.QueryContext(ctx,
`UPDATE accounts SET extra = jsonb_set( `UPDATE accounts SET extra = (
COALESCE(extra, '{}'::jsonb), COALESCE(extra, '{}'::jsonb)
'{quota_used}', -- 总额度:始终递增
to_jsonb(COALESCE((extra->>'quota_used')::numeric, 0) + $1) || jsonb_build_object('quota_used', COALESCE((extra->>'quota_used')::numeric, 0) + $1)
), updated_at = NOW() -- 日额度:仅在 quota_daily_limit > 0 时处理
WHERE id = $2 AND deleted_at IS NULL || CASE WHEN COALESCE((extra->>'quota_daily_limit')::numeric, 0) > 0 THEN
RETURNING jsonb_build_object(
COALESCE((extra->>'quota_used')::numeric, 0), 'quota_daily_used',
COALESCE((extra->>'quota_limit')::numeric, 0)`, CASE WHEN COALESCE((extra->>'quota_daily_start')::timestamptz, '1970-01-01'::timestamptz)
amount, id) + '24 hours'::interval <= NOW()
} else { THEN $1
// 周期制:单条 UPDATE 内联过期判断,避免 CTE snapshot 在 READ COMMITTED 下的 lost update ELSE COALESCE((extra->>'quota_daily_used')::numeric, 0) + $1 END,
rows, err = r.sql.QueryContext(ctx, 'quota_daily_start',
`UPDATE accounts SET extra = jsonb_set( CASE WHEN COALESCE((extra->>'quota_daily_start')::timestamptz, '1970-01-01'::timestamptz)
jsonb_set( + '24 hours'::interval <= NOW()
COALESCE(extra, '{}'::jsonb), THEN `+nowUTC+`
'{quota_used}', ELSE COALESCE(extra->>'quota_daily_start', `+nowUTC+`) END
to_jsonb(
CASE WHEN COALESCE((extra->>'quota_period_start')::timestamptz, '1970-01-01'::timestamptz)
+ $3::interval <= NOW()
THEN $1
ELSE COALESCE((extra->>'quota_used')::numeric, 0) + $1 END
)
),
'{quota_period_start}',
to_jsonb(
CASE WHEN COALESCE((extra->>'quota_period_start')::timestamptz, '1970-01-01'::timestamptz)
+ $3::interval <= NOW()
THEN to_char(NOW() AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')
ELSE COALESCE(extra->>'quota_period_start', to_char(NOW() AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"')) END
) )
), updated_at = NOW() ELSE '{}'::jsonb END
WHERE id = $2 AND deleted_at IS NULL -- 周额度:仅在 quota_weekly_limit > 0 时处理
RETURNING || CASE WHEN COALESCE((extra->>'quota_weekly_limit')::numeric, 0) > 0 THEN
COALESCE((extra->>'quota_used')::numeric, 0), jsonb_build_object(
COALESCE((extra->>'quota_limit')::numeric, 0)`, 'quota_weekly_used',
amount, id, interval) CASE WHEN COALESCE((extra->>'quota_weekly_start')::timestamptz, '1970-01-01'::timestamptz)
} + '168 hours'::interval <= NOW()
THEN $1
ELSE COALESCE((extra->>'quota_weekly_used')::numeric, 0) + $1 END,
'quota_weekly_start',
CASE WHEN COALESCE((extra->>'quota_weekly_start')::timestamptz, '1970-01-01'::timestamptz)
+ '168 hours'::interval <= NOW()
THEN `+nowUTC+`
ELSE COALESCE(extra->>'quota_weekly_start', `+nowUTC+`) END
)
ELSE '{}'::jsonb END
), updated_at = NOW()
WHERE id = $2 AND deleted_at IS NULL
RETURNING
COALESCE((extra->>'quota_used')::numeric, 0),
COALESCE((extra->>'quota_limit')::numeric, 0)`,
amount, id)
if err != nil { if err != nil {
return err return err
} }
@@ -1739,7 +1738,7 @@ func (r *accountRepository) IncrementQuotaUsed(ctx context.Context, id int64, am
return err return err
} }
// 配额刚超限时触发调度快照刷新,使账号及时从调度候选中移除 // 任一维度配额刚超限时触发调度快照刷新
if limit > 0 && newUsed >= limit && (newUsed-amount) < limit { if limit > 0 && newUsed >= limit && (newUsed-amount) < limit {
if err := enqueueSchedulerOutbox(ctx, r.sql, service.SchedulerOutboxEventAccountChanged, &id, nil, nil); err != nil { if err := enqueueSchedulerOutbox(ctx, r.sql, service.SchedulerOutboxEventAccountChanged, &id, nil, nil); err != nil {
logger.LegacyPrintf("repository.account", "[SchedulerOutbox] enqueue quota exceeded failed: account=%d err=%v", id, err) logger.LegacyPrintf("repository.account", "[SchedulerOutbox] enqueue quota exceeded failed: account=%d err=%v", id, err)
@@ -1748,25 +1747,13 @@ func (r *accountRepository) IncrementQuotaUsed(ctx context.Context, id int64, am
return nil return nil
} }
// periodToInterval 将周期类型转为 PostgreSQL interval 字符串 // ResetQuotaUsed 重置账号所有维度的配额用量为 0
func periodToInterval(period string) string {
switch period {
case "daily":
return "24 hours"
case "weekly":
return "168 hours"
default:
return ""
}
}
// ResetQuotaUsed 重置账号的 extra.quota_used 为 0,同时清除 quota_period_start 以开始新周期
func (r *accountRepository) ResetQuotaUsed(ctx context.Context, id int64) error { func (r *accountRepository) ResetQuotaUsed(ctx context.Context, id int64) error {
_, err := r.sql.ExecContext(ctx, _, err := r.sql.ExecContext(ctx,
`UPDATE accounts SET extra = ( `UPDATE accounts SET extra = (
COALESCE(extra, '{}'::jsonb) COALESCE(extra, '{}'::jsonb)
|| '{"quota_used": 0}'::jsonb || '{"quota_used": 0, "quota_daily_used": 0, "quota_weekly_used": 0}'::jsonb
) - 'quota_period_start', updated_at = NOW() ) - 'quota_daily_start' - 'quota_weekly_start', updated_at = NOW()
WHERE id = $1 AND deleted_at IS NULL`, WHERE id = $1 AND deleted_at IS NULL`,
id) id)
if err != nil { if err != nil {
+1 -1
View File
@@ -1096,7 +1096,7 @@ func (s *stubAccountRepo) UpdateExtra(ctx context.Context, id int64, updates map
return errors.New("not implemented") return errors.New("not implemented")
} }
func (s *stubAccountRepo) IncrementQuotaUsed(ctx context.Context, id int64, amount float64, _ string) error { func (s *stubAccountRepo) IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error {
return errors.New("not implemented") return errors.New("not implemented")
} }
+55 -47
View File
@@ -1152,45 +1152,51 @@ func (a *Account) GetCacheTTLOverrideTarget() string {
// GetQuotaLimit 获取 API Key 账号的配额限制(美元) // GetQuotaLimit 获取 API Key 账号的配额限制(美元)
// 返回 0 表示未启用 // 返回 0 表示未启用
func (a *Account) GetQuotaLimit() float64 { func (a *Account) GetQuotaLimit() float64 {
if a.Extra == nil { return a.getExtraFloat64("quota_limit")
return 0
}
if v, ok := a.Extra["quota_limit"]; ok {
return parseExtraFloat64(v)
}
return 0
} }
// GetQuotaUsed 获取 API Key 账号的已用配额(美元) // GetQuotaUsed 获取 API Key 账号的已用配额(美元)
func (a *Account) GetQuotaUsed() float64 { func (a *Account) GetQuotaUsed() float64 {
return a.getExtraFloat64("quota_used")
}
// GetQuotaDailyLimit 获取日额度限制(美元),0 表示未启用
func (a *Account) GetQuotaDailyLimit() float64 {
return a.getExtraFloat64("quota_daily_limit")
}
// GetQuotaDailyUsed 获取当日已用额度(美元)
func (a *Account) GetQuotaDailyUsed() float64 {
return a.getExtraFloat64("quota_daily_used")
}
// GetQuotaWeeklyLimit 获取周额度限制(美元),0 表示未启用
func (a *Account) GetQuotaWeeklyLimit() float64 {
return a.getExtraFloat64("quota_weekly_limit")
}
// GetQuotaWeeklyUsed 获取本周已用额度(美元)
func (a *Account) GetQuotaWeeklyUsed() float64 {
return a.getExtraFloat64("quota_weekly_used")
}
// getExtraFloat64 从 Extra 中读取指定 key 的 float64 值
func (a *Account) getExtraFloat64(key string) float64 {
if a.Extra == nil { if a.Extra == nil {
return 0 return 0
} }
if v, ok := a.Extra["quota_used"]; ok { if v, ok := a.Extra[key]; ok {
return parseExtraFloat64(v) return parseExtraFloat64(v)
} }
return 0 return 0
} }
// GetQuotaPeriod 获取配额周期类型("daily"/"weekly",空字符串表示累计制) // getExtraTime 从 Extra 中读取 RFC3339 时间戳
func (a *Account) GetQuotaPeriod() string { func (a *Account) getExtraTime(key string) time.Time {
if a.Extra == nil {
return ""
}
if v, ok := a.Extra["quota_period"]; ok {
if s, ok := v.(string); ok {
return s
}
}
return ""
}
// GetQuotaPeriodStart 获取当前周期的起始时间
func (a *Account) GetQuotaPeriodStart() time.Time {
if a.Extra == nil { if a.Extra == nil {
return time.Time{} return time.Time{}
} }
if v, ok := a.Extra["quota_period_start"]; ok { if v, ok := a.Extra[key]; ok {
if s, ok := v.(string); ok { if s, ok := v.(string); ok {
if t, err := time.Parse(time.RFC3339Nano, s); err == nil { if t, err := time.Parse(time.RFC3339Nano, s); err == nil {
return t return t
@@ -1203,38 +1209,40 @@ func (a *Account) GetQuotaPeriodStart() time.Time {
return time.Time{} return time.Time{}
} }
// quotaPeriodDuration 返回周期长度 // HasAnyQuotaLimit 检查是否配置了任一维度的配额限制
func quotaPeriodDuration(period string) time.Duration { func (a *Account) HasAnyQuotaLimit() bool {
switch period { return a.GetQuotaLimit() > 0 || a.GetQuotaDailyLimit() > 0 || a.GetQuotaWeeklyLimit() > 0
case "daily":
return 24 * time.Hour
case "weekly":
return 7 * 24 * time.Hour
default:
return 0
}
} }
// isQuotaPeriodExpired 检查配额周期是否已过期 // isPeriodExpired 检查指定周期(自 periodStart 起经过 dur)是否已过期
func isQuotaPeriodExpired(period string, periodStart time.Time) bool { func isPeriodExpired(periodStart time.Time, dur time.Duration) bool {
dur := quotaPeriodDuration(period) if periodStart.IsZero() {
if dur == 0 || periodStart.IsZero() { return true // 从未使用过,视为过期(下次 increment 会初始化)
return false
} }
return time.Since(periodStart) >= dur return time.Since(periodStart) >= dur
} }
// IsQuotaExceeded 检查 API Key 账号配额是否已超限 // IsQuotaExceeded 检查 API Key 账号配额是否已超限(任一维度超限即返回 true)
func (a *Account) IsQuotaExceeded() bool { func (a *Account) IsQuotaExceeded() bool {
limit := a.GetQuotaLimit() // 总额度
if limit <= 0 { if limit := a.GetQuotaLimit(); limit > 0 && a.GetQuotaUsed() >= limit {
return false return true
} }
// 周期性配额:如果当前周期已过期,视为未超限(下次 increment 时会自动重置) // 日额度(周期过期视为未超限,下次 increment 会重置)
if isQuotaPeriodExpired(a.GetQuotaPeriod(), a.GetQuotaPeriodStart()) { if limit := a.GetQuotaDailyLimit(); limit > 0 {
return false start := a.getExtraTime("quota_daily_start")
if !isPeriodExpired(start, 24*time.Hour) && a.GetQuotaDailyUsed() >= limit {
return true
}
} }
return a.GetQuotaUsed() >= limit // 周额度
if limit := a.GetQuotaWeeklyLimit(); limit > 0 {
start := a.getExtraTime("quota_weekly_start")
if !isPeriodExpired(start, 7*24*time.Hour) && a.GetQuotaWeeklyUsed() >= limit {
return true
}
}
return false
} }
// GetWindowCostLimit 获取 5h 窗口费用阈值(美元) // GetWindowCostLimit 获取 5h 窗口费用阈值(美元)
+2 -2
View File
@@ -68,8 +68,8 @@ type AccountRepository interface {
UpdateSessionWindow(ctx context.Context, id int64, start, end *time.Time, status string) error UpdateSessionWindow(ctx context.Context, id int64, start, end *time.Time, status string) error
UpdateExtra(ctx context.Context, id int64, updates map[string]any) error UpdateExtra(ctx context.Context, id int64, updates map[string]any) error
BulkUpdate(ctx context.Context, ids []int64, updates AccountBulkUpdate) (int64, error) BulkUpdate(ctx context.Context, ids []int64, updates AccountBulkUpdate) (int64, error)
// IncrementQuotaUsed 原子递增 API Key 账号的配额用量 // IncrementQuotaUsed 原子递增 API Key 账号的配额用量(总/日/周)
IncrementQuotaUsed(ctx context.Context, id int64, amount float64, period string) error IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error
// ResetQuotaUsed 重置 API Key 账号的配额用量为 0 // ResetQuotaUsed 重置 API Key 账号的配额用量为 0
ResetQuotaUsed(ctx context.Context, id int64) error ResetQuotaUsed(ctx context.Context, id int64) error
} }
@@ -199,7 +199,7 @@ func (s *accountRepoStub) BulkUpdate(ctx context.Context, ids []int64, updates A
panic("unexpected BulkUpdate call") panic("unexpected BulkUpdate call")
} }
func (s *accountRepoStub) IncrementQuotaUsed(ctx context.Context, id int64, amount float64, _ string) error { func (s *accountRepoStub) IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error {
return nil return nil
} }
@@ -187,7 +187,7 @@ func (m *mockAccountRepoForPlatform) BulkUpdate(ctx context.Context, ids []int64
return 0, nil return 0, nil
} }
func (m *mockAccountRepoForPlatform) IncrementQuotaUsed(ctx context.Context, id int64, amount float64, _ string) error { func (m *mockAccountRepoForPlatform) IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error {
return nil return nil
} }
+2 -3
View File
@@ -6583,10 +6583,9 @@ func postUsageBilling(ctx context.Context, p *postUsageBillingParams, deps *bill
} }
// 4. 账号配额用量(账号口径:TotalCost × 账号计费倍率) // 4. 账号配额用量(账号口径:TotalCost × 账号计费倍率)
if cost.TotalCost > 0 && p.Account.Type == AccountTypeAPIKey && p.Account.GetQuotaLimit() > 0 { if cost.TotalCost > 0 && p.Account.Type == AccountTypeAPIKey && p.Account.HasAnyQuotaLimit() {
accountCost := cost.TotalCost * p.AccountRateMultiplier accountCost := cost.TotalCost * p.AccountRateMultiplier
period := p.Account.GetQuotaPeriod() if err := deps.accountRepo.IncrementQuotaUsed(ctx, p.Account.ID, accountCost); err != nil {
if err := deps.accountRepo.IncrementQuotaUsed(ctx, p.Account.ID, accountCost, period); err != nil {
slog.Error("increment account quota used failed", "account_id", p.Account.ID, "cost", accountCost, "error", err) slog.Error("increment account quota used failed", "account_id", p.Account.ID, "cost", accountCost, "error", err)
} }
} }
@@ -176,7 +176,7 @@ func (m *mockAccountRepoForGemini) BulkUpdate(ctx context.Context, ids []int64,
return 0, nil return 0, nil
} }
func (m *mockAccountRepoForGemini) IncrementQuotaUsed(ctx context.Context, id int64, amount float64, _ string) error { func (m *mockAccountRepoForGemini) IncrementQuotaUsed(ctx context.Context, id int64, amount float64) error {
return nil return nil
} }
@@ -1228,7 +1228,7 @@
</div> </div>
<!-- API Key 账号配额限制 --> <!-- API Key 账号配额限制 -->
<QuotaLimitCard v-if="form.type === 'apikey'" v-model="editQuotaLimit" :period="editQuotaPeriod" @update:period="editQuotaPeriod = $event" /> <QuotaLimitCard v-if="form.type === 'apikey'" :totalLimit="editQuotaLimit" :dailyLimit="editQuotaDailyLimit" :weeklyLimit="editQuotaWeeklyLimit" @update:totalLimit="editQuotaLimit = $event" @update:dailyLimit="editQuotaDailyLimit = $event" @update:weeklyLimit="editQuotaWeeklyLimit = $event" />
<!-- Temp Unschedulable Rules --> <!-- Temp Unschedulable Rules -->
<div class="border-t border-gray-200 pt-4 dark:border-dark-600 space-y-4"> <div class="border-t border-gray-200 pt-4 dark:border-dark-600 space-y-4">
@@ -2473,7 +2473,8 @@ const addMethod = ref<AddMethod>('oauth') // For oauth-based: 'oauth' or 'setup-
const apiKeyBaseUrl = ref('https://api.anthropic.com') const apiKeyBaseUrl = ref('https://api.anthropic.com')
const apiKeyValue = ref('') const apiKeyValue = ref('')
const editQuotaLimit = ref<number | null>(null) const editQuotaLimit = ref<number | null>(null)
const editQuotaPeriod = ref<string>('') const editQuotaDailyLimit = ref<number | null>(null)
const editQuotaWeeklyLimit = ref<number | null>(null)
const modelMappings = ref<ModelMapping[]>([]) const modelMappings = ref<ModelMapping[]>([])
const modelRestrictionMode = ref<'whitelist' | 'mapping'>('whitelist') const modelRestrictionMode = ref<'whitelist' | 'mapping'>('whitelist')
const allowedModels = ref<string[]>([]) const allowedModels = ref<string[]>([])
@@ -3137,7 +3138,8 @@ const resetForm = () => {
apiKeyBaseUrl.value = 'https://api.anthropic.com' apiKeyBaseUrl.value = 'https://api.anthropic.com'
apiKeyValue.value = '' apiKeyValue.value = ''
editQuotaLimit.value = null editQuotaLimit.value = null
editQuotaPeriod.value = '' editQuotaDailyLimit.value = null
editQuotaWeeklyLimit.value = null
modelMappings.value = [] modelMappings.value = []
modelRestrictionMode.value = 'whitelist' modelRestrictionMode.value = 'whitelist'
allowedModels.value = [...claudeModels] // Default fill related models allowedModels.value = [...claudeModels] // Default fill related models
@@ -3552,12 +3554,23 @@ const createAccountAndFinish = async (
if (!applyTempUnschedConfig(credentials)) { if (!applyTempUnschedConfig(credentials)) {
return return
} }
// Inject quota_limit for apikey accounts // Inject quota limits for apikey accounts
let finalExtra = extra let finalExtra = extra
if (type === 'apikey' && editQuotaLimit.value != null && editQuotaLimit.value > 0) { if (type === 'apikey') {
finalExtra = { ...(extra || {}), quota_limit: editQuotaLimit.value } const hasAnyQuota = (editQuotaLimit.value != null && editQuotaLimit.value > 0) ||
if (editQuotaPeriod.value) { (editQuotaDailyLimit.value != null && editQuotaDailyLimit.value > 0) ||
finalExtra.quota_period = editQuotaPeriod.value (editQuotaWeeklyLimit.value != null && editQuotaWeeklyLimit.value > 0)
if (hasAnyQuota) {
finalExtra = { ...(extra || {}) }
if (editQuotaLimit.value != null && editQuotaLimit.value > 0) {
finalExtra.quota_limit = editQuotaLimit.value
}
if (editQuotaDailyLimit.value != null && editQuotaDailyLimit.value > 0) {
finalExtra.quota_daily_limit = editQuotaDailyLimit.value
}
if (editQuotaWeeklyLimit.value != null && editQuotaWeeklyLimit.value > 0) {
finalExtra.quota_weekly_limit = editQuotaWeeklyLimit.value
}
} }
} }
await doCreateAccount({ await doCreateAccount({
@@ -798,7 +798,7 @@
</div> </div>
<!-- API Key 账号配额限制 --> <!-- API Key 账号配额限制 -->
<QuotaLimitCard v-if="account?.type === 'apikey'" v-model="editQuotaLimit" :period="editQuotaPeriod" @update:period="editQuotaPeriod = $event" /> <QuotaLimitCard v-if="account?.type === 'apikey'" :totalLimit="editQuotaLimit" :dailyLimit="editQuotaDailyLimit" :weeklyLimit="editQuotaWeeklyLimit" @update:totalLimit="editQuotaLimit = $event" @update:dailyLimit="editQuotaDailyLimit = $event" @update:weeklyLimit="editQuotaWeeklyLimit = $event" />
<!-- OpenAI OAuth Codex 官方客户端限制开关 --> <!-- OpenAI OAuth Codex 官方客户端限制开关 -->
<div <div
@@ -1430,7 +1430,8 @@ const openaiAPIKeyResponsesWebSocketV2Mode = ref<OpenAIWSMode>(OPENAI_WS_MODE_OF
const codexCLIOnlyEnabled = ref(false) const codexCLIOnlyEnabled = ref(false)
const anthropicPassthroughEnabled = ref(false) const anthropicPassthroughEnabled = ref(false)
const editQuotaLimit = ref<number | null>(null) const editQuotaLimit = ref<number | null>(null)
const editQuotaPeriod = ref<string>('') const editQuotaDailyLimit = ref<number | null>(null)
const editQuotaWeeklyLimit = ref<number | null>(null)
const openAIWSModeOptions = computed(() => [ const openAIWSModeOptions = computed(() => [
{ value: OPENAI_WS_MODE_OFF, label: t('admin.accounts.openai.wsModeOff') }, { value: OPENAI_WS_MODE_OFF, label: t('admin.accounts.openai.wsModeOff') },
// TODO: ctx_pool 选项暂时隐藏,待测试完成后恢复 // TODO: ctx_pool 选项暂时隐藏,待测试完成后恢复
@@ -1594,10 +1595,14 @@ watch(
if (newAccount.type === 'apikey') { if (newAccount.type === 'apikey') {
const quotaVal = extra?.quota_limit as number | undefined const quotaVal = extra?.quota_limit as number | undefined
editQuotaLimit.value = (quotaVal && quotaVal > 0) ? quotaVal : null editQuotaLimit.value = (quotaVal && quotaVal > 0) ? quotaVal : null
editQuotaPeriod.value = (extra?.quota_period as string) || '' const dailyVal = extra?.quota_daily_limit as number | undefined
editQuotaDailyLimit.value = (dailyVal && dailyVal > 0) ? dailyVal : null
const weeklyVal = extra?.quota_weekly_limit as number | undefined
editQuotaWeeklyLimit.value = (weeklyVal && weeklyVal > 0) ? weeklyVal : null
} else { } else {
editQuotaLimit.value = null editQuotaLimit.value = null
editQuotaPeriod.value = '' editQuotaDailyLimit.value = null
editQuotaWeeklyLimit.value = null
} }
// Load antigravity model mapping (Antigravity 只支持映射模式) // Load antigravity model mapping (Antigravity 只支持映射模式)
@@ -2390,22 +2395,32 @@ const handleSubmit = async () => {
updatePayload.extra = newExtra updatePayload.extra = newExtra
} }
// For apikey accounts, handle quota_limit in extra // For apikey accounts, handle quota limits in extra
if (props.account.type === 'apikey') { if (props.account.type === 'apikey') {
const currentExtra = (updatePayload.extra as Record<string, unknown>) || const currentExtra = (updatePayload.extra as Record<string, unknown>) ||
(props.account.extra as Record<string, unknown>) || {} (props.account.extra as Record<string, unknown>) || {}
const newExtra: Record<string, unknown> = { ...currentExtra } const newExtra: Record<string, unknown> = { ...currentExtra }
// Total quota
if (editQuotaLimit.value != null && editQuotaLimit.value > 0) { if (editQuotaLimit.value != null && editQuotaLimit.value > 0) {
newExtra.quota_limit = editQuotaLimit.value newExtra.quota_limit = editQuotaLimit.value
if (editQuotaPeriod.value) {
newExtra.quota_period = editQuotaPeriod.value
} else {
delete newExtra.quota_period
}
} else { } else {
delete newExtra.quota_limit delete newExtra.quota_limit
delete newExtra.quota_period }
delete newExtra.quota_period_start // Daily quota
if (editQuotaDailyLimit.value != null && editQuotaDailyLimit.value > 0) {
newExtra.quota_daily_limit = editQuotaDailyLimit.value
} else {
delete newExtra.quota_daily_limit
delete newExtra.quota_daily_used
delete newExtra.quota_daily_start
}
// Weekly quota
if (editQuotaWeeklyLimit.value != null && editQuotaWeeklyLimit.value > 0) {
newExtra.quota_weekly_limit = editQuotaWeeklyLimit.value
} else {
delete newExtra.quota_weekly_limit
delete newExtra.quota_weekly_used
delete newExtra.quota_weekly_start
} }
updatePayload.extra = newExtra updatePayload.extra = newExtra
} }
@@ -1,40 +1,54 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch } from 'vue' import { ref, watch, computed } from 'vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
const { t } = useI18n() const { t } = useI18n()
const props = defineProps<{ const props = defineProps<{
modelValue: number | null totalLimit: number | null
period: string dailyLimit: number | null
weeklyLimit: number | null
}>() }>()
const emit = defineEmits<{ const emit = defineEmits<{
'update:modelValue': [value: number | null] 'update:totalLimit': [value: number | null]
'update:period': [value: string] 'update:dailyLimit': [value: number | null]
'update:weeklyLimit': [value: number | null]
}>() }>()
const enabled = ref(props.modelValue != null && props.modelValue > 0) const enabled = computed(() =>
(props.totalLimit != null && props.totalLimit > 0) ||
// Sync enabled state when modelValue changes externally (e.g. account load) (props.dailyLimit != null && props.dailyLimit > 0) ||
watch( (props.weeklyLimit != null && props.weeklyLimit > 0)
() => props.modelValue,
(val) => {
enabled.value = val != null && val > 0
}
) )
// When toggle is turned off, clear the value const localEnabled = ref(enabled.value)
// Sync when props change externally
watch(enabled, (val) => { watch(enabled, (val) => {
localEnabled.value = val
})
// When toggle is turned off, clear all values
watch(localEnabled, (val) => {
if (!val) { if (!val) {
emit('update:modelValue', null) emit('update:totalLimit', null)
emit('update:period', '') emit('update:dailyLimit', null)
emit('update:weeklyLimit', null)
} }
}) })
const onInput = (e: Event) => { const onTotalInput = (e: Event) => {
const raw = (e.target as HTMLInputElement).valueAsNumber const raw = (e.target as HTMLInputElement).valueAsNumber
emit('update:modelValue', Number.isNaN(raw) ? null : raw) emit('update:totalLimit', Number.isNaN(raw) ? null : raw)
}
const onDailyInput = (e: Event) => {
const raw = (e.target as HTMLInputElement).valueAsNumber
emit('update:dailyLimit', Number.isNaN(raw) ? null : raw)
}
const onWeeklyInput = (e: Event) => {
const raw = (e.target as HTMLInputElement).valueAsNumber
emit('update:weeklyLimit', Number.isNaN(raw) ? null : raw)
} }
</script> </script>
@@ -57,29 +71,30 @@ const onInput = (e: Event) => {
</div> </div>
<button <button
type="button" type="button"
@click="enabled = !enabled" @click="localEnabled = !localEnabled"
:class="[ :class="[
'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2', 'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2',
enabled ? 'bg-primary-600' : 'bg-gray-200 dark:bg-dark-600' localEnabled ? 'bg-primary-600' : 'bg-gray-200 dark:bg-dark-600'
]" ]"
> >
<span <span
:class="[ :class="[
'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out', 'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
enabled ? 'translate-x-5' : 'translate-x-0' localEnabled ? 'translate-x-5' : 'translate-x-0'
]" ]"
/> />
</button> </button>
</div> </div>
<div v-if="enabled" class="space-y-3"> <div v-if="localEnabled" class="space-y-3">
<!-- 日配额 -->
<div> <div>
<label class="input-label">{{ t('admin.accounts.quotaLimitAmount') }}</label> <label class="input-label">{{ t('admin.accounts.quotaDailyLimit') }}</label>
<div class="relative"> <div class="relative">
<span class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-500 dark:text-gray-400">$</span> <span class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-500 dark:text-gray-400">$</span>
<input <input
:value="modelValue" :value="dailyLimit"
@input="onInput" @input="onDailyInput"
type="number" type="number"
min="0" min="0"
step="0.01" step="0.01"
@@ -87,21 +102,43 @@ const onInput = (e: Event) => {
:placeholder="t('admin.accounts.quotaLimitPlaceholder')" :placeholder="t('admin.accounts.quotaLimitPlaceholder')"
/> />
</div> </div>
<p class="input-hint">{{ t('admin.accounts.quotaLimitAmountHint') }}</p> <p class="input-hint">{{ t('admin.accounts.quotaDailyLimitHint') }}</p>
</div> </div>
<!-- 周配额 -->
<div> <div>
<label class="input-label">{{ t('admin.accounts.quotaPeriod') }}</label> <label class="input-label">{{ t('admin.accounts.quotaWeeklyLimit') }}</label>
<select <div class="relative">
:value="period" <span class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-500 dark:text-gray-400">$</span>
@change="$emit('update:period', ($event.target as HTMLSelectElement).value)" <input
class="input" :value="weeklyLimit"
> @input="onWeeklyInput"
<option value="">{{ t('admin.accounts.quotaPeriodNone') }}</option> type="number"
<option value="daily">{{ t('admin.accounts.quotaPeriodDaily') }}</option> min="0"
<option value="weekly">{{ t('admin.accounts.quotaPeriodWeekly') }}</option> step="0.01"
</select> class="input pl-7"
<p class="input-hint">{{ t('admin.accounts.quotaPeriodHint') }}</p> :placeholder="t('admin.accounts.quotaLimitPlaceholder')"
/>
</div>
<p class="input-hint">{{ t('admin.accounts.quotaWeeklyLimitHint') }}</p>
</div>
<!-- 总配额 -->
<div>
<label class="input-label">{{ t('admin.accounts.quotaTotalLimit') }}</label>
<div class="relative">
<span class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-500 dark:text-gray-400">$</span>
<input
:value="totalLimit"
@input="onTotalInput"
type="number"
min="0"
step="0.01"
class="input pl-7"
:placeholder="t('admin.accounts.quotaLimitPlaceholder')"
/>
</div>
<p class="input-hint">{{ t('admin.accounts.quotaTotalLimitHint') }}</p>
</div> </div>
</div> </div>
</div> </div>
+8 -7
View File
@@ -1797,13 +1797,14 @@ export default {
quotaLimitHint: 'Set max spending limit (USD). Account will be paused when reached. Changing limit won\'t reset usage.', quotaLimitHint: 'Set max spending limit (USD). Account will be paused when reached. Changing limit won\'t reset usage.',
quotaLimitToggle: 'Enable Quota Limit', quotaLimitToggle: 'Enable Quota Limit',
quotaLimitToggleHint: 'When enabled, account will be paused when usage reaches the set limit', quotaLimitToggleHint: 'When enabled, account will be paused when usage reaches the set limit',
quotaLimitAmount: 'Limit Amount', quotaLimitAmount: 'Total Limit',
quotaLimitAmountHint: 'Maximum spending limit (USD). Account will be auto-paused when reached. Changing limit won\'t reset usage.', quotaLimitAmountHint: 'Cumulative spending limit (USD). Never resets automatically.',
quotaPeriod: 'Reset Period', quotaDailyLimit: 'Daily Limit',
quotaPeriodNone: 'Never (cumulative)', quotaDailyLimitHint: 'Maximum spending per 24-hour period. Resets automatically from first usage.',
quotaPeriodDaily: 'Daily (every 24 hours)', quotaWeeklyLimit: 'Weekly Limit',
quotaPeriodWeekly: 'Weekly (every 7 days)', quotaWeeklyLimitHint: 'Maximum spending per 7-day period. Resets automatically from first usage.',
quotaPeriodHint: 'Choose how often the usage counter resets. Period starts from first usage.', quotaTotalLimit: 'Total Limit',
quotaTotalLimitHint: 'Cumulative spending limit (USD). Never resets automatically.',
testConnection: 'Test Connection', testConnection: 'Test Connection',
reAuthorize: 'Re-Authorize', reAuthorize: 'Re-Authorize',
refreshToken: 'Refresh Token', refreshToken: 'Refresh Token',
+8 -7
View File
@@ -1796,13 +1796,14 @@ export default {
quotaLimitHint: '设置最大使用额度(美元),达到后账号暂停调度。修改限额不会重置已用额度。', quotaLimitHint: '设置最大使用额度(美元),达到后账号暂停调度。修改限额不会重置已用额度。',
quotaLimitToggle: '启用配额限制', quotaLimitToggle: '启用配额限制',
quotaLimitToggleHint: '开启后,当账号用量达到设定额度时自动暂停调度', quotaLimitToggleHint: '开启后,当账号用量达到设定额度时自动暂停调度',
quotaLimitAmount: '限额金额', quotaLimitAmount: '总限额',
quotaLimitAmountHint: '账号最大可用额度(美元),达到后自动暂停。修改限额不会重置已用额度。', quotaLimitAmountHint: '累计用量上限(美元),不自动重置。',
quotaPeriod: '重置周期', quotaDailyLimit: '日限额',
quotaPeriodNone: '不重置(累计)', quotaDailyLimitHint: '每24小时最大可用额度,从首次使用时开始自动重置。',
quotaPeriodDaily: '每日(24小时周期)', quotaWeeklyLimit: '周限额',
quotaPeriodWeekly: '每周(7天周期)', quotaWeeklyLimitHint: '每7天最大可用额度,从首次使用时开始自动重置。',
quotaPeriodHint: '选择用量计数器自动重置的频率。周期从首次使用时开始计算。', quotaTotalLimit: '总限额',
quotaTotalLimitHint: '累计用量上限(美元),不自动重置。',
testConnection: '测试连接', testConnection: '测试连接',
reAuthorize: '重新授权', reAuthorize: '重新授权',
refreshToken: '刷新令牌', refreshToken: '刷新令牌',