Merge remote-tracking branch 'origin/master' into ji

# Conflicts:
#	frontend-web/src/core/page-layout/sidebar-menu.ts
#	frontend-web/src/core/system-settings/api.ts
#	frontend-web/src/core/system-settings/hooks.ts
#	frontend-web/src/strategy-components/Header.tsx
#	offline-backend-20260512/backend/CLAUDE.md
#	offline-backend-20260512/backend/app/gateway/routers/system_settings.py
#	offline-backend-20260512/backend/packages/harness/deerflow/config/system_settings.py
#	offline-backend-20260512/backend/scripts/sql/column_additions_mysql.sql
This commit is contained in:
Administrator committed 2026-06-16 20:01:42 +08:00
commit b380575f16
103 files changed
+5915 -859

No files matched your search

@@ -0,0 +1,60 @@
"""Tests for the admin-configured「按类型聚合」module → agent-tag config.
Backs the zzJC / zzXD module left sidebar (需求 0616 #3/#4): an admin picks
which agent tags belong to the module, persisted in ``system_settings.json``.
"""
from __future__ import annotations
import json
from pathlib import Path
import pytest
from deerflow.config import system_settings as ss
@pytest.fixture
def tmp_runtime_home(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> Path:
"""Redirect ``runtime_home()`` to a per-test tmp dir."""
def fake_home() -> Path:
return tmp_path
monkeypatch.setattr(ss, "runtime_home", fake_home)
return tmp_path
def test_load_returns_empty_modules_when_missing(tmp_runtime_home: Path) -> None:
settings = ss.load_system_settings()
assert settings.agent_modules.modules == {}
assert ss.get_module_tag_ids(settings.agent_modules, "zzjc") == []
def test_set_module_tag_ids_dedupes_and_strips() -> None:
base = ss.AgentModuleSettings()
updated = ss.set_module_tag_ids(base, "zzjc", [" t1 ", "t2", "t1", "", " "])
assert updated.modules["zzjc"] == ["t1", "t2"]
# Original is untouched (returns a copy).
assert base.modules == {}
def test_set_module_tag_ids_keeps_other_modules() -> None:
base = ss.set_module_tag_ids(ss.AgentModuleSettings(), "zzjc", ["t1"])
both = ss.set_module_tag_ids(base, "zzxd", ["t2", "t3"])
assert ss.get_module_tag_ids(both, "zzjc") == ["t1"]
assert ss.get_module_tag_ids(both, "zzxd") == ["t2", "t3"]
def test_save_then_load_roundtrips(tmp_runtime_home: Path) -> None:
current = ss.load_system_settings()
updated = ss.set_module_tag_ids(current.agent_modules, "zzjc", ["tag-a", "tag-b"])
ss.save_system_settings(current.model_copy(update={"agent_modules": updated}))
file_path = tmp_runtime_home / "system_settings.json"
assert file_path.is_file()
saved = json.loads(file_path.read_text(encoding="utf-8"))
assert saved["agent_modules"]["modules"]["zzjc"] == ["tag-a", "tag-b"]
reloaded = ss.load_system_settings()
assert ss.get_module_tag_ids(reloaded.agent_modules, "zzjc") == ["tag-a", "tag-b"]
@@ -0,0 +1,124 @@
"""Tests for the research-template store (课题研究模板,需求 0616 #5).
A research template bundles writing-form presets (article type / outline /
material source / word count / audience / strict mode / topic) for one-click
pre-fill. Covers create (with defaults) / list ordering / get / partial update /
delete.
"""
from __future__ import annotations
import pytest
import pytest_asyncio
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
from deerflow.persistence.base import Base
from deerflow.persistence.research_templates import ResearchTemplateRepository
@pytest_asyncio.fixture
async def store(tmp_path):
engine = create_async_engine(f"sqlite+aiosqlite:///{tmp_path / 'rt.db'}")
async with engine.begin() as conn:
import deerflow.persistence.research_templates.model # noqa: F401
await conn.run_sync(Base.metadata.create_all)
sf = async_sessionmaker(engine, expire_on_commit=False)
return ResearchTemplateRepository(sf)
@pytest.mark.asyncio
async def test_create_applies_defaults(store: ResearchTemplateRepository):
row = await store.create(name="深度分析模板")
assert row["name"] == "深度分析模板"
assert row["material_source"] == "general"
assert row["word_count"] == 800
assert row["strict_mode"] is False
assert row["article_type_key"] is None
assert row["id"]
@pytest.mark.asyncio
async def test_create_full_then_get_roundtrips(store: ResearchTemplateRepository):
created = await store.create(
name="舆情研究",
description="围绕舆情的研究模板",
article_type_key="analysis",
outline="一、背景\n二、分析\n三、结论",
material_source="notebook",
word_count=1500,
audience="决策者",
strict_mode=True,
topic="某品牌近期舆情",
sort_order=2,
)
fetched = await store.get(created["id"])
assert fetched is not None
assert fetched["article_type_key"] == "analysis"
assert fetched["outline"].startswith("一、背景")
assert fetched["material_source"] == "notebook"
assert fetched["word_count"] == 1500
assert fetched["audience"] == "决策者"
assert fetched["strict_mode"] is True
assert fetched["topic"] == "某品牌近期舆情"
@pytest.mark.asyncio
async def test_list_orders_by_sort_order(store: ResearchTemplateRepository):
await store.create(name="B", sort_order=2)
await store.create(name="A", sort_order=1)
rows = await store.list()
assert [r["name"] for r in rows] == ["A", "B"]
@pytest.mark.asyncio
async def test_update_partial_keeps_other_fields(store: ResearchTemplateRepository):
created = await store.create(name="模板", word_count=800, strict_mode=False)
updated = await store.update(created["id"], word_count=2000, strict_mode=True)
assert updated is not None
assert updated["word_count"] == 2000
assert updated["strict_mode"] is True
assert updated["name"] == "模板" # untouched
@pytest.mark.asyncio
async def test_update_missing_returns_none(store: ResearchTemplateRepository):
assert await store.update("nope", name="x") is None
@pytest.mark.asyncio
async def test_delete(store: ResearchTemplateRepository):
created = await store.create(name="待删")
assert await store.delete(created["id"]) is True
assert await store.get(created["id"]) is None
assert await store.delete(created["id"]) is False
@pytest.mark.asyncio
async def test_seed_defaults_inserts_builtins_when_empty(store: ResearchTemplateRepository):
inserted = await store.seed_defaults()
assert inserted == 3
rows = await store.list()
names = [r["name"] for r in rows]
assert names == ["网摘", "周报", "要讯"] # sort_order 0/1/2
# 内置模板内容完整(范例质量)。
by_name = {r["name"]: r for r in rows}
assert by_name["网摘"]["article_type_key"] == "news"
assert by_name["周报"]["strict_mode"] is True
assert by_name["要讯"]["outline"]
assert all(r["topic"] for r in rows)
@pytest.mark.asyncio
async def test_seed_defaults_is_idempotent(store: ResearchTemplateRepository):
assert await store.seed_defaults() == 3
# 已有模板 → 再次播种跳过,不重复、不覆盖。
assert await store.seed_defaults() == 0
assert len(await store.list()) == 3
@pytest.mark.asyncio
async def test_seed_defaults_skips_when_user_has_templates(store: ResearchTemplateRepository):
await store.create(name="用户自建")
assert await store.seed_defaults() == 0
assert [r["name"] for r in await store.list()] == ["用户自建"]