mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-16 01:38:53 +00:00
* feat(memory): pluggable + self-contained memory system (MemoryManager plan phases 1 & 2) Phase 1 — Pluggable (steps 0-10): - ABC MemoryManager (9 methods) + singleton factory + drop-in backend discovery - DeerMem default backend with core/ (storage/queue/updater/prompt/message_processing) - NoopMemoryManager backend (proves pluggability) - All call sites (middleware/hook/prompt/gateway/client/app) routed through manager - hasattr capability probing for DeerMem-internal methods (no hard imports) - MemoryConfig gains manager_class field; shared vs DeerMem-private annotated Phase 2 — Self-contained DeerMem (steps 11-18): - backend_config passthrough + DeerMemConfig (all DeerMem-private fields moved off MemoryConfig) - DI: DeerMem owns storage/queue/updater/llm as instance attributes (no global singletons) - Storage independence: core/paths.py with own root (~/.deermem or ), factory auto-injects deer-flow's runtime_home() as absolute base_dir (zero-config) - LLM independence: core/llm.py via langchain init_chat_model (no create_chat_model) - Trace independence: optional tracing_callback replaces inject_langfuse_metadata/request_trace_context - Message processing independence: hide_from_ui default-skip + optional should_keep_hidden_message hook - Internal imports → relative (only deer_mem.py ABC import is host-relative) - Carrier (deer_mem.py adapter) / portable (deermem/ config+core) split - New tests: test_deermem_self_contained + test_memory_manager_pluggable; all memory tests migrated - Other-agent demo: samples/other_agent_demo/ + automated portability test - config.example.yaml memory section updated to phase-2 schema * feat(memory): port consolidation + staleness fix into self-contained DeerMem; phase-2 host hooks Port upstream #3996 (memory consolidation) and #3993 (staleness KeyError fix) from origin/MemoryManager into the pluggable, self-contained DeerMem structure (backends/deermem/deermem/), adapted to the DI MemoryUpdater (config injected, not get_memory_config globals): - DeerMemConfig: add consolidation_enabled (opt-in, default false) / consolidation_min_facts / consolidation_max_groups_per_cycle / consolidation_max_sources - prompt.py: factsToConsolidate JSON field + {consolidation_section} placeholder + CONSOLIDATION_PROMPT constant - updater.py: _coerce_source_confidence / _select_consolidation_candidates / _build_consolidation_section module helpers (matching the existing _select_stale_candidates style); consolidation normalization in _normalize_memory_update_data; consolidation apply in _apply_updates (after max_facts trim, with apply-time guardrails mirroring staleness); staleness KeyError fix (f["id"] -> f.get("id") is not None) applied to both the staleness guardrail and the consolidation allowed_source_ids comprehension - config.example.yaml: consolidation section under memory.backend_config - tests/test_memory_consolidation.py: 40 DI-adapted tests (running, not skipped) incl. the staleness KeyError regression Also includes in-flight phase-2 host-integration work: storage_path semantics (any absolute/relative value = root dir) and host-default tracing_callback / should_keep_hidden_message hooks injected into backend_config by the factory. Co-Authored-By: Claude <noreply@anthropic.com> * feat(memory): add noop backend template and backends guide - backends/noop/: complete drop-in template (config.py with zero deer-flow imports, noop_manager.py with a 6-step new-backend walkthrough in its docstring, commented optional fact-CRUD capabilities). - backends/README.md: which files to touch when adding/swapping a backend, the 5-item backend contract, and common pitfalls. - manager.py: generalize backend examples in comments (drop mem0-specific references). Co-Authored-By: Claude <noreply@anthropic.com> * fix(frontend): guard formatTimeAgo against invalid timestamps Return a neutral placeholder when the input date is invalid (e.g. an empty lastUpdated from a backend with no memories) instead of throwing 'Invalid time value' from date-fns. Co-Authored-By: Claude <noreply@anthropic.com> * feat(memory): wire tool-driven memory mode through the MemoryManager ABC tools.py (memory_search/add/update/delete) now calls get_memory_manager() instead of the removed host memory module, so tool mode (memory.mode: tool) works for any backend. DeerMem.search is implemented (case-insensitive substring match, ranked by confidence) as a stand-in for the planned semantic retrieval; noop.search returns [] (unchanged). Fact-CRUD tools use getattr+callable probing -- backends lacking those ops (noop) get a clear JSON error instead of crashing. Tests: test_memory_tools rewired to mock the manager (handler tests) + TestModeGating retained; test_memory_search now covers DeerMem.search; pluggable stubs test updated (search no longer a stub). Co-Authored-By: Claude <noreply@anthropic.com> * fix: resolve lint errors (import sorting, type annotation quotes, E402 in skipped tests) * docs: restore explanatory comments in config.example.yaml memory section * fix(security): port html-escape memory facts fix (#4097) to vendored DeerMem prompt.py * fix(memory): address review + port dropped upstream memory fixes Review blockers (vendored DeerMem): - #4044 restore _escape_memory_for_prompt (current_memory blob in MEMORY_UPDATE_PROMPT) - prevents </current_memory> breakout - #4028 html.escape staleness-section cat/content in _build_staleness_section - #4119 add _escape_summary for injection-path summaries (Work/Personal/ Current Focus/Recent/Earlier/Background) - default-model silent no-op: factory injects host default chat model via a new host_llm slot (create_chat_model(name=None)); DeerMem prefers host_llm over build_llm(model). Zero-config extraction works out of the box again - MemoryConfigResponse: fix stale docstring (backend-agnostic shape; DeerMem knobs live under backend_config, not top-level - restoring flat would re-couple the API to DeerMem). Frontend audited: does not read /memory/config - _host_default_tracing_callback: restore langfuse assistant_id/environment - search: push category onto the ABC signature; DeerMem filters BEFORE the top_k slice (was filtered client-side after slicing -> starved results) - _do_update_memory_sync: split into wrapper+impl; bind trace_id into the request-trace ContextVar on the Timer/executor worker via a new trace_context_manager host hook (None trace_id left unbound - no fabrication) - client.py fact-CRUD now passes user_id (was writing to the global bucket while get_memory reads per-user) - _resolve_manager_class: fail-fast (raise ValueError) on an unresolved explicit manager_class instead of silently falling back to DeerMem (memory is persistent state - a wrong store is a silent data-integrity footgun) Upstream memory fixes dropped by the host->vendored rename conflict, re-ported to backends/deermem/deermem/core/ (+ deer_mem.py): - #4073 queue busy-timer-spin -> _reprocess_pending flag (core/queue.py) - #4074 null source.confidence in staleness -> _coerce_source_confidence (core/updater.py: _build_staleness_section + _apply_updates stale sort) - #4075 factsToRemove is optional (drop from _REQUIRED_MEMORY_UPDATE_TOP_LEVEL_KEYS) - #4076 null confidence in search ranking -> _coerce_source_confidence (deer_mem.py DeerMem.search) host_llm + trace_context_manager are host-injected via backend_config (factory in manager.py), keeping backends/deermem/ at exactly one `from deerflow` line (the ABC contract) - portability test preserved. Co-Authored-By: Claude <noreply@anthropic.com> * fix: resolve lint errors (F541 f-string without placeholders, E501 line too long) * fix(memory): restore hide_from_ui clarification preservation, expose mode Two memory-system fixes (F541/E501 lint was already fixed on this branch): - filter_messages_for_memory: restore default preservation of well-formed human_input_response clarification answers (v2 regression). The self-containment refactor made the bare function skip ALL hide_from_ui when no hook was passed, but upstream preserves well-formed clarification responses by default (test_hide_from_ui_human_input_response_is_preserved). Inline a host-agnostic _is_human_clarification_response mirror of read_human_input_response as the default keep-decision; the host-injected should_keep_hidden_message hook still overrides (production path unchanged). Portable package stays zero `from deerflow`. - /memory/config: expose `mode` (middleware|tool) in MemoryConfigResponse + the config/status endpoints + client.get_memory_config. mode is a host- shared, behavior-determining field missing from the response projection. Sync tests (mock .mode; e2e assert mode present). - Align manager_class field docstring with fail-fast behavior. Tests: filter/self-contained/portability (35) + memory-config (4) pass; ruff clean. Co-Authored-By: Claude <noreply@anthropic.com> * fix(memory): resolve ruff format failures in memory module + tests `make lint` runs `ruff format --check` in addition to `ruff check`; 8 memory files had pending format changes -- 7 pre-existing (deer_mem, updater, tools, test_memory_queue/router/search/tools) + message_processing from the hide_from_ui fix. Apply `ruff format`: whitespace/wrapping only, no logic change. 109 memory tests pass; ruff check + format --check both clean. Co-Authored-By: Claude <noreply@anthropic.com> * fix(memory): address PR review - legacy field migration, fact_id contract, path/docs Address willem-bd's review on PR head bc8bf0d4 (risk:high, persistent state): - config: auto-migrate pre-abstraction top-level memory.* DeerMem fields (storage_path, max_facts, debounce_seconds, model_name, token_counting, staleness_*, consolidation_*) into backend_config on load + warn, so an upgrade does NOT silently revert customized settings (was: silent extra='ignore' drop). model_name -> backend_config.model.model. Unknown top-level keys warned. - factory: resolve a relative backend_config.storage_path against runtime_home() (base_dir-relative, CWD-independent) to preserve pre-abstraction semantics; paths.py stays portable (no runtime_home import). - tools: memory_add uses the fact_id returned directly by create_fact instead of re-deriving it via content-key matching (coupled the tool to the backend's content normalization; could misreport a storage cap). create_fact now returns (memory_data, fact_id); gateway/client/tool updated. Fix terse {"error":"content"} -> {"error":"empty content"}. - app.py: update stale token_counting=="char" warm-up comment to point at manager.warm (DeerMem.warm re-checks char and returns early). - router: comment explaining reload_memory silent fallback vs fact 501 asymmetry (read-only degrade vs write fail-loud). - CHANGELOG: document breaking changes (/memory/config + client.get_memory_config shape flat->backend_config; custom storage_class path moved + __init__ must accept config) and the legacy-field auto-migration. - tests: add regression test pinning the per-user memory path ({storage_path}/users/{safe_user_id}/memory.json == host make_safe_user_id) across the abstraction; update create_fact mocks for (memory_data, fact_id). Tests: 273 passed (memory suite); ruff check + format clean. Co-Authored-By: Claude <noreply@anthropic.com> * fix(memory): address PR review - storage_path, max_facts, tracing, parsing Six review findings (willem-bd), each verified against upstream: - storage_path semantics (file -> root dir): migration drops file-style (.json) legacy values with a warning; factory raises if storage_path resolves to an existing file (avoid silent NotADirectoryError write failure). CHANGELOG + config.example.yaml comment updated. - create_memory_fact enforces max_facts again (via _trim_facts_to_max) and returns (memory, None) when the cap evicts the new fact; memory_add tool reports "not stored", client raises ValueError, POST /memory/facts -> 409. - max_facts trim uses _coerce_source_confidence (was raw f.get("confidence", 0) -> TypeError on non-float imported/legacy confidence, swallowed as silent update failure). - memory-tracing assistant_id restored to "memory_agent" (was "lead-agent" copy-paste; matches upstream + DeerMem run_name). - _is_human_clarification_response cross-checked against read_human_input_response (drift guard test). - empty-string legacy values skipped silently in migration (narrow fix, not broad "if not value" which would skip explicit bool False). 8 new regression tests. make lint + 406 memory tests pass. Co-Authored-By: Claude <noreply@anthropic.com> * fix(memory): address internal review - storage fail-fast, build_llm degrade, config warn, noop template Addresses 4 findings from the PR #4122 internal supplemental review (parallel to willem-bd's review, no overlap): - create_storage fail-fast: a misspelled/unimportable storage_class now raises ValueError instead of silently falling back to FileMemoryStorage. Memory is persistent state, so a wrong store is a data-integrity footgun; mirrors the existing manager_class resolution policy. (storage.py) - noop template create_fact signature: the commented template used keyword-only `content` and returned a bare dict, while DeerMem's actual create_fact takes positional `content` and returns tuple[dict, str|None] (the memory_add tool passes content positionally; gateway/client/tools all tuple-unpack). A backend copied from the template would 500 on fact-CRUD. Template fixed; delete_fact/update_fact templates left (callers compatible). (noop_manager.py) - build_llm graceful degrade: wrap init_chat_model in try/except, degrade to None + WARNING on failure (mirroring _host_default_llm) so a misconfigured explicit model does not crash app startup -- non-LLM memory ops still work and an update raises at runtime with the error logged. (llm.py) - from_backend_config unknown-key warning: log a WARNING for unknown backend_config keys (mirrors the host layer's load_memory_config_from_dict) so a typo like `storage_pat` does not silently fall back to the default and write memory to an unintended location. (config.py) Tests: rewrote 3 create_storage fallback tests to expect ValueError; added 4 tests (build_llm zero-config/degrade, from_backend_config warn/silent). make lint green; full memory suite passes. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: lllyfff <2281215061@qq.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: lllyfff <122260771+lllyfff@users.noreply.github.com>
180 lines
7.8 KiB
Python
180 lines
7.8 KiB
Python
"""Configuration for the memory mechanism (host-shared fields only).
|
|
|
|
DeerMem-private fields live in ``backends/deermem/config.py`` (``DeerMemConfig``),
|
|
reached via ``backend_config`` (a dict the factory passes to the backend's
|
|
``__init__``). This module holds ONLY the host-shared fields every backend /
|
|
call site / factory reads: ``enabled`` / ``injection_enabled`` /
|
|
``manager_class`` / ``backend_config``. Keeping the shared schema slim is what
|
|
makes backends swappable and portable (DeerMem's knobs do not leak onto the
|
|
shared contract).
|
|
"""
|
|
|
|
import logging
|
|
from typing import Any, Literal
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Host-shared MemoryConfig fields (read by every backend / call site / factory).
|
|
_SHARED_FIELDS = frozenset({"enabled", "mode", "injection_enabled", "manager_class", "backend_config"})
|
|
|
|
# DeerMem-private fields that used to live at the top level of `memory:` in
|
|
# config.yaml (pre-abstraction). On load they are auto-migrated into
|
|
# `backend_config` so an upgrade does NOT silently revert customized settings
|
|
# to defaults. `model_name` maps to `backend_config.model.model` (the new nested
|
|
# model sub-config); the rest are 1:1.
|
|
_LEGACY_DEERMEM_FIELDS = frozenset(
|
|
{
|
|
"storage_path",
|
|
"storage_class",
|
|
"debounce_seconds",
|
|
"max_facts",
|
|
"fact_confidence_threshold",
|
|
"max_injection_tokens",
|
|
"token_counting",
|
|
"guaranteed_categories",
|
|
"guaranteed_token_budget",
|
|
"staleness_review_enabled",
|
|
"staleness_age_days",
|
|
"staleness_min_candidates",
|
|
"staleness_max_removals_per_cycle",
|
|
"staleness_protected_categories",
|
|
"consolidation_enabled",
|
|
"consolidation_min_facts",
|
|
"consolidation_max_groups_per_cycle",
|
|
"consolidation_max_sources",
|
|
"model_name",
|
|
}
|
|
)
|
|
|
|
|
|
class MemoryConfig(BaseModel):
|
|
"""Host-shared memory configuration (backend-agnostic)."""
|
|
|
|
enabled: bool = Field(
|
|
default=True,
|
|
description="Whether to enable the memory mechanism (call-site gate).",
|
|
)
|
|
mode: Literal["middleware", "tool"] = Field(
|
|
default="middleware",
|
|
description=(
|
|
"Memory operation mode. 'middleware': passive LLM summarization after each turn (current behavior). 'tool': model calls memory tools (memory_search, memory_add, etc.) directly. Mutually exclusive — only one mode runs at a time."
|
|
),
|
|
)
|
|
injection_enabled: bool = Field(
|
|
default=True,
|
|
description="Whether to inject memory into the system prompt (call-site gate).",
|
|
)
|
|
manager_class: str = Field(
|
|
default="deermem",
|
|
description=(
|
|
"Memory backend selector. Either a registered backend name "
|
|
"(matching a `backends/<name>/` folder that exposes `MANAGER_CLASS`, "
|
|
"e.g. `deermem` / `noop`) or a dotted import path to a "
|
|
"`MemoryManager` subclass. The factory resolves this at "
|
|
"`get_memory_manager()` time and raises `ValueError` on failure "
|
|
"(fail-fast: memory is persistent state, so an unresolved "
|
|
"manager_class is not silently substituted with a different "
|
|
"storage backend)."
|
|
),
|
|
)
|
|
backend_config: dict[str, Any] = Field(
|
|
default_factory=dict,
|
|
description=(
|
|
"Backend-private config (a dict), passed verbatim to the backend's "
|
|
"`__init__(backend_config=...)` by the factory. Each backend "
|
|
"self-interprets it (DeerMem parses it into `DeerMemConfig`). Values "
|
|
"live in the host config file (`config.yaml` `memory.backend_config`); "
|
|
"they do not belong on the shared `MemoryConfig` schema."
|
|
),
|
|
)
|
|
|
|
|
|
def should_use_memory_tools(config: MemoryConfig) -> bool:
|
|
"""Return True when memory should use model-directed tools."""
|
|
return config.enabled and config.mode == "tool"
|
|
|
|
|
|
# Global configuration instance
|
|
_memory_config: MemoryConfig = MemoryConfig()
|
|
|
|
|
|
def get_memory_config() -> MemoryConfig:
|
|
"""Get the current memory configuration."""
|
|
return _memory_config
|
|
|
|
|
|
def set_memory_config(config: MemoryConfig) -> None:
|
|
"""Set the memory configuration."""
|
|
global _memory_config
|
|
_memory_config = config
|
|
|
|
|
|
def load_memory_config_from_dict(config_dict: dict) -> None:
|
|
"""Load memory configuration from a dictionary.
|
|
|
|
Host-shared fields (``enabled`` / ``mode`` / ``injection_enabled`` /
|
|
``manager_class`` / ``backend_config``) are read directly. DeerMem-private
|
|
fields that used to live at the top level of ``memory:`` in config.yaml
|
|
(pre-abstraction: ``storage_path``, ``max_facts``, ``debounce_seconds``,
|
|
``model_name``, ``token_counting``, ``staleness_*``, ``consolidation_*``,
|
|
...) are **auto-migrated into ``backend_config``** with a warning, so an
|
|
upgrade from a pre-abstraction config does NOT silently revert customized
|
|
settings to defaults. Unknown top-level keys (likely typos) are warned and
|
|
ignored.
|
|
"""
|
|
global _memory_config
|
|
config_dict = dict(config_dict or {})
|
|
backend_config = dict(config_dict.get("backend_config") or {})
|
|
migrated: list[str] = []
|
|
for key in list(config_dict.keys()):
|
|
if key in _SHARED_FIELDS:
|
|
continue
|
|
if key in _LEGACY_DEERMEM_FIELDS:
|
|
value = config_dict.pop(key)
|
|
if value is None or value == "":
|
|
continue # default / empty value, no migration needed
|
|
if key == "model_name":
|
|
# old top-level model_name -> backend_config.model.model
|
|
model_cfg = dict(backend_config.get("model") or {})
|
|
if "model" not in model_cfg:
|
|
model_cfg["model"] = value
|
|
backend_config["model"] = model_cfg
|
|
migrated.append(f"{key} -> backend_config.model.model")
|
|
elif key == "storage_path" and str(value).endswith(".json"):
|
|
# Pre-abstraction storage_path was a FILE path (absolute = shared
|
|
# file opting out of per-user; a relative value like the old default
|
|
# "memory.json" was ignored for per-user). DeerMem now treats it as a
|
|
# root DIRECTORY. Carrying a file-style value verbatim would be
|
|
# resolved as a dir and either orphan per-user memory or hit
|
|
# NotADirectoryError on save. Drop it so the factory's zero-config
|
|
# runtime_home kicks in (per-user location unchanged:
|
|
# {base_dir}/users/{uid}/memory.json) and warn the operator.
|
|
logger.warning(
|
|
"Legacy memory.storage_path=%r looks like a file path; DeerMem now "
|
|
"treats storage_path as a root DIRECTORY (per-user memory under "
|
|
"{storage_path}/users/{uid}/memory.json). Dropped -- memory now "
|
|
"lands under the default root (runtime_home). Set "
|
|
"memory.backend_config.storage_path to a directory if you want a "
|
|
"custom location.",
|
|
value,
|
|
)
|
|
elif key not in backend_config:
|
|
# don't override an explicit backend_config value
|
|
backend_config[key] = value
|
|
migrated.append(f"{key} -> backend_config.{key}")
|
|
else:
|
|
logger.warning(
|
|
"Unknown memory config key %r at top level (not a shared field %s nor a known legacy DeerMem field); ignored.",
|
|
key,
|
|
sorted(_SHARED_FIELDS),
|
|
)
|
|
if migrated:
|
|
logger.warning(
|
|
"Migrated legacy top-level memory fields into backend_config; move them under memory.backend_config in config.yaml to silence this: %s",
|
|
", ".join(migrated),
|
|
)
|
|
config_dict["backend_config"] = backend_config
|
|
_memory_config = MemoryConfig(**config_dict)
|