fix(ai写作): 恢复内网直连检索(知识库检索)空地址回退默认端点
knowledge_base 检索类型遇到空 intranet_search_url 会短路报「未配置」、返回 0 素材,导致「内网直连检索不能用」。旧版 get_search_provider(search_provider= intranet) 在空地址时由 IntranetSearchProvider 回退内置默认内网端点,所以不配 地址也能直连。本次去掉该短路,空地址原样下传由 provider 回退默认端点,恢复旧逻辑。 - researcher.py: knowledge_base 分支无条件构造 IntranetSearchProvider - test_ai_writing_knowledge_base.py: 空地址用例改为断言回退默认端点仍出素材 - backend CLAUDE.md: 检索类型段说明更新 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
89232d7521
commit
0089af94d3
3 files changed
+56
-58
No files matched your search
+47
-53
@@ -5,9 +5,10 @@
|
||||
config.yaml 配置的技能顺序编排检索。内置「知识库检索」技能
|
||||
(knowledge-base-search)走原生 web/intranet 关键词并发检索;其它技能用
|
||||
其 description 生成定向 query 后调真实 provider 检索。
|
||||
- ``knowledge_base``(知识库检索):**直连内网知识库 ES 接口**
|
||||
(``ai_writing.intranet_search_url`` 配的 ``IntranetSearchProvider``),
|
||||
不编排任何技能、也不跑通用 provider。未配置接口地址时本次无素材并给出告警。
|
||||
- ``knowledge_base``(知识库检索 / 内网直连检索):**直连内网知识库 ES 接口**
|
||||
(``IntranetSearchProvider``),不编排任何技能、也不跑通用 provider。接口地址取
|
||||
``ai_writing.intranet_search_url``,**留空时回退 provider 内置默认内网端点**——与旧版
|
||||
``get_search_provider(search_provider=intranet)`` 一致,即便没配地址内网直连仍可用。
|
||||
- ``notebook``(我的空间):仅用笔记 API 素材。
|
||||
旧值 ``skill`` 仍按 ``general`` 兼容处理。
|
||||
|
||||
@@ -568,57 +569,50 @@ async def researcher_node(state: AIWritingState, config: RunnableConfig) -> dict
|
||||
# 仅使用 Step 1.5 已拉取的 notebook_materials。
|
||||
_emit(f"仅使用笔记素材,跳过技能检索({len(notebook_materials)} 条)")
|
||||
elif material_source == "knowledge_base":
|
||||
# ── 知识库检索:直连内网 ES 接口 ──
|
||||
# 用户在表单选了「知识库检索」→ 跳过技能编排、跳过通用 provider,
|
||||
# 直接调 config.yaml 配的 ai_writing.intranet_search_url 内网知识库 ES 接口
|
||||
# (IntranetSearchProvider)对检索词并发检索。未配置地址 → 无素材 + 告警。
|
||||
intranet_url = (ai_writing_config.get("intranet_search_url") or "").strip()
|
||||
if not intranet_url:
|
||||
_emit("未配置内网知识库检索接口(ai_writing.intranet_search_url),本次未检索到素材")
|
||||
search_errors.append("未配置 ai_writing.intranet_search_url,知识库检索不可用")
|
||||
_emit_skill_step({
|
||||
"type": "skill_error",
|
||||
"message": "「知识库检索」未配置内网接口地址(ai_writing.intranet_search_url),无法检索",
|
||||
"skill_name": KNOWLEDGE_SEARCH_SKILL_NAME,
|
||||
"reason": "intranet_search_url 为空",
|
||||
})
|
||||
else:
|
||||
from ..search.intranet_stub import IntranetSearchProvider
|
||||
# ── 知识库检索:直连内网 ES 接口(恢复旧版「内网直连检索」可用逻辑)──
|
||||
# 用户在表单选了「知识库检索」→ 跳过技能编排、跳过通用 provider,直接调内网知识库
|
||||
# ES 接口(IntranetSearchProvider)对检索词并发检索。接口地址优先取 config.yaml 的
|
||||
# ai_writing.intranet_search_url;**留空时回退到 IntranetSearchProvider 内置默认端点**
|
||||
# (历史上一直可用的内网 ES 地址),与旧版 get_search_provider(search_provider=intranet)
|
||||
# 完全一致——所以即便没配地址,内网直连依然可用,不再短路成「未配置 → 无素材」。
|
||||
from ..search.intranet_stub import IntranetSearchProvider
|
||||
|
||||
provider = IntranetSearchProvider(
|
||||
base_url=intranet_url,
|
||||
knowledge_base_name=ai_writing_config.get("intranet_knowledge_base", "samples"),
|
||||
# 内网慢检索超时可在 config.yaml 的 ai_writing.intranet_search_timeout 调大,默认 600s。
|
||||
timeout=ai_writing_config.get("intranet_search_timeout", 600),
|
||||
)
|
||||
# 用户输入框追加(is_user_query_search)时 keywords 已是 [用户原话],全部检索;
|
||||
# 首次检索按 keyword_count 截断检索词。
|
||||
search_keywords = keywords if is_user_query_search else keywords[:keyword_count]
|
||||
total = len(search_keywords)
|
||||
per_keyword = _per_keyword_limit(max_materials, total)
|
||||
_emit(f"知识库检索:直连内网接口检索 {total} 个方向…")
|
||||
_emit_skill_step({
|
||||
"type": "invoke_skill",
|
||||
"message": f"使用「{_KNOWLEDGE_SKILL_DISPLAY}」直连内网接口检索 {total} 个方向:{('、'.join(search_keywords[:3]))[:60]}",
|
||||
"skill_name": KNOWLEDGE_SEARCH_SKILL_NAME,
|
||||
})
|
||||
gathered = await asyncio.gather(
|
||||
*[provider.search(kw, max_results=per_keyword) for kw in search_keywords],
|
||||
return_exceptions=True,
|
||||
)
|
||||
for results in gathered:
|
||||
if isinstance(results, Exception):
|
||||
logger.warning("[knowledge-base] search failed: %s", results)
|
||||
search_errors.append(f"{type(results).__name__}: {results}")
|
||||
continue
|
||||
new_results.extend(results or [])
|
||||
search_errors.extend(getattr(provider, "errors", []))
|
||||
_emit_skill_step({
|
||||
"type": "skill_result",
|
||||
"message": f"「{_KNOWLEDGE_SKILL_DISPLAY}」(内网接口)检索到 {len(new_results)} 条素材",
|
||||
"skill_name": KNOWLEDGE_SEARCH_SKILL_NAME,
|
||||
"matched_count": len(new_results),
|
||||
})
|
||||
intranet_url = (ai_writing_config.get("intranet_search_url") or "").strip()
|
||||
provider = IntranetSearchProvider(
|
||||
base_url=intranet_url, # 空串 → provider 内部回退默认内网端点(旧逻辑)
|
||||
knowledge_base_name=ai_writing_config.get("intranet_knowledge_base", "samples"),
|
||||
# 内网慢检索超时可在 config.yaml 的 ai_writing.intranet_search_timeout 调大,默认 600s。
|
||||
timeout=ai_writing_config.get("intranet_search_timeout", 600),
|
||||
)
|
||||
endpoint_label = intranet_url or getattr(provider, "endpoint", "内置默认内网端点")
|
||||
# 用户输入框追加(is_user_query_search)时 keywords 已是 [用户原话],全部检索;
|
||||
# 首次检索按 keyword_count 截断检索词。
|
||||
search_keywords = keywords if is_user_query_search else keywords[:keyword_count]
|
||||
total = len(search_keywords)
|
||||
per_keyword = _per_keyword_limit(max_materials, total)
|
||||
_emit(f"知识库检索:直连内网接口检索 {total} 个方向…")
|
||||
_emit_skill_step({
|
||||
"type": "invoke_skill",
|
||||
"message": f"使用「{_KNOWLEDGE_SKILL_DISPLAY}」直连内网接口({endpoint_label})检索 {total} 个方向:{('、'.join(search_keywords[:3]))[:60]}",
|
||||
"skill_name": KNOWLEDGE_SEARCH_SKILL_NAME,
|
||||
})
|
||||
gathered = await asyncio.gather(
|
||||
*[provider.search(kw, max_results=per_keyword) for kw in search_keywords],
|
||||
return_exceptions=True,
|
||||
)
|
||||
for results in gathered:
|
||||
if isinstance(results, Exception):
|
||||
logger.warning("[knowledge-base] search failed: %s", results)
|
||||
search_errors.append(f"{type(results).__name__}: {results}")
|
||||
continue
|
||||
new_results.extend(results or [])
|
||||
search_errors.extend(getattr(provider, "errors", []))
|
||||
_emit_skill_step({
|
||||
"type": "skill_result",
|
||||
"message": f"「{_KNOWLEDGE_SKILL_DISPLAY}」(内网接口)检索到 {len(new_results)} 条素材",
|
||||
"skill_name": KNOWLEDGE_SEARCH_SKILL_NAME,
|
||||
"matched_count": len(new_results),
|
||||
})
|
||||
elif is_append_only:
|
||||
# ── 兼容旧版追加关键词模式 ──
|
||||
# 直接对用户给的关键词做原生并发检索(不走技能编排),结果追加到旧素材。
|
||||
|
||||
Reference in new issue
Block a user