feat(roundtable): Step2 提速四件套 + 方案总结报告意图对齐
Step2 提速: - 每席位推理深度覆盖(seat_mode): 业务链条逐席位可配 flash/thinking/pro/ultra, 覆盖链条级 seatMode;前台三处 dispatch + 后台 job 透传, run_seat 用 _SEAT_MODE_PARAMS 解析 - recommend 后端批内并行: engine._run_recommend 由串行 for 改 asyncio.gather(对齐前端) - 研讨前并行取数两段式(gather_first, 业务链条 opt-in): 研讨前全席位并行只取数, 产出作为共享资料注入研讨轮(_seat_message gathered + 前台 runGatherPhase); 新增 gather_first 列(migration 20260620_02 + idempotent SQL) - 削减重复广播: suppressPreBroadcast 扩到 recommend(round>=2)/chain(i>0)/chain收口, 保留首轮背景打底,省 N 次读写大 thread 方案总结报告效果: - summary 加"意图对齐+缺口核对+防幻觉护栏": SOUL + 后端 build_summary_prompt + 前端 buildSummaryPrompt 三处对齐; 推断标注(综合推断)、缺真实信息标注待补充交给用户、绝不凭空编 Tests: test_roundtable_seat_modes / test_roundtable_gather_phase / test_roundtable_summary_prompt Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
9a1b674950
commit
3ab674e438
25 files changed
+985
-44
No files matched your search
@@ -0,0 +1,140 @@
|
||||
"""会商 Step2 性能改造引擎测试:研讨前并行『取数』阶段(gather_first)+ recommend 批内并行。
|
||||
|
||||
覆盖:
|
||||
- gather_first=True:研讨前先对**全席位并行**跑一轮「只取数」,产出作为共享资料注入后续研讨轮席位任务;
|
||||
- gather_first=False(默认):不跑取数阶段,行为不变;
|
||||
- recommend 一轮派多席位 → 批内**并行**执行(_run_recommend 由串行改 asyncio.gather,峰值并发>1)。
|
||||
|
||||
引擎纯逻辑,用 JobProgressWriter(store=None) 干跑 + 录制网关,不需要 DB / 真模型。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
|
||||
import pytest
|
||||
|
||||
from deerflow.agents.roundtable_orchestrator import (
|
||||
JobProgressWriter,
|
||||
SeatRef,
|
||||
run_orchestration,
|
||||
)
|
||||
from deerflow.agents.roundtable_orchestrator.types import LeaderTurn, SeatTurn
|
||||
|
||||
_AGENTS = [SeatRef("seat-a", "情报"), SeatRef("seat-b", "环境"), SeatRef("seat-c", "方案")]
|
||||
# _GATHER_TASK 里的稳定标记(取数阶段)/ _seat_message 里注入资料块的稳定标记(研讨阶段)。
|
||||
_GATHER_MARK = "资料收集阶段"
|
||||
_GATHERED_BLOCK_MARK = "研讨前各席位已并行收集"
|
||||
|
||||
|
||||
def _writer() -> JobProgressWriter:
|
||||
return JobProgressWriter(None, job_id="job-x", agents=_AGENTS)
|
||||
|
||||
|
||||
def _thread_ids() -> dict[str, str]:
|
||||
return {a.agent_id: f"tid-{a.agent_id}" for a in _AGENTS} | {"roundtable-coordinator": "tid-co"}
|
||||
|
||||
|
||||
class _RecGateway:
|
||||
"""录制网关:run_leader 按预设各轮派活;run_seat 记录 (agent_id, task) 并追踪峰值并发。"""
|
||||
|
||||
def __init__(self, dispatch_cycles: list[list[tuple[str, str]]]) -> None:
|
||||
self._cycles = dispatch_cycles
|
||||
self._leader_calls = 0
|
||||
self.seat_tasks: list[tuple[str, str]] = []
|
||||
self.active = 0
|
||||
self.max_active = 0
|
||||
|
||||
async def run_leader(self, *, thread_ids, coordinator_name, message, model) -> LeaderTurn:
|
||||
i = self._leader_calls
|
||||
self._leader_calls += 1
|
||||
disp = self._cycles[i] if i < len(self._cycles) else []
|
||||
return LeaderTurn(final_text=f"leader-{i}", dispatched=disp)
|
||||
|
||||
async def run_seat(self, *, thread_ids, agent_id, task, model) -> SeatTurn:
|
||||
self.active += 1
|
||||
self.max_active = max(self.max_active, self.active)
|
||||
self.seat_tasks.append((agent_id, task))
|
||||
await asyncio.sleep(0.01) # 留出并发重叠窗口
|
||||
self.active -= 1
|
||||
return SeatTurn(final_text=f"{agent_id} 的产出")
|
||||
|
||||
# Step3 关掉,不应被调用
|
||||
async def create_report_thread(self) -> str: # pragma: no cover - 不应触发
|
||||
raise AssertionError("enable_report=False 不应绘制报告")
|
||||
|
||||
|
||||
async def _run(gw: _RecGateway, *, gather_first: bool):
|
||||
return await run_orchestration(
|
||||
gateway=gw,
|
||||
progress=_writer(),
|
||||
agents=_AGENTS,
|
||||
thread_ids=_thread_ids(),
|
||||
coordinator_name="roundtable-coordinator",
|
||||
model=None,
|
||||
seed_message="背景X",
|
||||
mode="recommend",
|
||||
intent_text="背景X",
|
||||
enable_report=False,
|
||||
gather_first=gather_first,
|
||||
)
|
||||
|
||||
|
||||
# 一轮派全部 3 席位 → 下一轮共识收口。
|
||||
_DISPATCH_ALL_THEN_CONSENSUS = [[("seat-a", "taskA"), ("seat-b", "taskB"), ("seat-c", "taskC")], []]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_recommend_dispatch_runs_in_parallel():
|
||||
"""recommend 一轮派多席位 → 批内并行(峰值并发 = 席位数,证明已由串行改并行)。"""
|
||||
gw = _RecGateway(_DISPATCH_ALL_THEN_CONSENSUS)
|
||||
result = await _run(gw, gather_first=False)
|
||||
assert result.status == "done"
|
||||
assert gw.max_active == 3 # 三席位真并行;若仍串行则恒为 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_gather_first_false_skips_gather_phase():
|
||||
"""默认 gather_first=False:不跑取数阶段,run_seat 只在研讨轮被调,无取数任务。"""
|
||||
gw = _RecGateway(_DISPATCH_ALL_THEN_CONSENSUS)
|
||||
await _run(gw, gather_first=False)
|
||||
assert not any(_GATHER_MARK in task for _, task in gw.seat_tasks)
|
||||
# 研讨轮任务也不应带「已收集资料」块(没有取数)
|
||||
assert not any(_GATHERED_BLOCK_MARK in task for _, task in gw.seat_tasks)
|
||||
# 仅 3 次席位调用(一轮研讨派活)
|
||||
assert len(gw.seat_tasks) == 3
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_gather_first_runs_parallel_gather_then_injects_material():
|
||||
"""gather_first=True:研讨前对全席位并行跑「只取数」一轮,产出注入后续研讨轮任务。"""
|
||||
gw = _RecGateway(_DISPATCH_ALL_THEN_CONSENSUS)
|
||||
result = await _run(gw, gather_first=True)
|
||||
assert result.status == "done"
|
||||
|
||||
gather_calls = [(aid, t) for aid, t in gw.seat_tasks if _GATHER_MARK in t]
|
||||
discuss_calls = [(aid, t) for aid, t in gw.seat_tasks if _GATHER_MARK not in t]
|
||||
|
||||
# ① 取数阶段覆盖全部席位(每席位一次「只取数」任务)
|
||||
assert {aid for aid, _ in gather_calls} == {"seat-a", "seat-b", "seat-c"}
|
||||
# ② 取数任务在研讨任务之前(取数是前置阶段)
|
||||
first_discuss_idx = gw.seat_tasks.index(discuss_calls[0])
|
||||
last_gather_idx = max(gw.seat_tasks.index(c) for c in gather_calls)
|
||||
assert last_gather_idx < first_discuss_idx
|
||||
# ③ 研讨轮任务带上「研讨前各席位已并行收集的资料」块,且包含各席位取数产出
|
||||
assert discuss_calls, "应有研讨轮任务"
|
||||
for _, dtask in discuss_calls:
|
||||
assert _GATHERED_BLOCK_MARK in dtask
|
||||
assert "seat-a 的产出" in dtask # 注入了取数阶段的产物
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_gather_phase_is_parallel():
|
||||
"""取数阶段本身并行(全席位并发跑,峰值并发 = 席位数)。"""
|
||||
# 首轮 leader 直接共识(dispatched=[]),让研讨轮不抢占并发,单独度量取数阶段峰值。
|
||||
gw = _RecGateway([[]])
|
||||
await _run(gw, gather_first=True)
|
||||
# 只有取数阶段跑了 run_seat(研讨轮因首轮共识没派活)
|
||||
assert all(_GATHER_MARK in t for _, t in gw.seat_tasks)
|
||||
assert len(gw.seat_tasks) == 3
|
||||
assert gw.max_active == 3 # 取数阶段三席位真并行
|
||||
@@ -0,0 +1,118 @@
|
||||
"""每席位「推理深度覆盖」(seat_modes)在进程内网关 run_seat 的解析测试。
|
||||
|
||||
语义(与前端 useStep2Orchestration「覆盖优先、否则跟随链条级 selectedMode」逐席位对齐):
|
||||
- 席位命中 seat_modes → 用该档(_SEAT_MODE_PARAMS)派生的 thinking/reasoning/subagent **覆盖**
|
||||
作业级 seat_*(不论作业级是什么);
|
||||
- 席位未命中 → 跟随作业级 seat_thinking_enabled / seat_reasoning_effort / seat_subagent_enabled;
|
||||
- 作业级仍为 None → 落 policy("seat") 默认。
|
||||
|
||||
只验证传给 _run_agent_turn 的三个运行参数,故把 _run_agent_turn / policy / 文本解析全部打桩,
|
||||
不触发真实 LLM / 沙箱。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def _gw(monkeypatch):
|
||||
"""构造一个被打桩的 InProcessRoundtableGateway,返回 (build, captured)。
|
||||
|
||||
build(seat_modes=..., seat_thinking_enabled=..., seat_reasoning_effort=..., seat_subagent_enabled=...)
|
||||
返回 gateway 实例;captured 记录最近一次 _run_agent_turn 收到的 thinking/reasoning/subagent。
|
||||
"""
|
||||
import app.gateway.roundtable_inprocess_gateway as gw
|
||||
|
||||
captured: dict[str, object] = {}
|
||||
|
||||
async def _fake_run_agent_turn(*args, **kwargs):
|
||||
captured["thinking_enabled"] = kwargs.get("thinking_enabled")
|
||||
captured["reasoning_effort"] = kwargs.get("reasoning_effort")
|
||||
captured["subagent_enabled"] = kwargs.get("subagent_enabled")
|
||||
return []
|
||||
|
||||
# policy("seat") 默认:thinking=True / reasoning="medium"(= 现有席位默认 pro 行为)。
|
||||
monkeypatch.setattr(
|
||||
gw,
|
||||
"roundtable_run_policy",
|
||||
lambda role: SimpleNamespace(excluded_tools=[], skill_stop_names=[], thinking_enabled=True, reasoning_effort="medium"),
|
||||
)
|
||||
monkeypatch.setattr(gw, "_run_agent_turn", _fake_run_agent_turn)
|
||||
# 技能强化与本测试无关 → 原样返回任务,避免触发 load_agent_config / skill storage。
|
||||
monkeypatch.setattr(gw, "append_seat_skill_directive", lambda agent_id, task, **k: task)
|
||||
monkeypatch.setattr(gw, "_latest_ai_text", lambda messages: "")
|
||||
monkeypatch.setattr(gw, "_tool_calls_since_last_human", lambda messages: [])
|
||||
|
||||
def _build(**kwargs):
|
||||
return gw.InProcessRoundtableGateway(SimpleNamespace(state=SimpleNamespace()), user_id="u1", agents=[], **kwargs)
|
||||
|
||||
return _build, captured
|
||||
|
||||
|
||||
async def _run(gateway):
|
||||
await gateway.run_seat(thread_ids={"seat-1": "tid-1"}, agent_id="seat-1", task="任务", model="m")
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_seat_mode_override_wins_over_job_level(_gw):
|
||||
"""席位配了 flash → 覆盖作业级 pro(thinking off / minimal / 无子代理)。"""
|
||||
build, captured = _gw
|
||||
gateway = build(
|
||||
seat_modes={"seat-1": "flash"},
|
||||
seat_thinking_enabled=True,
|
||||
seat_reasoning_effort="high",
|
||||
seat_subagent_enabled=True,
|
||||
)
|
||||
await _run(gateway)
|
||||
assert captured["thinking_enabled"] is False
|
||||
assert captured["reasoning_effort"] == "minimal"
|
||||
assert captured["subagent_enabled"] is False
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_ultra_override_enables_subagent(_gw):
|
||||
build, captured = _gw
|
||||
gateway = build(seat_modes={"seat-1": "ultra"})
|
||||
await _run(gateway)
|
||||
assert captured["thinking_enabled"] is True
|
||||
assert captured["reasoning_effort"] == "high"
|
||||
assert captured["subagent_enabled"] is True
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_no_override_follows_job_level(_gw):
|
||||
"""席位未命中 seat_modes → 跟随作业级 seat_*。"""
|
||||
build, captured = _gw
|
||||
gateway = build(
|
||||
seat_modes={"other": "flash"},
|
||||
seat_thinking_enabled=True,
|
||||
seat_reasoning_effort="low",
|
||||
seat_subagent_enabled=False,
|
||||
)
|
||||
await _run(gateway)
|
||||
assert captured["thinking_enabled"] is True
|
||||
assert captured["reasoning_effort"] == "low"
|
||||
assert captured["subagent_enabled"] is False
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_no_override_no_job_level_falls_back_to_policy(_gw):
|
||||
"""既无席位覆盖、作业级也为 None → 落 policy 默认(thinking=True / medium)。"""
|
||||
build, captured = _gw
|
||||
gateway = build(seat_modes={})
|
||||
await _run(gateway)
|
||||
assert captured["thinking_enabled"] is True
|
||||
assert captured["reasoning_effort"] == "medium"
|
||||
assert captured["subagent_enabled"] is False
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_unknown_mode_value_ignored_falls_through(_gw):
|
||||
"""非法档位值(前端不会下发,防御)→ 安全忽略,回退作业级/policy。"""
|
||||
build, captured = _gw
|
||||
gateway = build(seat_modes={"seat-1": "bogus"}, seat_reasoning_effort="low", seat_thinking_enabled=True)
|
||||
await _run(gateway)
|
||||
assert captured["thinking_enabled"] is True
|
||||
assert captured["reasoning_effort"] == "low"
|
||||
@@ -0,0 +1,50 @@
|
||||
"""方案总结报告 prompt(build_summary_prompt)的意图对齐 + 缺口护栏内容测试。
|
||||
|
||||
效果改造 B:弱席位场景下,总结智能体不能只拼接各席位交付,而要先对齐用户意图、核对覆盖、
|
||||
按护栏补强(推断标注「(综合推断)」、缺真实信息标注「待补充」交给用户、绝不凭空编)。
|
||||
prompt 是纯函数,直接断言其文本包含这些指令 + 仍带齐意图/交付/共识/编排提示原料。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from deerflow.agents.roundtable_orchestrator.engine import build_summary_prompt
|
||||
from deerflow.agents.roundtable_orchestrator.types import SeatRef
|
||||
|
||||
_AGENTS = [SeatRef("seat-a", "情报"), SeatRef("seat-b", "方案")]
|
||||
_DELIVERIES = {"seat-a": "情报席位交付内容", "seat-b": "方案席位交付内容"}
|
||||
|
||||
|
||||
def test_summary_prompt_carries_intent_and_alignment_directive():
|
||||
out = build_summary_prompt(
|
||||
"目标:拿下华东市场\n约束条件:\n- 预算有限",
|
||||
_AGENTS,
|
||||
_DELIVERIES,
|
||||
"总控共识:分两期推进",
|
||||
coordinator_prompt="重点突出风险",
|
||||
)
|
||||
# 原料齐全
|
||||
assert "拿下华东市场" in out
|
||||
assert "预算有限" in out
|
||||
assert "情报席位交付内容" in out and "方案席位交付内容" in out
|
||||
assert "总控共识:分两期推进" in out
|
||||
assert "重点突出风险" in out # 编排提示
|
||||
# 意图对齐 + 缺口核对指令
|
||||
assert "意图对齐与缺口核对" in out
|
||||
assert "核心诉求清单" in out
|
||||
# 防幻觉护栏三条
|
||||
assert "综合推断" in out
|
||||
assert "待补充" in out
|
||||
assert "绝不凭空编" in out
|
||||
|
||||
|
||||
def test_summary_prompt_alignment_directive_present_even_without_coordinator_prompt():
|
||||
out = build_summary_prompt("目标:X", _AGENTS, _DELIVERIES, "共识 Y")
|
||||
assert "意图对齐与缺口核对" in out
|
||||
assert "待补充" in out
|
||||
|
||||
|
||||
def test_summary_prompt_handles_empty_deliveries_gracefully():
|
||||
out = build_summary_prompt("目标:X", _AGENTS, {}, "")
|
||||
# 无交付时仍给出兜底说明,且意图对齐指令照常在
|
||||
assert "暂无文字交付" in out
|
||||
assert "意图对齐与缺口核对" in out
|
||||
Reference in new issue
Block a user