mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-21 10:15:47 +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>
351 lines
15 KiB
Python
351 lines
15 KiB
Python
"""Tests for tiktoken encoding cache and _count_tokens fallback.
|
|
|
|
Verifies:
|
|
- Module-level cache avoids repeated ``get_encoding`` calls.
|
|
- ``_count_tokens`` falls back to character estimation when tiktoken is
|
|
unavailable or the encoding fails to load.
|
|
- ``warm_tiktoken_cache`` populates the cache on success.
|
|
- An in-flight tiktoken load prevents duplicate blocking downloads.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
from unittest import mock
|
|
|
|
from deerflow.agents.memory.backends.deermem.deermem.core.prompt import (
|
|
_count_tokens,
|
|
_get_tiktoken_encoding,
|
|
_tiktoken_encoding_cache,
|
|
format_memory_for_injection,
|
|
warm_tiktoken_cache,
|
|
)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _get_tiktoken_encoding
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestGetTiktokenEncoding:
|
|
"""Tests for _get_tiktoken_encoding caching and fallback."""
|
|
|
|
def test_returns_none_when_tiktoken_unavailable(self, monkeypatch):
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.TIKTOKEN_AVAILABLE", False)
|
|
assert _get_tiktoken_encoding("cl100k_base") is None
|
|
|
|
def test_returns_encoding_on_success(self, monkeypatch):
|
|
# Clear cache to ensure a fresh call
|
|
_tiktoken_encoding_cache.pop("cl100k_base", None)
|
|
|
|
fake_enc = mock.Mock()
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.tiktoken.get_encoding", mock.Mock(return_value=fake_enc))
|
|
|
|
enc = _get_tiktoken_encoding("cl100k_base")
|
|
assert enc is fake_enc
|
|
|
|
def test_populates_cache_on_success(self, monkeypatch):
|
|
_tiktoken_encoding_cache.pop("cl100k_base", None)
|
|
|
|
fake_enc = mock.Mock()
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.tiktoken.get_encoding", mock.Mock(return_value=fake_enc))
|
|
|
|
_get_tiktoken_encoding("cl100k_base")
|
|
assert _tiktoken_encoding_cache["cl100k_base"] is fake_enc
|
|
|
|
def test_returns_cached_encoding_without_calling_get_encoding(self, monkeypatch):
|
|
fake_enc = mock.Mock()
|
|
monkeypatch.setitem(_tiktoken_encoding_cache, "cl100k_base", fake_enc)
|
|
|
|
# Now patch tiktoken.get_encoding to raise if called
|
|
import tiktoken
|
|
|
|
monkeypatch.setattr(tiktoken, "get_encoding", mock.Mock(side_effect=RuntimeError("should not be called")))
|
|
# Cached path — should NOT call get_encoding
|
|
enc = _get_tiktoken_encoding("cl100k_base")
|
|
assert enc is fake_enc
|
|
tiktoken.get_encoding.assert_not_called()
|
|
|
|
def test_returns_none_and_caches_failure_sentinel(self, monkeypatch):
|
|
"""A failed load is cached (with a timestamp) so it is not re-attempted (no repeated network download)."""
|
|
_tiktoken_encoding_cache.pop("bogus_encoding", None)
|
|
import tiktoken
|
|
|
|
get_encoding = mock.Mock(side_effect=OSError("download failed"))
|
|
monkeypatch.setattr(tiktoken, "get_encoding", get_encoding)
|
|
|
|
result = _get_tiktoken_encoding("bogus_encoding")
|
|
assert result is None
|
|
# The failure is remembered as a (None, timestamp) tuple.
|
|
assert "bogus_encoding" in _tiktoken_encoding_cache
|
|
cached = _tiktoken_encoding_cache["bogus_encoding"]
|
|
assert isinstance(cached, tuple)
|
|
assert cached[0] is None
|
|
|
|
# A second call must NOT re-attempt get_encoding (avoids re-blocking on
|
|
# the network download in restricted environments — see #3429).
|
|
result2 = _get_tiktoken_encoding("bogus_encoding")
|
|
assert result2 is None
|
|
assert get_encoding.call_count == 1
|
|
|
|
# Cleanup module-level cache to avoid cross-test leakage.
|
|
_tiktoken_encoding_cache.pop("bogus_encoding", None)
|
|
|
|
def test_failure_self_heals_after_cooldown(self, monkeypatch):
|
|
"""After the retry cooldown expires, a transient failure is re-attempted and can recover."""
|
|
_tiktoken_encoding_cache.pop("flaky_encoding", None)
|
|
import tiktoken
|
|
|
|
fake_enc = mock.Mock()
|
|
# First call fails, second call (after cooldown) succeeds.
|
|
get_encoding = mock.Mock(side_effect=[OSError("transient outage"), fake_enc])
|
|
monkeypatch.setattr(tiktoken, "get_encoding", get_encoding)
|
|
|
|
# Initial failure is cached.
|
|
assert _get_tiktoken_encoding("flaky_encoding") is None
|
|
assert get_encoding.call_count == 1
|
|
|
|
# Within the cooldown window: no retry, immediate fallback.
|
|
assert _get_tiktoken_encoding("flaky_encoding") is None
|
|
assert get_encoding.call_count == 1
|
|
|
|
# Simulate the cooldown having elapsed by ageing the cached timestamp.
|
|
from deerflow.agents.memory.backends.deermem.deermem.core import prompt as prompt_module
|
|
|
|
_, _failed_at = _tiktoken_encoding_cache["flaky_encoding"]
|
|
_tiktoken_encoding_cache["flaky_encoding"] = (
|
|
None,
|
|
_failed_at - prompt_module._TIKTOKEN_RETRY_COOLDOWN_S - 1,
|
|
)
|
|
|
|
# Now the load is retried and recovers to accurate counting.
|
|
assert _get_tiktoken_encoding("flaky_encoding") is fake_enc
|
|
assert get_encoding.call_count == 2
|
|
|
|
_tiktoken_encoding_cache.pop("flaky_encoding", None)
|
|
|
|
def test_in_flight_load_returns_none_without_duplicate_get_encoding(self, monkeypatch):
|
|
"""Concurrent callers must not start duplicate blocking BPE downloads."""
|
|
_tiktoken_encoding_cache.pop("slow_encoding", None)
|
|
import tiktoken
|
|
|
|
started = threading.Event()
|
|
release = threading.Event()
|
|
fake_enc = mock.Mock()
|
|
|
|
def slow_get_encoding(_name):
|
|
started.set()
|
|
assert release.wait(timeout=2), "test timed out waiting to release slow get_encoding"
|
|
return fake_enc
|
|
|
|
get_encoding = mock.Mock(side_effect=slow_get_encoding)
|
|
monkeypatch.setattr(tiktoken, "get_encoding", get_encoding)
|
|
|
|
result: dict[str, object | None] = {}
|
|
|
|
def load_encoding():
|
|
result["encoding"] = _get_tiktoken_encoding("slow_encoding")
|
|
|
|
thread = threading.Thread(target=load_encoding)
|
|
thread.start()
|
|
try:
|
|
assert started.wait(timeout=1), "slow get_encoding did not start"
|
|
|
|
# While the first call is still blocked, a second call should see
|
|
# the in-flight sentinel and fall back immediately instead of
|
|
# starting another potentially long network download.
|
|
assert _get_tiktoken_encoding("slow_encoding") is None
|
|
assert get_encoding.call_count == 1
|
|
finally:
|
|
release.set()
|
|
thread.join(timeout=2)
|
|
_tiktoken_encoding_cache.pop("slow_encoding", None)
|
|
|
|
assert result["encoding"] is fake_enc
|
|
assert get_encoding.call_count == 1
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _count_tokens
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestCountTokens:
|
|
"""Tests for _count_tokens fallback behaviour."""
|
|
|
|
def test_returns_character_estimate_when_tiktoken_unavailable(self, monkeypatch):
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.TIKTOKEN_AVAILABLE", False)
|
|
text = "Hello, world! This is a test."
|
|
result = _count_tokens(text)
|
|
assert result == len(text) // 4
|
|
|
|
def test_returns_character_estimate_when_encoding_fails(self, monkeypatch):
|
|
monkeypatch.setattr(
|
|
"deerflow.agents.memory.backends.deermem.deermem.core.prompt._get_tiktoken_encoding",
|
|
lambda _name=None: None,
|
|
)
|
|
text = "Some text to count"
|
|
result = _count_tokens(text)
|
|
assert result == len(text) // 4
|
|
|
|
def test_returns_token_count_on_success(self, monkeypatch):
|
|
fake_enc = mock.Mock()
|
|
fake_enc.encode.return_value = [0, 1, 2, 3]
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt._get_tiktoken_encoding", mock.Mock(return_value=fake_enc))
|
|
|
|
text = "Hello, world!"
|
|
result = _count_tokens(text)
|
|
assert result == 4
|
|
assert result <= len(text)
|
|
|
|
def test_falls_back_on_encode_exception(self, monkeypatch):
|
|
# Cache an encoding whose .encode raises
|
|
fake_enc = mock.Mock()
|
|
fake_enc.encode.side_effect = RuntimeError("encode failed")
|
|
monkeypatch.setitem(_tiktoken_encoding_cache, "test_enc", fake_enc)
|
|
|
|
text = "Fallback test"
|
|
result = _count_tokens(text, encoding_name="test_enc")
|
|
assert result == len(text) // 4
|
|
|
|
def test_use_tiktoken_false_returns_char_estimate_without_touching_tiktoken(self, monkeypatch):
|
|
"""use_tiktoken=False must never call tiktoken (guarantees no BPE download)."""
|
|
# Spy on both the encoding loader and tiktoken.get_encoding directly.
|
|
get_encoding_spy = mock.Mock(side_effect=AssertionError("get_encoding must not be called"))
|
|
loader_spy = mock.Mock(side_effect=AssertionError("_get_tiktoken_encoding must not be called"))
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.tiktoken.get_encoding", get_encoding_spy)
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt._get_tiktoken_encoding", loader_spy)
|
|
|
|
text = "Hello, world! This is a network-free count."
|
|
result = _count_tokens(text, use_tiktoken=False)
|
|
assert result == len(text) // 4
|
|
get_encoding_spy.assert_not_called()
|
|
loader_spy.assert_not_called()
|
|
|
|
def test_cjk_estimate_is_denser_than_plain_quarter(self, monkeypatch):
|
|
"""CJK text should estimate more tokens than the plain len // 4 heuristic.
|
|
|
|
CJK characters are ~2 chars/token, so the char-based estimate must not
|
|
under-fill the budget the way ``len(text) // 4`` would.
|
|
"""
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.TIKTOKEN_AVAILABLE", False)
|
|
# "User prefers concise answers" rendered in CJK (Chinese) characters.
|
|
text = "\u7528\u6237\u504f\u597d\u7b80\u6d01\u7684\u4e2d\u6587\u56de\u7b54\u5e76\u5173\u6ce8\u91d1\u878d\u9886\u57df"
|
|
result = _count_tokens(text)
|
|
# Each CJK char counts as ~1/2 token (vs 1/4 for the plain heuristic).
|
|
assert result == len(text) // 2
|
|
assert result > len(text) // 4
|
|
|
|
def test_cjk_estimate_combines_cjk_and_non_cjk_characters(self, monkeypatch):
|
|
"""Mixed-language text should apply the CJK density only to CJK chars."""
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.TIKTOKEN_AVAILABLE", False)
|
|
# ASCII words mixed with CJK (Chinese) characters: "User" + "likes" + "Python and data analysis".
|
|
text = "User\u559c\u6b22Python\u548c\u6570\u636e\u5206\u6790"
|
|
cjk = sum(1 for ch in text if "\u4e00" <= ch <= "\u9fff")
|
|
|
|
result = _count_tokens(text)
|
|
|
|
assert result == (len(text) - cjk) // 4 + cjk // 2
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# warm_tiktoken_cache
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestWarmTiktokenCache:
|
|
"""Tests for warm_tiktoken_cache startup helper."""
|
|
|
|
def test_returns_true_on_success(self, monkeypatch):
|
|
_tiktoken_encoding_cache.pop("cl100k_base", None)
|
|
|
|
fake_enc = mock.Mock()
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.tiktoken.get_encoding", mock.Mock(return_value=fake_enc))
|
|
|
|
assert warm_tiktoken_cache() is True
|
|
assert _tiktoken_encoding_cache["cl100k_base"] is fake_enc
|
|
|
|
def test_returns_true_if_already_cached(self, monkeypatch):
|
|
fake_enc = mock.Mock()
|
|
monkeypatch.setitem(_tiktoken_encoding_cache, "cl100k_base", fake_enc)
|
|
|
|
import tiktoken
|
|
|
|
monkeypatch.setattr(tiktoken, "get_encoding", mock.Mock(side_effect=RuntimeError("should not be called")))
|
|
assert warm_tiktoken_cache() is True
|
|
tiktoken.get_encoding.assert_not_called()
|
|
|
|
def test_returns_false_when_tiktoken_unavailable(self, monkeypatch):
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.TIKTOKEN_AVAILABLE", False)
|
|
assert warm_tiktoken_cache() is False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# format_memory_for_injection token_counting strategy
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestFormatMemoryForInjectionTokenCounting:
|
|
"""Verify the use_tiktoken flag is honoured end-to-end."""
|
|
|
|
@staticmethod
|
|
def _sample_memory() -> dict:
|
|
return {
|
|
"facts": [
|
|
{"content": "User prefers concise answers.", "category": "preference", "confidence": 0.9},
|
|
{"content": "User works in the finance domain.", "category": "context", "confidence": 0.8},
|
|
],
|
|
}
|
|
|
|
def test_use_tiktoken_false_never_touches_tiktoken(self, monkeypatch):
|
|
"""With use_tiktoken=False, formatting must not call tiktoken at all."""
|
|
get_encoding_spy = mock.Mock(side_effect=AssertionError("get_encoding must not be called"))
|
|
monkeypatch.setattr("deerflow.agents.memory.backends.deermem.deermem.core.prompt.tiktoken.get_encoding", get_encoding_spy)
|
|
|
|
result = format_memory_for_injection(self._sample_memory(), max_tokens=2000, use_tiktoken=False)
|
|
assert "User prefers concise answers." in result
|
|
get_encoding_spy.assert_not_called()
|
|
|
|
def test_use_tiktoken_true_uses_encoding(self, monkeypatch):
|
|
"""With use_tiktoken=True (default), the cached encoding is used for counting."""
|
|
fake_enc = mock.Mock()
|
|
fake_enc.encode.side_effect = lambda text: list(range(len(text)))
|
|
monkeypatch.setattr(
|
|
"deerflow.agents.memory.backends.deermem.deermem.core.prompt._get_tiktoken_encoding",
|
|
mock.Mock(return_value=fake_enc),
|
|
)
|
|
|
|
result = format_memory_for_injection(self._sample_memory(), max_tokens=2000, use_tiktoken=True)
|
|
assert "User prefers concise answers." in result
|
|
assert fake_enc.encode.called
|
|
|
|
def test_empty_memory_returns_empty(self):
|
|
assert format_memory_for_injection({}, max_tokens=2000, use_tiktoken=False) == ""
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# MemoryConfig.token_counting
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestDeerMemConfigTokenCounting:
|
|
"""Verify DeerMemConfig.token_counting defaults and validation (moved from MemoryConfig in step 11)."""
|
|
|
|
def test_default_is_tiktoken(self):
|
|
from deerflow.agents.memory.backends.deermem.deermem.config import DeerMemConfig
|
|
|
|
assert DeerMemConfig().token_counting == "tiktoken"
|
|
|
|
def test_accepts_char(self):
|
|
from deerflow.agents.memory.backends.deermem.deermem.config import DeerMemConfig
|
|
|
|
assert DeerMemConfig(token_counting="char").token_counting == "char"
|
|
|
|
def test_rejects_invalid_value(self):
|
|
import pytest
|
|
from pydantic import ValidationError
|
|
|
|
from deerflow.agents.memory.backends.deermem.deermem.config import DeerMemConfig
|
|
|
|
with pytest.raises(ValidationError):
|
|
DeerMemConfig(token_counting="invalid")
|