mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 09:20:22 +08:00
fix(pool): 修复 Codex 配额倒计时不准确 (#297)
* fix(pool): 修复 Codex 配额倒计时不准确 - 后端号池 keys payload 增加 upstream_metadata 透传 - 前端补充 PoolKeyDetail.upstream_metadata 与 Codex reset_after_seconds 类型 - 号池页倒计时优先使用 reset_at/reset_seconds/updated_at 结构化数据计算 - 仅在缺少结构化字段时回退 account_quota 文案解析 * fix(pool): 将已重置的 Codex 配额恢复为 100% - reset_after_seconds/reset_seconds 会按 updated_at 扣减经过时间(不再当作静态值) - 若窗口已重置(剩余秒数 <= 0),该窗口 used_percent 按 0 处理
This commit is contained in:
@@ -1067,7 +1067,7 @@ async fn gateway_formats_codex_quota_countdown_from_reset_after_seconds() {
|
||||
key.upstream_metadata = Some(json!({
|
||||
"codex": {
|
||||
"plan_type": "plus",
|
||||
"updated_at": 1_775_553_285u64,
|
||||
"updated_at": 4_102_444_800u64,
|
||||
"primary_used_percent": 10.0,
|
||||
"primary_reset_after_seconds": 266_400,
|
||||
"secondary_used_percent": 33.0,
|
||||
@@ -1109,6 +1109,75 @@ async fn gateway_formats_codex_quota_countdown_from_reset_after_seconds() {
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn gateway_codex_quota_resets_to_full_after_countdown_elapsed() {
|
||||
let mut provider = sample_provider("provider-codex", "codex", 10).with_transport_fields(
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
Some(json!({
|
||||
"pool_advanced": {
|
||||
"enabled": true
|
||||
}
|
||||
})),
|
||||
);
|
||||
provider.provider_type = "codex".to_string();
|
||||
|
||||
let mut key = sample_key(
|
||||
"key-codex-expired",
|
||||
"provider-codex",
|
||||
"openai:cli",
|
||||
"oauth-placeholder",
|
||||
);
|
||||
key.name = "codex expired quota key".to_string();
|
||||
key.auth_type = "oauth".to_string();
|
||||
key.upstream_metadata = Some(json!({
|
||||
"codex": {
|
||||
"plan_type": "plus",
|
||||
"updated_at": 1u64,
|
||||
"primary_used_percent": 42.0,
|
||||
"primary_reset_after_seconds": 60,
|
||||
"secondary_used_percent": 77.0,
|
||||
"secondary_reset_after_seconds": 120
|
||||
}
|
||||
}));
|
||||
|
||||
let provider_catalog_repository = Arc::new(InMemoryProviderCatalogReadRepository::seed(
|
||||
vec![provider],
|
||||
Vec::new(),
|
||||
vec![key],
|
||||
));
|
||||
let state = AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(GatewayDataState::with_provider_catalog_reader_for_tests(
|
||||
provider_catalog_repository,
|
||||
));
|
||||
|
||||
let response = local_admin_pool_response(
|
||||
&state,
|
||||
http::Method::GET,
|
||||
"/api/admin/pool/provider-codex/keys?page=1&page_size=50&status=all",
|
||||
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(), 1);
|
||||
assert_eq!(keys[0]["account_quota"], "周剩余 100.0% | 5H剩余 100.0%");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn gateway_pool_prefers_upstream_plan_type_over_auth_config() {
|
||||
let mut provider = sample_provider("provider-codex", "codex", 10).with_transport_fields(
|
||||
|
||||
Reference in New Issue
Block a user