mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 01:10:23 +08:00
fix(kiro,pool,model): 对齐 Kiro 管理链路并修复全局模型删除行为 (#305)
* feat(pool): 号池支持跳过额度耗尽账号 - 新增 pool_advanced.skip_exhausted_accounts 开关及高级设置 UI, 默认关闭并兼容旧配置 - 为 Codex/Kiro 增加额度耗尽判定, 接入请求侧候选跳过并新增 account_quota_exhausted skip reason - 号池列表将额度耗尽账号标记为 blocked/额度耗尽, 并补充前后端相关测试 * fix(kiro): 对齐账号管理与 provider-query 的 Rust 行为 - 修复 Kiro 单条导入误走 import-refresh-token 的前端分流, 并为误用路径返回明确错误提示 - 为 Kiro 导入与本地请求链补齐 bearer 兼容, 同步放开账号启停等 Key 更新操作的 auth_type 校验 - 实现 Kiro provider-query 本地模型测试与 failover 执行链, 并修复结果弹窗在无 trace 时无法展示 attempts/响应体的问题 * fix(model): 删除全局模型时级联清理关联提供商模型 - 对齐 Python 版本删除逻辑, GlobalModel 删除前先在事务内清理关联的 Provider Model 记录 - 修复已绑定 Provider 的模型在 Rust SQL 仓库下会被外键约束拦住、无法正常删除的问题 - 增加管理端回归测试, 覆盖绑定 Provider Model 的 GlobalModel 删除场景 * fix(kiro,ci): 恢复 Kiro OAuth 持久化并修复 Rust CI * Fix oauth-managed provider key semantics --------- Co-authored-by: fawney19 <elky0401@gmail.com>
This commit is contained in:
@@ -90,6 +90,81 @@ fn admin_pool_reason_indicates_ban(reason: &str) -> bool {
|
||||
.any(|hint| normalized.contains(hint))
|
||||
}
|
||||
|
||||
fn admin_pool_metadata_bucket<'a>(
|
||||
upstream_metadata: Option<&'a Value>,
|
||||
provider_type: &str,
|
||||
) -> Option<&'a serde_json::Map<String, Value>> {
|
||||
upstream_metadata
|
||||
.and_then(Value::as_object)
|
||||
.and_then(|metadata| metadata.get(&provider_type.trim().to_ascii_lowercase()))
|
||||
.and_then(Value::as_object)
|
||||
}
|
||||
|
||||
fn admin_pool_json_bool(value: Option<&Value>) -> Option<bool> {
|
||||
match value {
|
||||
Some(Value::Bool(value)) => Some(*value),
|
||||
Some(Value::String(value)) => match value.trim().to_ascii_lowercase().as_str() {
|
||||
"true" | "1" => Some(true),
|
||||
"false" | "0" => Some(false),
|
||||
_ => None,
|
||||
},
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn admin_pool_json_f64(value: Option<&Value>) -> Option<f64> {
|
||||
match value {
|
||||
Some(Value::Number(number)) => number.as_f64(),
|
||||
Some(Value::String(value)) => value.trim().parse::<f64>().ok(),
|
||||
_ => None,
|
||||
}
|
||||
.filter(|value| value.is_finite())
|
||||
}
|
||||
|
||||
pub fn admin_pool_key_account_quota_exhausted(
|
||||
key: &StoredProviderCatalogKey,
|
||||
provider_type: &str,
|
||||
) -> bool {
|
||||
let provider_type = provider_type.trim().to_ascii_lowercase();
|
||||
let Some(bucket) = admin_pool_metadata_bucket(key.upstream_metadata.as_ref(), &provider_type)
|
||||
else {
|
||||
return false;
|
||||
};
|
||||
|
||||
match provider_type.as_str() {
|
||||
"codex" => {
|
||||
if admin_pool_json_bool(bucket.get("credits_unlimited")) == Some(true) {
|
||||
return false;
|
||||
}
|
||||
if admin_pool_json_bool(bucket.get("has_credits")) == Some(false) {
|
||||
return true;
|
||||
}
|
||||
admin_pool_json_f64(bucket.get("primary_used_percent"))
|
||||
.is_some_and(|value| value >= 100.0)
|
||||
|| admin_pool_json_f64(bucket.get("secondary_used_percent"))
|
||||
.is_some_and(|value| value >= 100.0)
|
||||
}
|
||||
"kiro" => {
|
||||
if admin_pool_json_f64(bucket.get("remaining")).is_some_and(|value| value <= 0.0) {
|
||||
return true;
|
||||
}
|
||||
if admin_pool_json_f64(bucket.get("usage_percentage"))
|
||||
.is_some_and(|value| value >= 100.0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
match (
|
||||
admin_pool_json_f64(bucket.get("usage_limit")),
|
||||
admin_pool_json_f64(bucket.get("current_usage")),
|
||||
) {
|
||||
(Some(limit), Some(current)) if limit > 0.0 => current >= limit,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn admin_pool_has_proxy(key: &StoredProviderCatalogKey) -> bool {
|
||||
match key.proxy.as_ref() {
|
||||
Some(Value::Object(values)) => !values.is_empty(),
|
||||
@@ -525,6 +600,103 @@ pub fn build_admin_pool_selection_payload(keys: &[StoredProviderCatalogKey]) ->
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[allow(clippy::items_after_test_module)]
|
||||
mod tests {
|
||||
use super::admin_pool_key_account_quota_exhausted;
|
||||
use aether_data_contracts::repository::provider_catalog::StoredProviderCatalogKey;
|
||||
use serde_json::json;
|
||||
|
||||
fn sample_key(upstream_metadata: Option<serde_json::Value>) -> StoredProviderCatalogKey {
|
||||
let mut key = StoredProviderCatalogKey::new(
|
||||
"key-1".to_string(),
|
||||
"provider-1".to_string(),
|
||||
"key-1".to_string(),
|
||||
"oauth".to_string(),
|
||||
None,
|
||||
true,
|
||||
)
|
||||
.expect("key should build");
|
||||
key.upstream_metadata = upstream_metadata;
|
||||
key
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn detects_codex_exhaustion_from_metadata() {
|
||||
assert!(admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"codex": {
|
||||
"has_credits": false,
|
||||
"credits_unlimited": false
|
||||
}
|
||||
}))),
|
||||
"codex",
|
||||
));
|
||||
assert!(admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"codex": {
|
||||
"primary_used_percent": 100.0
|
||||
}
|
||||
}))),
|
||||
"codex",
|
||||
));
|
||||
assert!(admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"codex": {
|
||||
"secondary_used_percent": 100.0
|
||||
}
|
||||
}))),
|
||||
"codex",
|
||||
));
|
||||
assert!(!admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"codex": {
|
||||
"has_credits": false,
|
||||
"credits_unlimited": true
|
||||
}
|
||||
}))),
|
||||
"codex",
|
||||
));
|
||||
assert!(!admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(None),
|
||||
"codex",
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn detects_kiro_exhaustion_from_metadata() {
|
||||
assert!(admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"kiro": {
|
||||
"remaining": 0
|
||||
}
|
||||
}))),
|
||||
"kiro",
|
||||
));
|
||||
assert!(admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"kiro": {
|
||||
"usage_percentage": 100.0
|
||||
}
|
||||
}))),
|
||||
"kiro",
|
||||
));
|
||||
assert!(admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(Some(json!({
|
||||
"kiro": {
|
||||
"usage_limit": 100.0,
|
||||
"current_usage": 100.0
|
||||
}
|
||||
}))),
|
||||
"kiro",
|
||||
));
|
||||
assert!(!admin_pool_key_account_quota_exhausted(
|
||||
&sample_key(None),
|
||||
"kiro",
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build_admin_pool_key_payload(
|
||||
key: &StoredProviderCatalogKey,
|
||||
context: &AdminPoolKeyPayloadContext,
|
||||
|
||||
Reference in New Issue
Block a user