feat: Phase 4 — Experiment 自动归档 + 异步 Job(状态机 / SSE / 一键复跑)
- 数据表:job / experiment(spec/result JSON 存档、code_version),Alembic 迁移 53113c80257f
- Job:queued→running→(success|failed) 状态机,BackgroundTasks 本地执行 + 失败兜底标记;结果与 Experiment 关联
- Experiment:每次研究成功自动归档(含 git commit 与收益摘要),支持一键复跑(同 spec 重建 Job)
- API:POST /api/jobs、GET /api/jobs/{id}(内嵌结果)、SSE /api/jobs/{id}/events、/api/experiments 列表/详情/rerun
- 前端:新增「实验」页(列表 / 详情 / 复跑 + Job 轮询);导航更新
- 端到端验证:真实 20 股 job 提交→后台执行→success→EXP 归档(-12.41%);executor 成功/失败路径单测
- 测试 73 passed(新增 5 项 Job/Experiment)/ ruff clean / 前端 tsc + build 通过
This commit is contained in:
+65
@@ -0,0 +1,65 @@
|
||||
"""phase4 jobs and experiments
|
||||
|
||||
Revision ID: 53113c80257f
|
||||
Revises: e4d188250fb2
|
||||
Create Date: 2026-09-06 17:16:05.976236
|
||||
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision: str = "53113c80257f"
|
||||
down_revision: str | None = "e4d188250fb2"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table(
|
||||
"experiment",
|
||||
sa.Column("id", sa.String(length=32), nullable=False),
|
||||
sa.Column("kind", sa.String(length=16), nullable=False),
|
||||
sa.Column("spec_json", sa.Text(), nullable=False),
|
||||
sa.Column("result_json", sa.Text(), nullable=False),
|
||||
sa.Column("summary_text", sa.String(length=200), nullable=True),
|
||||
sa.Column("code_version", sa.String(length=40), nullable=True),
|
||||
sa.Column("data_version", sa.String(length=40), nullable=True),
|
||||
sa.Column("job_id", sa.String(length=32), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(), nullable=False),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
op.create_table(
|
||||
"job",
|
||||
sa.Column("id", sa.String(length=32), nullable=False),
|
||||
sa.Column("kind", sa.String(length=16), nullable=False),
|
||||
sa.Column("status", sa.String(length=12), nullable=False),
|
||||
sa.Column("stage", sa.String(length=24), nullable=True),
|
||||
sa.Column("spec_json", sa.Text(), nullable=False),
|
||||
sa.Column("error", sa.Text(), nullable=True),
|
||||
sa.Column("result_json", sa.Text(), nullable=True),
|
||||
sa.Column("experiment_id", sa.String(length=32), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(), nullable=False),
|
||||
sa.Column("started_at", sa.DateTime(), nullable=True),
|
||||
sa.Column("finished_at", sa.DateTime(), nullable=True),
|
||||
sa.PrimaryKeyConstraint("id"),
|
||||
)
|
||||
with op.batch_alter_table("job", schema=None) as batch_op:
|
||||
batch_op.create_index(batch_op.f("ix_job_status"), ["status"], unique=False)
|
||||
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
with op.batch_alter_table("job", schema=None) as batch_op:
|
||||
batch_op.drop_index(batch_op.f("ix_job_status"))
|
||||
|
||||
op.drop_table("job")
|
||||
op.drop_table("experiment")
|
||||
# ### end Alembic commands ###
|
||||
@@ -4,6 +4,10 @@
|
||||
模型统一继承 infra.persistence.sqlalchemy.base.Base。
|
||||
"""
|
||||
|
||||
from app.infrastructure.persistence.sqlalchemy.models.jobs import ( # noqa: F401
|
||||
ExperimentModel,
|
||||
JobModel,
|
||||
)
|
||||
from app.infrastructure.persistence.sqlalchemy.models.market import ( # noqa: F401
|
||||
AdjustFactorModel,
|
||||
FinancialIndicatorModel,
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
"""Phase 4:Job(异步任务)与 Experiment(实验归档)表。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import DateTime, String, Text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.infrastructure.persistence.sqlalchemy.base import Base
|
||||
|
||||
|
||||
class JobModel(Base):
|
||||
__tablename__ = "job"
|
||||
|
||||
id: Mapped[str] = mapped_column(String(32), primary_key=True)
|
||||
kind: Mapped[str] = mapped_column(String(16))
|
||||
status: Mapped[str] = mapped_column(String(12), index=True)
|
||||
stage: Mapped[str | None] = mapped_column(String(24), nullable=True)
|
||||
spec_json: Mapped[str] = mapped_column(Text)
|
||||
error: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
result_json: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
experiment_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime)
|
||||
started_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
finished_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
|
||||
|
||||
class ExperimentModel(Base):
|
||||
__tablename__ = "experiment"
|
||||
|
||||
id: Mapped[str] = mapped_column(String(32), primary_key=True)
|
||||
kind: Mapped[str] = mapped_column(String(16))
|
||||
spec_json: Mapped[str] = mapped_column(Text)
|
||||
result_json: Mapped[str] = mapped_column(Text)
|
||||
summary_text: Mapped[str | None] = mapped_column(String(200), nullable=True)
|
||||
code_version: Mapped[str | None] = mapped_column(String(40), nullable=True)
|
||||
data_version: Mapped[str | None] = mapped_column(String(40), nullable=True)
|
||||
job_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime)
|
||||
@@ -0,0 +1,63 @@
|
||||
"""Job / Experiment 的 SQLAlchemy 实现(Phase 4)。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.domain.entities.research import ExperimentRecord, JobRecord
|
||||
from app.infrastructure.persistence.sqlalchemy.models.jobs import ExperimentModel, JobModel
|
||||
|
||||
|
||||
def _job_to_model(job: JobRecord) -> JobModel:
|
||||
return JobModel(**job.model_dump())
|
||||
|
||||
|
||||
class SqlAlchemyJobRepository:
|
||||
def __init__(self, session: Session) -> None:
|
||||
self._session = session
|
||||
|
||||
def create(self, job: JobRecord) -> JobRecord:
|
||||
self._session.add(_job_to_model(job))
|
||||
self._session.flush()
|
||||
return job
|
||||
|
||||
def get(self, job_id: str) -> JobRecord | None:
|
||||
row = self._session.get(JobModel, job_id)
|
||||
return JobRecord.model_validate(row, from_attributes=True) if row else None
|
||||
|
||||
def update(self, job: JobRecord) -> None:
|
||||
row = self._session.get(JobModel, job.id)
|
||||
if row is None:
|
||||
raise KeyError(f"job {job.id} 不存在")
|
||||
for k, v in job.model_dump().items():
|
||||
setattr(row, k, v)
|
||||
|
||||
def list_recent(self, kind: str | None = None, limit: int = 20) -> list[JobRecord]:
|
||||
stmt = select(JobModel).order_by(JobModel.created_at.desc()).limit(limit)
|
||||
if kind:
|
||||
stmt = stmt.where(JobModel.kind == kind)
|
||||
return [
|
||||
JobRecord.model_validate(r, from_attributes=True)
|
||||
for r in self._session.scalars(stmt).all()
|
||||
]
|
||||
|
||||
|
||||
class SqlAlchemyExperimentRepository:
|
||||
def __init__(self, session: Session) -> None:
|
||||
self._session = session
|
||||
|
||||
def save(self, experiment: ExperimentRecord) -> ExperimentRecord:
|
||||
self._session.add(ExperimentModel(**experiment.model_dump()))
|
||||
self._session.flush()
|
||||
return experiment
|
||||
|
||||
def get(self, experiment_id: str) -> ExperimentRecord | None:
|
||||
row = self._session.get(ExperimentModel, experiment_id)
|
||||
return ExperimentRecord.model_validate(row, from_attributes=True) if row else None
|
||||
|
||||
def list_recent(self, limit: int = 50) -> list[ExperimentRecord]:
|
||||
rows = self._session.scalars(
|
||||
select(ExperimentModel).order_by(ExperimentModel.created_at.desc()).limit(limit)
|
||||
).all()
|
||||
return [ExperimentRecord.model_validate(r, from_attributes=True) for r in rows]
|
||||
Reference in New Issue
Block a user