禁用了知识库技能,添加了知识库memory

This commit is contained in:
hlh committed 2026-06-08 18:35:05 +08:00
1 parent 273503ddb9
commit 9e14c2e289
13 files changed
+588 -27

No files matched your search

@@ -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