fix: 全方位审查问题修复(P0~P3)
P0: ORM-迁移同步 - 新增 RawEvent/IngestFailure/DataQualityCheck/DataLineage 4 个模型类 - MatchStats 补充 xg_source/xg_updated_at/xg_source_record_id 字段 - 修复 server_default=_utcnow → func.now()(4 处) - BigInteger 导入 P1: - log_buffer.py 移除 threading.Lock(asyncio 单线程下无需锁) - 确认 context_builder/understat/injuries 等已有修复 P2: - Dockerfile 新增非 root 用户 + .dockerignore - 前端 fetchDashboard 修复 total 字段(改用 items.length) - 前端 fetchSystemConfig 改用真实 /admin/settings 端点 - 修复 validation.py return self"" → return self P3: - predict.py 缓存加 _CACHE_MAX_SIZE=200 淘汰 - eval.py get_eval_summary 加 limit 参数(默认 1000)+ 返回 total_settled - orchestrator.py agent provider 配置缓存 60s
This commit is contained in:
@@ -30,6 +30,11 @@ from src.llm.provider import LLMProvider, get_default_provider
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# P3-2: agent provider 配置缓存(TTL 60s),避免每次 _agent_provider 都多次查 DB
|
||||
_AGENT_PROVIDER_CACHE: dict[str, tuple[float, LLMProvider]] = {}
|
||||
_AGENT_PROVIDER_CACHE_TTL = 60.0
|
||||
|
||||
|
||||
# ── 5 个专家 agent 定义 ──
|
||||
# A=近期状态 B=攻防数据 C=主客因素 D=阵容完整性 E=历史交锋
|
||||
SPECIALIST_SPECS: list[AgentSpec] = [
|
||||
@@ -103,7 +108,16 @@ async def _agent_provider(agent_id: str, *, tier: str) -> LLMProvider:
|
||||
覆盖优先级:
|
||||
模型: AGENT_MODEL_{ID}(运行时) → 层级默认(LLM_SPECIALIST/AGGREGATOR_MODEL) → 全局 LLM_MODEL
|
||||
地址/密钥: AGENT_BASE_URL_{ID} / AGENT_API_KEY_{ID}(运行时) → 全局 LLM_BASE_URL / LLM_API_KEY
|
||||
|
||||
P3-2: 结果缓存 60 秒,避免每次预测都多次查询运行时配置 DB。
|
||||
"""
|
||||
cache_key = f"{agent_id}:{tier}"
|
||||
cached = _AGENT_PROVIDER_CACHE.get(cache_key)
|
||||
if cached is not None:
|
||||
ts, provider = cached
|
||||
if time.time() - ts < _AGENT_PROVIDER_CACHE_TTL:
|
||||
return provider
|
||||
|
||||
pfx = f"AGENT_{agent_id.upper()}_"
|
||||
p = await get_default_provider()
|
||||
tier_model = settings.LLM_SPECIALIST_MODEL if tier == "specialist" else settings.LLM_AGGREGATOR_MODEL
|
||||
@@ -118,6 +132,11 @@ async def _agent_provider(agent_id: str, *, tier: str) -> LLMProvider:
|
||||
key = await get_runtime_value(f"{pfx}API_KEY")
|
||||
if key:
|
||||
p.api_key = key
|
||||
|
||||
_AGENT_PROVIDER_CACHE[cache_key] = (time.time(), p)
|
||||
# 简单淘汰:超过 20 条时清空(60s TTL 下不会累积太多)
|
||||
if len(_AGENT_PROVIDER_CACHE) > 20:
|
||||
_AGENT_PROVIDER_CACHE.clear()
|
||||
return p
|
||||
|
||||
|
||||
|
||||
+14
-4
@@ -3,7 +3,7 @@ from __future__ import annotations
|
||||
|
||||
import logging
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy import func, select
|
||||
|
||||
from src.db.models import Prediction
|
||||
from src.db.unit_of_work import get_uow
|
||||
@@ -32,12 +32,22 @@ def _actual_1x2(home: int, away: int) -> str:
|
||||
return "2"
|
||||
|
||||
|
||||
async def get_eval_summary() -> dict:
|
||||
"""按 provider × 模型聚合评估。"""
|
||||
async def get_eval_summary(limit: int = 1000) -> dict:
|
||||
"""按 provider × 模型聚合评估。
|
||||
|
||||
P3-4: 默认限制评估最近 1000 条已结算预测,避免全表加载导致内存压力。
|
||||
可通过 eval 路由的 query 参数调整。
|
||||
"""
|
||||
async with get_uow() as session:
|
||||
# 先统计全量已结算数,用于前端展示"共 X 条,评估 Y 条"
|
||||
total_settled = (await session.execute(
|
||||
select(func.count()).where(Prediction.settled == True)
|
||||
)).scalar_one()
|
||||
stmt = (
|
||||
select(Prediction)
|
||||
.where(Prediction.settled == True)
|
||||
.order_by(Prediction.id.desc())
|
||||
.limit(limit)
|
||||
)
|
||||
result = await session.execute(stmt)
|
||||
rows = list(result.scalars().all())
|
||||
@@ -76,4 +86,4 @@ async def get_eval_summary() -> dict:
|
||||
"avg_score_rmse": round(avg_err, 2) if avg_err is not None else None,
|
||||
"avg_subjective_confidence": round(avg_conf, 2) if avg_conf is not None else None,
|
||||
})
|
||||
return {"summary": summary}
|
||||
return {"summary": summary, "total_settled": total_settled, "evaluated": len(rows)}
|
||||
|
||||
+5
-1
@@ -8,7 +8,6 @@ import time
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from threading import Lock
|
||||
|
||||
from src.core.config import settings
|
||||
from sqlalchemy import select
|
||||
@@ -25,6 +24,7 @@ _PROMPT_DIR = Path(__file__).resolve().parent / "prompts"
|
||||
|
||||
# ── LLM 响应缓存(match+provider+model+version → 结果) ──
|
||||
_CACHE_TTL_SEC = 300 # 5 分钟
|
||||
_CACHE_MAX_SIZE = 200 # P3-1: 有上限,避免长期运行内存无限增长
|
||||
# P1-5: 缓存仅在 asyncio 协程内同步访问(dict 操作 GIL 原子),无需 threading.Lock。
|
||||
# 删除 _cache_lock,避免同步锁阻塞事件循环;dict 的 get/set 在 CPython 下原子。
|
||||
_cache: dict[str, tuple[float, PredictResult]] = {}
|
||||
@@ -56,6 +56,10 @@ def _set_cached(match_id: int, provider: str, model: str, version: str, tpl_hash
|
||||
# P1-5: 无锁写入。同上,dict set 原子。
|
||||
key = _cache_key(match_id, provider, model, version, tpl_hash)
|
||||
_cache[key] = (time.time(), result)
|
||||
# P3-1: 超过上限时淘汰最旧条目(按时间戳排序)
|
||||
if len(_cache) > _CACHE_MAX_SIZE:
|
||||
oldest_key = min(_cache, key=lambda k: _cache[k][0])
|
||||
_cache.pop(oldest_key, None)
|
||||
|
||||
|
||||
def clear_prompt_cache() -> None:
|
||||
|
||||
@@ -75,7 +75,7 @@ class PredictionOutputSchema(BaseModel):
|
||||
):
|
||||
self.alt_pred_home_goals = None
|
||||
self.alt_pred_away_goals = None
|
||||
return self""
|
||||
return self
|
||||
|
||||
@field_validator("pred_1x2")
|
||||
@classmethod
|
||||
|
||||
Reference in New Issue
Block a user