Merge remote-tracking branch 'origin/hlh' into ji

This commit is contained in:
吉鑫升 committed 2026-06-11 16:35:18 +08:00
commit 80e84de868
13 files changed
+588 -27

No files matched your search

@@ -758,28 +758,23 @@ def _get_memory_context(agent_name: str | None = None, *, app_config: AppConfig
from deerflow.config.memory_config import get_effective_memory_config
from deerflow.runtime.user_context import get_effective_user_id
user_id = get_effective_user_id()
config = get_effective_memory_config(user_id)
if not config.enabled or not config.injection.enabled:
return ""
manager = build_memory_manager(
user_id=user_id,
agent_id=agent_name or "default",
config=config,
)
user_id = get_effective_user_id()
config = get_effective_memory_config(user_id)
manager = build_memory_manager(
user_id=user_id,
agent_id=agent_name or "default",
config=config,
app_config=app_config,
)
# 只取静态块 (builtin 的 frozen snapshot + Hindsight 的模式说明)。
# Hindsight 的动态召回需要当前 query,走 MemoryMiddleware.before_model。
memory_content = manager.build_system_prompt()
if not memory_content.strip():
return ""
return f"""<memory>
{memory_content}
</memory>
"""
context_content = manager.build_system_prompt()
if not context_content.strip():
return ""
return f"{context_content}\n"
except Exception:
logger.exception("Failed to load memory context")
return ""
@@ -32,6 +32,8 @@ logger = logging.getLogger(__name__)
#: 内建 provider 的固定名字。
BUILTIN_PROVIDER_NAME = "builtin"
KNOWLEDGE_PROVIDER_NAME = "knowledge"
_INTERNAL_PROVIDER_NAMES = {BUILTIN_PROVIDER_NAME, KNOWLEDGE_PROVIDER_NAME}
class MemoryManager:
@@ -49,11 +51,11 @@ class MemoryManager:
内建 provider (``name == "builtin"``) 始终接受。外部 provider 至多 1 个,
第二个会被拒绝并 log 警告。返回是否注册成功。
"""
is_builtin = provider.name == BUILTIN_PROVIDER_NAME
if not is_builtin:
is_internal = provider.name in _INTERNAL_PROVIDER_NAMES
if not is_internal:
if self._has_external:
existing = next(
(p.name for p in self._providers if p.name != BUILTIN_PROVIDER_NAME),
(p.name for p in self._providers if p.name not in _INTERNAL_PROVIDER_NAMES),
"unknown",
)
logger.warning(
@@ -220,6 +222,7 @@ def build_memory_manager(
agent_id: str | None = None,
thread_id: str | None = None,
config: Any = None,
app_config: Any = None,
) -> MemoryManager:
"""按生效配置组装并初始化一个 MemoryManager。
@@ -246,7 +249,9 @@ def build_memory_manager(
manager = MemoryManager()
base_dir = str(get_paths().base_dir)
if getattr(config, "version", "v2") == "v1":
memory_enabled = bool(getattr(config, "enabled", True) and getattr(config.injection, "enabled", True))
if memory_enabled and getattr(config, "version", "v2") == "v1":
# V1 模式:原版 DeerFlow memory.json + LLM 自动提取
from deerflow.agents.memory.providers.v1_builtin import V1BuiltinProvider
@@ -260,7 +265,7 @@ def build_memory_manager(
token_budget=v1_cfg.token_budget,
)
)
else:
elif memory_enabled:
# V2 模式:USER.md / MEMORY.md + 可选 Hindsight
from deerflow.agents.memory.providers.builtin import BuiltinFileProvider
@@ -286,11 +291,21 @@ def build_memory_manager(
except Exception as exc: # noqa: BLE001 - Hindsight 接入失败不能阻断记忆系统
logger.warning("加载 Hindsight provider 失败,退回纯 builtin:%s", exc)
try:
from deerflow.agents.memory.providers.knowledge import KnowledgeProvider
knowledge = KnowledgeProvider(app_config=app_config)
if knowledge.is_available():
manager.add_provider(knowledge)
except Exception as exc: # noqa: BLE001 - 知识库路由失败不能阻断对话
logger.warning("加载 Knowledge provider 失败:%s", exc)
manager.initialize_all(
user_id=user_id,
agent_id=agent_id,
thread_id=thread_id,
base_dir=base_dir,
app_config=app_config,
)
return manager
@@ -227,7 +227,10 @@ class BuiltinFileProvider(MemoryProvider):
保持系统提示词稳定,利于 prefix cache。
"""
blocks = [b for b in (self._snapshot.get("user"), self._snapshot.get("memory")) if b]
return "\n\n".join(blocks)
content = "\n\n".join(blocks)
if not content:
return ""
return f"<memory>\n{content}\n</memory>"
def get_tool_schemas(self) -> list[dict[str, Any]]:
"""builtin 的 ``memory`` 工具以 LangChain BaseTool 形式独立注册,
@@ -0,0 +1,93 @@
"""Read-only provider for the mounted policy knowledge base.
This provider keeps the current knowledge-base behaviour: inject the lightweight
``routing.md`` guide and let the model decide when to read concrete files. It
does not automatically retrieve snippets and never writes to the knowledge base.
"""
from __future__ import annotations
import logging
from functools import lru_cache
from pathlib import Path
from typing import Any
from deerflow.agents.memory.provider import MemoryProvider
logger = logging.getLogger(__name__)
@lru_cache(maxsize=16)
def _read_routing_file(host_path: str) -> str:
path = Path(host_path)
if not path.is_file():
return ""
return path.read_text(encoding="utf-8").strip()
class KnowledgeProvider(MemoryProvider):
"""Injects the knowledge routing guide as a read-only context provider."""
def __init__(self, *, app_config: Any | None = None) -> None:
self._app_config = app_config
self._routing_host_path: Path | None = None
@property
def name(self) -> str:
return "knowledge"
def is_available(self) -> bool:
return True
def initialize(
self,
*,
user_id: str,
agent_id: str | None = None,
thread_id: str | None = None,
base_dir: str,
**kwargs: Any,
) -> None:
app_config = self._app_config or kwargs.get("app_config")
if app_config is None:
from deerflow.config import get_app_config
app_config = get_app_config()
self._routing_host_path = None
for mount in app_config.sandbox.mounts or []:
if mount.container_path.rstrip("/") == "/mnt/knowledge":
self._routing_host_path = Path(mount.host_path) / "routing.md"
break
def system_prompt_block(self) -> str:
if self._routing_host_path is None:
return ""
content = _read_routing_file(str(self._routing_host_path.resolve()))
if not content:
return ""
logger.debug("Injected knowledge routing memory from %s", self._routing_host_path)
return f"""<knowledge_routing_memory source="/mnt/knowledge/routing.md">
{content}
</knowledge_routing_memory>"""
def prefetch(self, query: str, *, thread_id: str = "") -> str:
return ""
def sync_turn(
self,
user_content: str,
assistant_content: str,
*,
thread_id: str = "",
turn_index: int | None = None,
) -> None:
return None
def get_tool_schemas(self) -> list[dict[str, Any]]:
return []
__all__ = ["KnowledgeProvider"]