sync: 鍚屾灞€鍩熺綉鏈€鏂颁唬鐮?(source master @ b69568e4)
This commit is contained in:
1 parent
4f7f07504a
commit
8bc8b0e082
1651 files changed
+278599
-11416
No files matched your search
+5
-1
@@ -9,13 +9,17 @@ from deerflow.persistence.compact_menu_overrides.keys import (
|
||||
normalize_compact_menu_type,
|
||||
)
|
||||
from deerflow.persistence.compact_menu_overrides.memory import MemoryCompactMenuOverrideStore
|
||||
from deerflow.persistence.compact_menu_overrides.model import CompactMenuOverrideRow
|
||||
from deerflow.persistence.compact_menu_overrides.model import (
|
||||
CompactMenuOverrideRow,
|
||||
UserCompactMenuOverrideConfigRow,
|
||||
)
|
||||
from deerflow.persistence.compact_menu_overrides.sql import CompactMenuOverrideRepository
|
||||
|
||||
__all__ = [
|
||||
"ALLOWED_COMPACT_MENU_TYPES",
|
||||
"CompactMenuOverrideRepository",
|
||||
"CompactMenuOverrideRow",
|
||||
"UserCompactMenuOverrideConfigRow",
|
||||
"CompactMenuOverrideStore",
|
||||
"DEFAULT_COMPACT_MENU_TYPE",
|
||||
"MemoryCompactMenuOverrideStore",
|
||||
|
||||
+24
-1
@@ -1,4 +1,10 @@
|
||||
"""Abstract compact-sidebar menu override persistence API."""
|
||||
"""Abstract compact-sidebar menu override persistence API.
|
||||
|
||||
The regular rows are the administrator's default for a compact-menu variant.
|
||||
Personal layouts live in a separate complete snapshot per user and variant;
|
||||
the router overlays that snapshot while allowing newly-added default node ids
|
||||
to flow through.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -22,3 +28,20 @@ class CompactMenuOverrideStore(ABC):
|
||||
) -> list[dict[str, Any]]:
|
||||
"""Atomically replace the compact-menu override set for one type."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def list_user_overrides(self, user_id: str, menu_type: str | None = None) -> list[dict[str, Any]] | None:
|
||||
"""Return one user's snapshot for a type, or ``None`` if absent."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def replace_user_overrides(
|
||||
self,
|
||||
user_id: str,
|
||||
rows: list[dict[str, Any]],
|
||||
*,
|
||||
menu_type: str | None = None,
|
||||
updated_by: str | None = None,
|
||||
) -> list[dict[str, Any]] | None:
|
||||
"""Replace one user's snapshot; an empty list resets to defaults."""
|
||||
raise NotImplementedError
|
||||
+34
@@ -38,6 +38,7 @@ def _public(row: dict[str, Any]) -> dict[str, Any]:
|
||||
class MemoryCompactMenuOverrideStore(CompactMenuOverrideStore):
|
||||
def __init__(self) -> None:
|
||||
self._rows: dict[str, dict[str, Any]] = {}
|
||||
self._user_rows: dict[tuple[str, str], list[dict[str, Any]]] = {}
|
||||
|
||||
async def list_overrides(self, menu_type: str | None = None) -> list[dict[str, Any]]:
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
@@ -62,3 +63,36 @@ class MemoryCompactMenuOverrideStore(CompactMenuOverrideStore):
|
||||
stored = _normalize(r, t, updated_by)
|
||||
self._rows[str(stored["node_id"])] = stored
|
||||
return await self.list_overrides(t)
|
||||
|
||||
async def list_user_overrides(self, user_id: str, menu_type: str | None = None) -> list[dict[str, Any]] | None:
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
rows = self._user_rows.get((str(user_id), t))
|
||||
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]],
|
||||
*,
|
||||
menu_type: str | None = None,
|
||||
updated_by: str | None = None,
|
||||
) -> list[dict[str, Any]] | None:
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
key = (str(user_id), t)
|
||||
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 not node_id:
|
||||
continue
|
||||
stored = _normalize(row, t, updated_by or str(user_id))
|
||||
# Expose the public id in a personal document just like the API.
|
||||
public = _public(stored)
|
||||
by_id[str(public["node_id"])] = public
|
||||
if not by_id:
|
||||
self._user_rows.pop(key, None)
|
||||
return None
|
||||
self._user_rows[key] = [dict(r) for r in by_id.values()]
|
||||
return [dict(r) for r in self._user_rows[key]]
|
||||
+15
-1
@@ -12,7 +12,7 @@ from sqlalchemy import Index, 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 CompactMenuOverrideRow(Base):
|
||||
@@ -28,3 +28,17 @@ class CompactMenuOverrideRow(Base):
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
BeijingDateTime(), default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC)
|
||||
)
|
||||
|
||||
|
||||
class UserCompactMenuOverrideConfigRow(Base):
|
||||
"""A user's complete snapshot for one compact-menu variant."""
|
||||
|
||||
__tablename__ = "user_compact_menu_override_configs"
|
||||
|
||||
user_id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
menu_type: Mapped[str] = mapped_column(String(32), 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)
|
||||
)
|
||||
+88
-2
@@ -2,7 +2,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import delete, or_, select
|
||||
@@ -15,7 +15,10 @@ from deerflow.persistence.compact_menu_overrides.keys import (
|
||||
public_node_id,
|
||||
storage_node_id,
|
||||
)
|
||||
from deerflow.persistence.compact_menu_overrides.model import CompactMenuOverrideRow
|
||||
from deerflow.persistence.compact_menu_overrides.model import (
|
||||
CompactMenuOverrideRow,
|
||||
UserCompactMenuOverrideConfigRow,
|
||||
)
|
||||
|
||||
|
||||
def _to_dict(row: CompactMenuOverrideRow) -> dict[str, Any]:
|
||||
@@ -42,6 +45,41 @@ def _row_from(data: dict[str, Any], menu_type: str, updated_by: str | None) -> C
|
||||
)
|
||||
|
||||
|
||||
def _normalize_user_row(data: dict[str, Any], menu_type: str) -> dict[str, Any]:
|
||||
placement = str(data.get("placement") or "sidebar")
|
||||
return {
|
||||
"node_id": public_node_id(str(data["node_id"]), menu_type),
|
||||
"menu_type": menu_type,
|
||||
"placement": placement if placement in {"sidebar", "settings", "toolbox"} else "sidebar",
|
||||
"sort_order": int(data.get("sort_order", 0)),
|
||||
"label": (data.get("label") or None),
|
||||
}
|
||||
|
||||
|
||||
def _user_rows(row: UserCompactMenuOverrideConfigRow) -> list[dict[str, Any]]:
|
||||
value = row.overrides
|
||||
if isinstance(value, str):
|
||||
import json
|
||||
|
||||
try:
|
||||
value = json.loads(value)
|
||||
except (TypeError, ValueError):
|
||||
value = []
|
||||
if not isinstance(value, list):
|
||||
value = []
|
||||
menu_type = normalize_compact_menu_type(row.menu_type)
|
||||
updated_at = row.updated_at.isoformat() if isinstance(row.updated_at, datetime) else row.updated_at
|
||||
return [
|
||||
{
|
||||
**_normalize_user_row(item, menu_type),
|
||||
"updated_by": row.updated_by,
|
||||
"updated_at": updated_at,
|
||||
}
|
||||
for item in value
|
||||
if isinstance(item, dict) and item.get("node_id")
|
||||
]
|
||||
|
||||
|
||||
class CompactMenuOverrideRepository(CompactMenuOverrideStore):
|
||||
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
||||
self._sf = session_factory
|
||||
@@ -76,6 +114,54 @@ class CompactMenuOverrideRepository(CompactMenuOverrideStore):
|
||||
await session.refresh(row)
|
||||
return [_to_dict(row) for row in new_rows]
|
||||
|
||||
async def list_user_overrides(self, user_id: str, menu_type: str | None = None) -> list[dict[str, Any]] | None:
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
async with self._sf() as session:
|
||||
row = await session.get(UserCompactMenuOverrideConfigRow, (str(user_id), t))
|
||||
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]],
|
||||
*,
|
||||
menu_type: str | None = None,
|
||||
updated_by: str | None = None,
|
||||
) -> list[dict[str, Any]] | None:
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
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, t)
|
||||
by_id[normalized["node_id"]] = normalized
|
||||
async with self._sf() as session:
|
||||
row = await session.get(UserCompactMenuOverrideConfigRow, (key, t))
|
||||
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 = UserCompactMenuOverrideConfigRow(
|
||||
user_id=key,
|
||||
menu_type=t,
|
||||
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()
|
||||
# ``expire_on_commit=False`` keeps this writer-side row usable and
|
||||
# avoids a replica-lag-prone post-commit refresh.
|
||||
return _user_rows(row)
|
||||
|
||||
|
||||
def _menu_type_filter(menu_type: str):
|
||||
if menu_type == DEFAULT_COMPACT_MENU_TYPE:
|
||||
|
||||
Reference in new issue
Block a user