mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-04-25 11:18:22 +00:00
Tail-end of Phase 2: - Migrate ~70 remaining test sites off AppConfig.current(): drop dead monkey-patches (production no longer calls current), hoist the mocked config into a local variable and pass it explicitly. Verified with `grep -rn 'AppConfig\.current' backend/tests` → empty. - Delete the AppConfig.current() classmethod entirely. The transitional raise-only shim is no longer needed now that no test references it. - Update docs: plan marked shipped (P2-6..P2-10 in commit 84dccef2); backend/CLAUDE.md Config Lifecycle rewritten to describe the explicit-parameter design; gateway/deps.py docstrings no longer point at the removed current() surface. AppConfig is now a pure Pydantic value object. Every consumer holds its own captured instance — Gateway (app.state.config via Depends(get_config)), DeerFlowClient (self._app_config), agent runtime (DeerFlowContext.app_config), LangGraph Server bootstrap (AppConfig.from_file() inside make_lead_agent). 2337 non-e2e tests pass.
169 lines
6.9 KiB
Python
169 lines
6.9 KiB
Python
|
|
# --- Phase 2 config-refactor test helper ---
|
|
# Memory APIs now take MemoryConfig / AppConfig explicitly. Tests construct a
|
|
# minimal config once and reuse it across call sites.
|
|
from deerflow.config.app_config import AppConfig as _TestAppConfig
|
|
from deerflow.config.memory_config import MemoryConfig as _TestMemoryConfig
|
|
from deerflow.config.sandbox_config import SandboxConfig as _TestSandboxConfig
|
|
|
|
_TEST_MEMORY_CONFIG = _TestMemoryConfig(enabled=True)
|
|
_TEST_APP_CONFIG = _TestAppConfig(sandbox=_TestSandboxConfig(use="test"), memory=_TEST_MEMORY_CONFIG)
|
|
# -------------------------------------------
|
|
|
|
"""Tests for per-user memory storage isolation."""
|
|
import pytest
|
|
from pathlib import Path
|
|
from unittest.mock import patch
|
|
|
|
from deerflow.agents.memory.storage import FileMemoryStorage, create_empty_memory
|
|
from deerflow.config.app_config import AppConfig
|
|
from deerflow.config.memory_config import MemoryConfig
|
|
from deerflow.config.sandbox_config import SandboxConfig
|
|
|
|
|
|
def _mock_app_config() -> AppConfig:
|
|
"""Build a minimal AppConfig with default (empty) memory storage_path."""
|
|
return AppConfig(sandbox=SandboxConfig(use="test"), memory=MemoryConfig(storage_path=""))
|
|
|
|
|
|
@pytest.fixture
|
|
def base_dir(tmp_path: Path) -> Path:
|
|
return tmp_path
|
|
|
|
|
|
@pytest.fixture
|
|
def storage() -> FileMemoryStorage:
|
|
return FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
|
|
|
|
|
|
|
|
class TestUserIsolatedStorage:
|
|
def test_save_and_load_per_user(self, storage: FileMemoryStorage, base_dir: Path):
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
memory_a = create_empty_memory()
|
|
memory_a["user"]["workContext"]["summary"] = "User A context"
|
|
storage.save(memory_a, user_id="alice")
|
|
|
|
memory_b = create_empty_memory()
|
|
memory_b["user"]["workContext"]["summary"] = "User B context"
|
|
storage.save(memory_b, user_id="bob")
|
|
|
|
loaded_a = storage.load(user_id="alice")
|
|
loaded_b = storage.load(user_id="bob")
|
|
|
|
assert loaded_a["user"]["workContext"]["summary"] == "User A context"
|
|
assert loaded_b["user"]["workContext"]["summary"] == "User B context"
|
|
|
|
def test_user_memory_file_location(self, base_dir: Path):
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
memory = create_empty_memory()
|
|
s.save(memory, user_id="alice")
|
|
expected_path = base_dir / "users" / "alice" / "memory.json"
|
|
assert expected_path.exists()
|
|
|
|
def test_cache_isolated_per_user(self, base_dir: Path):
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
memory_a = create_empty_memory()
|
|
memory_a["user"]["workContext"]["summary"] = "A"
|
|
s.save(memory_a, user_id="alice")
|
|
|
|
memory_b = create_empty_memory()
|
|
memory_b["user"]["workContext"]["summary"] = "B"
|
|
s.save(memory_b, user_id="bob")
|
|
|
|
loaded_a = s.load(user_id="alice")
|
|
assert loaded_a["user"]["workContext"]["summary"] == "A"
|
|
|
|
def test_no_user_id_uses_legacy_path(self, base_dir: Path):
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
memory = create_empty_memory()
|
|
s.save(memory, user_id=None)
|
|
expected_path = base_dir / "memory.json"
|
|
assert expected_path.exists()
|
|
|
|
def test_user_and_legacy_do_not_interfere(self, base_dir: Path):
|
|
"""user_id=None (legacy) and user_id='alice' must use different files and caches."""
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
|
|
legacy_mem = create_empty_memory()
|
|
legacy_mem["user"]["workContext"]["summary"] = "legacy"
|
|
s.save(legacy_mem, user_id=None)
|
|
|
|
user_mem = create_empty_memory()
|
|
user_mem["user"]["workContext"]["summary"] = "alice"
|
|
s.save(user_mem, user_id="alice")
|
|
|
|
assert s.load(user_id=None)["user"]["workContext"]["summary"] == "legacy"
|
|
assert s.load(user_id="alice")["user"]["workContext"]["summary"] == "alice"
|
|
|
|
def test_user_agent_memory_file_location(self, base_dir: Path):
|
|
"""Per-user per-agent memory uses the user_agent_memory_file path."""
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
memory = create_empty_memory()
|
|
memory["user"]["workContext"]["summary"] = "agent scoped"
|
|
s.save(memory, "test-agent", user_id="alice")
|
|
expected_path = base_dir / "users" / "alice" / "agents" / "test-agent" / "memory.json"
|
|
assert expected_path.exists()
|
|
|
|
def test_cache_key_is_user_agent_tuple(self, base_dir: Path):
|
|
"""Cache keys must be (user_id, agent_name) tuples, not bare agent names."""
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
memory = create_empty_memory()
|
|
s.save(memory, user_id="alice")
|
|
# After save, cache should have tuple key
|
|
assert ("alice", None) in s._memory_cache
|
|
|
|
def test_reload_with_user_id(self, base_dir: Path):
|
|
"""reload() with user_id should force re-read from the user-scoped file."""
|
|
from deerflow.config.paths import Paths
|
|
|
|
paths = Paths(base_dir)
|
|
with patch("deerflow.agents.memory.storage.get_paths", return_value=paths):
|
|
s = FileMemoryStorage(_TEST_MEMORY_CONFIG)
|
|
memory = create_empty_memory()
|
|
memory["user"]["workContext"]["summary"] = "initial"
|
|
s.save(memory, user_id="alice")
|
|
|
|
# Load once to prime cache
|
|
s.load(user_id="alice")
|
|
|
|
# Write updated content directly to file
|
|
user_file = base_dir / "users" / "alice" / "memory.json"
|
|
import json
|
|
|
|
updated = create_empty_memory()
|
|
updated["user"]["workContext"]["summary"] = "updated"
|
|
user_file.write_text(json.dumps(updated))
|
|
|
|
# reload should pick up the new content
|
|
reloaded = s.reload(user_id="alice")
|
|
assert reloaded["user"]["workContext"]["summary"] == "updated"
|