sync update from LAN repo (source dhk-1 @ 3e87be55)
This commit is contained in:
1 parent
ab6068a7c1
commit
42f2a26fa8
1482 files changed
+227759
-9584
No files matched your search
@@ -1,10 +1,11 @@
|
||||
"""Compact/sidebar-summary menu override API.
|
||||
|
||||
Routes (prefix ``/api/compact-menu-overrides``):
|
||||
GET "" list compact-menu overrides.
|
||||
GET "" read effective/default/personal compact-menu overrides.
|
||||
``menu_type`` omitted / empty → type A (original legacy data).
|
||||
PUT "" replace that type's override set (admin).
|
||||
PUT "" replace that type in the caller's editable scope.
|
||||
``menu_type`` omitted / empty → type A, does not wipe type B.
|
||||
DELETE "" reset that type in the caller's editable scope.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -15,7 +16,8 @@ from typing import Literal
|
||||
from fastapi import APIRouter, HTTPException, Query, Request
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from app.gateway.deps import get_current_user, get_optional_user_from_request
|
||||
from app.gateway.auth.disabled_mode import is_auth_disabled
|
||||
from app.gateway.deps import get_optional_user_from_request
|
||||
from deerflow.persistence.compact_menu_overrides import (
|
||||
DEFAULT_COMPACT_MENU_TYPE,
|
||||
CompactMenuOverrideStore,
|
||||
@@ -41,6 +43,10 @@ class CompactMenuOverrideResponse(CompactMenuOverride):
|
||||
class CompactMenuOverrideListResponse(BaseModel):
|
||||
menu_type: str = DEFAULT_COMPACT_MENU_TYPE
|
||||
overrides: list[CompactMenuOverrideResponse]
|
||||
default_overrides: list[CompactMenuOverrideResponse] = Field(default_factory=list)
|
||||
user_overrides: list[CompactMenuOverrideResponse] = Field(default_factory=list)
|
||||
has_user_override: bool = False
|
||||
editable_scope: Literal["default", "user"] = "default"
|
||||
|
||||
|
||||
class CompactMenuOverrideReplaceRequest(BaseModel):
|
||||
@@ -59,12 +65,62 @@ def _get_store(request: Request) -> CompactMenuOverrideStore:
|
||||
return store
|
||||
|
||||
|
||||
async def _require_admin(request: Request) -> None:
|
||||
async def _actor(request: Request) -> tuple[str | None, bool]:
|
||||
"""Return ``(user_id, is_admin)`` while preserving auth-disabled mode."""
|
||||
user = await get_optional_user_from_request(request)
|
||||
if user is None:
|
||||
return
|
||||
if getattr(user, "system_role", None) != "admin":
|
||||
raise HTTPException(status_code=403, detail="简介菜单管理仅限管理员")
|
||||
if is_auth_disabled():
|
||||
return None, True
|
||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||
return str(user.id), getattr(user, "system_role", None) == "admin"
|
||||
|
||||
|
||||
def _merge_overrides(default_rows: list[dict], user_rows: list[dict] | None) -> list[dict]:
|
||||
"""Overlay personal rows and retain administrator rows for new nodes."""
|
||||
if user_rows is None:
|
||||
return [dict(row) for row in default_rows]
|
||||
merged: list[dict] = []
|
||||
seen: set[str] = set()
|
||||
for row in user_rows:
|
||||
node_id = str(row.get("node_id") or "")
|
||||
if not node_id or node_id in seen:
|
||||
continue
|
||||
merged.append(dict(row))
|
||||
seen.add(node_id)
|
||||
for row in default_rows:
|
||||
node_id = str(row.get("node_id") or "")
|
||||
if node_id and node_id not in seen:
|
||||
merged.append(dict(row))
|
||||
seen.add(node_id)
|
||||
return merged
|
||||
|
||||
|
||||
async def _read_response(
|
||||
request: Request,
|
||||
store: CompactMenuOverrideStore,
|
||||
menu_type: str,
|
||||
) -> CompactMenuOverrideListResponse:
|
||||
default_rows = await store.list_overrides(menu_type)
|
||||
user_id, is_admin = await _actor(request)
|
||||
if is_admin or user_id is None:
|
||||
return CompactMenuOverrideListResponse(
|
||||
menu_type=menu_type,
|
||||
overrides=[CompactMenuOverrideResponse(**row) for row in default_rows],
|
||||
default_overrides=[CompactMenuOverrideResponse(**row) for row in default_rows],
|
||||
user_overrides=[],
|
||||
has_user_override=False,
|
||||
editable_scope="default",
|
||||
)
|
||||
user_rows = await store.list_user_overrides(user_id, menu_type)
|
||||
effective = _merge_overrides(default_rows, user_rows)
|
||||
return CompactMenuOverrideListResponse(
|
||||
menu_type=menu_type,
|
||||
overrides=[CompactMenuOverrideResponse(**row) for row in effective],
|
||||
default_overrides=[CompactMenuOverrideResponse(**row) for row in default_rows],
|
||||
user_overrides=[CompactMenuOverrideResponse(**row) for row in (user_rows or [])],
|
||||
has_user_override=user_rows is not None,
|
||||
editable_scope="user",
|
||||
)
|
||||
|
||||
|
||||
@router.get("", response_model=CompactMenuOverrideListResponse)
|
||||
@@ -78,11 +134,7 @@ async def list_compact_menu_overrides(
|
||||
) -> CompactMenuOverrideListResponse:
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
store = _get_store(request)
|
||||
rows = await store.list_overrides(t)
|
||||
return CompactMenuOverrideListResponse(
|
||||
menu_type=t,
|
||||
overrides=[CompactMenuOverrideResponse(**r) for r in rows],
|
||||
)
|
||||
return await _read_response(request, store, t)
|
||||
|
||||
|
||||
@router.put("", response_model=CompactMenuOverrideListResponse)
|
||||
@@ -90,16 +142,28 @@ async def replace_compact_menu_overrides(
|
||||
request: Request,
|
||||
body: CompactMenuOverrideReplaceRequest,
|
||||
) -> CompactMenuOverrideListResponse:
|
||||
await _require_admin(request)
|
||||
t = normalize_compact_menu_type(body.menu_type)
|
||||
store = _get_store(request)
|
||||
user_id = await get_current_user(request)
|
||||
rows = await store.replace_all(
|
||||
[o.model_dump() for o in body.overrides],
|
||||
menu_type=t,
|
||||
updated_by=user_id,
|
||||
)
|
||||
return CompactMenuOverrideListResponse(
|
||||
menu_type=t,
|
||||
overrides=[CompactMenuOverrideResponse(**r) for r in rows],
|
||||
)
|
||||
user_id, is_admin = await _actor(request)
|
||||
payload = [o.model_dump() for o in body.overrides]
|
||||
if is_admin or user_id is None:
|
||||
await store.replace_all(payload, menu_type=t, updated_by=user_id)
|
||||
else:
|
||||
await store.replace_user_overrides(user_id, payload, menu_type=t, updated_by=user_id)
|
||||
return await _read_response(request, store, t)
|
||||
|
||||
|
||||
@router.delete("", response_model=CompactMenuOverrideListResponse)
|
||||
async def reset_compact_menu_overrides(
|
||||
request: Request,
|
||||
menu_type: str | None = Query(default=None, max_length=32),
|
||||
) -> CompactMenuOverrideListResponse:
|
||||
"""Clear the caller's personal compact layout for one variant."""
|
||||
t = normalize_compact_menu_type(menu_type)
|
||||
store = _get_store(request)
|
||||
user_id, is_admin = await _actor(request)
|
||||
if is_admin or user_id is None:
|
||||
await store.replace_all([], menu_type=t, updated_by=user_id)
|
||||
else:
|
||||
await store.replace_user_overrides(user_id, [], menu_type=t, updated_by=user_id)
|
||||
return await _read_response(request, store, t)
|
||||
Reference in new issue
Block a user