i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-06 01:17:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(pool): 读取层配额归一化扩展到全部提供商

Browse Source 
- normalize_expired_codex_quota_windows 改为通用实现并去掉 Codex 门槛：
  对全部带重置时间的提供商窗口（kiro/xai/grok/antigravity/gemini_cli/
  chatgpt_web/windsurf 等）按“已重置”口径归一化比例
  （used_ratio/remaining_ratio）、数值（used_value/remaining_value）与
  窗口级耗尽标记
- 归一化条件收紧为“观测完整”（有比例观测，或有上限+用量数值），跳过
  window_minutes=0、无重置时间、只有 remaining_value 却没有上限的窗口，
  避免比例已恢复 100% 而数值仍停留在旧值
- 顶层汇总状态（exhausted/code）同样对所有提供商生效，避免列表状态筛选
  与前端提醒继续显示旧的“额度耗尽”
- 新增单测 3 个（非 Codex 窗口归一化/汇总清理/未到期保留）与 kiro 端到端
  用例 1 个（额度文本 + 状态筛选）；kiro 既有集成用例期望值更新为
  “剩余 100.0% (0/20)”（窗口已到期）；grok/windsurf 回填用例的重置时间
  改到未来，继续覆盖“未到期”路径

验证：aether-gateway lib 全量回归通过（仅 3 个依赖 PostgreSQL 服务端的用例
因本机环境缺失失败，与本改动无关）；cargo fmt、clippy -D warnings（lib）、
架构守卫 208/208 通过。
This commit is contained in:
AAEE86
2026-09-29 19:01:36 +08:00
parent 309f507ef4
commit 9abbf268a1
2 changed files with 403 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/shared/catalog.rs
+315 -27
View File
@@ -2575,19 +2575,17 @@ fn windsurf_quota_snapshot_has_stale_cooldown(quota_snapshot: &Map<String, Value
has_capacity || !exhausted
}
/// 读取状态快照时，把已越过重置时间点的 Codex 配额窗口按“已重置”口径归一化。
/// 读取状态快照时，把已越过重置时间点的配额窗口按“已重置”口径归一化。
///
/// 背景：调度侧早已把到期窗口视为未耗尽（`provider_pool_reset_deadline_elapsed`），
/// 账号额度文本也会按到期强制显示 100%，但列表读取此前直接返回存量快照，
/// 导致管理端倒计时归零后进度条仍停留在旧的剩余百分比。这里让读取层与
/// 调度侧、文本侧使用同一口径，避免三处状态互相矛盾。
fn normalize_expired_codex_quota_windows(
snapshot: &mut serde_json::Map<String, Value>,
provider_type: &str,
) {
if !provider_type.trim().eq_ignore_ascii_case("codex") {
return;
}
///
/// 覆盖所有带重置时间的提供商窗口（codex/kiro/xai/grok/antigravity/
/// gemini_cli/chatgpt_web/windsurf 等）：比例（used_ratio/remaining_ratio）、
/// 数值（used_value/remaining_value）与窗口级耗尽标记会一起恢复为“已重置”。
fn normalize_expired_quota_windows(snapshot: &mut serde_json::Map<String, Value>) {
let Some(quota) = snapshot.get_mut("quota").and_then(Value::as_object_mut) else {
return;
};
@@ -2603,7 +2601,7 @@ fn normalize_expired_codex_quota_windows(
};
for window in windows.iter_mut().filter_map(Value::as_object_mut) {
// 与同类 Codex 窗口处理保持一致：window_minutes=0 不是真实配额窗口。
// 与同类窗口处理保持一致：window_minutes=0 不是真实配额窗口。
if window.get("window_minutes").and_then(Value::as_u64) == Some(0) {
continue;
}
@@ -2614,15 +2612,38 @@ fn normalize_expired_codex_quota_windows(
) {
continue;
}
// 只归一化带用量观测的窗口，避免把没有观测数据的窗口凭空显示成 100%。
let has_usage_observation = ["used_ratio", "remaining_ratio"]
// 只归一化“观测完整”的窗口：要么有比例观测，要么有上限 + 用量数值。
// 这样既不会把无数据窗口凭空显示成 100%，也不会出现比例已恢复 100%
// 而数值仍停留在旧值的不一致（例如只有 remaining_value 却没有上限的窗口）。
let has_ratio_observation = ["used_ratio", "remaining_ratio"]
.into_iter()
.any(|field| window.get(field).is_some_and(Value::is_number));
if !has_usage_observation {
let limit_value = window
.get("limit_value")
.and_then(admin_provider_quota_pure::coerce_json_f64)
.filter(|value| *value > 0.0);
let has_value_observation = limit_value.is_some()
&& ["used_value", "remaining_value"]
.into_iter()
.any(|field| window.get(field).is_some_and(Value::is_number));
if !has_ratio_observation && !has_value_observation {
continue;
}
window.insert("used_ratio".to_string(), json!(0.0));
window.insert("remaining_ratio".to_string(), json!(1.0));
// 比例口径：已用清零、剩余 100%；字段原本为 null 时一并补齐，保证展示口径统一。
for (field, value) in [("used_ratio", 0.0), ("remaining_ratio", 1.0)] {
if window.contains_key(field) {
window.insert(field.to_string(), json!(value));
}
}
// 数值口径：已用清零；有上限时把剩余恢复到上限（用于“剩余 x/y”类文本展示）。
if window.contains_key("used_value") {
window.insert("used_value".to_string(), json!(0.0));
}
if window.contains_key("remaining_value") {
if let Some(limit_value) = limit_value {
window.insert("remaining_value".to_string(), json!(limit_value));
}
}
// 同步清掉窗口级耗尽标记，避免展示与调度口径互相矛盾。
for field in ["is_exhausted", "exhausted"] {
if let Some(slot) = window.get_mut(field) {
@@ -2673,9 +2694,8 @@ pub(crate) fn provider_key_status_snapshot_payload(
// Legacy snapshots can retain an exhausted summary after a window reset or
// newer quota observation. Use the same decision as scheduling so the
// account list and its status filter do not keep displaying that stale block.
if provider_type.trim().eq_ignore_ascii_case("codex")
&& !aether_provider_pool::provider_pool_key_account_quota_exhausted(key, provider_type)
{
// 对所有提供商生效：适配器判定已是“重置感知”的，与调度口径保持一致。
if !aether_provider_pool::provider_pool_key_account_quota_exhausted(key, provider_type) {
if let Some(quota) = snapshot.get_mut("quota").and_then(Value::as_object_mut) {
quota.insert("exhausted".to_string(), json!(false));
if quota.get("code").and_then(Value::as_str) == Some("exhausted") {
@@ -2683,9 +2703,9 @@ pub(crate) fn provider_key_status_snapshot_payload(
}
}
}
// 读取时归一化已到期的 Codex 配额窗口，保证列表进度条与调度侧、
// 读取时归一化已到期的配额窗口，保证列表进度条、额度文字与调度侧、
// 账号额度文本使用同一“已重置”口径。
normalize_expired_codex_quota_windows(&mut snapshot, provider_type);
normalize_expired_quota_windows(&mut snapshot);
snapshot.insert(
"oauth".to_string(),
build_provider_key_oauth_status_snapshot(key),
@@ -3881,6 +3901,274 @@ mod tests {
);
}
#[test]
fn provider_key_status_snapshot_payload_normalizes_expired_quota_windows_for_other_providers() {
let mut key = sample_catalog_key();
key.status_snapshot = Some(json!({
"quota": {
"version": 2,
"provider_type": "kiro",
"code": "ok",
"exhausted": false,
"observed_at": 1_700_000_000u64,
"updated_at": 1_700_000_000u64,
"windows": [
{
"code": "usage",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": 0.4,
"remaining_ratio": 0.6,
"used_value": 60.0,
"remaining_value": 90.0,
"limit_value": 150.0,
"reset_at": 1_700_003_600u64,
"reset_seconds": 3_600u64
},
{
"code": "usage_null_ratio",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": null,
"remaining_ratio": null,
"used_value": 60.0,
"remaining_value": 90.0,
"limit_value": 150.0,
"reset_at": 1_700_003_600u64,
"reset_seconds": 3_600u64
},
{
"code": "usage_active",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": 0.4,
"remaining_ratio": 0.6,
"used_value": 60.0,
"remaining_value": 90.0,
"limit_value": 150.0,
"reset_at": 2_000_000_000u64,
"reset_seconds": 300_000_000u64
},
{
"code": "usage_no_observation",
"label": "额度",
"scope": "account",
"unit": "count",
"reset_at": 1_700_003_600u64,
"reset_seconds": 3_600u64
},
{
"code": "usage_no_deadline",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": 0.4,
"remaining_ratio": 0.6,
"used_value": 60.0,
"remaining_value": 90.0,
"limit_value": 150.0
},
{
"code": "usage_remaining_without_limit",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": null,
"remaining_ratio": null,
"remaining_value": 0.0,
"reset_at": 1_700_003_600u64,
"reset_seconds": 3_600u64
}
]
}
}));
let payload = provider_key_status_snapshot_payload(&key, "kiro");
// 已到期窗口：比例与数值一起按“已重置”归一化（不再只覆盖 Codex）。
assert_eq!(
payload.pointer("/quota/windows/0/used_ratio"),
Some(&json!(0.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/remaining_ratio"),
Some(&json!(1.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/used_value"),
Some(&json!(0.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/remaining_value"),
Some(&json!(150.0))
);
// 比例字段为 null 时补齐为已重置口径，保证优先读比例的展示实现一致。
assert_eq!(
payload.pointer("/quota/windows/1/used_ratio"),
Some(&json!(0.0))
);
assert_eq!(
payload.pointer("/quota/windows/1/remaining_ratio"),
Some(&json!(1.0))
);
assert_eq!(
payload.pointer("/quota/windows/1/used_value"),
Some(&json!(0.0))
);
assert_eq!(
payload.pointer("/quota/windows/1/remaining_value"),
Some(&json!(150.0))
);
// 未到期窗口保留原始观测值。
assert_eq!(
payload.pointer("/quota/windows/2/used_ratio"),
Some(&json!(0.4))
);
assert_eq!(
payload.pointer("/quota/windows/2/remaining_value"),
Some(&json!(90.0))
);
// 没有用量观测的窗口不会被凭空补成 100%。
assert_eq!(payload.pointer("/quota/windows/3/used_ratio"), None);
assert_eq!(payload.pointer("/quota/windows/3/remaining_ratio"), None);
// 没有重置时间的窗口无法判定是否已重置，保持原样。
assert_eq!(
payload.pointer("/quota/windows/4/used_ratio"),
Some(&json!(0.4))
);
assert_eq!(
payload.pointer("/quota/windows/4/remaining_ratio"),
Some(&json!(0.6))
);
// 只有 remaining_value 却没有上限的窗口观测不完整，跳过归一化，
// 避免比例已恢复 100% 而数值仍停留在旧值。
assert_eq!(
payload.pointer("/quota/windows/5/remaining_ratio"),
Some(&json!(null))
);
assert_eq!(
payload.pointer("/quota/windows/5/remaining_value"),
Some(&json!(0.0))
);
}
#[test]
fn provider_key_status_snapshot_payload_clears_expired_quota_exhausted_state_for_other_providers(
) {
let mut key = sample_catalog_key();
key.status_snapshot = Some(json!({
"quota": {
"version": 2,
"provider_type": "kiro",
"code": "exhausted",
"label": "额度耗尽",
"reason": "额度已耗尽",
"exhausted": true,
"usage_ratio": 1.0,
"observed_at": 1_700_000_000u64,
"updated_at": 1_700_000_000u64,
"windows": [
{
"code": "usage",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": 1.0,
"remaining_ratio": 0.0,
"used_value": 150.0,
"remaining_value": 0.0,
"limit_value": 150.0,
"reset_at": 1_700_003_600u64,
"reset_seconds": 3_600u64,
"is_exhausted": true
}
]
}
}));
let payload = provider_key_status_snapshot_payload(&key, "kiro");
// 汇总状态沿用调度口径（窗口已到期 → 不再视为耗尽），对所有提供商生效。
assert_eq!(payload.pointer("/quota/exhausted"), Some(&json!(false)));
assert_eq!(payload.pointer("/quota/code"), Some(&json!("ok")));
// 窗口比例、数值与耗尽标记同步归一化。
assert_eq!(
payload.pointer("/quota/windows/0/is_exhausted"),
Some(&json!(false))
);
assert_eq!(
payload.pointer("/quota/windows/0/used_ratio"),
Some(&json!(0.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/remaining_ratio"),
Some(&json!(1.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/used_value"),
Some(&json!(0.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/remaining_value"),
Some(&json!(150.0))
);
}
#[test]
fn provider_key_status_snapshot_payload_keeps_active_quota_exhausted_state_for_other_providers()
{
let mut key = sample_catalog_key();
key.status_snapshot = Some(json!({
"quota": {
"version": 2,
"provider_type": "kiro",
"code": "exhausted",
"label": "额度耗尽",
"exhausted": true,
"usage_ratio": 1.0,
"observed_at": 1_700_000_000u64,
"updated_at": 1_700_000_000u64,
"windows": [
{
"code": "usage",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": 1.0,
"remaining_ratio": 0.0,
"used_value": 150.0,
"remaining_value": 0.0,
"limit_value": 150.0,
"reset_at": 2_000_000_000u64,
"reset_seconds": 300_000_000u64,
"is_exhausted": true
}
]
}
}));
let payload = provider_key_status_snapshot_payload(&key, "kiro");
// 未到期的耗尽状态保留，不能被读取层提前“恢复”。
assert_eq!(payload.pointer("/quota/exhausted"), Some(&json!(true)));
assert_eq!(payload.pointer("/quota/code"), Some(&json!("exhausted")));
assert_eq!(
payload.pointer("/quota/windows/0/is_exhausted"),
Some(&json!(true))
);
assert_eq!(
payload.pointer("/quota/windows/0/used_ratio"),
Some(&json!(1.0))
);
assert_eq!(
payload.pointer("/quota/windows/0/remaining_ratio"),
Some(&json!(0.0))
);
}
#[test]
fn provider_key_status_snapshot_payload_backfills_chatgpt_web_image_quota() {
let mut key = sample_catalog_key();
@@ -3959,14 +4247,14 @@ mod tests {
"used_percent": 60.0,
"remaining": 60.0,
"total": 150.0,
"reset_at": 1_778_157_172u64,
"reset_at": 2_000_000_000u64,
"is_exhausted": false
},
"quota_heavy": {
"display_name": "heavy",
"remaining_fraction": 0.0,
"used_percent": 100.0,
"reset_at": 1_778_157_172u64,
"reset_at": 2_000_000_000u64,
"is_exhausted": true
}
}
@@ -3989,7 +4277,7 @@ mod tests {
assert_eq!(quota.get("pool_tier"), Some(&json!("heavy")));
assert_eq!(quota.get("exhausted"), Some(&json!(false)));
assert_eq!(quota.get("usage_ratio"), Some(&json!(1.0)));
assert_eq!(quota.get("reset_at"), Some(&json!(1_778_157_172u64)));
assert_eq!(quota.get("reset_at"), Some(&json!(2_000_000_000u64)));
assert_eq!(windows.len(), 2);
assert!(windows.iter().any(|window| {
window
@@ -4102,8 +4390,8 @@ mod tests {
"plan_name": "Pro",
"daily_remaining_percent": 40.0,
"weekly_remaining_percent": 65.0,
"daily_reset_at": 1_778_100_000u64,
"weekly_reset_at": 1_778_600_000u64,
"daily_reset_at": 2_000_000_000u64,
"weekly_reset_at": 2_000_600_000u64,
"prompt_used": 12.0,
"prompt_limit": 100.0,
"prompt_remaining": 88.0,
@@ -4138,13 +4426,13 @@ mod tests {
assert_eq!(quota.get("code"), Some(&json!("ok")));
assert_eq!(quota.get("plan_type"), Some(&json!("Pro")));
assert_eq!(quota.get("usage_ratio"), Some(&json!(0.6)));
assert_eq!(quota.get("reset_at"), Some(&json!(1_778_100_000u64)));
assert_eq!(quota.get("reset_at"), Some(&json!(2_000_000_000u64)));
assert_eq!(daily.get("remaining_ratio"), Some(&json!(0.4)));
assert_eq!(daily.get("used_ratio"), Some(&json!(0.6)));
assert_eq!(daily.get("reset_seconds"), Some(&json!(32_754u64)));
assert_eq!(daily.get("reset_seconds"), Some(&json!(221_932_754u64)));
assert_eq!(weekly.get("remaining_ratio"), Some(&json!(0.65)));
assert_eq!(weekly.get("used_ratio"), Some(&json!(0.35)));
assert_eq!(weekly.get("reset_seconds"), Some(&json!(532_754u64)));
assert_eq!(weekly.get("reset_seconds"), Some(&json!(222_532_754u64)));
assert_eq!(quota.get("allowed_models_count"), Some(&json!(82)));
}
apps/aether-gateway/src/tests/control/admin/pool.rs
+88 -1
View File
@@ -3044,7 +3044,94 @@ async fn gateway_prefers_status_snapshot_kiro_quota_over_stale_metadata() {
assert_eq!(keys[0]["scheduling_status"], json!("available"));
assert_eq!(keys[0]["scheduling_reason"], json!("available"));
assert_eq!(keys[0]["quota_updated_at"], json!(1_775_553_285u64));
assert_eq!(keys[0]["account_quota"], json!("剩余 75.0% (5/20)"));
// 窗口重置时间已过：读取层按“已重置”口径归一化（调度侧同样不再视为耗尽），
// 同时仍优先使用快照（上限 20）而不是陈旧元数据（上限 100）。
assert_eq!(keys[0]["account_quota"], json!("剩余 100.0% (0/20)"));
}
#[tokio::test]
async fn gateway_kiro_pool_filter_clears_stale_exhausted_summary_after_window_reset() {
let mut provider = sample_provider("provider-kiro", "kiro", 10);
provider.provider_type = "kiro".to_string();
provider.config = Some(json!({"pool_advanced": {
"reserve_minimum_quota": false, "skip_exhausted_accounts": true
}}));
let mut key = sample_key(
"key-kiro-expired",
"provider-kiro",
"claude:messages",
"oauth-placeholder",
);
key.name = "kiro expired quota key".to_string();
key.auth_type = "oauth".to_string();
key.status_snapshot = Some(json!({
"quota": {
"version": 2,
"provider_type": "kiro",
"code": "exhausted",
"label": "额度耗尽",
"reason": "额度已耗尽",
"freshness": "fresh",
"source": "refresh_api",
"observed_at": 1_775_553_285u64,
"exhausted": true,
"usage_ratio": 1.0,
"updated_at": 1_775_553_285u64,
"reset_seconds": 0u64,
"plan_type": "KIRO PRO+",
"windows": [
{
"code": "usage",
"label": "额度",
"scope": "account",
"unit": "count",
"used_ratio": 1.0,
"remaining_ratio": 0.0,
"used_value": 20.0,
"remaining_value": 0.0,
"limit_value": 20.0,
"reset_at": 1_775_639_685u64,
"reset_seconds": 0u64,
"is_exhausted": true
}
]
}
}));
let state = AppState::new()
.expect("gateway should build")
.with_data_state_for_tests(GatewayDataState::with_provider_catalog_reader_for_tests(
Arc::new(InMemoryProviderCatalogReadRepository::seed(
vec![provider],
Vec::new(),
vec![key],
)),
));
for status in ["all", "available", "quota_exhausted"] {
let response = local_admin_pool_response(
&state,
http::Method::GET,
&format!("/api/admin/pool/provider-kiro/keys?page=1&page_size=50&status={status}"),
None,
)
.await;
assert_eq!(response.status(), StatusCode::OK);
let payload: serde_json::Value = serde_json::from_slice(
&to_bytes(response.into_body(), usize::MAX)
.await
.expect("body should read"),
)
.expect("json body should parse");
let keys = payload["keys"].as_array().expect("keys should be array");
assert_eq!(keys.len(), usize::from(status != "quota_exhausted"));
if let Some(key) = keys.first() {
assert_eq!(key["scheduling_status"], json!("available"));
assert_eq!(key["status_snapshot"]["quota"]["code"], json!("ok"));
assert_eq!(key["status_snapshot"]["quota"]["exhausted"], json!(false));
assert_eq!(key["account_quota"], json!("剩余 100.0% (0/20)"));
}
}
}
#[tokio::test]