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

@@ -4,13 +4,14 @@ from __future__ import annotations
from deerflow.persistence.menu_overrides.base import MenuOverrideStore
from deerflow.persistence.menu_overrides.memory import MemoryMenuOverrideStore
from deerflow.persistence.menu_overrides.model import MenuOverrideRow
from deerflow.persistence.menu_overrides.model import MenuOverrideRow, UserMenuOverrideConfigRow
from deerflow.persistence.menu_overrides.sql import MenuOverrideRepository
__all__ = [
"MemoryMenuOverrideStore",
"MenuOverrideRepository",
"MenuOverrideRow",
"UserMenuOverrideConfigRow",
"MenuOverrideStore",
"make_menu_override_store",
]
@@ -1,11 +1,11 @@
"""Abstract sidebar-menu override persistence API.
Global / shared store: no ``user_id`` scoping. Reads are open to any caller; the
router gates writes behind admin. ``updated_by`` is audit-only.
The whole override set is treated as one document: the editor computes the full
desired layout and replaces every row atomically via :meth:`replace_all`, so the
stored set never drifts out of sync with what the admin sees.
The original ``menu_overrides`` document remains the administrator's default
layout. User layouts are stored as a separate, complete snapshot so that a
user can customise the menu without changing the default for anybody else.
The router overlays a user's snapshot on top of the default and lets default
rows for node ids not present in that snapshot flow through (new administrator
menus therefore appear for existing users).
"""
from __future__ import annotations
@@ -28,3 +28,24 @@ class MenuOverrideStore(ABC):
Returns the persisted rows.
"""
raise NotImplementedError
@abstractmethod
async def list_user_overrides(self, user_id: str) -> list[dict[str, Any]] | None:
"""Return one user's snapshot, or ``None`` when no snapshot exists."""
raise NotImplementedError
@abstractmethod
async def replace_user_overrides(
self,
user_id: str,
rows: list[dict[str, Any]],
*,
updated_by: str | None = None,
) -> list[dict[str, Any]] | None:
"""Replace one user's snapshot.
An empty list removes the snapshot and returns ``None``. This is the
reset-to-default operation and intentionally differs from the admin
``replace_all`` document, where an empty list means an empty default.
"""
raise NotImplementedError
@@ -23,6 +23,7 @@ def _normalize(data: dict[str, Any], updated_by: str | None) -> dict[str, Any]:
class MemoryMenuOverrideStore(MenuOverrideStore):
def __init__(self) -> None:
self._rows: dict[str, dict[str, Any]] = {}
self._user_rows: dict[str, list[dict[str, Any]]] = {}
async def list_overrides(self) -> list[dict[str, Any]]:
return [dict(r) for r in sorted(self._rows.values(), key=lambda r: r.get("sort_order", 0))]
@@ -35,3 +36,29 @@ class MemoryMenuOverrideStore(MenuOverrideStore):
continue
self._rows[str(node_id)] = _normalize(r, updated_by)
return [dict(r) for r in self._rows.values()]
async def list_user_overrides(self, user_id: str) -> list[dict[str, Any]] | None:
rows = self._user_rows.get(str(user_id))
return [dict(r) for r in rows] if rows is not None else None
async def replace_user_overrides(
self,
user_id: str,
rows: list[dict[str, Any]],
*,
updated_by: str | None = None,
) -> list[dict[str, Any]] | None:
key = str(user_id)
if not rows:
self._user_rows.pop(key, None)
return None
by_id: dict[str, dict[str, Any]] = {}
for row in rows:
node_id = row.get("node_id")
if node_id:
by_id[str(node_id)] = _normalize(row, updated_by or key)
if not by_id:
self._user_rows.pop(key, None)
return None
self._user_rows[key] = [dict(row) for row in by_id.values()]
return [dict(row) for row in self._user_rows[key]]
@@ -1,9 +1,10 @@
"""ORM model for sidebar-menu overrides (菜单管理).
Global / shared — there is no ``user_id`` scoping; every account sees the same
menu layout. The static menu tree (icons / routes / adminOnly) lives in the
frontend code; this table only stores per-node **overrides** keyed by the static
node id (or an injected iframe light-app node id ``light-app-<appId>``):
``menu_overrides`` stores the administrator's shared default. Personal layouts
live separately in ``user_menu_override_configs`` as complete snapshots. The
static menu tree (icons / routes / adminOnly) lives in the frontend code; the
default table stores per-node **overrides** keyed by the static node id (or an
injected iframe light-app node id ``light-app-<appId>``):
- ``parent_id`` — the effective parent node id (NULL = top level). Re-parenting
a node moves its whole subtree.
@@ -23,7 +24,7 @@ from sqlalchemy import Boolean, Integer, String
from sqlalchemy.orm import Mapped, mapped_column
from deerflow.persistence.base import Base
from deerflow.persistence.types import BeijingDateTime
from deerflow.persistence.types import BeijingDateTime, PortableJSON
class MenuOverrideRow(Base):
@@ -40,3 +41,22 @@ class MenuOverrideRow(Base):
updated_at: Mapped[datetime] = mapped_column(
BeijingDateTime(), default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC)
)
class UserMenuOverrideConfigRow(Base):
"""A complete personal sidebar-menu snapshot.
Keeping the snapshot in one row is deliberate: the presence of a row is
the ``has_user_override`` bit, while the node ids in ``overrides`` are the
user's known-node set. This lets us distinguish an administrator-added
node from an old node the user intentionally left at its default value.
"""
__tablename__ = "user_menu_override_configs"
user_id: Mapped[str] = mapped_column(String(64), primary_key=True)
overrides: Mapped[list[dict]] = mapped_column(PortableJSON(), nullable=False, default=list)
updated_by: Mapped[str | None] = mapped_column(String(64))
updated_at: Mapped[datetime] = mapped_column(
BeijingDateTime(), default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC)
)
@@ -2,14 +2,14 @@
from __future__ import annotations
from datetime import datetime
from datetime import UTC, datetime
from typing import Any
from sqlalchemy import delete, select
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
from deerflow.persistence.menu_overrides.base import MenuOverrideStore
from deerflow.persistence.menu_overrides.model import MenuOverrideRow
from deerflow.persistence.menu_overrides.model import MenuOverrideRow, UserMenuOverrideConfigRow
def _to_dict(row: MenuOverrideRow) -> dict[str, Any]:
@@ -31,6 +31,42 @@ def _row_from(data: dict[str, Any], updated_by: str | None) -> MenuOverrideRow:
)
def _normalize_user_row(data: dict[str, Any]) -> dict[str, Any]:
"""Keep only the public override fields in the personal JSON document."""
return {
"node_id": str(data["node_id"]),
"parent_id": (str(data["parent_id"]) if data.get("parent_id") not in (None, "") else None),
"sort_order": int(data.get("sort_order", 0)),
"label": (data.get("label") or None),
"disabled": bool(data.get("disabled", False)),
}
def _user_rows(row: UserMenuOverrideConfigRow) -> list[dict[str, Any]]:
value = row.overrides
if isinstance(value, str):
# PortableJSON handles MySQL automatically, but this keeps old rows
# readable if a driver returned the raw TEXT value.
import json
try:
value = json.loads(value)
except (TypeError, ValueError):
value = []
if not isinstance(value, list):
value = []
updated_at = row.updated_at.isoformat() if isinstance(row.updated_at, datetime) else row.updated_at
return [
{
**_normalize_user_row(item),
"updated_by": row.updated_by,
"updated_at": updated_at,
}
for item in value
if isinstance(item, dict) and item.get("node_id")
]
class MenuOverrideRepository(MenuOverrideStore):
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
self._sf = session_factory
@@ -56,3 +92,49 @@ class MenuOverrideRepository(MenuOverrideStore):
for row in new_rows:
await session.refresh(row)
return [_to_dict(row) for row in new_rows]
async def list_user_overrides(self, user_id: str) -> list[dict[str, Any]] | None:
async with self._sf() as session:
row = await session.get(UserMenuOverrideConfigRow, str(user_id))
return _user_rows(row) if row is not None else None
async def replace_user_overrides(
self,
user_id: str,
rows: list[dict[str, Any]],
*,
updated_by: str | None = None,
) -> list[dict[str, Any]] | None:
key = str(user_id)
by_id: dict[str, dict[str, Any]] = {}
for data in rows:
node_id = data.get("node_id")
if node_id:
normalized = _normalize_user_row(data)
by_id[normalized["node_id"]] = normalized
async with self._sf() as session:
row = await session.get(UserMenuOverrideConfigRow, key)
if not by_id:
if row is not None:
await session.delete(row)
await session.commit()
return None
now = datetime.now(UTC)
payload = list(by_id.values())
if row is None:
row = UserMenuOverrideConfigRow(
user_id=key,
overrides=payload,
updated_by=updated_by or key,
)
session.add(row)
else:
row.overrides = payload
row.updated_by = updated_by or key
row.updated_at = now
await session.commit()
# The shared session factory uses ``expire_on_commit=False``. Build
# the response from the writer-side instance instead of issuing a
# post-commit refresh that a read/write-splitting endpoint could
# route to a lagging replica.
return _user_rows(row)