mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 17:30:23 +08:00
perf: 优化请求鉴权链路并批量化统计/调度查询
- 为 Pipeline/Context 增加按需读取请求体能力,支持 async 懒加载 JSON body - 为 chat/cli/video/claude/openai-cli 适配器关闭默认预读,减少无效 body 读取与超时风险 - 将本地登录、JWT 用户加载、API Key 鉴权迁移到线程池隔离会话执行,避免阻塞事件循环 - 为 API Key 鉴权返回结构化余额结果,并在主请求会话中重新绑定 user/api_key 后再校验状态、过期和锁定信息 - 为 management/user token 前缀认证引入独立会话与结果回绑,避免跨会话对象写入失效 - 为 Usage 余额检查补充结构化返回,统一透出 remaining 与欠费/不可用文案映射 - 为用户与管理端活跃请求查询增加 maintain_status 开关,避免轮询指定 id 时误触发状态修复 - 重写 user_me usage 汇总逻辑,支持 group_by=None 的粗粒度聚合 - 修正 provider 维度成功率与平均响应时间统计,基于 success_count 和成功响应耗时汇总计算 - 前端 Usage 轮询由 setInterval 改为串行 setTimeout,避免并发轮询叠加 - 为 StatsAggregator 增加按本地日期批量计算百分位能力,替代逐天 fan-out 查询 - 为混合统计查询合并连续实时日期区间,并批量读取 StatsDaily,减少逐日查询次数 - 为用户日统计增加批量聚合入口,替代逐用户循环聚合 - 为系统配置导出改用 selectinload 预加载 provider 关联数据,减少 N+1 查询 - 为管理员用户列表增加钱包批量查询,避免逐用户回表 - 为调度器增加 provider 轻量引用预过滤,先按 allowed_providers 缩小范围再加载完整 provider 图 - 为 CandidateBuilder 增加 provider refs/provider_ids 查询能力,保留分页顺序 - 为模型缓存增加 provider_model_mappings 索引缓存与 model_mappings 规则缓存,减少重复全量扫描 - 为请求候选中间态改为 flush/batch commit,降低 pending/streaming 状态切换的事务往返 - 为钱包访问结果补充 balance_snapshot,并抽取余额快照复用逻辑 - 补充 pipeline、auth、admin users、user_me usage、stats aggregator、model cache、 scheduler、wallet、request candidate 等回归与契约测试
This commit is contained in:
@@ -8,18 +8,20 @@
|
||||
"""
|
||||
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from decimal import Decimal
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
import jwt
|
||||
import pytest
|
||||
|
||||
from src.core.exceptions import ForbiddenException
|
||||
from src.core.enums import AuthSource
|
||||
from src.core.exceptions import ForbiddenException
|
||||
from src.models.database import UserRole
|
||||
from src.services.auth.service import (
|
||||
JWT_ALGORITHM,
|
||||
JWT_EXPIRATION_HOURS,
|
||||
JWT_SECRET_KEY,
|
||||
AuthenticatedUserSnapshot,
|
||||
AuthService,
|
||||
)
|
||||
|
||||
@@ -235,6 +237,115 @@ class TestUserAuthentication:
|
||||
|
||||
assert result is None
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_authenticate_user_threadsafe_uses_isolated_session_for_local_login(self) -> None:
|
||||
mock_user = MagicMock()
|
||||
mock_user.id = "user-123"
|
||||
mock_user.email = "test@example.com"
|
||||
mock_user.username = "tester"
|
||||
mock_user.created_at = datetime.now(timezone.utc)
|
||||
mock_user.is_deleted = False
|
||||
mock_user.is_active = True
|
||||
mock_user.auth_source = AuthSource.LOCAL
|
||||
mock_user.role = UserRole.USER
|
||||
mock_user.verify_password.return_value = True
|
||||
|
||||
thread_db = MagicMock()
|
||||
thread_db.query.return_value.filter.return_value.first.return_value = mock_user
|
||||
route_db = MagicMock()
|
||||
|
||||
with patch("src.services.auth.service.create_session", return_value=thread_db):
|
||||
with patch(
|
||||
"src.services.auth.service.UserCacheService.invalidate_user_cache",
|
||||
new_callable=AsyncMock,
|
||||
) as invalidate_cache:
|
||||
result = await AuthService.authenticate_user_threadsafe(
|
||||
route_db,
|
||||
"test@example.com",
|
||||
"password123",
|
||||
)
|
||||
|
||||
assert isinstance(result, AuthenticatedUserSnapshot)
|
||||
assert result.user_id == "user-123"
|
||||
assert result.username == "tester"
|
||||
thread_db.commit.assert_called_once()
|
||||
thread_db.close.assert_called_once()
|
||||
route_db.commit.assert_not_called()
|
||||
invalidate_cache.assert_awaited_once_with("user-123", "test@example.com")
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_load_user_for_pipeline_threadsafe_prefetches_balance(self) -> None:
|
||||
mock_user = MagicMock()
|
||||
mock_user.id = "user-123"
|
||||
mock_user.is_active = True
|
||||
mock_user.is_deleted = False
|
||||
|
||||
thread_db = MagicMock()
|
||||
thread_db.query.return_value.filter.return_value.first.return_value = mock_user
|
||||
|
||||
with patch("src.services.auth.service.create_session", return_value=thread_db):
|
||||
with patch(
|
||||
"src.services.wallet.service.WalletService.get_balance_snapshot",
|
||||
return_value=Decimal("7.5"),
|
||||
):
|
||||
result = await AuthService.load_user_for_pipeline_threadsafe(
|
||||
"user-123",
|
||||
include_balance=True,
|
||||
)
|
||||
|
||||
assert result is not None
|
||||
assert result.user == mock_user
|
||||
assert result.balance_remaining == 7.5
|
||||
thread_db.expunge.assert_called_with(mock_user)
|
||||
thread_db.close.assert_called_once()
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_authenticate_api_key_threadsafe_returns_balance_and_access_result(self) -> None:
|
||||
mock_user = MagicMock()
|
||||
mock_user.id = "user-123"
|
||||
mock_api_key = MagicMock()
|
||||
mock_api_key.id = "key-123"
|
||||
|
||||
thread_db = MagicMock()
|
||||
|
||||
with patch("src.services.auth.service.create_session", return_value=thread_db):
|
||||
with patch.object(
|
||||
AuthService,
|
||||
"authenticate_api_key",
|
||||
return_value=(mock_user, mock_api_key),
|
||||
):
|
||||
with patch(
|
||||
"src.services.usage.service.UsageService.check_request_balance_details",
|
||||
return_value=MagicMock(allowed=False, message="????", remaining=0.0),
|
||||
) as mock_balance_details:
|
||||
with patch(
|
||||
"src.services.wallet.service.WalletService.get_balance_snapshot"
|
||||
) as mock_balance_snapshot:
|
||||
result = await AuthService.authenticate_api_key_threadsafe("sk-test")
|
||||
|
||||
assert result is not None
|
||||
assert result.user == mock_user
|
||||
assert result.api_key == mock_api_key
|
||||
assert result.access_ok is False
|
||||
assert result.balance_remaining == 0.0
|
||||
assert result.access_message == "????"
|
||||
mock_balance_details.assert_called_once()
|
||||
mock_balance_snapshot.assert_not_called()
|
||||
thread_db.expunge.assert_any_call(mock_user)
|
||||
thread_db.expunge.assert_any_call(mock_api_key)
|
||||
thread_db.close.assert_called_once()
|
||||
|
||||
def test_detach_instance_logs_debug_when_expunge_fails(self) -> None:
|
||||
mock_db = MagicMock()
|
||||
mock_db.expunge.side_effect = RuntimeError("expunge boom")
|
||||
mock_instance = MagicMock()
|
||||
|
||||
with patch("src.services.auth.service.logger.debug") as mock_debug:
|
||||
AuthService._detach_instance(mock_db, mock_instance)
|
||||
|
||||
mock_debug.assert_called_once()
|
||||
assert "expunge failed" in mock_debug.call_args[0][0]
|
||||
|
||||
|
||||
class TestAPIKeyAuthentication:
|
||||
"""测试 API Key 认证"""
|
||||
|
||||
Reference in New Issue
Block a user