sync: 鍚屾灞€鍩熺綉鏈€鏂颁唬鐮?(source master @ b69568e4)

This commit is contained in:
gozeros committed 2026-10-21 14:51:31 +08:00
1 parent 4f7f07504a
commit 8bc8b0e082
1651 files changed
+278599 -11416

No files matched your search

@@ -102,10 +102,22 @@ class MemoryManager:
# ---- 系统提示词组装 / 召回 -------------------------------------------
def build_system_prompt(self) -> str:
"""收集所有 provider 的静态系统提示词块。"""
def build_system_prompt(
self,
*,
excluded_provider_names: set[str] | frozenset[str] | None = None,
) -> str:
"""收集所有 provider 的静态系统提示词块。
``excluded_provider_names`` 只影响本次静态提示组装,不会移除或
关闭 provider。调用方因此可以屏蔽冲突的旧路由说明,同时完整保留
用户记忆、动态召回和写回生命周期。
"""
blocks: list[str] = []
excluded = excluded_provider_names or set()
for provider in self._providers:
if provider.name in excluded:
continue
try:
block = provider.system_prompt_block()
except Exception as exc: # noqa: BLE001
@@ -18,8 +18,9 @@ def _get_v1_cfg():
def _memory_enabled() -> bool:
from deerflow.config.memory_config import get_memory_config
return get_memory_config().enabled
from deerflow.config.system_settings import get_memory_runtime_settings
return get_memory_runtime_settings().enabled
@dataclass
@@ -4,7 +4,7 @@ from __future__ import annotations
from deerflow.agents.memory.message_processing import detect_correction, detect_reinforcement, filter_messages_for_memory
from deerflow.agents.memory.v1.queue import get_memory_queue
from deerflow.config.memory_config import get_memory_config
from deerflow.config.system_settings import get_memory_runtime_settings
def memory_flush_hook(event: object) -> None:
@@ -16,7 +16,7 @@ def memory_flush_hook(event: object) -> None:
- ``agent_name: str | None``
- ``runtime: RunnableConfig``
"""
if not get_memory_config().enabled:
if not get_memory_runtime_settings().enabled:
return
thread_id = getattr(event, "thread_id", None)
@@ -260,8 +260,9 @@ class MemoryUpdater:
reinforcement_detected: bool,
user_id: str | None = None,
) -> tuple[dict[str, Any], str] | None:
from deerflow.config.memory_config import get_memory_config
config = get_memory_config()
from deerflow.config.memory_config import get_effective_memory_config
config = get_effective_memory_config(user_id or "default")
if not config.enabled or not messages:
return None