mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 09:20:22 +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:
@@ -60,7 +60,7 @@ export async function getModelCapabilities(modelName: string): Promise<ModelCapa
|
||||
* 获取完整的 API Key(用于查看和复制)
|
||||
*/
|
||||
export interface RevealKeyResult {
|
||||
auth_type: 'api_key' | 'service_account' | 'oauth'
|
||||
auth_type: 'api_key' | 'service_account' | 'oauth' | 'bearer'
|
||||
api_key?: string
|
||||
refresh_token?: string
|
||||
auth_config?: string | Record<string, unknown>
|
||||
@@ -165,7 +165,7 @@ export async function updateProviderKey(
|
||||
data: Partial<{
|
||||
api_formats: string[] // 支持的 API 格式列表
|
||||
api_key: string
|
||||
auth_type: 'api_key' | 'service_account' | 'oauth' // 认证类型
|
||||
auth_type: 'api_key' | 'service_account' | 'oauth' | 'bearer' // 认证类型
|
||||
auth_config: Record<string, unknown> // 认证配置(Vertex AI Service Account JSON)
|
||||
name: string
|
||||
rate_multipliers: Record<string, number> | null // 按 API 格式的成本倍率
|
||||
|
||||
@@ -104,6 +104,12 @@ export interface PoolKeyDetail {
|
||||
key_name: string
|
||||
is_active: boolean
|
||||
auth_type: string
|
||||
credential_kind?: 'raw_secret' | 'oauth_session' | 'service_account' | string | null
|
||||
runtime_auth_kind?: 'api_key' | 'bearer' | 'service_account' | 'unknown' | string | null
|
||||
oauth_managed?: boolean
|
||||
can_refresh_oauth?: boolean
|
||||
can_export_oauth?: boolean
|
||||
can_edit_oauth?: boolean
|
||||
oauth_expires_at?: number | null
|
||||
oauth_invalid_at?: number | null // 兼容字段;优先使用 status_snapshot.oauth
|
||||
oauth_invalid_reason?: string | null // 兼容字段;优先使用 status_snapshot.oauth
|
||||
@@ -200,6 +206,12 @@ export interface PoolKeySelectionItem {
|
||||
key_id: string
|
||||
key_name: string
|
||||
auth_type: string
|
||||
credential_kind?: 'raw_secret' | 'oauth_session' | 'service_account' | string | null
|
||||
runtime_auth_kind?: 'api_key' | 'bearer' | 'service_account' | 'unknown' | string | null
|
||||
oauth_managed?: boolean
|
||||
can_refresh_oauth?: boolean
|
||||
can_export_oauth?: boolean
|
||||
can_edit_oauth?: boolean
|
||||
}
|
||||
|
||||
export interface PoolKeySelectionResponse {
|
||||
|
||||
@@ -229,7 +229,13 @@ export interface EndpointAPIKey {
|
||||
api_formats: string[] // 支持的 endpoint signature 列表(如 "openai:chat")
|
||||
api_key_masked: string
|
||||
api_key_plain?: string | null
|
||||
auth_type: 'api_key' | 'service_account' | 'oauth' // 认证类型(必返回)
|
||||
auth_type: 'api_key' | 'service_account' | 'oauth' | 'bearer' // 认证类型(必返回)
|
||||
credential_kind?: 'raw_secret' | 'oauth_session' | 'service_account' | string | null
|
||||
runtime_auth_kind?: 'api_key' | 'bearer' | 'service_account' | 'unknown' | string | null
|
||||
oauth_managed?: boolean
|
||||
can_refresh_oauth?: boolean
|
||||
can_export_oauth?: boolean
|
||||
can_edit_oauth?: boolean
|
||||
name: string // 密钥名称(必填,用于识别)
|
||||
rate_multipliers?: Record<string, number> | null // 按 endpoint signature 的成本倍率
|
||||
internal_priority: number // Key 内部优先级
|
||||
@@ -492,6 +498,7 @@ export interface PoolAdvancedConfig {
|
||||
global_priority?: number | null
|
||||
sticky_session_ttl_seconds?: number | null
|
||||
load_threshold_percent?: number | null
|
||||
skip_exhausted_accounts?: boolean | null
|
||||
// 旧字段(兼容读取)
|
||||
lru_enabled?: boolean
|
||||
scheduling_mode?: 'lru' | 'multi_score' | null
|
||||
|
||||
Reference in New Issue
Block a user