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)
130 lines
4.2 KiB
Python
130 lines
4.2 KiB
Python
"""Repository 层:封装数据访问。
|
|
|
|
Repository 只负责查询,不负责事务提交。
|
|
事务由 Application Service 通过 UnitOfWork 控制。
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from sqlalchemy import func, select
|
|
from sqlalchemy.orm import selectinload
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from src.db.models import League, Match, Prediction, Team
|
|
|
|
|
|
class MatchRepository:
|
|
"""比赛数据访问。"""
|
|
|
|
def __init__(self, session: AsyncSession) -> None:
|
|
self._session = session
|
|
|
|
async def get_by_id(self, match_id: int) -> Match | None:
|
|
return await self._session.get(Match, match_id)
|
|
|
|
async def get_with_relations(self, match_id: int) -> Match | None:
|
|
stmt = (
|
|
select(Match)
|
|
.options(
|
|
selectinload(Match.league),
|
|
selectinload(Match.home_team),
|
|
selectinload(Match.away_team),
|
|
selectinload(Match.stats),
|
|
)
|
|
.where(Match.id == match_id)
|
|
)
|
|
return (await self._session.execute(stmt)).scalar_one_or_none()
|
|
|
|
async def find_by_teams_and_date(
|
|
self, league_id: int, home_team_id: int, away_team_id: int, date
|
|
) -> Match | None:
|
|
"""按联赛+主队+客队+日期查找比赛(天级匹配)。
|
|
|
|
预加载 stats:调用方(understat 回填)会读取 existing.stats,
|
|
async session 下惰性加载会抛 MissingGreenlet。
|
|
"""
|
|
if hasattr(date, "date"):
|
|
date = date.date()
|
|
|
|
stmt = (
|
|
select(Match)
|
|
.options(selectinload(Match.stats))
|
|
.where(Match.league_id == league_id)
|
|
.where(Match.home_team_id == home_team_id)
|
|
.where(Match.away_team_id == away_team_id)
|
|
.where(func.date(Match.match_date) == date)
|
|
)
|
|
return (await self._session.execute(stmt)).scalar_one_or_none()
|
|
|
|
async def add(self, match: Match) -> None:
|
|
self._session.add(match)
|
|
await self._session.flush()
|
|
|
|
|
|
class TeamRepository:
|
|
"""球队数据访问。"""
|
|
|
|
def __init__(self, session: AsyncSession) -> None:
|
|
self._session = session
|
|
|
|
async def get_by_name(self, name: str) -> Team | None:
|
|
stmt = select(Team).where(Team.name == name)
|
|
return (await self._session.execute(stmt)).scalar_one_or_none()
|
|
|
|
async def get_or_create(self, name: str) -> Team:
|
|
"""按名获取球队,不存在则创建。"""
|
|
team = await self.get_by_name(name)
|
|
if team is None:
|
|
team = Team(name=name)
|
|
self._session.add(team)
|
|
await self._session.flush()
|
|
return team
|
|
|
|
async def get_all_by_names(self, names: list[str]) -> dict[str, Team]:
|
|
"""批量获取球队,返回 name → Team 映射。"""
|
|
if not names:
|
|
return {}
|
|
stmt = select(Team).where(Team.name.in_(names))
|
|
teams = (await self._session.execute(stmt)).scalars().all()
|
|
return {t.name: t for t in teams}
|
|
|
|
async def add(self, team: Team) -> None:
|
|
self._session.add(team)
|
|
await self._session.flush()
|
|
|
|
|
|
class LeagueRepository:
|
|
"""联赛数据访问。"""
|
|
|
|
def __init__(self, session: AsyncSession) -> None:
|
|
self._session = session
|
|
|
|
async def get_by_code(self, code: str) -> League | None:
|
|
stmt = select(League).where(League.code == code)
|
|
return (await self._session.execute(stmt)).scalar_one_or_none()
|
|
|
|
async def get_or_create(self, code: str, name: str, country: str | None = None) -> League:
|
|
league = await self.get_by_code(code)
|
|
if league is None:
|
|
league = League(code=code, name=name, country=country)
|
|
self._session.add(league)
|
|
await self._session.flush()
|
|
return league
|
|
|
|
async def add(self, league: League) -> None:
|
|
self._session.add(league)
|
|
await self._session.flush()
|
|
|
|
|
|
class PredictionRepository:
|
|
"""预测记录数据访问。"""
|
|
|
|
def __init__(self, session: AsyncSession) -> None:
|
|
self._session = session
|
|
|
|
async def get_by_id(self, prediction_id: int) -> Prediction | None:
|
|
return await self._session.get(Prediction, prediction_id)
|
|
|
|
async def add(self, prediction: Prediction) -> None:
|
|
self._session.add(prediction)
|
|
await self._session.flush()
|