Simplify template candidate confirmation and direct batch backtesting
Deploy production / deploy (push) Successful in 57s

This commit is contained in:
yuxuanhui
2026-09-20 11:01:07 +08:00
parent 07dd767c52
commit 13a2168ca5
14 changed files with 510 additions and 245 deletions
+1 -1
View File
@@ -138,7 +138,7 @@ async def test_sdk_template_creation_frozen_evidence_and_web_expansion(app, logg
assert {c["expression"] for c in experiment["candidates"]} == {
f"rank({field}) + {offset}" for field in ["TEST_FIN_001", "TEST_FIN_002"] for offset in [0, 1, 5]
}
assert all(c["validation"]["status"] == "valid" for c in experiment["candidates"])
assert all("validation" not in c for c in experiment["candidates"])
assert experiment["evidence"]["template"]["provenance"] == stored["provenance"]
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(BacktestRun)) == 1
+91 -19
View File
@@ -8,7 +8,7 @@ from app.catalog.research_metadata import ResearchMetadata
from app.models import BacktestRun, CatalogResource, ResearchExperiment
from app.research.expressions import analyze, expand
from tests.conftest import alpha
from tests.test_backtests import execute, setup, start
from tests.test_backtests import execute, setup
from tests.test_catalog import SCOPE, prepare, sync
from tests.test_catalog import catalog as catalog_fixture
@@ -120,7 +120,7 @@ def test_bounded_sampling_and_repeated_placeholders():
expand(expression, values, "all", 100)
async def test_template_version_expansion_preview_and_backtest(app, logged_in, research_input):
async def test_template_version_expansion_direct_backtest_and_idempotency(app, logged_in, research_input):
saved = await logged_in.post("/api/v1/research/assets", json={"kind": "template", "content": template()})
assert saved.status_code == 201, saved.text
asset = saved.json()
@@ -130,7 +130,7 @@ async def test_template_version_expansion_preview_and_backtest(app, logged_in, r
assert generated.status_code == 201, generated.text
experiment = generated.json()
assert len(experiment["candidates"]) == 2
assert all(c["validation"]["status"] == "valid" for c in experiment["candidates"])
assert all("validation" not in c for c in experiment["candidates"])
modified = template()
modified["expression"] = "-rank({field})"
response = await logged_in.put(
@@ -147,10 +147,24 @@ async def test_template_version_expansion_preview_and_backtest(app, logged_in, r
)
).status_code == 409
platform, lane = await setup(app)
preview = await logged_in.post(f"/api/v1/research/experiments/{experiment['id']}/preview", json={})
assert preview.status_code == 201, preview.text
assert not platform.posts
run = await start(logged_in, preview.json(), "research-stage-one")
from app.models import BacktestPreview
url = f"/api/v1/research/experiments/{experiment['id']}/backtest"
request = {"candidate_ids": ["c2"], "idempotency_key": "template-confirmation"}
result = await logged_in.post(url, json=request)
assert result.status_code == 202, result.text
run = result.json()
assert run["total"] == 1
assert run["source"]["kind"] == "template"
assert run["source"]["input_snapshot_ids"] == [research_input["id"]]
retry = await logged_in.post(url, json=request)
assert retry.status_code == 202 and retry.json()["backtest_run_id"] == run["backtest_run_id"]
conflict = await logged_in.post(url, json={**request, "candidate_ids": ["c1"]})
assert conflict.status_code == 409
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(BacktestRun)) == 1
assert await db.scalar(select(func.count()).select_from(BacktestPreview)) == 1
assert lane.wake.is_set()
await execute(app, lane, run["backtest_run_id"])
results = (await logged_in.get(f"/api/v1/backtests/runs/{run['backtest_run_id']}/results")).json()
aid = results["items"][0]["alpha_id"]
@@ -161,22 +175,34 @@ async def test_template_version_expansion_preview_and_backtest(app, logged_in, r
assert old["backtest_run_ids"] == [run["backtest_run_id"]]
async def test_invalid_fields_and_unknown_operators_never_start(app, logged_in, research_input):
async def test_template_generation_does_not_require_field_operator_or_settings_evidence(app, logged_in, research_input):
from sqlalchemy import delete
async with app.state.sessions.begin() as db:
await db.execute(delete(CatalogResource))
body = expansion(research_input["id"])
body["template"]["variables"]["field"]["values"] = ["other_field"]
assert (await logged_in.post("/api/v1/research/experiments", json=body)).status_code == 422
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(ResearchExperiment)) == 0
body = expansion(research_input["id"])
body["template"]["expression"] = "made_up({field})"
body["template"]["expression"] = "made_up({field}) + vec_avg(TEST_FIN_001)"
response = await logged_in.post("/api/v1/research/experiments", json=body)
assert response.status_code == 201, response.text
eid = response.json()["id"]
assert (await logged_in.post(f"/api/v1/research/experiments/{eid}/preview", json={})).status_code == 422
experiment = response.json()
assert all("validation" not in c for c in experiment["candidates"])
assert not {"operators_snapshot", "settings_snapshot", "field_availability"} & experiment["evidence"].keys()
assert (await logged_in.post(f"/api/v1/research/experiments/{experiment['id']}/preview", json={})).status_code == 201
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(BacktestRun)) == 0
@pytest.mark.parametrize("expression", ["rank({field}", "rank({field},,)", "x = {field}"])
async def test_template_syntax_errors_reject_whole_collection(app, logged_in, research_input, expression):
body = expansion(research_input["id"])
body["template"]["expression"] = expression
response = await logged_in.post("/api/v1/research/experiments", json=body)
assert response.status_code == 422 and "语法错误" in response.text
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(ResearchExperiment)) == 0
async def test_import_preview_conflict_and_explicit_commit(logged_in):
legacy = {
"name": "legacy",
@@ -367,7 +393,7 @@ def test_actual_cnhk_setting_choice_nesting_is_supported():
)
async def test_published_input_does_not_override_conflicting_field_evidence(app, logged_in, research_input):
async def test_template_candidates_ignore_conflicting_field_evidence(app, logged_in, research_input):
async with app.state.sessions.begin() as db:
await ResearchMetadata(db).publish(
"availability-fixture",
@@ -382,12 +408,11 @@ async def test_published_input_does_not_override_conflicting_field_evidence(app,
experiment = (
await logged_in.post("/api/v1/research/experiments", json=expansion(research_input["id"]))
).json()
assert experiment["candidates"][0]["validation"]["status"] == "needs_review"
assert experiment["candidates"][1]["validation"]["status"] == "valid"
assert all("validation" not in c for c in experiment["candidates"])
denied = await logged_in.post(
f"/api/v1/research/experiments/{experiment['id']}/preview", json={"candidate_ids": ["c1"]}
)
assert denied.status_code == 422
assert denied.status_code == 201
duplicate = await logged_in.post(
f"/api/v1/research/experiments/{experiment['id']}/preview", json={"candidate_ids": ["c2", "c2"]}
)
@@ -607,3 +632,50 @@ async def test_template_contract_rejects_removed_scope(logged_in):
assert response.status_code == 422, response.text
assert "scope" in response.text
assert "scope" not in TemplateSpec.model_json_schema()["properties"]
async def test_template_start_checks_selection_and_ignores_old_row_validation(app, logged_in, research_input):
from app.models import BacktestPreview
experiment = (await logged_in.post("/api/v1/research/experiments", json=expansion(research_input["id"]))).json()
async with app.state.sessions.begin() as db:
row = await db.get(ResearchExperiment, experiment["id"])
row.candidates = [{**c, "validation": {"status": "needs_review", "syntax": [], "types": [],
"availability": ["历史字段未核实"]}} for c in row.candidates]
await setup(app)
url = f"/api/v1/research/experiments/{experiment['id']}/backtest"
for ids in [[], ["unknown"], ["c1", "c1"]]:
response = await logged_in.post(url, json={"candidate_ids": ids, "idempotency_key": "confirm-old"})
assert response.status_code == 422, response.text
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(BacktestPreview)) == 0
assert await db.scalar(select(func.count()).select_from(BacktestRun)) == 0
response = await logged_in.post(url, json={"candidate_ids": ["c1", "c2"], "idempotency_key": "confirm-old"})
assert response.status_code == 202 and response.json()["total"] == 2
retry = await logged_in.post(url, json={"candidate_ids": ["c2", "c1"], "idempotency_key": "confirm-old"})
assert retry.status_code == 202 and retry.json()["backtest_run_id"] == response.json()["backtest_run_id"]
@pytest.mark.parametrize("change", ["syntax", "scope", "archived", "disconnected"])
async def test_template_start_rejects_unusable_collection_without_partial_writes(app, logged_in, research_input, change):
from app.models import Account, BacktestPreview
experiment = (await logged_in.post("/api/v1/research/experiments", json=expansion(research_input["id"]))).json()
async with app.state.sessions.begin() as db:
row = await db.get(ResearchExperiment, experiment["id"])
if change == "syntax":
row.candidates = [{**c, "expression": "rank("} for c in row.candidates]
elif change == "scope":
row.candidates = [{**c, "settings": {**c["settings"], "region": "EUR"}} for c in row.candidates]
elif change == "archived":
row.archived = True
else:
(await db.get(Account, 1)).connection_status = "disconnected"
app.state.runner.backtests.wake.clear()
response = await logged_in.post(f"/api/v1/research/experiments/{experiment['id']}/backtest",
json={"candidate_ids": ["c1"], "idempotency_key": "invalid"})
assert response.status_code == (422 if change in ("syntax", "scope") else 409), response.text
assert not app.state.runner.backtests.wake.is_set()
async with app.state.sessions() as db:
assert await db.scalar(select(func.count()).select_from(BacktestPreview)) == 0
assert await db.scalar(select(func.count()).select_from(BacktestRun)) == 0