mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-16 09:41:59 +00:00
5ff3e1136d
为什么:一轮问数据搬到服务端之后(上一个提交),页面不该再推这一轮:建图那条流、发起运行、复核、按复核重来、落库都和页面 绑在一起,页面一断这一轮就停。现在页面只发起、只看,要不要运行、要不要重来、什么时候交付都照服务端说的。 做了什么: - 新的 api/chatTurns.ts:发起、查询、停止(挂在 api.chatTurns),streamChatTurn 订阅这一轮的事件日志——先回放、再接实时; 断了按收到的最后一个 seq 自动重连(收到东西马上接着连,连不上按退避),45 秒什么都没收到(服务端 15 秒一拍心跳)当连接死了。 - store/chat.ts:plan / launch / settle / retry 换成发起(launchTurn)+ 播放(play)。收到的操作照原来的渲染逻辑画(画布边收 边长、过程步骤、思考、查看、用量);收到 run 就接上运行自己的实时流画过程(watch 只画过程,不再判结局);stage 说到了 哪一步(停在审批上立刻去拿待审批);turn.retry 照原来自动重来那样重置;end 照服务端落库的那一行摆结局(和刷新之后从库里 恢复的是同一份 restoreTurn)。「重试本轮」「重新运行本轮」「放宽步数」「跑一下」「继续运行」「停止」都走新接口。 - 页面不再写这一轮的结局(不再 PATCH 轮次、不再调 /copilot/review、不再发 POST /api/runs);失败的说法照服务端记的原因 (meta.cause)按 lib/explain 讲,老轮次记的 failure 照旧认。 - 刷新、关掉再打开:服务端还在跑的一轮(ConversationTurn.job)从这一次尝试的第一条事件接着播;库里停在半路、服务端又没在跑 的(老轮次、服务重启后停着的)请服务端接着收尾(mode=resume),不在页面上自己收尾。问数据页的显示不变。 - 页面上那份退路(MAX_ATTEMPTS、fillInput、retryInstruction、等复核的计时)去掉:决定只在服务端一处。后端对照测试改成守 「页面上不再有这几样」。 - scripts/check-chat.mjs:伪造的服务端照 backend/app/chat/job.py 的做法用原来那几份剧本把一轮跑完(生成、发起运行、等运行的剧本 放完、复核、拼那一行),原有各段照过;守落库的几处改成守「页面不 PATCH 这一轮」和照服务端那一行摆;新加「断线重连补齐」 「刷新、关掉再打开接着看」「停止(建图中也停得下)」几段,并核对发起、重试、放宽步数、继续运行、停止的请求体。 - 服务端顺带:turn.attempt 带上到目前为止的用量、从什么时候算起(补交付的到运行结束为止),turn.retry 带上换下来的那次运行 并进之后的用量(页面上的运行壳子里没有用量);接着收尾(resume)不要求运行还在,运行记录删了的照实收成「运行记录不见了」。
269 lines
15 KiB
Python
269 lines
15 KiB
Python
"""问数据一轮的「决定」(app/chat/turn.py;细案 01 做法 1)。
|
||
|
||
要不要运行、输入怎么填、要不要带着原图重来、重来时说什么,从问数据页下沉到后端:final 带 next,复核带 retry_instruction,
|
||
问数据的一轮后来整个搬到了服务端(chat/drive.py、chat/job.py),页面只发起、只播放。这里守:
|
||
|
||
- 各条决定的分支(next_step、fill_input、retry_after_review、retry_instruction 的两种措辞);
|
||
- 页面上不再留一份同样的决定(一轮整个搬到服务端之后,frontend/src/store/chat.ts 只发起、只播放);用户点重试本轮时的措辞;
|
||
- /copilot/review 按这一轮试过几次给 retry_instruction:可以重来时是那句话,不重来是 null。
|
||
|
||
问题、字段名都是虚构的。
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import re
|
||
import uuid
|
||
from pathlib import Path
|
||
|
||
import pytest
|
||
from httpx import ASGITransport, AsyncClient
|
||
|
||
from app.chat import turn
|
||
from app.main import app
|
||
|
||
CHAT_TS = Path(__file__).resolve().parents[2] / "frontend" / "src" / "store" / "chat.ts"
|
||
|
||
|
||
def _final(*, issues=(), autorun=True, **extra) -> dict:
|
||
return {"op": "final", "graph": {"nodes": [], "edges": []}, "issues": list(issues), "autorun": autorun, **extra}
|
||
|
||
|
||
ERROR = {"level": "error", "message": "图是空的"}
|
||
WARNING = {"level": "warning", "message": "多余的 {{ }}"}
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# next_step
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
def test_next_step_branches():
|
||
assert turn.next_step(_final()) == "run"
|
||
assert turn.next_step(_final(issues=[WARNING])) == "run", "warning 不挡运行"
|
||
assert turn.next_step(_final(autorun=False)) == "ready", "模型说不运行:只建不跑"
|
||
assert turn.next_step(_final(autorun=False, asked={"question": "哪个月?", "options": []})) == "ready"
|
||
assert turn.next_step(_final(issues=[ERROR])) == "fail", "自查过还有 error:判失败,不再整轮重来"
|
||
assert turn.next_step(_final(issues=[ERROR]), self_checked=False) == "retry", "老服务端没自查:重来一次"
|
||
assert turn.next_step(_final(issues=[ERROR], autorun=False)) == "fail", "没过检查比只建不跑优先"
|
||
assert turn.next_step({"op": "reply", "text": "已经查过了"}) == "reply"
|
||
assert turn.next_step({"op": "error", "message": "x"}) == "fail"
|
||
empty = {"op": "error", "message": "助手本轮未完成:模型没有给出任何修改,也没有说明原因",
|
||
"code": turn.EMPTY_GENERATION, "reason": "模型没有给出任何修改,也没有说明原因"}
|
||
assert turn.next_step(empty) == "retry", "只写了思考、一个操作都没给:按重来一次的规矩自动重来"
|
||
assert turn.error_reason(empty) == "模型没有给出任何修改,也没有说明原因"
|
||
assert turn.error_reason({"op": "error", "message": "助手本轮未完成:接入返回了 502"}) == "接入返回了 502"
|
||
assert turn.next_step(None) == "asked", "流结束时只有反问"
|
||
assert set(turn.NEXT_STEPS) == {"run", "ready", "fail"}
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# fill_input
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
def _graph(*fields: dict) -> dict:
|
||
return {"nodes": [{"id": "start", "type": "input", "data": {"label": "输入", "config": {"fields": list(fields)}}},
|
||
{"id": "out", "type": "output", "data": {"label": "成果", "config": {}}}], "edges": []}
|
||
|
||
|
||
def test_fill_input_rules():
|
||
assert turn.fill_input(_graph(), "上周销售额", "问:…") == {"question": "上周销售额", "history": "问:…"}
|
||
assert turn.fill_input({"nodes": []}, "上周销售额") == {"question": "上周销售额", "history": ""}
|
||
# 名字像「问题」的优先,其余字段填默认值(没有就空串)
|
||
got = turn.fill_input(_graph({"name": "region", "default": "华东"}, {"name": "topic"}, {"name": "limit"}), "退款率")
|
||
assert got == {"history": "", "region": "华东", "topic": "退款率", "limit": ""}
|
||
got = turn.fill_input(_graph({"name": "门店"}, {"name": "需求说明"}), "退款率")
|
||
assert got["需求说明"] == "退款率" and got["门店"] == ""
|
||
# 没有像问题的:第一个必填的;再没有:第一个
|
||
got = turn.fill_input(_graph({"name": "a"}, {"name": "b", "required": True}), "退款率")
|
||
assert got["b"] == "退款率" and got["a"] == ""
|
||
got = turn.fill_input(_graph({"name": "a"}, {"name": "b"}), "退款率")
|
||
assert got["a"] == "退款率"
|
||
# 大小写不敏感
|
||
assert turn.fill_input(_graph({"name": "UserQuery"}), "退款率")["UserQuery"] == "退款率"
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# 复核之后:要不要重来、说什么
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
BROKEN = {"retry": True, "severity": "broken", "note": "结论不可用",
|
||
"signals": [{"kind": "step_limit", "detail": "agent 用满了 8 步"}, {"kind": "tool_error", "detail": "表不存在"}]}
|
||
|
||
|
||
def test_retry_after_review():
|
||
assert turn.retry_after_review(BROKEN, 0) is True
|
||
assert turn.retry_after_review(BROKEN, 1) is False, "一轮最多自动再试一次"
|
||
assert turn.retry_after_review({**BROKEN, "severity": "degraded"}, 0) is False
|
||
assert turn.retry_after_review({**BROKEN, "retry": False}, 0) is False
|
||
assert turn.retry_after_review(None, 0) is False
|
||
assert turn.review_reason(BROKEN) == "agent 用满了 8 步;表不存在"
|
||
assert turn.review_reason({"signals": [], "note": "结论不可用"}) == "结论不可用"
|
||
|
||
|
||
def test_retry_instruction_two_wordings():
|
||
with_base = turn.retry_instruction("上周销售额", "表不存在", True)
|
||
assert with_base.startswith("这个工作流上一次运行没有成功:表不存在。\n\n请针对这个原因改它")
|
||
assert with_base.endswith("改完继续回答原来的问题:上周销售额")
|
||
scratch = turn.retry_instruction("上周销售额", "表不存在", False)
|
||
assert scratch == "上周销售额\n\n(上一次没有成功:表不存在。请针对这个原因调整,重新给出完整的工作流。)"
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# 页面不再留一份同样的决定
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
def _ts() -> str:
|
||
return CHAT_TS.read_text(encoding="utf-8")
|
||
|
||
|
||
def test_the_page_no_longer_keeps_its_own_copy_of_the_decisions():
|
||
"""一轮整个搬到服务端之后(docs/design/orchestration-round §1),问数据页只发起、只播放:要不要运行、要不要重来、重来说
|
||
什么、入口怎么填都只在这里(和 chat/drive.py),页面上那份退路(MAX_ATTEMPTS、fillInput、retryInstruction)去掉了——
|
||
两份并存迟早走样,界面层也不放逻辑。以前这里逐字对照两边的常量和措辞,现在守的是页面上没有这几样。"""
|
||
ts = _ts()
|
||
for name in ("const MAX_ATTEMPTS", "function fillInput", "function retryInstruction", "streamCopilot(",
|
||
"api.copilot.review(", "api.runs.start(", "patchTurn("):
|
||
assert name not in ts, f"chat.ts 里又出现了 {name}:这一轮的决定、发起、落库应在服务端"
|
||
|
||
|
||
def test_user_retry_wordings():
|
||
"""用户点「重试本轮」时交给助手的话(以前在页面 retryTurn 里拼):有图时说「没有给出可用的结果」,没图的同从零重建。"""
|
||
with_base = turn.user_retry_instruction("上周销售额", "已手动停止", True)
|
||
assert with_base == ("这个工作流上一次没有给出可用的结果:已手动停止。\n\n请针对这个原因改它(比如调大最大步数、改正工具参数、"
|
||
"换个查询方式),改完继续回答原来的问题:上周销售额")
|
||
assert turn.user_retry_instruction("上周销售额", "已手动停止", False) == turn.retry_instruction(
|
||
"上周销售额", "已手动停止", False)
|
||
|
||
|
||
# --------------------------------------------------------------------------
|
||
# /copilot/review 给 retry_instruction
|
||
# --------------------------------------------------------------------------
|
||
|
||
|
||
@pytest.fixture
|
||
async def client():
|
||
async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as c:
|
||
yield c
|
||
|
||
|
||
async def _run(output: dict, graph: dict, code: str) -> str:
|
||
from app.core.events import EventType
|
||
from app.db.base import SessionLocal
|
||
from app.db.models import Run, RunEvent
|
||
|
||
async with SessionLocal() as session:
|
||
run = Run(id=uuid.uuid4().hex, status="succeeded", output=output, graph=graph)
|
||
session.add(run)
|
||
await session.flush()
|
||
session.add(RunEvent(run_id=run.id, seq=1, type=EventType.LOG, node_id="a", ts=0.0,
|
||
data={"level": "warn", "code": code, "message": "agent 用满了 8 步还没给出结论"}))
|
||
await session.commit()
|
||
return run.id
|
||
|
||
|
||
def test_the_page_says_the_server_is_retrying_an_empty_generation():
|
||
"""只写了思考、一个操作都没给(error.next=retry)时,重来一次是服务端定的(chat/drive.py 照 next_step 走,问数据的一轮记一条
|
||
turn.retry,kind=empty);页面照它把这一轮重置、写「助手上一次没有给出任何操作,正在重新生成工作流…」。读 chat.ts 里
|
||
turn.retry 那一支(行为另由 tests/test_chat_turns.py 和 scripts/check-chat.mjs 的 emptyretry 一节守)。"""
|
||
branch = re.search(r"function retryPatch\((.*?)\n\}", _ts(), re.S)
|
||
assert branch, "chat.ts 里找不到 retryPatch"
|
||
assert re.search(r"d\.kind === 'empty' \? CHAT_RETRY_TEXT\.empty", branch.group(1)), branch.group(1)
|
||
|
||
|
||
async def test_answer_ops_says_to_retry_an_empty_generation(client, monkeypatch):
|
||
"""生成过程一个操作都没给(deepseek 偶发只出思考):error 操作带机读码 copilot_empty、原因、next=retry。"""
|
||
import json
|
||
|
||
import app.api.copilot as copilot
|
||
from tests.test_usage_meter import Scripted
|
||
|
||
model = Scripted(model="claude-opus-5", replies=[[""]])
|
||
|
||
async def _model(*_a, **_k):
|
||
return model, "claude-opus-5"
|
||
|
||
monkeypatch.setattr(copilot, "get_chat_model", _model)
|
||
events = []
|
||
async with client.stream("POST", "/api/copilot/generate-stream",
|
||
json={"instruction": "上周各地区销售额", "intent": "answer"}) as r:
|
||
async for line in r.aiter_lines():
|
||
if line.startswith("data: "):
|
||
events.append(json.loads(line[6:]))
|
||
[err] = [e for e in events if e["op"] == "error"]
|
||
assert err["code"] == turn.EMPTY_GENERATION and err["next"] == "retry", err
|
||
assert err["reason"] == "模型没有给出任何修改,也没有说明原因" and err["message"].startswith("助手本轮未完成")
|
||
|
||
|
||
async def test_the_eval_driver_retries_an_empty_generation_once(monkeypatch):
|
||
"""评测的作答(app/eval/answer.Driver)走同一个决定:第一次一个操作都没给就带着原因重来一次,原因照实记在 retries;
|
||
重来还不行才照实报建图失败(助手调用失败),不再试第三次。"""
|
||
import json
|
||
|
||
import app.api.copilot as copilot
|
||
from app.eval import answer
|
||
from tests.test_usage_meter import Scripted
|
||
|
||
reply = json.dumps({"op": "reply", "text": "上周没有华中区的数据"}, ensure_ascii=False)
|
||
for replies, path in (([[""], [reply]], "reply"), ([[""]], "build_failed")):
|
||
model = Scripted(model="claude-opus-5", replies=replies)
|
||
seen: list[str] = []
|
||
|
||
async def _model(*_a, _m=model, **_k):
|
||
return _m, "claude-opus-5"
|
||
|
||
monkeypatch.setattr(copilot, "get_chat_model", _model)
|
||
real = answer.Driver._generate
|
||
|
||
async def spy(self, instruction, base_graph, _seen=seen, _real=real):
|
||
_seen.append(instruction)
|
||
return await _real(self, instruction, base_graph)
|
||
|
||
monkeypatch.setattr(answer.Driver, "_generate", spy)
|
||
driver = answer.Driver("上周华中区销售额", datasource_ids=[], ctx=answer.TurnContext(
|
||
suite_id="s", suite_name="虚构题集", eval_run_id="e", case_id=None, case_seq=1, actor=None))
|
||
t = await driver.drive()
|
||
assert t.path == path and t.attempts == 1 and model.calls == 2, (t.path, t.attempts, model.calls, t.reason)
|
||
assert t.retries == ["模型没有给出任何修改,也没有说明原因"], t.retries
|
||
assert seen[1] == turn.retry_instruction("上周华中区销售额", t.retries[0], False), seen
|
||
if path == "build_failed":
|
||
assert t.copilot_failed and t.reason.startswith("助手本轮未完成"), t.reason
|
||
assert t.usage["assistant"]["calls"] == 2, "两次生成都是这一题花的"
|
||
|
||
|
||
async def test_review_says_whether_and_how_to_retry(client, monkeypatch):
|
||
import app.api.copilot as copilot
|
||
from app.providers.factory import ProviderNotConfigured
|
||
|
||
async def unconfigured(*_a, **_k):
|
||
raise ProviderNotConfigured("没有可用的 provider")
|
||
|
||
# 没配模型:规则层照样判得出不可用、该重来
|
||
monkeypatch.setattr(copilot, "get_chat_model", unconfigured)
|
||
graph = _graph({"name": "question"})
|
||
run_id = await _run({"answer": "大概 3 家"}, graph, "step_limit")
|
||
body = (await client.post("/api/copilot/review", json={"run_id": run_id, "question": "有几家门店"})).json()
|
||
assert body["severity"] == "broken" and body["retry"] is True
|
||
assert body["retry_instruction"] == turn.retry_instruction("有几家门店", turn.review_reason(body), True)
|
||
# 这一轮已经重来过一次:不再给
|
||
body = (await client.post("/api/copilot/review",
|
||
json={"run_id": run_id, "question": "有几家门店", "attempt": 1})).json()
|
||
assert body["retry_instruction"] is None
|
||
# 运行的图是空的:措辞换成从零再建
|
||
bare = await _run({"answer": "大概 3 家"}, {}, "step_limit")
|
||
body = (await client.post("/api/copilot/review", json={"run_id": bare, "question": "有几家门店"})).json()
|
||
assert body["retry_instruction"].startswith("有几家门店\n\n(上一次没有成功:")
|
||
# 干净的运行:不重来
|
||
from app.db.base import SessionLocal
|
||
from app.db.models import Run
|
||
|
||
async with SessionLocal() as session:
|
||
clean = Run(status="succeeded", output={"answer": "3 家"}, graph=graph)
|
||
session.add(clean)
|
||
await session.commit()
|
||
clean_id = clean.id
|
||
body = (await client.post("/api/copilot/review", json={"run_id": clean_id, "question": "有几家门店"})).json()
|
||
assert body["verdict"] == "ok" and body["retry_instruction"] is None
|