bruno
45e59009c3
4 passes (283 → 93 routes async sur 667 = 86 % hors loop, avant 61 %) :
A. RACINE AUTH — `get_current_user` (auth/session.py) était `async def`
SANS aucun await (cookie decode = synchrone) ; idem ses clones :
`agent._current_user_id/_workspace_id/_current_admin` (34 sites) et
`sso._require_admin` (corps 0 await, 6 sites) → `def` +
47 `await` supprimés. Piège : 3 call sites passaient par l'alias `gcu`
(grep littéral aveugle) — 8 tests en échec → corrigés.
B. Re-scan : 19 routes devenues SANS await → `def` (agent 8, sso 5,
web_clipper 3, projects 2, auth 1…).
C/D. 155 routes dont les seuls awaits = `request.json()` / événements :
- try/except `body = {}` → `Body(default={})` (même tolérance)
- try/except `raise HTTPException(400)` → `Body(...)` REQUIS
(422 FastAPI — aucun test ne couvrait le 400)
- forme conditionnelle `request.json() if content-type else {}`
(54 sites) → défaut `{}` (sans corps = `{}` dans les 2 cas)
- `await fire_*` → `run_event_sync(...)` ; imports `Body` /
`run_event_sync` ajoutés aux routers convertis
Reste async (93, justifié) : form/upload/file (22), réseau gitea/llm/oidc,
`_json_body` (9), 2 JSON inline en argument, 1 fallback logique
(capture_frontend_error), 1 lecture conditionnelle (web_clipper), mixtes.
suite **1089/1089** · ruff OK · docs à jour
113 lines
3.7 KiB
Python
113 lines
3.7 KiB
Python
"""FlowDeck — Sidebar customization API (v4.6.0)."""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
|
|
from fastapi import APIRouter, Body, HTTPException, Request
|
|
|
|
from app.auth.session import SessionManager
|
|
from app.db import get_conn
|
|
|
|
logger = logging.getLogger(__name__)
|
|
router = APIRouter(tags=["sidebar"], prefix="/api/sidebar")
|
|
|
|
|
|
def _get_user(request: Request) -> dict:
|
|
user = SessionManager.decode_session(request.cookies.get("flowdeck_session", ""))
|
|
if not user:
|
|
raise HTTPException(status_code=401, detail="Not authenticated")
|
|
return user
|
|
|
|
|
|
DEFAULT_CONFIG = {
|
|
"workspace": {"visible": True, "order": 0, "show_count": None},
|
|
"gitea": {"visible": True, "order": 1, "show_count": None},
|
|
"meetings": {"visible": True, "order": 2, "show_count": 5},
|
|
"recents": {"visible": True, "order": 3, "show_count": 10},
|
|
"favorites": {"visible": True, "order": 4, "show_count": 10},
|
|
"agents": {"visible": True, "order": 5, "show_count": None},
|
|
"teamspaces": {"visible": True, "order": 6, "show_count": None},
|
|
"shared": {"visible": True, "order": 7, "show_count": 10},
|
|
"published": {"visible": True, "order": 8, "show_count": 10},
|
|
"private": {"visible": True, "order": 9, "show_count": None},
|
|
}
|
|
|
|
|
|
@router.get("/config")
|
|
def get_sidebar_config(request: Request):
|
|
"""Get the current user's sidebar customization config."""
|
|
user = _get_user(request)
|
|
with get_conn() as conn:
|
|
row = conn.execute(
|
|
"SELECT sidebar_config FROM users WHERE id=?", (user["id"],)
|
|
).fetchone()
|
|
if not row:
|
|
return {"config": DEFAULT_CONFIG}
|
|
|
|
raw = row["sidebar_config"]
|
|
if not raw:
|
|
return {"config": DEFAULT_CONFIG}
|
|
|
|
try:
|
|
stored = json.loads(raw)
|
|
except (json.JSONDecodeError, TypeError):
|
|
return {"config": DEFAULT_CONFIG}
|
|
|
|
# Merge with defaults to ensure all keys exist
|
|
merged = dict(DEFAULT_CONFIG)
|
|
merged.update(stored)
|
|
return {"config": merged}
|
|
|
|
|
|
def get_sidebar_config_sync(user_id: int) -> dict:
|
|
"""Synchronous helper to get sidebar config (used during template rendering)."""
|
|
with get_conn() as conn:
|
|
row = conn.execute(
|
|
"SELECT sidebar_config FROM users WHERE id=?", (user_id,)
|
|
).fetchone()
|
|
if not row:
|
|
return dict(DEFAULT_CONFIG)
|
|
raw = row["sidebar_config"]
|
|
if not raw:
|
|
return dict(DEFAULT_CONFIG)
|
|
try:
|
|
stored = json.loads(raw)
|
|
except (json.JSONDecodeError, TypeError):
|
|
return dict(DEFAULT_CONFIG)
|
|
merged = dict(DEFAULT_CONFIG)
|
|
merged.update(stored)
|
|
return merged
|
|
|
|
|
|
@router.put("/config")
|
|
def save_sidebar_config(request: Request, body: dict = Body(...)):
|
|
"""Save the current user's sidebar customization config."""
|
|
user = _get_user(request)
|
|
|
|
config = body.get("config")
|
|
if not config or not isinstance(config, dict):
|
|
raise HTTPException(status_code=400, detail="config object is required")
|
|
|
|
# Merge with defaults to ensure validity
|
|
merged = dict(DEFAULT_CONFIG)
|
|
for key, val in config.items():
|
|
if key in DEFAULT_CONFIG and isinstance(val, dict):
|
|
merged[key] = {
|
|
"visible": val.get("visible", DEFAULT_CONFIG[key]["visible"]),
|
|
"order": val.get("order", DEFAULT_CONFIG[key]["order"]),
|
|
"show_count": val.get("show_count", DEFAULT_CONFIG[key]["show_count"]),
|
|
}
|
|
elif key not in DEFAULT_CONFIG:
|
|
# Allow new custom sections
|
|
merged[key] = val
|
|
|
|
with get_conn() as conn:
|
|
conn.execute(
|
|
"UPDATE users SET sidebar_config=? WHERE id=?",
|
|
(json.dumps(merged), user["id"]),
|
|
)
|
|
conn.commit()
|
|
|
|
return {"status": "ok", "config": merged}
|