feat: 报告结构支持检索方向/来源与智能新增,并修复协助卡停轮与宿主跳转
为深度研究报告结构增加检索方向与技能来源、对话式智能新增页与详情排版;澄清中间件在 after_model 可靠结束本轮,避免弱模型出卡后继续生成;任务按钮补充 host 跳转与相关深链能力。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
a5a9c952e8
commit
51afebb394
67 files changed
+4511
-699
No files matched your search
+62
-7
@@ -71,12 +71,14 @@ class DeerFlowMaterialProvider:
|
||||
runtime_thread_id: str = "",
|
||||
model_name: str | None = None,
|
||||
fetch_enabled: bool = True,
|
||||
retrieval_skills: list[str] | None = None,
|
||||
) -> None:
|
||||
self._user_id = user_id
|
||||
self._session_id = session_id
|
||||
self._runtime_thread_id = runtime_thread_id
|
||||
self._model_name = model_name
|
||||
self._fetch_enabled = fetch_enabled
|
||||
self._retrieval_skills = _normalize_named_skills(retrieval_skills)
|
||||
self._settings = None
|
||||
self._settings_error: str | None = None
|
||||
self._question_answer_tool_names = _load_question_answer_tool_names(model_name)
|
||||
@@ -112,9 +114,11 @@ class DeerFlowMaterialProvider:
|
||||
|
||||
materials: list[ResearchMaterial] = []
|
||||
seen_keys: set[str] = set()
|
||||
directed_skills = bool(self._retrieval_skills)
|
||||
|
||||
# 1. The genuine Q&A skill runtime. Skills may call web, MCP or another
|
||||
# deployment-specific source according to their SKILL.md instructions.
|
||||
# A non-empty 检索来源 list replaces the default research-skill trio.
|
||||
skill_results = await self._search_via_question_answer_skills(query, limit=limit)
|
||||
materials.extend(
|
||||
self._normalise_search_results(
|
||||
@@ -128,6 +132,21 @@ class DeerFlowMaterialProvider:
|
||||
if cancellation is not None:
|
||||
cancellation.raise_if_cancelled()
|
||||
|
||||
# Specified skills are the retrieval source: do not also dump generic
|
||||
# web_search / DDG on top. Empty 检索来源 keeps the original fallbacks.
|
||||
if directed_skills:
|
||||
hydrated: list[ResearchMaterial] = []
|
||||
for material in materials[:limit]:
|
||||
if cancellation is not None:
|
||||
cancellation.raise_if_cancelled()
|
||||
if material.url and len(material.raw_content) < SNIPPET_THRESHOLD and self._fetch_enabled:
|
||||
fetched = await asyncio.to_thread(_safe_fetch, material.url)
|
||||
if fetched:
|
||||
material.raw_content = fetched
|
||||
if material.raw_content:
|
||||
hydrated.append(material)
|
||||
return dedupe_materials(hydrated)[:limit]
|
||||
|
||||
# 2. Retain compatibility with deployed configurable search providers.
|
||||
if len(materials) < limit:
|
||||
configured_results = await self._search_configured_web(query)
|
||||
@@ -170,11 +189,7 @@ class DeerFlowMaterialProvider:
|
||||
|
||||
async def _search_via_question_answer_skills(self, query: str, *, limit: int) -> list[Any]:
|
||||
"""Run eligible research skills through the same runtime as Q&A."""
|
||||
runnable = [
|
||||
skill
|
||||
for skill in self._research_skills
|
||||
if _SKILL_REQUIRED_TOOLS.get(skill.name, set()) <= self._question_answer_tool_names
|
||||
]
|
||||
runnable = self._runnable_research_skills()
|
||||
if not runnable:
|
||||
logger.info(
|
||||
"Deep Research Q&A skills are enabled but their required search tools are unavailable; "
|
||||
@@ -195,6 +210,8 @@ class DeerFlowMaterialProvider:
|
||||
}
|
||||
}
|
||||
state = {"model_name": self._model_name or ""}
|
||||
collected: list[Any] = []
|
||||
directed = bool(self._retrieval_skills)
|
||||
for skill in runnable:
|
||||
try:
|
||||
results, error = await run_skill_via_real_agent(
|
||||
@@ -212,10 +229,28 @@ class DeerFlowMaterialProvider:
|
||||
logger.warning("Deep Research Q&A skill %s failed: %s", skill.name, exc)
|
||||
continue
|
||||
if results:
|
||||
return list(results)[:limit]
|
||||
collected.extend(list(results)[:limit])
|
||||
if not directed or len(collected) >= limit:
|
||||
return collected[:limit]
|
||||
if error:
|
||||
logger.info("Deep Research Q&A skill %s returned no materials: %s", skill.name, error)
|
||||
return []
|
||||
return collected[:limit]
|
||||
|
||||
def _runnable_research_skills(self) -> list[Any]:
|
||||
"""Default Q&A trio, or the report-structure 检索来源 when named."""
|
||||
skills = (
|
||||
_load_named_research_skills(self._retrieval_skills)
|
||||
if self._retrieval_skills
|
||||
else self._research_skills
|
||||
)
|
||||
if self._retrieval_skills:
|
||||
# User-named skills may use any tool; skip the trio's required-tool gate.
|
||||
return list(skills)
|
||||
return [
|
||||
skill
|
||||
for skill in skills
|
||||
if _SKILL_REQUIRED_TOOLS.get(skill.name, set()) <= self._question_answer_tool_names
|
||||
]
|
||||
|
||||
async def _search_configured_web(self, query: str) -> list[dict[str, Any]]:
|
||||
"""Run the existing configurable ``web_search`` adapter when enabled."""
|
||||
@@ -398,6 +433,26 @@ def _load_question_answer_research_skills() -> list[Any]:
|
||||
return []
|
||||
|
||||
|
||||
def _load_named_research_skills(names: list[str]) -> list[Any]:
|
||||
"""Load enabled skills by name, preserving the requested order."""
|
||||
if not names:
|
||||
return []
|
||||
try:
|
||||
from deerflow.skills import get_or_new_skill_storage
|
||||
|
||||
by_name = {skill.name: skill for skill in get_or_new_skill_storage().load_skills(enabled_only=True)}
|
||||
return [by_name[name] for name in names if name in by_name]
|
||||
except Exception as exc: # noqa: BLE001
|
||||
logger.warning("Deep Research failed to load named retrieval skills: %s", exc)
|
||||
return []
|
||||
|
||||
|
||||
def _normalize_named_skills(value: list[str] | None) -> list[str]:
|
||||
from deerflow.persistence.report_structures.skills import normalize_retrieval_skills
|
||||
|
||||
return normalize_retrieval_skills(value)
|
||||
|
||||
|
||||
def _material_matches_domains(material: ResearchMaterial, domains: list[str] | None) -> bool:
|
||||
"""Apply the requested domain allow-list without dropping URL-less KB hits."""
|
||||
if not domains or not material.url:
|
||||
|
||||
Reference in new issue
Block a user