fix(backlog): 修评审 3 HIGH — resume chain_key 真值 / 模板空白校验 / 续写链 resume E2E
1. resume_chain 回报真 chain_key:从 awaiting job.result 读回(run 时 _chain_result 持久化),不再按 job.kind 推断(kind 恒为通用常量 "chain",从不在 SUPPORTED_CHAINS → 总错回退 draft_volume)。continue_volume 的 resume 回执现报真值。 2. 模板 title/body 拒纯空白:StringConstraints(strip_whitespace, min_length=1), " " strip 后为空 → 422。 3. 续写链 resume 路径 E2E:continue_volume 第 1 章冲突 → interrupt → awaiting → resume 带裁决 → done,断言 resume 回执 / job result chain_key="continue_volume" (回归守卫 #1)。 测试:+resume continue_volume 单测(chain_key 真值)+2 模板空白 422 单测 +1 续写链 resume E2E。重生成 TS 客户端(仅 description 文案变化)。
This commit is contained in:
@@ -365,6 +365,31 @@ async def test_resume_chain_awaiting_returns_202(
|
||||
assert len(_noop_run_chain_job) == 1
|
||||
|
||||
|
||||
async def test_resume_continue_volume_reports_true_chain_key(
|
||||
_noop_run_chain_job: list[dict[str, Any]],
|
||||
) -> None:
|
||||
"""回归守卫 #1:resume continue_volume run → 回执 chain_key="continue_volume"(读自
|
||||
job.result,run 时由 _chain_result 持久化),而非旧 bug 按 job.kind 推断的 "draft_volume"。
|
||||
且转发给 run_chain_job 的 chain_key 也是真值(续写模式不被错降为 draft_volume)。"""
|
||||
project_repo = FakeProjectRepo()
|
||||
job_repo = FakeJobRepo()
|
||||
pid = await _seed_project(project_repo)
|
||||
job = await job_repo.create(pid, "chain") # kind 恒为通用常量 "chain"
|
||||
# run 时 interrupt 把真 chain_key 持久进 result(continue_volume)。
|
||||
await job_repo.set_awaiting(job.id, {"awaiting_chapter": 1, "chain_key": "continue_volume"})
|
||||
app = _app(project_repo, job_repo)
|
||||
|
||||
async with _client(app) as client:
|
||||
resp = await client.post(
|
||||
f"/projects/{pid}/chains/runs/{job.id}/resume",
|
||||
json={"decisions": [{"conflict_index": 0, "verdict": "ignore"}]},
|
||||
)
|
||||
|
||||
assert resp.status_code == 202
|
||||
assert resp.json()["chain_key"] == "continue_volume"
|
||||
assert _noop_run_chain_job[0]["kwargs"]["chain_key"] == "continue_volume"
|
||||
|
||||
|
||||
async def test_resume_chain_non_awaiting_returns_409(
|
||||
_noop_run_chain_job: list[dict[str, Any]],
|
||||
) -> None:
|
||||
|
||||
@@ -105,6 +105,23 @@ async def test_create_template_empty_body_returns_422() -> None:
|
||||
assert resp.status_code == 422
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_template_whitespace_only_title_returns_422() -> None:
|
||||
# strip 后为空 → min_length=1 不满足 → 422(防纯空白标题,审评 #2)。
|
||||
client, _repo, _session = _make_client()
|
||||
async with client:
|
||||
resp = await client.post("/templates", json={"title": " ", "body": "b"})
|
||||
assert resp.status_code == 422
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_template_whitespace_only_body_returns_422() -> None:
|
||||
client, _repo, _session = _make_client()
|
||||
async with client:
|
||||
resp = await client.post("/templates", json={"title": "a", "body": " "})
|
||||
assert resp.status_code == 422
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_template_returns_204_and_commits() -> None:
|
||||
client, repo, session = _make_client()
|
||||
|
||||
@@ -215,7 +215,9 @@ async def resume_chain(
|
||||
f"job {job_id} 已被并发续跑抢占或非 awaiting_input 态,不可重复续跑",
|
||||
)
|
||||
|
||||
chain_key = claimed.kind if claimed.kind in SUPPORTED_CHAINS else "draft_volume"
|
||||
# chain_key 真值:run 时 interrupt 把图 state 的 chain_key 持久进 job.result(_chain_result)。
|
||||
# 读回它,而非按 job.kind 推断(kind 恒为通用常量 JOB_KIND_CHAIN,从不在 SUPPORTED_CHAINS)。
|
||||
chain_key = _chain_key_from_result(claimed.result)
|
||||
|
||||
accept_op = build_accept_op(
|
||||
session_factory=session_factory,
|
||||
@@ -251,6 +253,17 @@ async def resume_chain(
|
||||
return ChainResumeAccepted(job_id=job_id, chain_key=chain_key)
|
||||
|
||||
|
||||
def _chain_key_from_result(result: dict[str, Any] | None) -> str:
|
||||
"""从 awaiting job 的 result 取真 chain_key(run 时由 _chain_result 持久化)。
|
||||
|
||||
缺失/非受支持 key(旧行/异常)→ 回退 "draft_volume"(保守默认,不崩)。
|
||||
"""
|
||||
key = (result or {}).get("chain_key")
|
||||
if isinstance(key, str) and key in SUPPORTED_CHAINS:
|
||||
return key
|
||||
return "draft_volume"
|
||||
|
||||
|
||||
def _chapter_repo_factory(session: AsyncSession) -> object:
|
||||
"""链节点(review 重读草稿)按 session 建 chapter draft repo。"""
|
||||
from ww_core.domain.chapter_repo import SqlChapterRepo
|
||||
|
||||
@@ -2,21 +2,25 @@
|
||||
|
||||
snake_case;前端经 OpenAPI 生成 TS 类型消费。改字段 → 前端必须 `pnpm gen:api`。
|
||||
单用户本地版:作者保存/复用提示词模板,可一键填入生成器的 brief/text。
|
||||
`title`/`body` 非空(`min_length=1`,空 → FastAPI 422)。`category`/`tool_key` 可选。
|
||||
`title`/`body` 非空(先 strip 再 `min_length=1`,纯空白 → 422)。`category`/`tool_key` 可选。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import uuid
|
||||
from typing import Annotated
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
from pydantic import BaseModel, Field, StringConstraints
|
||||
|
||||
# 先去首尾空白再校验长度:纯空白(" ")strip 后为空 → min_length=1 不满足 → 422。
|
||||
NonBlankStr = Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)]
|
||||
|
||||
|
||||
class TemplateCreateRequest(BaseModel):
|
||||
"""POST /templates:新建一条提示词模板。"""
|
||||
|
||||
title: str = Field(min_length=1, description="模板标题")
|
||||
body: str = Field(min_length=1, description="模板正文(一键填入生成器的 brief/text)")
|
||||
title: NonBlankStr = Field(description="模板标题(非空,纯空白 → 422)")
|
||||
body: NonBlankStr = Field(description="模板正文(非空,一键填入生成器的 brief/text)")
|
||||
category: str | None = Field(default=None, description="可选分类")
|
||||
tool_key: str | None = Field(default=None, description="可选关联生成器(NULL=通用)")
|
||||
|
||||
|
||||
4
apps/web/lib/api/schema.d.ts
vendored
4
apps/web/lib/api/schema.d.ts
vendored
@@ -1797,12 +1797,12 @@ export interface components {
|
||||
TemplateCreateRequest: {
|
||||
/**
|
||||
* Title
|
||||
* @description 模板标题
|
||||
* @description 模板标题(非空,纯空白 → 422)
|
||||
*/
|
||||
title: string;
|
||||
/**
|
||||
* Body
|
||||
* @description 模板正文(一键填入生成器的 brief/text)
|
||||
* @description 模板正文(非空,一键填入生成器的 brief/text)
|
||||
*/
|
||||
body: string;
|
||||
/**
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user