feat: integrate WeKnora llmwiki knowledge flow

This commit is contained in:
吉鑫升 committed 2026-08-11 18:13:30 +08:00
1 parent a0a75a9964
commit e0c09f6704
63 files changed
+7045 -197

No files matched your search

@@ -1,26 +1,26 @@
import asyncio
import logging
import os
import queue
import sys
import threading
from collections.abc import AsyncGenerator
from contextlib import asynccontextmanager
from datetime import datetime
from time import perf_counter
from dotenv import load_dotenv
from fastapi import FastAPI
import os
import queue
import sys
import threading
from collections.abc import AsyncGenerator
from contextlib import asynccontextmanager
from datetime import datetime
from time import perf_counter
from dotenv import load_dotenv
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
# Load .env BEFORE any module that reads os.environ at import time.
# Without this, GATEWAY_CORS_ORIGINS / AUTH_JWT_SECRET / DEER_FLOW_AUTH_DISABLED
# placed in /workspace/.env are silently ignored when the container is started
# without explicit `-e` flags, leading to ephemeral JWT secrets, missing CORS
# origins, and "Failed to fetch" in the browser.
load_dotenv()
from app.gateway.auth.disabled_mode import is_auth_disabled # noqa: E402
# origins, and "Failed to fetch" in the browser.
load_dotenv()
from app.gateway.auth.disabled_mode import is_auth_disabled # noqa: E402
from app.gateway.auth_middleware import AuthMiddleware
from app.gateway.config import get_gateway_config
from app.gateway.csrf_middleware import CSRFMiddleware
@@ -43,16 +43,17 @@ from app.gateway.routers import (
intent,
knowledge,
knowledge_ingest,
light_apps,
llm_metrics,
mcp,
light_apps,
llm_metrics,
llmwiki,
mcp,
memory,
menu_overrides,
models,
multi_agent,
notifications,
open_3qfx,
open_chat,
open_chat,
parallel_agent_tasks,
parallel_agents,
position_roundtable,
@@ -89,8 +90,7 @@ from app.gateway.routers import (
uploads,
user_preferences,
user_prompts,
weknora_sources,
writing,
writing,
)
from deerflow.config import app_config as deerflow_app_config
from deerflow.config.app_config import apply_logging_level
@@ -1430,8 +1430,8 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# MCP API is mounted at /api/mcp
app.include_router(mcp.router)
# Authenticated source-context proxy for the WeKnora retrieval skill.
app.include_router(weknora_sources.router)
# DeerFlow-native LLMWiki management/search BFF (conditionally backed by WeKnora).
app.include_router(llmwiki.router)
# Memory API is mounted at /api/memory
app.include_router(memory.router)
@@ -1622,11 +1622,12 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
app.include_router(recommend.router) # Step 1?2?/api/recommend/stream?? init?
# Step 3 ????/?????? artifacts.router?/api/threads/{id}/artifacts?
# ?????????(? auth_middleware._PUBLIC_PATH_PREFIXES)?
# ????? ``/health`` ?? API ??? ``/api/health``,?????
# ?? base URL ????,?????????? 401?
@app.get("/health", tags=["health"])
@app.get("/api/health", tags=["health"])
# Health probes are always unauthenticated (see
# auth_middleware.PUBLIC_HEALTH_PATHS). Support the bare Gateway path,
# API base URL, and LangGraph proxy base URL for deployment monitors.
@app.api_route("/health", methods=["GET", "HEAD"], tags=["health"])
@app.api_route("/api/health", methods=["GET", "HEAD"], tags=["health"])
@app.api_route("/api/langgraph/health", methods=["GET", "HEAD"], tags=["health"])
async def health_check() -> dict:
"""Health check endpoint.
@@ -24,15 +24,25 @@ from app.gateway.internal_auth import INTERNAL_AUTH_HEADER_NAME, get_internal_us
from app.gateway.proxy_path import app_relative_path
from deerflow.runtime.user_context import reset_current_user, set_current_user
# Paths that never require authentication.
# Health probes are deliberately public, including the LangGraph-compatible
# gateway alias used by some deployments. Keep these as exact paths: health
# checks must bypass authentication, but similarly named application routes
# must not inherit that exemption.
PUBLIC_HEALTH_PATHS: frozenset[str] = frozenset(
{
"/health",
"/api/health",
"/api/langgraph/health",
}
)
# Path prefixes that never require authentication.
#
# ``/api/public/`` is a namespace reserved for intentionally world-readable,
# read-only endpoints (e.g. public conversation share snapshots). Only mount
# safe read-only routes under it — everything there bypasses auth entirely.
_PUBLIC_PATH_PREFIXES: tuple[str, ...] = (
"/health",
"/api/health",
"/docs",
_PUBLIC_PATH_PREFIXES: tuple[str, ...] = (
"/docs",
"/redoc",
"/openapi.json",
"/api/public/",
@@ -43,9 +53,10 @@ _PUBLIC_PATH_PREFIXES: tuple[str, ...] = (
# Exact auth paths that are public (login/register/status check).
# /api/v1/auth/me, /api/v1/auth/change-password etc. are NOT public.
_PUBLIC_EXACT_PATHS: frozenset[str] = frozenset(
{
"/api/v1/auth/login/local",
_PUBLIC_EXACT_PATHS: frozenset[str] = frozenset(
{
*PUBLIC_HEALTH_PATHS,
"/api/v1/auth/login/local",
"/api/v1/auth/login/username",
"/api/v1/auth/login/token",
"/api/v1/auth/register",
@@ -293,10 +293,16 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
app.state.dashboard_session_store = make_dashboard_session_store(sf)
from deerflow.persistence.task_buttons import make_task_button_store
from deerflow.persistence.task_buttons import make_task_button_store
app.state.task_button_store = make_task_button_store(sf)
from deerflow.integrations.weknora.runtime import register_llmwiki_store
from deerflow.persistence.llmwiki import make_llmwiki_store
app.state.llmwiki_store = make_llmwiki_store(sf)
register_llmwiki_store(app.state.llmwiki_store)
from deerflow.persistence.taskcop_tasks import make_taskcop_task_store
app.state.taskcop_task_store = make_taskcop_task_store(sf)
@@ -0,0 +1,241 @@
"""Asynchronous conversation sedimentation into WeKnora-backed LLMWiki."""
from __future__ import annotations
import asyncio
import logging
from dataclasses import dataclass
from typing import Any
from deerflow.integrations.weknora.client import WeKnoraClient, WeKnoraError
from deerflow.integrations.weknora.runtime import build_weknora_client, get_resolved_llmwiki_runtime
from deerflow.persistence.llmwiki import LlmWikiStore
logger = logging.getLogger(__name__)
CONVERSATION_DEPOSIT_KB_NAME = "对话沉淀"
_DEPOSIT_KB_LOCK = asyncio.Lock()
@dataclass(frozen=True)
class ConversationTurnDeposit:
thread_id: str
question: str
answer: str
human_message_id: str | None
assistant_message_id: str
assistant_id: str | None
knowledge_base_ids: list[str]
created_by_user_id: str | None
def _store(app: Any) -> LlmWikiStore | None:
return getattr(app.state, "llmwiki_store", None)
def _client(app: Any) -> WeKnoraClient | None:
runtime = get_resolved_llmwiki_runtime(getattr(app.state, "config", None))
if not runtime.weknora_enabled:
return None
try:
return build_weknora_client(runtime)
except RuntimeError:
logger.debug("LLMWiki conversation deposit skipped: WeKnora client is unavailable", exc_info=True)
return None
def _shorten(text: str, max_chars: int) -> str:
value = " ".join(str(text or "").split())
if len(value) <= max_chars:
return value
return f"{value[: max_chars - 1].rstrip()}…"
def _title_for_turn(turn: ConversationTurnDeposit) -> str:
question = _shorten(turn.question, 48)
return f"对话沉淀 - {question or turn.assistant_message_id[:12]}"
def _format_markdown(turn: ConversationTurnDeposit, title: str) -> str:
kb_line = "、".join(turn.knowledge_base_ids) if turn.knowledge_base_ids else "未显式选择知识库"
return f"""---
source: DeerFlow
type: conversation-deposit
thread_id: {turn.thread_id}
human_message_id: {turn.human_message_id or ""}
assistant_message_id: {turn.assistant_message_id}
assistant_id: {turn.assistant_id or ""}
knowledge_base_ids: {kb_line}
created_by_user_id: {turn.created_by_user_id or ""}
---
# {title}
> 本页由 DeerFlow 在一轮问答结束后自动沉淀,用于后续 LLMWiki 检索、Wiki 索引与图谱构建。
## 摘要
{_shorten(turn.answer, 360) or "本轮回答为空。"}
## 用户问题
{turn.question.strip() or "(空)"}
## 助手回答
{turn.answer.strip() or "(空)"}
## 结构化线索
- 来源线程:`{turn.thread_id}`
- 用户消息:`{turn.human_message_id or ""}`
- 回答消息:`{turn.assistant_message_id}`
- 智能体:`{turn.assistant_id or "通用问答"}`
- 本轮显式知识库:{kb_line}
## LLMWiki 标签
#对话沉淀 #DeerFlow #问答知识
"""
async def ensure_conversation_deposit_knowledge_base(
app: Any,
*,
owner_user_id: str | None,
) -> dict[str, Any] | None:
store = _store(app)
client = _client(app)
if store is None or client is None:
return None
existing = await store.get_conversation_deposit_mapping()
if existing is not None:
return existing
async with _DEPOSIT_KB_LOCK:
existing = await store.get_conversation_deposit_mapping()
if existing is not None:
return existing
remote_id = ""
try:
for remote in await client.list_knowledge_bases():
if str(remote.get("name") or "").strip() == CONVERSATION_DEPOSIT_KB_NAME and remote.get("id"):
remote_id = str(remote["id"])
break
except WeKnoraError:
logger.debug("Could not scan WeKnora knowledge bases before creating deposit base", exc_info=True)
if remote_id:
mapped = await store.get_by_weknora_id(remote_id)
if mapped is not None:
if mapped.get("publication_status") != "published":
return await store.request_publish(
str(mapped["id"]),
owner_user_id or "system",
is_admin=True,
)
return mapped
remote = {"id": remote_id, "name": CONVERSATION_DEPOSIT_KB_NAME, "description": "DeerFlow 全局问答沉淀知识库", "type": "document"}
else:
try:
remote = await client.create_knowledge_base(
name=CONVERSATION_DEPOSIT_KB_NAME,
description="DeerFlow 全局问答沉淀知识库。所有用户可见,不默认参与问答检索。",
kb_type="document",
wiki_enabled=True,
)
except WeKnoraError:
logger.warning("Failed to create WeKnora conversation deposit knowledge base", exc_info=True)
return None
try:
row = await store.create_mapping(
weknora_id=str(remote["id"]),
owner_user_id=owner_user_id or "system",
name=CONVERSATION_DEPOSIT_KB_NAME,
description=str(remote.get("description") or "DeerFlow 全局问答沉淀知识库"),
kb_type="document",
)
published = await store.request_publish(str(row["id"]), owner_user_id or "system", is_admin=True)
return published or row
except Exception:
logger.exception("Failed to persist conversation deposit knowledge-base mapping")
return None
async def deposit_conversation_turn(app: Any, turn: ConversationTurnDeposit) -> None:
if not turn.thread_id or not turn.assistant_message_id:
return
if not turn.question.strip() and not turn.answer.strip():
return
store = _store(app)
client = _client(app)
if store is None or client is None:
return
kb = await ensure_conversation_deposit_knowledge_base(app, owner_user_id=turn.created_by_user_id)
if kb is None:
return
previous = await store.get_conversation_deposit(
thread_id=turn.thread_id,
assistant_message_id=turn.assistant_message_id,
)
previous_doc_id = str((previous or {}).get("weknora_knowledge_id") or "")
if previous_doc_id:
try:
await client.delete_document(previous_doc_id)
except WeKnoraError as exc:
if exc.status_code != 404:
logger.warning("Failed to delete old conversation deposit document %s", previous_doc_id, exc_info=True)
title = _title_for_turn(turn)
content = _format_markdown(turn, title)
try:
remote_doc = await client.create_manual_document(
str(kb["weknora_id"]),
title=title,
content=content,
)
except WeKnoraError:
logger.warning("Failed to create conversation deposit document", exc_info=True)
return
await store.upsert_conversation_deposit(
thread_id=turn.thread_id,
human_message_id=turn.human_message_id,
assistant_message_id=turn.assistant_message_id,
knowledge_base_mapping_id=str(kb["id"]),
weknora_knowledge_id=str(remote_doc.get("id") or remote_doc.get("knowledge_id") or ""),
title=title,
created_by_user_id=turn.created_by_user_id,
)
async def delete_conversation_deposit_documents(
app: Any,
*,
thread_id: str,
message_ids: list[str] | None = None,
) -> None:
store = _store(app)
client = _client(app)
if store is None or client is None:
return
try:
rows = await store.delete_conversation_deposits(thread_id=thread_id, message_ids=message_ids)
except Exception:
logger.debug("Failed to delete local conversation deposit rows", exc_info=True)
return
for row in rows:
doc_id = str(row.get("weknora_knowledge_id") or "")
if not doc_id:
continue
try:
await client.delete_document(doc_id)
except WeKnoraError as exc:
if exc.status_code != 404:
logger.warning("Failed to delete WeKnora conversation deposit document %s", doc_id, exc_info=True)
@@ -0,0 +1,290 @@
"""LLMWiki retrieval helpers for normal DeerFlow chat runs.
The public chat API accepts DeerFlow-local LLMWiki knowledge-base mapping ids.
When WeKnora mode is enabled, this module resolves those local ids under the
current DeerFlow user's permissions, searches WeKnora once before the model
call, and attaches both:
* a hidden prompt with numbered context snippets, and
* structured citation sources for the existing reference panel.
The helper lives in ``app.gateway`` because it needs Gateway auth state and the
DeerFlow-owned mapping store. Harness code remains app-import free.
"""
from __future__ import annotations
import logging
from collections.abc import Mapping
from dataclasses import dataclass
from typing import Any
from urllib.parse import urlencode
from fastapi import HTTPException, Request
from langchain_core.messages import HumanMessage
from app.gateway.deps import get_optional_user_from_request
from app.gateway.utils import sanitize_log_param
from deerflow.config.agents_config import load_agent_config, validate_agent_id
from deerflow.integrations.weknora.client import WeKnoraError
from deerflow.integrations.weknora.runtime import build_weknora_client, get_resolved_llmwiki_runtime
from deerflow.persistence.llmwiki import LlmWikiStore
from deerflow.runtime.user_context import get_effective_user_id
logger = logging.getLogger(__name__)
_MAX_SOURCES = 8
_MAX_SOURCE_CHARS = 1400
@dataclass(frozen=True)
class LlmWikiRagContext:
knowledge_base_ids: list[str]
source_count: int
prompt: str
sources: list[dict[str, Any]]
query: str
def _store(request: Request) -> LlmWikiStore | None:
return getattr(request.app.state, "llmwiki_store", None)
async def _actor(request: Request) -> tuple[str, bool]:
user = await get_optional_user_from_request(request)
if user is None:
return get_effective_user_id(), True
return str(user.id), getattr(user, "system_role", None) == "admin"
def _as_id_list(value: Any) -> list[str]:
if value is None:
return []
if isinstance(value, str):
parts = [value]
elif isinstance(value, (list, tuple, set)):
parts = list(value)
else:
return []
return list(dict.fromkeys(str(item).strip() for item in parts if str(item).strip()))
def _body_selected_ids(body: Any) -> list[str]:
for source in (getattr(body, "context", None), getattr(body, "metadata", None)):
if isinstance(source, Mapping) and "llmwiki_knowledge_base_ids" in source:
return _as_id_list(source.get("llmwiki_knowledge_base_ids"))
return []
def _assistant_agent_id(body: Any) -> str | None:
assistant_id = validate_agent_id(getattr(body, "assistant_id", None))
if assistant_id:
return assistant_id
context = getattr(body, "context", None)
if isinstance(context, Mapping):
return validate_agent_id(str(context.get("agent_id") or "")) if context.get("agent_id") else None
metadata = getattr(body, "metadata", None)
if isinstance(metadata, Mapping):
return validate_agent_id(str(metadata.get("agent_id") or "")) if metadata.get("agent_id") else None
return None
def _agent_bound_ids(body: Any) -> list[str]:
agent_id = _assistant_agent_id(body)
if not agent_id:
return []
try:
config = load_agent_config(agent_id)
except (FileNotFoundError, ValueError):
return []
return _as_id_list(config.llmwiki_knowledge_base_ids if config else None)
def resolve_requested_llmwiki_knowledge_base_ids(body: Any) -> list[str]:
"""Return selected ids plus custom-agent defaults, de-duplicated in order."""
return list(dict.fromkeys([*_agent_bound_ids(body), *_body_selected_ids(body)]))
def llmwiki_selection_requested(body: Any) -> bool:
return bool(resolve_requested_llmwiki_knowledge_base_ids(body))
def _latest_human_query(graph_input: dict[str, Any]) -> str:
messages = graph_input.get("messages")
if not isinstance(messages, list):
return ""
for message in reversed(messages):
if isinstance(message, HumanMessage):
return _message_text(getattr(message, "content", ""))
if isinstance(message, dict) and str(message.get("type") or message.get("role") or "") in {"human", "user"}:
return _message_text(message.get("content"))
return ""
def _message_text(content: Any) -> str:
if isinstance(content, str):
return content.strip()
if isinstance(content, list):
parts: list[str] = []
for item in content:
if isinstance(item, str):
parts.append(item)
elif isinstance(item, Mapping):
text = item.get("text") or item.get("content")
if isinstance(text, str):
parts.append(text)
return "\n".join(part.strip() for part in parts if part and part.strip()).strip()
return str(content or "").strip()
def _truncate(text: str, max_chars: int) -> str:
value = text.strip()
if len(value) <= max_chars:
return value
return f"{value[: max_chars - 1].rstrip()}…"
def _source_from_result(result: dict[str, Any], mapping: dict[str, Any], index: int) -> dict[str, Any]:
chunk_id = str(result.get("chunk_id") or "")
title = str(result.get("title") or result.get("filename") or mapping.get("name") or f"LLMWiki 片段 {index}")
content = str(result.get("content") or "")
params = urlencode({"knowledge_base_id": mapping["id"], "chunk_id": chunk_id})
raw = {
**result,
"knowledge_base_id": mapping["id"],
"knowledge_base_name": mapping.get("name") or "",
"source": mapping.get("name") or "LLMWiki",
"url": f"/weknora-source-preview?{params}",
}
return {
"index": index,
"id": chunk_id or str(result.get("knowledge_id") or f"{mapping['id']}:{index}"),
"title": title,
"type": "llmwiki",
"snippet": _truncate(content, 360),
"content": content,
"source": mapping.get("name") or "LLMWiki",
"score": float(result.get("score") or 0),
"url": f"/weknora-source-preview?{params}",
"skillName": "llmwiki_search",
"mode": "citation",
"raw": raw,
}
def _build_prompt(query: str, sources: list[dict[str, Any]]) -> str:
if not sources:
return (
"当前用户选择了 LLMWiki 知识库,但 DeerFlow 未检索到可用片段。"
"请直接说明没有检索到可用背景资料,不要编造知识库内容或引用编号。"
)
lines = [
"当前用户选择了 LLMWiki 知识库。DeerFlow 已在模型回答前自动检索到以下背景资料。",
"请优先依据这些资料回答;如果资料不足,请明确说明不足之处,不要编造。",
"引用规则:正文关键结论必须使用 [1]、[2] 这样的编号引用下方资料;只能引用存在的编号;不要在正文末尾重复输出完整参考文献列表,前端会展示引用卡片。",
"",
f"用户问题:{query}",
"",
f"<llmwiki_reference_batch source_count=\"{len(sources)}\">",
]
for source in sources:
meta = " / ".join(
str(item)
for item in (
source.get("source"),
f"score={source.get('score'):.4f}" if isinstance(source.get("score"), float) else None,
)
if item
)
lines.append(f"[{source['index']}] {source.get('title') or 'LLMWiki 片段'}")
if meta:
lines.append(f"来源:{meta}")
lines.append(_truncate(str(source.get("content") or source.get("snippet") or ""), _MAX_SOURCE_CHARS))
lines.append("")
lines.append("</llmwiki_reference_batch>")
return "\n".join(lines).strip()
async def build_llmwiki_rag_context(
*,
request: Request,
body: Any,
graph_input: dict[str, Any],
) -> LlmWikiRagContext:
selected_ids = resolve_requested_llmwiki_knowledge_base_ids(body)
if not selected_ids:
return LlmWikiRagContext([], 0, "", [], "")
runtime = get_resolved_llmwiki_runtime(getattr(request.app.state, "config", None))
if not runtime.weknora_enabled:
return LlmWikiRagContext(selected_ids, 0, "", [], "")
store = _store(request)
if store is None:
return LlmWikiRagContext(selected_ids, 0, "", [], "")
query = _latest_human_query(graph_input)
if not query:
return LlmWikiRagContext(selected_ids, 0, "", [], "")
user_id, is_admin = await _actor(request)
rows: list[dict[str, Any]] = []
for mapping_id in selected_ids:
row = await store.get_authorized(mapping_id, user_id, write=False, is_admin=is_admin)
if row is None:
raise HTTPException(status_code=404, detail=f"Knowledge base {mapping_id} not found")
rows.append(row)
remote_to_local = {str(row["weknora_id"]): row for row in rows}
try:
results = await build_weknora_client(runtime).search(query, [str(row["weknora_id"]) for row in rows])
except WeKnoraError as exc:
logger.warning(
"LLMWiki pre-retrieval failed for user=%s kb_count=%s: %s",
sanitize_log_param(user_id),
len(rows),
exc,
)
return LlmWikiRagContext(
selected_ids,
0,
f"当前用户选择了 LLMWiki 知识库,但自动检索失败:{exc}。请说明暂时无法检索知识库背景资料,不要编造引用。",
[],
query,
)
sources: list[dict[str, Any]] = []
for result in results:
mapping = remote_to_local.get(str(result.get("knowledge_base_id") or ""))
if mapping is None or not str(result.get("content") or "").strip():
continue
sources.append(_source_from_result(result, mapping, len(sources) + 1))
if len(sources) >= _MAX_SOURCES:
break
return LlmWikiRagContext(selected_ids, len(sources), _build_prompt(query, sources), sources, query)
def attach_llmwiki_rag_to_graph_input(
graph_input: dict[str, Any],
rag: LlmWikiRagContext,
) -> dict[str, Any]:
if not rag.prompt and not rag.sources:
return graph_input
messages = graph_input.get("messages")
if not isinstance(messages, list) or not messages:
return graph_input
new_messages = list(messages)
for index, message in enumerate(new_messages):
if not isinstance(message, HumanMessage):
continue
extra = dict(getattr(message, "additional_kwargs", None) or {})
existing = str(extra.get("prompt_prefix") or "").strip()
extra["prompt_prefix"] = f"{existing}\n\n{rag.prompt}".strip() if existing else rag.prompt
extra["llmwiki_knowledge_base_ids"] = rag.knowledge_base_ids
extra["llmwiki_reference_query"] = rag.query
if rag.sources:
extra["llmwiki_reference_sources"] = rag.sources
new_messages[index] = message.model_copy(update={"additional_kwargs": extra})
break
return {**graph_input, "messages": new_messages}
@@ -64,10 +64,15 @@ class AgentResponse(BaseModel):
description="入库模板名 (external knowledge-ingest templateName). When set, markdown artifacts produced in this agent's chats can be published to the external knowledge-ingest API.",
)
seat_skill_directive: bool | None = Field(
seat_skill_directive: bool | None = Field(
default=None,
description="会商席位「技能识别强化」开关 (config.yaml). True = 本智能体作为会商席位时强化技能识别 (与业务链条同名开关取 OR). None/False = 关 (默认).",
)
)
llmwiki_knowledge_base_ids: list[str] | None = Field(
default=None,
description="DeerFlow LLMWiki mapping ids this agent may offer for conversation retrieval.",
)
tags: list[dict] = Field(default_factory=list, description="Tags assigned to this agent")
@@ -120,7 +125,12 @@ class AgentCreateRequest(BaseModel):
tool_groups: list[str] | None = Field(default=None, description="Optional tool group whitelist persisted to config.yaml")
common_questions: list[CommonQuestion] | None = Field(default=None, description="Recommended questions (常用问题) persisted to config.yaml. Each item is {title, prompt}; legacy strings are coerced.")
template_name: str | None = Field(default=None, description="入库模板名 persisted to config.yaml. Enables publishing markdown artifacts to the external knowledge-ingest API.")
seat_skill_directive: bool | None = Field(default=None, description="会商席位「技能识别强化」开关 persisted to config.yaml. None/False = off (默认).")
seat_skill_directive: bool | None = Field(default=None, description="会商席位「技能识别强化」开关 persisted to config.yaml. None/False = off (默认).")
llmwiki_knowledge_base_ids: list[str] | None = Field(
default=None,
max_length=100,
description="Allowed DeerFlow LLMWiki mapping ids persisted to config.yaml.",
)
class AgentUpdateRequest(BaseModel):
@@ -137,7 +147,12 @@ class AgentUpdateRequest(BaseModel):
tool_groups: list[str] | None = Field(default=None, description="Updated tool group whitelist (config.yaml)")
common_questions: list[CommonQuestion] | None = Field(default=None, description="Updated recommended questions (常用问题, config.yaml). Each item is {title, prompt}; legacy strings are coerced.")
template_name: str | None = Field(default=None, description="Updated 入库模板名 (config.yaml). Empty string clears it.")
seat_skill_directive: bool | None = Field(default=None, description="Updated 会商席位「技能识别强化」开关 (config.yaml).")
seat_skill_directive: bool | None = Field(default=None, description="Updated 会商席位「技能识别强化」开关 (config.yaml).")
llmwiki_knowledge_base_ids: list[str] | None = Field(
default=None,
max_length=100,
description="Updated allowed DeerFlow LLMWiki mapping ids (config.yaml).",
)
class AgentSelectorResponse(BaseModel):
@@ -178,10 +193,38 @@ def _current_user_id(request: Request) -> str:
return get_effective_user_id()
def _is_admin_user(request: Request) -> bool:
def _is_admin_user(request: Request) -> bool:
"""Return True when the request is authenticated as a system admin."""
user = getattr(request.state, "user", None)
return getattr(user, "system_role", None) == "admin"
return getattr(user, "system_role", None) == "admin"
async def _validate_llmwiki_bindings(
request: Request,
mapping_ids: list[str] | None,
) -> list[str] | None:
"""Normalize bindings and require read access for the editing actor."""
if mapping_ids is None:
return None
normalized = list(dict.fromkeys(item.strip() for item in mapping_ids if item.strip()))
if not normalized:
return []
store = getattr(request.app.state, "llmwiki_store", None)
if store is None:
raise HTTPException(status_code=503, detail="LLMWiki metadata store is unavailable")
user_id = _current_user_id(request)
is_admin = _is_admin_user(request)
for mapping_id in normalized:
row = await store.get_authorized(
mapping_id,
user_id,
write=False,
is_admin=is_admin,
)
if row is None:
raise HTTPException(status_code=422, detail=f"LLMWiki knowledge base '{mapping_id}' is unavailable")
return normalized
def _email_local_part(email: str | None) -> str | None:
@@ -233,7 +276,7 @@ def _validate_storage_id(agent_id: str) -> str:
raise HTTPException(status_code=422, detail=str(exc)) from exc
def _write_agent_config(
def _write_agent_config(
agent_id: str,
*,
name: str,
@@ -243,8 +286,9 @@ def _write_agent_config(
tool_groups: list[str] | None = None,
common_questions: list[CommonQuestion] | None = None,
template_name: str | None = None,
seat_skill_directive: bool | None = None,
) -> None:
seat_skill_directive: bool | None = None,
llmwiki_knowledge_base_ids: list[str] | None = None,
) -> None:
agent_dir = get_paths().agent_dir(agent_id)
agent_dir.mkdir(parents=True, exist_ok=True)
config_file = agent_dir / "config.yaml"
@@ -273,15 +317,19 @@ def _write_agent_config(
if template_name is not None and template_name.strip():
config_data["template_name"] = template_name.strip()
# 会商席位技能识别强化开关:仅当显式设置时写入(None = 不写, 由 AgentConfig 默认为关)。
if seat_skill_directive is not None:
config_data["seat_skill_directive"] = bool(seat_skill_directive)
if seat_skill_directive is not None:
config_data["seat_skill_directive"] = bool(seat_skill_directive)
if llmwiki_knowledge_base_ids is not None:
config_data["llmwiki_knowledge_base_ids"] = list(
dict.fromkeys(item.strip() for item in llmwiki_knowledge_base_ids if item.strip())
)
with open(config_file, "w", encoding="utf-8") as f:
yaml.dump(config_data, f, default_flow_style=False, allow_unicode=True)
def _load_config_extras(agent_id: str) -> dict[str, Any]:
"""Read skills/model/tool_groups/common_questions from the agent's config.yaml, tolerant of missing files."""
empty = {"skills": None, "model": None, "tool_groups": None, "common_questions": None, "template_name": None, "seat_skill_directive": None}
empty = {"skills": None, "model": None, "tool_groups": None, "common_questions": None, "template_name": None, "seat_skill_directive": None, "llmwiki_knowledge_base_ids": None}
try:
cfg = load_agent_config(agent_id)
except (FileNotFoundError, ValueError):
@@ -294,7 +342,8 @@ def _load_config_extras(agent_id: str) -> dict[str, Any]:
"tool_groups": cfg.tool_groups,
"common_questions": cfg.common_questions,
"template_name": cfg.template_name,
"seat_skill_directive": cfg.seat_skill_directive,
"seat_skill_directive": cfg.seat_skill_directive,
"llmwiki_knowledge_base_ids": cfg.llmwiki_knowledge_base_ids,
}
@@ -455,7 +504,7 @@ def _record_to_response(
can happen lazily when the agent is actually opened.
"""
soul: str | None = None
extras: dict[str, Any] = {"skills": None, "model": None, "tool_groups": None, "common_questions": None, "template_name": None, "seat_skill_directive": None}
extras: dict[str, Any] = {"skills": None, "model": None, "tool_groups": None, "common_questions": None, "template_name": None, "seat_skill_directive": None, "llmwiki_knowledge_base_ids": None}
if include_extras:
_ensure_agent_dir_from_record(record)
extras = _load_config_extras(record["id"])
@@ -479,7 +528,8 @@ def _record_to_response(
skills=extras["skills"],
common_questions=extras.get("common_questions"),
template_name=extras.get("template_name"),
seat_skill_directive=extras.get("seat_skill_directive"),
seat_skill_directive=extras.get("seat_skill_directive"),
llmwiki_knowledge_base_ids=extras.get("llmwiki_knowledge_base_ids"),
featured_order=record.get("featured_order"),
)
@@ -780,7 +830,7 @@ async def get_agent(agent_id: str, request: Request) -> AgentResponse:
summary="Create Agent",
description="Create a new user-owned agent. The display name can be Chinese and may duplicate existing names.",
)
async def create_agent_endpoint(request: AgentCreateRequest, http_request: Request) -> AgentResponse:
async def create_agent_endpoint(request: AgentCreateRequest, http_request: Request) -> AgentResponse:
_require_agents_api_enabled()
name = _validate_display_name(request.name)
store = get_agent_store(http_request)
@@ -789,9 +839,13 @@ async def create_agent_endpoint(request: AgentCreateRequest, http_request: Reque
agent_id = _validate_storage_id(request.id)
if await store.get_any(agent_id) is not None:
raise HTTPException(status_code=409, detail=f"Agent id '{agent_id}' already exists")
else:
agent_id = uuid4().hex
agent_dir = get_paths().agent_dir(agent_id)
else:
agent_id = uuid4().hex
agent_dir = get_paths().agent_dir(agent_id)
llmwiki_ids = await _validate_llmwiki_bindings(
http_request,
request.llmwiki_knowledge_base_ids,
)
try:
if agent_dir.exists():
@@ -806,7 +860,8 @@ async def create_agent_endpoint(request: AgentCreateRequest, http_request: Reque
tool_groups=request.tool_groups,
common_questions=request.common_questions,
template_name=request.template_name,
seat_skill_directive=request.seat_skill_directive,
seat_skill_directive=request.seat_skill_directive,
llmwiki_knowledge_base_ids=llmwiki_ids,
)
_write_agent_soul(agent_id, request.soul)
@@ -887,9 +942,14 @@ async def update_agent(agent_id: str, request: AgentUpdateRequest, http_request:
next_tool_groups = request.tool_groups if "tool_groups" in fields_set else existing_extras["tool_groups"]
next_common_questions = request.common_questions if "common_questions" in fields_set else existing_extras["common_questions"]
next_template_name = request.template_name if "template_name" in fields_set else existing_extras["template_name"]
next_seat_skill_directive = request.seat_skill_directive if "seat_skill_directive" in fields_set else existing_extras["seat_skill_directive"]
config_dirty = bool(update_data) or any(key in fields_set for key in ("skills", "model", "tool_groups", "common_questions", "template_name", "seat_skill_directive"))
next_seat_skill_directive = request.seat_skill_directive if "seat_skill_directive" in fields_set else existing_extras["seat_skill_directive"]
next_llmwiki_ids = (
await _validate_llmwiki_bindings(http_request, request.llmwiki_knowledge_base_ids)
if "llmwiki_knowledge_base_ids" in fields_set
else existing_extras["llmwiki_knowledge_base_ids"]
)
config_dirty = bool(update_data) or any(key in fields_set for key in ("skills", "model", "tool_groups", "common_questions", "template_name", "seat_skill_directive", "llmwiki_knowledge_base_ids"))
if config_dirty:
_write_agent_config(
agent_id,
@@ -900,7 +960,8 @@ async def update_agent(agent_id: str, request: AgentUpdateRequest, http_request:
tool_groups=next_tool_groups,
common_questions=next_common_questions,
template_name=next_template_name,
seat_skill_directive=next_seat_skill_directive,
seat_skill_directive=next_seat_skill_directive,
llmwiki_knowledge_base_ids=next_llmwiki_ids,
)
# Keep the listing cache in lock-step with config.yaml, but only
# when the cached fields were actually touched — a partial update
File diff suppressed because it is too large. Load diff
@@ -12,11 +12,12 @@ matching the LangGraph Platform wire format expected by the
from __future__ import annotations
import logging
import asyncio
import json
import logging
import os
from pathlib import Path
import uuid
from pathlib import Path
from typing import Any
from fastapi import APIRouter, HTTPException, Request
@@ -26,6 +27,7 @@ from sqlalchemy import select
from app.gateway.authz import require_permission
from app.gateway.deps import get_checkpointer
from app.gateway.llmwiki_deposit import delete_conversation_deposit_documents
from app.gateway.utils import sanitize_log_param
from deerflow.config.extensions_config import SkillDisplayConfig
from deerflow.config.paths import Paths, get_paths
@@ -34,10 +36,12 @@ from deerflow.persistence.skills.model import SkillDisplayAdapterRow
from deerflow.runtime import serialize_channel_values
from deerflow.runtime.references import (
adapt_reference_batches_with_displays,
build_reference_batches as build_runtime_reference_batches,
build_reference_debug_payload,
build_reference_debug_summary,
)
from deerflow.runtime.references import (
build_reference_batches as build_runtime_reference_batches,
)
from deerflow.runtime.user_context import get_effective_user_id
from deerflow.utils.time import coerce_iso, now_iso
@@ -1250,6 +1254,13 @@ async def clear_thread_messages(thread_id: str, request: Request) -> dict[str, A
len(messages),
sanitize_log_param(thread_id),
)
asyncio.create_task(
delete_conversation_deposit_documents(
request.app,
thread_id=thread_id,
message_ids=None,
)
)
return {
"ok": True,
"deleted_ids": deleted_ids,
@@ -1345,6 +1356,13 @@ async def delete_thread_message(thread_id: str, message_id: str, request: Reques
len(messages) - len(filtered),
sanitize_log_param(thread_id),
)
asyncio.create_task(
delete_conversation_deposit_documents(
request.app,
thread_id=thread_id,
message_ids=deleted_ids,
)
)
return {"ok": True, "deleted_ids": deleted_ids, "remaining": len(filtered)}
@@ -21,6 +21,11 @@ from fastapi import HTTPException, Request
from langchain_core.messages import HumanMessage
from app.gateway.deps import get_concurrency_gate, get_run_context, get_run_manager, get_stream_bridge
from app.gateway.llmwiki_rag import (
attach_llmwiki_rag_to_graph_input,
build_llmwiki_rag_context,
llmwiki_selection_requested,
)
from app.gateway.utils import sanitize_log_param
from deerflow.config import get_app_config
from deerflow.config.agents_config import load_agent_config, validate_agent_id
@@ -275,6 +280,8 @@ def _prompt_prefix_opted_in(body: Any) -> bool:
def _rag_mode_requested(body: Any) -> bool:
if llmwiki_selection_requested(body):
return True
context = getattr(body, "context", None)
if isinstance(context, Mapping) and context.get("rag_mode_enabled"):
return True
@@ -325,6 +332,7 @@ _CONTEXT_CONFIGURABLE_KEYS: frozenset[str] = frozenset(
"thinking_force_disabled",
"reasoning_effort",
"rag_mode_enabled",
"llmwiki_knowledge_base_ids",
"writing_mode",
"writing_artifact_path",
"canvas_artifact_title",
@@ -1003,6 +1011,27 @@ async def start_run(
prefix_settings = load_system_settings().prompt_prefix
if prefix_settings.enabled and prefix_settings.prompt_prefix.strip():
graph_input = _prepend_prompt_prefix(graph_input, prefix_settings.prompt_prefix.strip())
llmwiki_rag = await build_llmwiki_rag_context(
request=request,
body=body,
graph_input=graph_input,
)
if llmwiki_rag.prompt or llmwiki_rag.sources:
graph_input = attach_llmwiki_rag_to_graph_input(graph_input, llmwiki_rag)
effective_rag_mode = True
run_metadata["llmwiki_knowledge_base_ids"] = llmwiki_rag.knowledge_base_ids
run_metadata["llmwiki_rag_source_count"] = llmwiki_rag.source_count
try:
await run_ctx.thread_store.update_metadata(
thread_id,
{
"llmwiki_knowledge_base_ids": llmwiki_rag.knowledge_base_ids,
"rag_mode_enabled": True,
"rag_mode": True,
},
)
except Exception:
logger.debug("Failed to persist LLMWiki RAG metadata for %s", sanitize_log_param(thread_id), exc_info=True)
if effective_rag_mode:
graph_input = _append_invisible_prompt(graph_input, _RAG_CITATION_PROMPT)
config = build_run_config(thread_id, body.config, body.metadata, assistant_id=body.assistant_id)
@@ -1014,6 +1043,8 @@ async def start_run(
body_context = dict(getattr(body, "context", None) or {})
if effective_rag_mode:
body_context["rag_mode_enabled"] = True
if "llmwiki_knowledge_base_ids" not in body_context and llmwiki_rag.knowledge_base_ids:
body_context["llmwiki_knowledge_base_ids"] = llmwiki_rag.knowledge_base_ids
# Promote whitelisted top-level body fields into the context map so
# callers can pass them either nested under ``context`` or as flat
# top-level fields (``excluded_tools``, ``skill_stop_names``, …).