sync snapshot from LAN repo (source codex/merge-tjlnew-classic-retrieval-20261019 @ ded012d9)
This commit is contained in:
1 parent
ea9dcff9c0
commit
c753e6c9b5
818 files changed
+14037
-108991
No files matched your search
@@ -29,7 +29,6 @@ from fastapi import APIRouter, HTTPException, Request
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from app.gateway.auth.disabled_mode import is_auth_disabled
|
||||
from app.gateway.catalog_cache import cached_catalog, catalog_key, invalidate_catalog
|
||||
from app.gateway.deps import get_optional_user_from_request
|
||||
from deerflow.persistence.menu_overrides import MenuOverrideStore
|
||||
|
||||
@@ -117,11 +116,9 @@ def _merge_overrides(default_rows: list[dict], user_rows: list[dict] | None) ->
|
||||
return merged
|
||||
|
||||
|
||||
async def _read_response(
|
||||
request: Request, store: MenuOverrideStore, *, actor: tuple[str | None, bool] | None = None,
|
||||
) -> MenuOverrideListResponse:
|
||||
user_id, is_admin = actor if actor is not None else await _actor(request)
|
||||
async def _read_response(request: Request, store: MenuOverrideStore) -> MenuOverrideListResponse:
|
||||
default_rows = await store.list_overrides()
|
||||
user_id, is_admin = await _actor(request)
|
||||
if is_admin or user_id is None:
|
||||
return MenuOverrideListResponse(
|
||||
overrides=[MenuOverrideResponse(**row) for row in default_rows],
|
||||
@@ -194,12 +191,8 @@ def _validate_depth(
|
||||
|
||||
@router.get("", response_model=MenuOverrideListResponse)
|
||||
async def list_menu_overrides(request: Request) -> MenuOverrideListResponse:
|
||||
actor = await _actor(request)
|
||||
store = _get_store(request)
|
||||
return await cached_catalog(
|
||||
request, "menu_overrides", catalog_key(*actor),
|
||||
lambda: _read_response(request, store, actor=actor), MenuOverrideListResponse,
|
||||
)
|
||||
return await _read_response(request, store)
|
||||
|
||||
|
||||
@router.put("", response_model=MenuOverrideListResponse)
|
||||
@@ -221,7 +214,6 @@ async def replace_menu_overrides(request: Request, body: MenuOverrideReplaceRequ
|
||||
await store.replace_all(payload, updated_by=user_id)
|
||||
else:
|
||||
await store.replace_user_overrides(user_id, payload, updated_by=user_id)
|
||||
await invalidate_catalog(request, "menu_overrides")
|
||||
return await _read_response(request, store)
|
||||
|
||||
|
||||
@@ -234,5 +226,4 @@ async def reset_menu_overrides(request: Request) -> MenuOverrideListResponse:
|
||||
await store.replace_all([], updated_by=user_id)
|
||||
else:
|
||||
await store.replace_user_overrides(user_id, [], updated_by=user_id)
|
||||
await invalidate_catalog(request, "menu_overrides")
|
||||
return await _read_response(request, store)
|
||||
Reference in new issue
Block a user