WorkBuddy
235fb0de97
P0-1 backtest 会话生命周期: - _get_historical_matches 加 selectinload(league/home_team/away_team), 并在 session 内物化为 BacktestCandidate 纯数据快照,避免 session 关闭后访问惰性关系抛 MissingGreenlet - except 收窄并改用 logger.exception 保留堆栈 - 移除未使用的 and_ / League 导入 P0-2 切片函数关系属性 MissingGreenlet: - models.py 为 Match.league/home_team/away_team/stats 声明 lazy=selectin - context_builder 的 _get_form/_get_h2h/_get_home_away 显式 selectinload (修复 form_slice/h2h_slice 恒定失败,被 fail-open 掩盖的问题) - repositories.find_by_teams_and_date 加 selectinload(Match.stats) P0-3 bzzoiro raw 变量泄漏导致血缘错乱: - normalized_matches 改为携带 (nm, raw) 元组,内层循环解包 - source_event_id / source_record_id 现在取到正确 event id - 已有比赛补建 stats 时补齐 source/source_event_id/retrieved_at/available_at - 抽取 _match_key()/_to_date() 统一日期键构造 (P1-6)
316 lines
14 KiB
Python
316 lines
14 KiB
Python
"""Bzzoiro 数据源:抓取 + 入库。
|
|
|
|
迁移自旧项目 app/data/sources/bzzoiro/,改成 async + 简化入库。
|
|
使用 Repository 模式进行数据访问,不直接控制事务。
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json as _json
|
|
import logging
|
|
import random
|
|
import time as _time
|
|
import urllib.error
|
|
import urllib.parse
|
|
import urllib.request
|
|
from collections.abc import Iterable
|
|
from datetime import datetime, timezone
|
|
|
|
from sqlalchemy import select
|
|
|
|
from src.core.config import settings
|
|
from src.data.config import BZZOIRO_LEAGUE_IDS, LEAGUE_COUNTRIES, LEAGUE_NAMES, REQUEST_INTERVAL
|
|
from src.data.normalize import normalize_bzzoiro
|
|
from src.data.sources import register
|
|
from src.db.models import League, Match, MatchStats, Team
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _to_date(value):
|
|
"""把 datetime / date / str 统一成 `date`。"""
|
|
if value is None:
|
|
return None
|
|
if hasattr(value, "date") and callable(value.date):
|
|
return value.date()
|
|
return value
|
|
|
|
|
|
def _match_key(home_team_id: int, away_team_id: int, match_date) -> tuple[int, int, str]:
|
|
"""比赛去重键:(主队, 客队, 天级日期 ISO 字符串)。
|
|
|
|
统一在这里构造,避免"预加载时用 str(date)、写入时用 isoformat()"这类
|
|
隐式格式依赖 —— 两者当前恰好相等,但一旦有人改动其一就会静默失配,
|
|
导致所有比赛被判为不存在而重复插入。
|
|
"""
|
|
d = _to_date(match_date)
|
|
return (home_team_id, away_team_id, d.isoformat() if d is not None else "")
|
|
|
|
|
|
def _fetch_json_sync(path: str, params: dict | None = None, max_retries: int = 3) -> dict | list:
|
|
"""同步 HTTP(bzzoiro 客户端保持同步,在 async 函数里 run_in_executor)。"""
|
|
base = settings.BZZOIRO_BASE.rstrip("/")
|
|
url = f"{base}/{path.lstrip('/')}"
|
|
if params:
|
|
url += "?" + urllib.parse.urlencode(params)
|
|
key = settings.BZZOIRO_KEY
|
|
if not key:
|
|
raise RuntimeError("BZZOIRO_KEY 未设置")
|
|
|
|
last_exc: Exception | None = None
|
|
for attempt in range(max_retries):
|
|
try:
|
|
req = urllib.request.Request(url)
|
|
req.add_header("Authorization", f"Token {key}")
|
|
req.add_header("Accept", "application/json")
|
|
with urllib.request.urlopen(req, timeout=30) as resp:
|
|
return _json.loads(resp.read().decode("utf-8"))
|
|
except urllib.error.HTTPError as e:
|
|
last_exc = e
|
|
if e.code == 429:
|
|
# 指数退避: 429 通常意味着限速
|
|
delay = min(2 ** attempt, 16) + random.uniform(0, 1)
|
|
logger.warning("bzzoiro 429, retry %d in %.1fs", attempt + 1, delay)
|
|
_time.sleep(delay)
|
|
continue
|
|
if 500 <= e.code < 600:
|
|
delay = min(2 ** attempt, 16) + random.uniform(0, 1)
|
|
logger.warning("bzzoiro %d, retry %d in %.1fs", e.code, attempt + 1, delay)
|
|
_time.sleep(delay)
|
|
continue
|
|
raise # 4xx 直接抛
|
|
except (urllib.error.URLError, TimeoutError, ConnectionError) as e:
|
|
last_exc = e
|
|
delay = min(2 ** attempt, 16) + random.uniform(0, 1)
|
|
logger.warning("bzzoiro network error, retry %d in %.1fs: %s", attempt + 1, delay, e)
|
|
_time.sleep(delay)
|
|
raise RuntimeError(f"bzzoiro request failed after {max_retries} attempts: {last_exc}")
|
|
|
|
|
|
async def fetch_bzzoiro_events(
|
|
league_code: str,
|
|
*,
|
|
status: str = "finished",
|
|
date_from: str | None = None,
|
|
date_to: str | None = None,
|
|
limit: int = 200,
|
|
) -> list[dict]:
|
|
"""抓取 bzzoiro 原始事件(异步包装)。"""
|
|
league_id = BZZOIRO_LEAGUE_IDS.get(league_code)
|
|
if league_id is None:
|
|
raise ValueError(f"未知联赛代码: {league_code}")
|
|
|
|
loop = asyncio.get_event_loop()
|
|
rows: list[dict] = []
|
|
offset = 0
|
|
payload: dict | list = {}
|
|
while True:
|
|
params: dict = {
|
|
"league_id": league_id,
|
|
"status": status,
|
|
"limit": limit,
|
|
"offset": offset,
|
|
}
|
|
if date_from:
|
|
params["date_from"] = str(date_from)[:10]
|
|
if date_to:
|
|
params["date_to"] = str(date_to)[:10]
|
|
# 显式位置参数,避免 lambda 闭包捕获循环变量
|
|
payload = await loop.run_in_executor(None, _fetch_json_sync, "/events/", params)
|
|
batch = payload.get("results") or []
|
|
if not batch:
|
|
break
|
|
rows.extend(batch)
|
|
total = payload.get("total")
|
|
offset += limit
|
|
if total is not None and offset >= total:
|
|
break
|
|
if len(batch) < limit:
|
|
break
|
|
await asyncio.sleep(REQUEST_INTERVAL)
|
|
return rows
|
|
|
|
|
|
@register
|
|
class BzzoiroSource:
|
|
"""bzzoiro 数据源(实现 DataSource 协议)。"""
|
|
|
|
name = "bzzoiro"
|
|
|
|
async def ingest(
|
|
self,
|
|
db,
|
|
*,
|
|
leagues: Iterable[str],
|
|
date_from: str | None = None,
|
|
date_to: str | None = None,
|
|
status: str = "finished",
|
|
) -> dict:
|
|
"""采集 bzzoiro → 入库。返回统计。
|
|
|
|
注意: 本方法不控制事务(commit/rollback),由调用方通过 UnitOfWork 控制。
|
|
"""
|
|
result: dict = {"leagues": {}, "total_inserted": 0, "total_updated": 0, "errors": []}
|
|
|
|
for code in leagues:
|
|
league_r: dict = {"inserted": 0, "updated": 0, "errors": []}
|
|
try:
|
|
raw_events = await fetch_bzzoiro_events(code, status=status, date_from=date_from, date_to=date_to)
|
|
except Exception as e:
|
|
logger.exception("bzzoiro fetch failed for %s", code)
|
|
league_r["errors"].append(f"fetch failed: {e}")
|
|
result["leagues"][code] = league_r
|
|
continue
|
|
|
|
# 获取或创建联赛
|
|
stmt = select(League).where(League.code == code)
|
|
league = (await db.execute(stmt)).scalar_one_or_none()
|
|
if league is None:
|
|
league = League(code=code, name=LEAGUE_NAMES.get(code, code), country=LEAGUE_COUNTRIES.get(code))
|
|
db.add(league)
|
|
await db.flush()
|
|
|
|
# === 批量优化: 预加载球队和已有比赛到内存 ===
|
|
team_name_to_id: dict[str, int] = {}
|
|
existing_matches: dict[tuple[int, int, str], Match] = {} # 完整对象,避免重复查询
|
|
# (NormalizedMatch, 原始 event) 成对保存:后续写 source_record_id 时
|
|
# 必须用配对的那条 event,不能依赖外层循环变量残留值。
|
|
normalized_matches: list[tuple] = []
|
|
|
|
if raw_events:
|
|
# 一次遍历: 收集球队名 + 规范化
|
|
all_team_names = set()
|
|
for raw in raw_events:
|
|
nm = normalize_bzzoiro(raw, code)
|
|
if nm is not None:
|
|
try:
|
|
nm.validate()
|
|
except Exception as e:
|
|
logger.debug("normalize skip: %s", e)
|
|
league_r["errors"].append(f"normalize: {e}")
|
|
continue
|
|
normalized_matches.append((nm, raw))
|
|
all_team_names.add(nm.home_team)
|
|
all_team_names.add(nm.away_team)
|
|
|
|
if all_team_names:
|
|
stmt = select(Team).where(Team.name.in_(all_team_names))
|
|
teams = (await db.execute(stmt)).scalars().all()
|
|
team_name_to_id = {t.name: t.id for t in teams}
|
|
|
|
# 预加载已有比赛(完整对象)
|
|
stmt = select(Match).where(Match.league_id == league.id)
|
|
for m in (await db.execute(stmt)).scalars():
|
|
key = _match_key(m.home_team_id, m.away_team_id, m.match_date_date)
|
|
existing_matches[key] = m
|
|
|
|
for nm, raw in normalized_matches:
|
|
# 球队: 内存查找 + 按需创建
|
|
home_team_id = team_name_to_id.get(nm.home_team)
|
|
if home_team_id is None:
|
|
home = Team(name=nm.home_team)
|
|
db.add(home)
|
|
await db.flush()
|
|
home_team_id = home.id
|
|
team_name_to_id[nm.home_team] = home_team_id
|
|
|
|
away_team_id = team_name_to_id.get(nm.away_team)
|
|
if away_team_id is None:
|
|
away = Team(name=nm.away_team)
|
|
db.add(away)
|
|
await db.flush()
|
|
away_team_id = away.id
|
|
team_name_to_id[nm.away_team] = away_team_id
|
|
|
|
# 查找已有比赛: 内存查找
|
|
match_key = _match_key(home_team_id, away_team_id, nm.date)
|
|
existing_match = existing_matches.get(match_key)
|
|
|
|
if existing_match is None:
|
|
m = Match(
|
|
league_id=league.id,
|
|
season=nm.season_label or None,
|
|
home_team_id=home_team_id,
|
|
away_team_id=away_team_id,
|
|
match_date=nm.date,
|
|
match_date_date=_to_date(nm.date),
|
|
match_status=nm.match_status,
|
|
home_goals=nm.home_goals,
|
|
away_goals=nm.away_goals,
|
|
home_ht_goals=nm.home_ht_goals,
|
|
away_ht_goals=nm.away_ht_goals,
|
|
match_stage=nm.match_stage,
|
|
)
|
|
db.add(m)
|
|
await db.flush()
|
|
existing_matches[match_key] = m # 防止同批重复
|
|
if nm.home_xg is not None or nm.away_xg is not None:
|
|
now = datetime.now(timezone.utc)
|
|
stats = MatchStats(
|
|
match_id=m.id,
|
|
home_xg=nm.home_xg,
|
|
away_xg=nm.away_xg,
|
|
home_shots=nm.home_shots,
|
|
away_shots=nm.away_shots,
|
|
home_shots_on_target=nm.home_shots_on_target,
|
|
away_shots_on_target=nm.away_shots_on_target,
|
|
home_corners=nm.home_corners,
|
|
away_corners=nm.away_corners,
|
|
home_possession=nm.home_possession,
|
|
home_yellow_cards=nm.home_yellow_cards,
|
|
away_yellow_cards=nm.away_yellow_cards,
|
|
home_red_cards=nm.home_red_cards,
|
|
away_red_cards=nm.away_red_cards,
|
|
source="bzzoiro",
|
|
source_event_id=str(raw.get("id", "")),
|
|
retrieved_at=now,
|
|
available_at=now,
|
|
)
|
|
db.add(stats)
|
|
league_r["inserted"] += 1
|
|
else:
|
|
# 已有比赛: 直接从内存获取对象更新(无需再查询)
|
|
changed = False
|
|
if existing_match.match_status != nm.match_status and nm.match_status == "finished":
|
|
existing_match.match_status = nm.match_status
|
|
changed = True
|
|
if existing_match.home_goals is None and nm.home_goals is not None:
|
|
existing_match.home_goals = nm.home_goals
|
|
existing_match.away_goals = nm.away_goals
|
|
existing_match.home_ht_goals = nm.home_ht_goals
|
|
existing_match.away_ht_goals = nm.away_ht_goals
|
|
changed = True
|
|
if existing_match.match_stage is None and nm.match_stage:
|
|
existing_match.match_stage = nm.match_stage
|
|
changed = True
|
|
if existing_match.stats is None and (nm.home_xg is not None or nm.away_xg is not None):
|
|
now = datetime.now(timezone.utc)
|
|
existing_match.stats = MatchStats(
|
|
match_id=existing_match.id,
|
|
source="bzzoiro",
|
|
source_event_id=str(raw.get("id", "")),
|
|
retrieved_at=now,
|
|
available_at=now,
|
|
)
|
|
db.add(existing_match.stats)
|
|
await db.flush()
|
|
if existing_match.stats is not None:
|
|
for fld in ("home_xg", "away_xg", "home_shots", "away_shots",
|
|
"home_shots_on_target", "away_shots_on_target",
|
|
"home_corners", "away_corners", "home_possession",
|
|
"home_yellow_cards", "away_yellow_cards",
|
|
"home_red_cards", "away_red_cards"):
|
|
if getattr(existing_match.stats, fld, None) is None:
|
|
v = getattr(nm, fld, None)
|
|
if v is not None:
|
|
setattr(existing_match.stats, fld, v)
|
|
changed = True
|
|
if changed:
|
|
league_r["updated"] += 1
|
|
|
|
# 注意: 不在此处 commit,由调用方 UnitOfWork 控制事务
|
|
result["leagues"][code] = league_r
|
|
result["total_inserted"] += league_r["inserted"]
|
|
result["total_updated"] += league_r["updated"]
|
|
return result
|