mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 17:30:23 +08:00
feat(pool): 引入多维评分调度策略与账号状态检测
- 新增 multi_score 调度模式,支持 LRU/延迟/健康度/剩余额度多维加权评分 - 新增调度预设维度系统(free_team_first, quota_balanced, recent_refresh, single_account),支持有序对象列表配置格式并兼容旧字符串列表 - 新增 account_state 模块,统一账号封禁/受限检测逻辑,替代分散在 routes 中的判断代码 - 新增 health_cache 模块和 latency 采样(redis_ops.record_latency / batch_get_latency_avgs) - RequestDispatcher 返回 ttfb_ms,PoolManager.on_request_success 记录延迟样本 - 前端:PoolConfigDialog 替换为 PoolSchedulingDialog,支持预设维度可视化配置;号池管理页增加调度模式标签与账号异常 Badge 显示 - 提取前端 accountBlock 工具函数,ProviderDetailDrawer 复用统一判断 - scheduling_dimensions 增加 account_state 和 latency 维度评估 - 补充 account_state、health_cache、multi_score 策略、preset 维度、redis latency 等测试
This commit is contained in:
@@ -48,7 +48,25 @@ class TestPoolCandidateTraceExtraData:
|
||||
ct = PoolCandidateTrace(key_id="k4", reason="random")
|
||||
data = ct.to_extra_data()
|
||||
sel = data["pool_selection"]
|
||||
assert sel == {"reason": "random"}
|
||||
assert sel["reason"] == "random"
|
||||
assert sel["scoring_mode"] == "lru"
|
||||
|
||||
def test_selected_multi_score_fields(self) -> None:
|
||||
ct = PoolCandidateTrace(
|
||||
key_id="k4b",
|
||||
reason="multi_score",
|
||||
scoring_mode="multi_score",
|
||||
latency_avg_ms=245.7,
|
||||
health_score=0.82,
|
||||
composite_score=0.372156,
|
||||
)
|
||||
data = ct.to_extra_data()
|
||||
sel = data["pool_selection"]
|
||||
assert sel["reason"] == "multi_score"
|
||||
assert sel["scoring_mode"] == "multi_score"
|
||||
assert sel["latency_avg_ms"] == 245.7
|
||||
assert sel["health_score"] == 0.82
|
||||
assert sel["composite_score"] == 0.372156
|
||||
|
||||
def test_skipped_cooldown(self) -> None:
|
||||
ct = PoolCandidateTrace(
|
||||
@@ -78,11 +96,28 @@ class TestPoolCandidateTraceExtraData:
|
||||
assert skip["cost_window_usage"] == 2000
|
||||
assert "cooldown_reason" not in skip
|
||||
|
||||
def test_skipped_account_blocked(self) -> None:
|
||||
ct = PoolCandidateTrace(
|
||||
key_id="k6b",
|
||||
skipped=True,
|
||||
skip_type="account_blocked",
|
||||
account_block_code="account_banned",
|
||||
account_block_label="账号封禁",
|
||||
account_block_reason="account suspended",
|
||||
)
|
||||
data = ct.to_extra_data()
|
||||
skip = data["pool_skip"]
|
||||
assert skip["type"] == "account_blocked"
|
||||
assert skip["account_block_code"] == "account_banned"
|
||||
assert skip["account_block_label"] == "账号封禁"
|
||||
assert skip["account_block_reason"] == "account suspended"
|
||||
|
||||
def test_skipped_minimal(self) -> None:
|
||||
ct = PoolCandidateTrace(key_id="k7", skipped=True, skip_type="upstream")
|
||||
data = ct.to_extra_data()
|
||||
skip = data["pool_skip"]
|
||||
assert skip == {"type": "upstream"}
|
||||
assert skip["type"] == "upstream"
|
||||
assert skip["scoring_mode"] == "lru"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -113,6 +148,7 @@ class TestPoolSchedulingTraceSummary:
|
||||
assert summary["attempted"] == 2
|
||||
assert summary["skipped_cooldown"] == 2
|
||||
assert summary["skipped_cost"] == 1
|
||||
assert summary["skipped_account_blocked"] == 0
|
||||
assert summary["sticky_session"] is True
|
||||
assert summary["success_key_id"] == "k1"[:8]
|
||||
assert summary["success_reason"] == "sticky"
|
||||
@@ -129,6 +165,7 @@ class TestPoolSchedulingTraceSummary:
|
||||
assert summary["attempted"] == 2
|
||||
assert summary["skipped_cooldown"] == 0
|
||||
assert summary["skipped_cost"] == 0
|
||||
assert summary["skipped_account_blocked"] == 0
|
||||
assert "success_key_id" not in summary
|
||||
assert "success_reason" not in summary
|
||||
|
||||
@@ -143,3 +180,15 @@ class TestPoolSchedulingTraceSummary:
|
||||
assert summary["attempted"] == 0
|
||||
assert summary["skipped_cooldown"] == 1
|
||||
assert summary["skipped_cost"] == 1
|
||||
assert summary["skipped_account_blocked"] == 0
|
||||
|
||||
def test_summary_with_account_blocked(self) -> None:
|
||||
trace = PoolSchedulingTrace(provider_id="prov-4", total_keys=2)
|
||||
trace.candidate_traces = {
|
||||
"k1": PoolCandidateTrace(key_id="k1", skipped=True, skip_type="account_blocked"),
|
||||
"k2": PoolCandidateTrace(key_id="k2", reason="lru"),
|
||||
}
|
||||
|
||||
summary = trace.build_summary(success_key_id="k2")
|
||||
assert summary["attempted"] == 1
|
||||
assert summary["skipped_account_blocked"] == 1
|
||||
|
||||
Reference in New Issue
Block a user