sync: 鍚屾灞€鍩熺綉鏈€鏂颁唬鐮?(source master @ b69568e4)
This commit is contained in:
1 parent
4f7f07504a
commit
8bc8b0e082
1651 files changed
+278599
-11416
No files matched your search
@@ -1,76 +1,35 @@
|
||||
"""RC-BE-005: pre-plan intent router and requirement resolver."""
|
||||
"""P1-R 需求确认:规划师智能体是唯一路径(无规则/模板兜底)。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
|
||||
from app.report_collaboration.requirement.extractor import extract_topic, wants_direct_start
|
||||
from app.report_collaboration.requirement.intent_router import route_pre_plan_turn
|
||||
from app.report_collaboration.requirement.resolver import RequirementResolver
|
||||
from deerflow.persistence.report_collaboration import MemoryReportCollaborationStore
|
||||
from deerflow.persistence.report_collaboration import MemoryReportCollaborationStore, ReportCollaborationValidationError
|
||||
|
||||
|
||||
def test_topic_only_asks_plan_affecting_gaps() -> None:
|
||||
decision = route_pre_plan_turn(
|
||||
"写一份新能源汽车主要品牌市场趋势分析报告",
|
||||
previous_snapshot=None,
|
||||
previous_revision=0,
|
||||
clarification_round=0,
|
||||
max_clarification_rounds=3,
|
||||
)
|
||||
assert decision.action == "clarify"
|
||||
assert "新能源" in decision.requirement.topic
|
||||
assert decision.requirement.revision == 1
|
||||
assert len(decision.questions) >= 2
|
||||
assert any("读者" in item for item in decision.questions)
|
||||
assert any("角度" in item for item in decision.questions)
|
||||
class _ScriptedLLM:
|
||||
"""按顺序吐出预置 JSON 决策(模拟规划师智能体多轮)。"""
|
||||
|
||||
def __init__(self, payloads: list[str]) -> None:
|
||||
self._payloads = list(payloads)
|
||||
|
||||
async def ainvoke(self, messages):
|
||||
payload = self._payloads.pop(0) if self._payloads else self._payloads[0]
|
||||
return SimpleNamespace(content=payload)
|
||||
|
||||
|
||||
def test_direct_start_records_default_assumptions() -> None:
|
||||
first = route_pre_plan_turn(
|
||||
"撰写新能源汽车趋势报告,直接开始",
|
||||
previous_snapshot=None,
|
||||
previous_revision=0,
|
||||
clarification_round=0,
|
||||
max_clarification_rounds=3,
|
||||
)
|
||||
assert first.action == "ready"
|
||||
assert first.used_defaults is True
|
||||
assert first.requirement.audience == "企业战略决策人员"
|
||||
assert "市场份额" in first.requirement.required_angles
|
||||
assert first.assumptions
|
||||
_CLARIFY = """{"reply": "新能源汽车趋势是个好题目。先确认两个关键点:这份报告主要给谁看?希望覆盖哪些角度?",
|
||||
"action": "clarify", "questions": ["这份报告主要给谁看?", "希望覆盖哪些角度?"],
|
||||
"impact": ["读者影响研究线", "角度影响成员分工"],
|
||||
"requirement": {"topic": "新能源汽车趋势报告"}}"""
|
||||
|
||||
|
||||
def test_direct_start_without_topic_still_asks_topic() -> None:
|
||||
decision = route_pre_plan_turn(
|
||||
"直接开始",
|
||||
previous_snapshot=None,
|
||||
previous_revision=0,
|
||||
clarification_round=0,
|
||||
max_clarification_rounds=3,
|
||||
)
|
||||
assert decision.action == "clarify"
|
||||
assert any("主题" in item for item in decision.questions)
|
||||
|
||||
|
||||
def test_clarification_cap_uses_explicit_assumptions() -> None:
|
||||
first = route_pre_plan_turn(
|
||||
"写一份行业报告",
|
||||
previous_snapshot=None,
|
||||
previous_revision=0,
|
||||
clarification_round=0,
|
||||
max_clarification_rounds=1,
|
||||
)
|
||||
assert first.action == "clarify"
|
||||
capped = route_pre_plan_turn(
|
||||
"先这样吧",
|
||||
previous_snapshot=first.requirement.model_dump(),
|
||||
previous_revision=first.requirement.revision,
|
||||
clarification_round=1,
|
||||
max_clarification_rounds=1,
|
||||
)
|
||||
assert capped.action == "ready"
|
||||
assert capped.used_defaults is True
|
||||
_READY = """{"reply": "清楚了:给投资机构,覆盖市场份额、价格策略和政策环境。我来为你们设计工作流。",
|
||||
"action": "ready", "assumptions": ["时间范围默认近两年"],
|
||||
"requirement": {"topic": "新能源汽车趋势报告", "audience": "投资机构", "required_angles": ["市场份额", "价格策略", "政策环境"]}}"""
|
||||
|
||||
|
||||
def test_extract_helpers() -> None:
|
||||
@@ -79,14 +38,15 @@ def test_extract_helpers() -> None:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_resolver_writes_clarification_without_planning() -> None:
|
||||
async def test_resolver_clarify_round_persists_agent_reply_and_record() -> None:
|
||||
store = MemoryReportCollaborationStore()
|
||||
session = await store.create_session(owner_id="u1", title="", idempotency_key="s1")
|
||||
user = await store.create_message(session["id"], role="human", content="写一份新能源汽车趋势报告", idempotency_key="m1")
|
||||
resolver = RequirementResolver(store)
|
||||
llm = _ScriptedLLM([_CLARIFY])
|
||||
resolver = RequirementResolver(store, planner_llm_factory=lambda: llm)
|
||||
decision = await resolver.handle_user_message(session["id"], user_message=user, idempotency_key="m1", max_clarification_rounds=3)
|
||||
assert decision is not None
|
||||
assert decision.action == "clarify"
|
||||
assert decision is not None and decision.action == "clarify"
|
||||
assert "先确认两个关键点" in (decision.reply or "")
|
||||
|
||||
snapshot = await store.get_snapshot(session["id"])
|
||||
assert snapshot["session"]["status"] == "clarifying"
|
||||
@@ -96,10 +56,14 @@ async def test_resolver_writes_clarification_without_planning() -> None:
|
||||
assert len(ai) == 1
|
||||
assert ai[0]["completed_at"]
|
||||
assert ai[0]["name"] == "协调者"
|
||||
# 智能体文案直接落库,模板开场不得出现
|
||||
assert "先确认两个关键点" in ai[0]["content"]
|
||||
assert "收到您的报告需求" not in ai[0]["content"]
|
||||
record = await store.get_session_record(session["id"])
|
||||
assert record["requirement_json"]["ready_to_plan"] is False
|
||||
assert record["requirement_json"]["clarifications"][0]["resolved"] is False
|
||||
|
||||
# 幂等:同一消息重放不产生第二条 AI 回复
|
||||
replay = await resolver.handle_user_message(session["id"], user_message=user, idempotency_key="m1", max_clarification_rounds=3)
|
||||
assert replay is None
|
||||
snapshot2 = await store.get_snapshot(session["id"])
|
||||
@@ -107,52 +71,63 @@ async def test_resolver_writes_clarification_without_planning() -> None:
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_resolver_ready_is_not_plan_ready() -> None:
|
||||
async def test_resolver_ready_writes_requirement_metadata_for_summary_card() -> None:
|
||||
store = MemoryReportCollaborationStore()
|
||||
session = await store.create_session(owner_id="u1", title="", idempotency_key="s2")
|
||||
user = await store.create_message(
|
||||
session["id"],
|
||||
role="human",
|
||||
content="写一份新能源汽车趋势报告,面向战略决策层,必须覆盖市场、政策、海外和风险,直接开始",
|
||||
idempotency_key="m2",
|
||||
session["id"], role="human", content="写一份新能源汽车趋势报告,给投资机构看", idempotency_key="m2"
|
||||
)
|
||||
resolver = RequirementResolver(store)
|
||||
llm = _ScriptedLLM([_READY])
|
||||
resolver = RequirementResolver(store, planner_llm_factory=lambda: llm)
|
||||
decision = await resolver.handle_user_message(session["id"], user_message=user, idempotency_key="m2")
|
||||
assert decision is not None
|
||||
assert decision.action == "ready"
|
||||
assert decision is not None and decision.action == "ready"
|
||||
|
||||
snapshot = await store.get_snapshot(session["id"])
|
||||
assert snapshot["session"]["status"] == "clarifying"
|
||||
assert snapshot["plans"] == []
|
||||
assert snapshot["plans"] == [] # ready ≠ 已生成方案
|
||||
ai = [item for item in snapshot["messages"] if item["role"] == "ai"][-1]
|
||||
assert ai["metadata"]["ready_to_plan"] is True
|
||||
assert ai["metadata"]["requirement"]["audience"] == "投资机构"
|
||||
assert "设计工作流" in ai["content"]
|
||||
record = await store.get_session_record(session["id"])
|
||||
assert record["requirement_json"]["ready_to_plan"] is True
|
||||
assert all(item["resolved"] for item in record["requirement_json"]["clarifications"])
|
||||
assert "不等于已经生成" in snapshot["messages"][-1]["content"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_answer_merges_and_resolves_clarification() -> None:
|
||||
async def test_resolver_answer_merges_fields_across_rounds() -> None:
|
||||
store = MemoryReportCollaborationStore()
|
||||
session = await store.create_session(owner_id="u1", title="", idempotency_key="s3")
|
||||
first = await store.create_message(session["id"], role="human", content="写一份新能源汽车趋势报告", idempotency_key="m3a")
|
||||
resolver = RequirementResolver(store)
|
||||
llm = _ScriptedLLM([_CLARIFY, _READY])
|
||||
resolver = RequirementResolver(store, planner_llm_factory=lambda: llm)
|
||||
await resolver.handle_user_message(session["id"], user_message=first, idempotency_key="m3a")
|
||||
|
||||
second = await store.create_message(
|
||||
session["id"],
|
||||
role="human",
|
||||
content="读者是投资机构,必须覆盖市场份额、价格策略和政策环境",
|
||||
idempotency_key="m3b",
|
||||
session["id"], role="human", content="读者是投资机构,必须覆盖市场份额、价格策略和政策环境", idempotency_key="m3b"
|
||||
)
|
||||
decision = await resolver.handle_user_message(session["id"], user_message=second, idempotency_key="m3b")
|
||||
assert decision is not None
|
||||
assert decision.action == "ready"
|
||||
assert decision.used_defaults is False
|
||||
assert decision.requirement.audience == "投资机构"
|
||||
assert decision is not None and decision.action == "ready"
|
||||
assert decision.requirement.revision == 2
|
||||
assert decision.requirement.audience == "投资机构"
|
||||
assert set(decision.requirement.required_angles) == {"市场份额", "价格策略", "政策环境"}
|
||||
record = await store.get_session_record(session["id"])
|
||||
assert record["requirement_revision"] == 2
|
||||
assert all(item["resolved"] for item in record["requirement_json"]["clarifications"])
|
||||
snapshot = await store.get_snapshot(session["id"])
|
||||
assert snapshot["plans"] == []
|
||||
assert snapshot["session"]["status"] == "clarifying"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_resolver_raises_planner_unavailable_without_fallback() -> None:
|
||||
store = MemoryReportCollaborationStore()
|
||||
session = await store.create_session(owner_id="u1", title="", idempotency_key="s4")
|
||||
user = await store.create_message(session["id"], role="human", content="写报告", idempotency_key="m4")
|
||||
|
||||
# 工厂显式禁用(模型不可用)→ 直接报错,无规则兜底
|
||||
disabled = RequirementResolver(store, planner_llm_factory=lambda: None)
|
||||
with pytest.raises(ReportCollaborationValidationError) as exc:
|
||||
await disabled.handle_user_message(session["id"], user_message=user, idempotency_key="m4")
|
||||
assert exc.value.code == "PLANNER_UNAVAILABLE"
|
||||
|
||||
# 模型输出不合法 → 同样报错
|
||||
broken = RequirementResolver(store, planner_llm_factory=lambda: _ScriptedLLM(["我说人话不行吗"]))
|
||||
with pytest.raises(ReportCollaborationValidationError) as exc2:
|
||||
await broken.handle_user_message(session["id"], user_message=user, idempotency_key="m4")
|
||||
assert exc2.value.code == "PLANNER_UNAVAILABLE"
|
||||
Reference in new issue
Block a user