mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-14 19:42:02 +08:00
ad45f59d66
* 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>
177 lines
6.9 KiB
Python
177 lines
6.9 KiB
Python
"""Tests for DeerMem.search (the ABC search implementation).
|
|
|
|
DeerMem.search is a case-insensitive substring search over stored facts
|
|
(stand-in for the planned semantic retrieval). The optional ``category`` kwarg
|
|
filters BEFORE the ``top_k`` slice (it is on the ABC signature; the
|
|
``memory_search`` tool forwards it). These tests cover the backend's own search.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
|
|
from deerflow.agents.memory.backends.deermem.deer_mem import DeerMem
|
|
|
|
|
|
def _make_fact(content: str, category: str = "context", confidence: float = 0.7) -> dict:
|
|
return {
|
|
"id": f"fact_test_{hash(content) & 0xFFFFFFFF:08x}",
|
|
"content": content,
|
|
"category": category,
|
|
"confidence": confidence,
|
|
"createdAt": "2026-07-09T00:00:00Z",
|
|
"source": "test",
|
|
}
|
|
|
|
|
|
def _deer_mem_with_facts(facts: list[dict]) -> DeerMem:
|
|
"""Build a DeerMem whose updater returns the given facts (no disk I/O)."""
|
|
mgr = DeerMem(backend_config=None)
|
|
mgr._updater = SimpleNamespace(get_memory_data=lambda agent_name=None, *, user_id=None: {"facts": facts})
|
|
return mgr
|
|
|
|
|
|
class TestDeerMemSearch:
|
|
"""Tests for DeerMem.search."""
|
|
|
|
def test_basic_substring_match(self):
|
|
"""Should find facts containing the query string (case-insensitive)."""
|
|
facts = [
|
|
_make_fact("User prefers Python", "preference", 0.9),
|
|
_make_fact("User works with TypeScript", "context", 0.7),
|
|
_make_fact("User lives in Beijing", "personal", 0.8),
|
|
]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
results = mgr.search("python")
|
|
assert len(results) == 1
|
|
assert results[0]["content"] == "User prefers Python"
|
|
|
|
def test_case_insensitive(self):
|
|
"""Should match regardless of case."""
|
|
mgr = _deer_mem_with_facts([_make_fact("User prefers Python", "preference", 0.9)])
|
|
|
|
assert len(mgr.search("PYTHON")) == 1
|
|
assert len(mgr.search("python")) == 1
|
|
assert len(mgr.search("Python")) == 1
|
|
|
|
def test_empty_query_returns_empty(self):
|
|
"""Should return empty list for empty query, not error."""
|
|
mgr = _deer_mem_with_facts([_make_fact("Some fact")])
|
|
|
|
assert mgr.search("") == []
|
|
assert mgr.search(" ") == []
|
|
|
|
def test_no_match_returns_empty(self):
|
|
"""Should return empty list when nothing matches."""
|
|
mgr = _deer_mem_with_facts([_make_fact("User prefers Python")])
|
|
|
|
assert mgr.search("Rust") == []
|
|
|
|
def test_sorted_by_confidence_desc(self):
|
|
"""Should return results sorted by confidence descending."""
|
|
facts = [
|
|
_make_fact("Fact A", confidence=0.3),
|
|
_make_fact("Fact B", confidence=0.9),
|
|
_make_fact("Fact C", confidence=0.6),
|
|
]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
results = mgr.search("Fact")
|
|
assert len(results) == 3
|
|
assert results[0]["confidence"] == 0.9
|
|
assert results[1]["confidence"] == 0.6
|
|
assert results[2]["confidence"] == 0.3
|
|
|
|
def test_respects_top_k(self):
|
|
"""Should return at most ``top_k`` results."""
|
|
facts = [_make_fact(f"Fact {i}", confidence=0.5) for i in range(20)]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
results = mgr.search("Fact", top_k=5)
|
|
assert len(results) == 5
|
|
|
|
def test_null_confidence_does_not_crash_sort(self):
|
|
"""A fact stored with ``"confidence": null`` (corrupted/hand-edited memory)
|
|
must not break the confidence sort. ``.get("confidence", 0)`` returns the
|
|
stored ``None`` and comparing None with floats raises TypeError; the coerce
|
|
helper defaults null to a finite midpoint instead."""
|
|
null_fact = {
|
|
"id": "fact_null",
|
|
"content": "Fact with null confidence",
|
|
"category": "context",
|
|
"confidence": None,
|
|
"createdAt": "2026-07-09T00:00:00Z",
|
|
"source": "test",
|
|
}
|
|
facts = [
|
|
_make_fact("Fact high", confidence=0.9),
|
|
null_fact,
|
|
_make_fact("Fact low", confidence=0.2),
|
|
]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
# Must not raise TypeError during the confidence sort.
|
|
results = mgr.search("Fact")
|
|
|
|
assert len(results) == 3
|
|
# Highest real confidence still sorts first; null (coerced to 0.5) sits
|
|
# between the 0.9 and 0.2 facts.
|
|
assert results[0]["content"] == "Fact high"
|
|
assert {r["content"] for r in results} == {"Fact high", "Fact with null confidence", "Fact low"}
|
|
|
|
def test_non_positive_top_k_returns_empty(self):
|
|
"""Should return empty for top_k <= 0 (no negative-slice expansion)."""
|
|
mgr = _deer_mem_with_facts([_make_fact(f"Fact {i}", confidence=0.5) for i in range(3)])
|
|
|
|
assert mgr.search("Fact", top_k=0) == []
|
|
assert mgr.search("Fact", top_k=-1) == []
|
|
|
|
def test_no_facts_returns_empty(self):
|
|
"""Should return empty list when memory has no facts."""
|
|
mgr = _deer_mem_with_facts([])
|
|
|
|
assert mgr.search("anything") == []
|
|
|
|
def test_non_string_content_is_skipped(self):
|
|
"""Facts whose content is not a str are skipped, not crashed on."""
|
|
facts = [
|
|
{"id": "f1", "content": "likes uv", "category": "preference", "confidence": 0.9},
|
|
{"id": "f2", "content": 42, "category": "context", "confidence": 0.5},
|
|
{"id": "f3", "content": None, "category": "context", "confidence": 0.5},
|
|
]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
results = mgr.search("uv")
|
|
assert len(results) == 1
|
|
assert results[0]["id"] == "f1"
|
|
|
|
def test_category_filters_before_top_k_slice(self):
|
|
"""category filters BEFORE the top_k slice, so a category-scoped search
|
|
is not starved by higher-confidence facts in other categories."""
|
|
facts = [
|
|
_make_fact("uv fast", "preference", 0.9),
|
|
_make_fact("uv tool", "context", 0.95),
|
|
_make_fact("uv python", "context", 0.9),
|
|
_make_fact("uv rust", "context", 0.85),
|
|
]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
# top_k=1 without category -> the single highest-confidence fact (context, 0.95)
|
|
assert mgr.search("uv", top_k=1)[0]["category"] == "context"
|
|
# top_k=1 WITH category=preference -> the preference fact (0.9), not
|
|
# starved by the higher-confidence context facts that would otherwise
|
|
# occupy the top_k slice first.
|
|
pref = mgr.search("uv", top_k=1, category="preference")
|
|
assert len(pref) == 1
|
|
assert pref[0]["category"] == "preference"
|
|
assert pref[0]["content"] == "uv fast"
|
|
|
|
def test_category_none_returns_all_categories(self):
|
|
"""category=None (default) returns facts from all categories."""
|
|
facts = [
|
|
_make_fact("uv a", "preference", 0.9),
|
|
_make_fact("uv b", "context", 0.5),
|
|
]
|
|
mgr = _deer_mem_with_facts(facts)
|
|
|
|
assert len(mgr.search("uv", category=None)) == 2
|