From a7333368f1845cd7677b7af72848a25551198e9c Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Mon, 5 Oct 2026 19:00:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=B4=A8=E8=AF=A2=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=A1=A5=E5=85=A8=EF=BC=9A=E5=B0=81=E5=AD=98=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E8=BF=BD=E9=97=AE=E9=80=94=E4=B8=AD=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E8=A2=AB=E7=BB=A7=E7=BB=AD=E4=BA=86=E4=B8=8D=E5=86=99?= =?UTF-8?q?=E8=BF=9B=E8=AE=B0=E5=BD=95=E3=80=81/verify=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A0=B8=E5=AF=B9=E4=B8=80=E8=87=B4=E3=80=81=E6=89=B9?= =?UTF-8?q?=E5=87=86=E5=92=8C=E9=A9=B3=E5=9B=9E=E9=83=BD=E5=9C=A8=E5=9B=9E?= =?UTF-8?q?=E7=AD=94=E6=9C=9F=E9=97=B4=E8=A2=AB=E6=8B=A6=EF=BC=9B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=AF=B4=E6=98=8E=E5=86=99=E6=98=8E=E8=B4=A8=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E4=BB=B6=E7=9A=84=E5=BD=A2=E7=8A=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 失败的探索运行封存后追问,回答途中被继续运行:回答照样交回,recorded 为假,继续运行重新封存后核对一致 - 停在审批时质询、批准、封存之后,经 /api/runs/{id}/verify 核对,封存范围盖住这条质询 - 质询期间批准、驳回都回 409 inquiry_busy - api/inquiry.py 的说明补上质询工件的返回形状 {id, content, masked[, mask_note]},以及回答文档原样给 --- backend/app/api/inquiry.py | 4 ++- backend/tests/test_inquiry_api.py | 51 ++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/backend/app/api/inquiry.py b/backend/app/api/inquiry.py index 7c5b73ad..111ae5fa 100644 --- a/backend/app/api/inquiry.py +++ b/backend/app/api/inquiry.py @@ -2,7 +2,9 @@ - POST /api/runs/{run_id}/inquiries:{report, unit, quote?, question, approval_id?} → {inquiry, recorded, note} - GET /api/runs/{run_id}/inquiries?report=&unit=:{items: [Inquiry]},封存前后的都算,按先后 -- GET /api/runs/{run_id}/inquiries/artifacts/{artifact_id}:质询引用过的工件,查询快照的遮罩列照证据面板遮好 +- GET /api/runs/{run_id}/inquiries/artifacts/{artifact_id}:质询引用过的工件 {id, content, masked[, mask_note]}—— + 查询快照的遮罩列照证据面板遮好(masked 是遮掉的列名);回答文档(answer.doc_artifact)组装时就遮好了,原样给。 + 不是这次运行的质询引用过的回 404:工件 id 不能拿来取任意快照 不受理:409 {detail, code}(inquiry_not_open / inquiry_busy / inquiry_disabled);输入不合法 422 {detail, field}, field 指明是哪一项(前后端约定的形状,不是 FastAPI 自己那种校验错误数组,所以请求体自己解析)。 diff --git a/backend/tests/test_inquiry_api.py b/backend/tests/test_inquiry_api.py index d0b2971b..7926b046 100644 --- a/backend/tests/test_inquiry_api.py +++ b/backend/tests/test_inquiry_api.py @@ -34,12 +34,15 @@ from app.data import introspect from app.data.engine import engines from app.db.base import SessionLocal from app.db.models import Approval, DataSource, Run, RunEvent, Setting +from app.engine import compiler from app.engine import inquiry as inquiry_mod from app.engine import spend, verify_agent +from app.engine.context import NodeError from app.engine.evidence import iter_segments, iter_units from app.engine.judge import SPEND_KEY as JUDGE_SPEND_KEY from app.engine.nodes import report as report_mod from app.engine.runner import run_manager, verify_manifest +from app.engine.schema import NodeType from app.main import app from app.providers.factory import ProviderNotConfigured from app.providers.mock_model import MockChatModel @@ -331,7 +334,8 @@ async def test_asking_while_waiting_is_recorded_and_sealed_with_the_run(monkeypa final = await wait(paused.id) assert final.status == "succeeded", final.error assert final.manifest_seq > event.seq - assert (await verify_manifest(paused.id))["ok"] is True + verified = (await client.get(f"/api/runs/{paused.id}/verify")).json() + assert verified["ok"] is True and verified["sealed_at"] == final.manifest_seq >= event.seq # 用量计进运行用量,明细在 inquiry 下 assert final.usage["inquiry"]["calls"] == item["usage"]["calls"] assert final.usage["inquiry"]["input_tokens"] == item["usage"]["input_tokens"] @@ -392,9 +396,10 @@ async def test_while_answering_approving_resuming_and_continuing_are_refused(mon approval_id=approval.id)) try: await asyncio.wait_for(entered.wait(), 10) - refused = await client.post(f"/api/approvals/{approval.id}/decide", json={"approved": False, "note": "先别批"}, - headers={"X-Actor": "reviewer"}) - assert refused.status_code == 409 and refused.json() == BUSY_DECIDE + for decision in ({"approved": True}, {"approved": False, "note": "先别批"}): + refused = await client.post(f"/api/approvals/{approval.id}/decide", json=decision, + headers={"X-Actor": "reviewer"}) + assert refused.status_code == 409 and refused.json() == BUSY_DECIDE refused = await client.post(f"/api/runs/{paused.id}/resume", json={"response": {"approved": True}, "approval_id": approval.id}) assert refused.status_code == 409 and refused.json() == BUSY_DECIDE @@ -458,6 +463,44 @@ async def test_after_the_seal_only_exploratory_runs_take_inquiries(monkeypatch, assert await events(formal.id, "approval.inquiry") == [] +async def test_a_follow_up_is_not_written_once_the_run_is_continued(monkeypatch, shop, client): + """失败的探索运行也封存了,可以追问。追问途中运行被继续了(另一个进程、或者抢在登记之前):记录上的封存不再是 + 开始回答时的那份,回答照样交回,不写进运行记录;继续运行跑完重新封存,核对照旧一致。""" + state = {"fail": True, "continued": False} + original = compiler.RUNNERS[NodeType.TRANSFORM] + + async def flaky(st, ctx): + if ctx.node.id == "boom" and state["fail"]: + raise NodeError(ctx.node.id, "下游接口暂时不可用") + return await original(st, ctx) + + monkeypatch.setitem(compiler.RUNNERS, NodeType.TRANSFORM, flaky) + + async def continue_meanwhile(): + if not state["continued"]: + state["continued"], state["fail"] = True, False + await run_manager.continue_failed(state["run"]) + + Models(monkeypatch, shop, before=continue_meanwhile) + graph = chain(node("start", "input"), node("fetch", "tool", tool=f"db_query__{shop}", args={"sql": QUERY}), + node("write", "report", "写周报", instructions="写周报"), + node("boom", "transform", mode="template", template="门店 17 家"), + node("out", "output", fields=[{"name": "周报", "value": "{{ nodes.write.text }}"}])) + failed = await finish(shop, graph=graph) + assert failed.status == "failed" and failed.manifest_seq is not None + state["run"] = failed.id + + r = await ask(client, failed.id, report="write", unit=None, question=QUESTION) + assert r.status_code == 200, r.text + body = r.json() + assert body["recorded"] is False and body["note"] == NOT_RECORDED + assert body["inquiry"]["post_seal"] is True and body["inquiry"]["answer"]["text"] == NO_TEST_TEXT + final = await wait(failed.id) + assert final.status == "succeeded", final.error + assert await events(failed.id, "approval.inquiry") == [] + assert (await verify_manifest(failed.id))["ok"] is True + + async def test_a_formal_run_waiting_for_approval_takes_inquiries(monkeypatch, shop, client): """正式运行停在审批时可以质询:问答随运行一起封存,正式运行同样可以复核。""" Models(monkeypatch, shop)