sync: 鍚屾灞€鍩熺綉鏈€鏂颁唬鐮?(source master @ b69568e4)

This commit is contained in:
gozeros committed 2026-10-21 14:51:31 +08:00
1 parent 4f7f07504a
commit 8bc8b0e082
1651 files changed
+278599 -11416

No files matched your search

@@ -6,10 +6,14 @@ keep independent left-nav layouts. Saving type B must not wipe type A.
from __future__ import annotations
from types import SimpleNamespace
import pytest
import pytest_asyncio
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
from app.gateway.routers import compact_menu_overrides as compact_router
from app.gateway.routers.compact_menu_overrides import _merge_overrides
from deerflow.persistence.base import Base
from deerflow.persistence.compact_menu_overrides import (
CompactMenuOverrideRepository,
@@ -154,3 +158,73 @@ async def test_memory_store_parity():
assert b_rows[0]["placement"] == "settings"
a_ids = {r["node_id"] for r in await mem.list_overrides("A")}
assert a_ids == {"y"}
@pytest.mark.asyncio
async def test_personal_compact_snapshots_are_isolated_by_user_and_type(store: CompactMenuOverrideRepository):
await store.replace_user_overrides(
"user-1",
[{"node_id": "chat", "placement": "toolbox", "sort_order": 0, "label": "我的对话"}],
menu_type="A",
updated_by="user-1",
)
await store.replace_user_overrides(
"user-1",
[{"node_id": "chat", "placement": "settings", "sort_order": 0, "label": "B 对话"}],
menu_type="B",
updated_by="user-1",
)
assert (await store.list_user_overrides("user-1", "A"))[0]["placement"] == "toolbox"
assert (await store.list_user_overrides("user-1", "B"))[0]["placement"] == "settings"
assert await store.list_user_overrides("user-2", "A") is None
assert await store.replace_user_overrides("user-1", [], menu_type="A") is None
assert await store.list_user_overrides("user-1", "A") is None
assert (await store.list_user_overrides("user-1", "B"))[0]["label"] == "B 对话"
def test_personal_compact_nodes_win_while_new_default_nodes_flow_through():
default_rows = [
{"node_id": "existing", "placement": "settings", "sort_order": 0, "label": "管理员名称"},
{"node_id": "new", "placement": "toolbox", "sort_order": 1, "label": "新增菜单"},
]
personal_rows = [
{"node_id": "existing", "placement": "sidebar", "sort_order": 3, "label": "我的名称"},
]
merged = {row["node_id"]: row for row in _merge_overrides(default_rows, personal_rows)}
assert merged["existing"]["label"] == "我的名称"
assert merged["existing"]["placement"] == "sidebar"
assert merged["new"]["label"] == "新增菜单"
@pytest.mark.asyncio
async def test_user_compact_put_does_not_replace_admin_default(monkeypatch):
store = MemoryCompactMenuOverrideStore()
await store.replace_all(
[{"node_id": "chat", "placement": "settings", "sort_order": 0, "label": "默认对话"}],
menu_type="A",
updated_by="admin-1",
)
request = SimpleNamespace(app=SimpleNamespace(state=SimpleNamespace(compact_menu_override_store=store)))
async def current_user(_request):
return SimpleNamespace(id="user-1", system_role="user")
monkeypatch.setattr(compact_router, "get_optional_user_from_request", current_user)
body = compact_router.CompactMenuOverrideReplaceRequest(
menu_type="A",
overrides=[
compact_router.CompactMenuOverride(
node_id="chat",
placement="toolbox",
sort_order=0,
label="我的对话",
)
],
)
saved = await compact_router.replace_compact_menu_overrides(request, body)
assert saved.editable_scope == "user"
assert saved.overrides[0].placement == "toolbox"
assert (await store.list_overrides("A"))[0]["placement"] == "settings"