mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-12 12:09:50 +08:00
- 前端优先级管理: 保存时对比原始快照,仅提交实际变更的 provider/key 优先级, 并限制并发请求数(SAVE_CONCURRENCY=6),避免无效 API 调用 - handler_adapter_base: _normalize_test_base_url 改为 _validate_test_base_url, 移除对 dict 类型 base_url 的兼容,严格要求字符串输入 - provider_query: 新增 _require_test_endpoint_base_url,在测试链路提前校验 endpoint.base_url 类型和非空 - system.py: 导入 endpoint 时通过 ProviderEndpointCreate 模型校验数据, 拒绝非法 base_url 类型(如 dict) - usage detail: 使用 defer() 延迟加载 body 列,通过 SQL CASE 表达式在 数据库端计算 has_*_body 标记,减少不必要的大字段传输 - provider routes: 新建 provider 时 priority=0 边界处理,clamp 并 shift
167 lines
5.8 KiB
Python
167 lines
5.8 KiB
Python
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
from pydantic import ValidationError
|
|
|
|
from src.api.admin.provider_query import TestModelFailoverRequest as FailoverRequestModel
|
|
from src.api.admin.provider_query import (
|
|
_build_direct_test_candidates,
|
|
_build_test_attempts_from_candidate_keys,
|
|
_filter_test_candidates_by_endpoint,
|
|
_flatten_test_candidates_for_concurrency,
|
|
_require_test_endpoint_base_url,
|
|
_resolve_test_effective_model,
|
|
)
|
|
from src.services.scheduling.schemas import PoolCandidate
|
|
|
|
|
|
def _build_provider() -> tuple[SimpleNamespace, SimpleNamespace, SimpleNamespace]:
|
|
endpoint_a = SimpleNamespace(id="ep-a", api_format="openai:chat", is_active=True)
|
|
endpoint_b = SimpleNamespace(id="ep-b", api_format="claude:cli", is_active=True)
|
|
key_all = SimpleNamespace(
|
|
id="key-all", is_active=True, api_formats=["openai:chat", "claude:cli"]
|
|
)
|
|
key_b = SimpleNamespace(id="key-b", is_active=True, api_formats=["claude:cli"])
|
|
provider = SimpleNamespace(
|
|
id="provider-1", endpoints=[endpoint_a, endpoint_b], api_keys=[key_all, key_b]
|
|
)
|
|
return provider, endpoint_a, endpoint_b
|
|
|
|
|
|
def test_build_direct_test_candidates_respects_endpoint_id() -> None:
|
|
provider, _endpoint_a, endpoint_b = _build_provider()
|
|
|
|
candidates = _build_direct_test_candidates(provider, endpoint_id=endpoint_b.id) # type: ignore[arg-type]
|
|
|
|
assert {candidate.endpoint.id for candidate in candidates} == {endpoint_b.id}
|
|
assert {candidate.key.id for candidate in candidates} == {"key-all", "key-b"}
|
|
|
|
|
|
def test_filter_test_candidates_by_endpoint_keeps_matching_candidates() -> None:
|
|
provider, endpoint_a, endpoint_b = _build_provider()
|
|
candidates = _build_direct_test_candidates(provider) # type: ignore[arg-type]
|
|
|
|
filtered = _filter_test_candidates_by_endpoint(candidates, endpoint_a.id)
|
|
|
|
assert {candidate.endpoint.id for candidate in filtered} == {endpoint_a.id}
|
|
assert all(candidate.endpoint.id != endpoint_b.id for candidate in filtered)
|
|
|
|
|
|
def test_resolve_test_effective_model_prefers_pool_key_mapping() -> None:
|
|
provider, endpoint_a, _endpoint_b = _build_provider()
|
|
candidate = _build_direct_test_candidates(provider, endpoint_id=endpoint_a.id)[0] # type: ignore[arg-type]
|
|
pool_key = SimpleNamespace(id="pool-key", _pool_mapping_matched_model="mapped-model")
|
|
request = SimpleNamespace(mode="global", model_name="gpt-4")
|
|
|
|
effective = _resolve_test_effective_model(
|
|
provider=provider, # type: ignore[arg-type]
|
|
candidate=candidate,
|
|
request=request, # type: ignore[arg-type]
|
|
gm_obj=None,
|
|
key=pool_key,
|
|
)
|
|
|
|
assert effective == "mapped-model"
|
|
|
|
|
|
def test_build_test_attempts_from_candidate_keys_includes_retry_index() -> None:
|
|
candidate_keys = [
|
|
SimpleNamespace(
|
|
candidate_index=2,
|
|
retry_index=1,
|
|
key_id="key-b",
|
|
key_name="Key B",
|
|
auth_type="api_key",
|
|
status="failed",
|
|
skip_reason=None,
|
|
error_message="timeout",
|
|
status_code=504,
|
|
latency_ms=1200,
|
|
)
|
|
]
|
|
|
|
attempts = _build_test_attempts_from_candidate_keys(
|
|
candidate_keys=candidate_keys,
|
|
candidate_meta_by_pair={
|
|
(2, "key-b"): {
|
|
"endpoint_api_format": "openai:chat",
|
|
"endpoint_base_url": "https://example.test/v1",
|
|
"effective_model": "mapped-model",
|
|
}
|
|
},
|
|
candidate_meta_by_index={},
|
|
)
|
|
|
|
assert len(attempts) == 1
|
|
assert attempts[0].retry_index == 1
|
|
assert attempts[0].effective_model == "mapped-model"
|
|
assert attempts[0].endpoint_api_format == "openai:chat"
|
|
|
|
|
|
def test_flatten_test_candidates_for_concurrency_expands_pool_keys() -> None:
|
|
provider, endpoint_a, _endpoint_b = _build_provider()
|
|
pool_key_a = SimpleNamespace(
|
|
id="pool-a",
|
|
name="Pool A",
|
|
auth_type="oauth",
|
|
_pool_mapping_matched_model="mapped-a",
|
|
)
|
|
pool_key_b = SimpleNamespace(
|
|
id="pool-b",
|
|
name="Pool B",
|
|
auth_type="oauth",
|
|
_pool_skipped=True,
|
|
_pool_skip_reason="quota_exhausted",
|
|
)
|
|
candidate = PoolCandidate(
|
|
provider=provider, # type: ignore[arg-type]
|
|
endpoint=endpoint_a, # type: ignore[arg-type]
|
|
key=pool_key_a, # type: ignore[arg-type]
|
|
pool_keys=[pool_key_a, pool_key_b], # type: ignore[list-item]
|
|
is_cached=True,
|
|
provider_api_format="openai:chat",
|
|
)
|
|
|
|
flattened = _flatten_test_candidates_for_concurrency([candidate])
|
|
|
|
assert len(flattened) == 2
|
|
assert flattened[0].key.id == "pool-a"
|
|
assert flattened[0].mapping_matched_model == "mapped-a"
|
|
assert flattened[0].is_skipped is False
|
|
assert flattened[1].key.id == "pool-b"
|
|
assert flattened[1].is_skipped is True
|
|
assert flattened[1].skip_reason == "quota_exhausted"
|
|
|
|
|
|
def test_test_model_failover_request_validates_concurrency_range() -> None:
|
|
ok = FailoverRequestModel(
|
|
provider_id="p1",
|
|
mode="global",
|
|
model_name="gpt-4o-mini",
|
|
concurrency=5,
|
|
)
|
|
assert ok.concurrency == 5
|
|
|
|
with pytest.raises(ValidationError):
|
|
FailoverRequestModel(
|
|
provider_id="p1",
|
|
mode="global",
|
|
model_name="gpt-4o-mini",
|
|
concurrency=0,
|
|
)
|
|
|
|
|
|
def test_require_test_endpoint_base_url_rejects_non_string() -> None:
|
|
endpoint = SimpleNamespace(id="ep-bad", api_format="claude:chat", base_url={"url": "https://x"})
|
|
|
|
with pytest.raises(ValueError, match="invalid base_url type"):
|
|
_require_test_endpoint_base_url(endpoint)
|
|
|
|
|
|
def test_require_test_endpoint_base_url_trims_whitespace() -> None:
|
|
endpoint = SimpleNamespace(
|
|
id="ep-ok", api_format="claude:chat", base_url=" https://api.anthropic.com "
|
|
)
|
|
|
|
assert _require_test_endpoint_base_url(endpoint) == "https://api.anthropic.com"
|