fix: reconcile ai-11-2 with local knowledge and permission changes

This commit is contained in:
gr
2026-11-03 12:13:47 +08:00
parent 276338381b
commit 3cb30a7574
18 changed files with 3094 additions and 337 deletions
+143 -24
View File
@@ -85,6 +85,21 @@ class RoleBody(BaseModel):
permissions: list[str] = Field(default_factory=list)
class PermissionBody(BaseModel):
"""权限菜单里管理员自己加的一条:权限点(action)或左侧菜单链接(link)。"""
code: str = ""
name: str = ""
group_name: str = ""
page_name: str = ""
kind: str = "action"
link_url: str = ""
link_mode: str = "tab"
icon: str = ""
sort_order: int = 0
enabled: bool = True
class UserBody(BaseModel):
username: str = ""
password: str = ""
@@ -411,8 +426,13 @@ def create_app(
)
return account
# 代码里实际用到的权限码。建完路由后和权限菜单对一遍:忘了在 rbac.PERMISSIONS
# 登记的码会被自动登记,新功能上线就能在角色界面里勾到,不用等下一次补登记。
used_codes: set[str] = set()
def require(*codes: str):
"""权限依赖。只认权限码,不认角色名。"""
"""权限依赖。只认权限码,不认角色名。多个码要同时具备。"""
used_codes.update(codes)
async def guard(principal: Principal = Depends(current)) -> Principal:
missing = [code for code in codes if code not in principal.permissions]
@@ -425,6 +445,28 @@ def create_app(
return guard
def require_any(*codes: str):
"""权限依赖:具备其中任意一个码即可(例如"能看"或"能改"都能读列表)。"""
used_codes.update(codes)
async def guard(principal: Principal = Depends(current)) -> Principal:
if not any(code in principal.permissions for code in codes):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail=f"缺少权限:{' 或 '.join(codes)}",
)
return principal
return guard
def need(principal: Principal, code: str) -> None:
"""同一个接口对应两个按钮时(比如保存接口既管「新增」又管「编辑」),进来之后再判具体那个码。
这里用到的码必须已经出现在该接口的 require / require_any 里,这样才会被登记进权限菜单。
"""
if code not in principal.permissions:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=f"缺少权限:{code}")
def resolve_admin_tenant(
principal: Principal, account_id: int | None
) -> str | list[str]:
@@ -738,17 +780,65 @@ def create_app(
# ── 角色与权限 ───────────────────────────────────────────────────────
@app.get("/api/v2/permissions")
async def permissions(_: Principal = Depends(require("role:write"))) -> dict:
async def permissions(
# 权限菜单页要看,角色页勾选权限也要用这棵树
_: Principal = Depends(require_any("permission:read", "role:read", "role:write")),
) -> dict:
return {"permissions": database.permission_catalog()}
@app.post("/api/v2/permissions")
async def create_permission(
body: PermissionBody, request: Request, principal: Principal = Depends(require("permission:create"))
) -> dict:
try:
item = database.create_permission(body.model_dump(), principal.id, client_ip(request))
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
return {"permission": item, "permissions": database.permission_catalog()}
@app.put("/api/v2/permissions/{code}")
async def update_permission(
code: str,
body: PermissionBody,
request: Request,
principal: Principal = Depends(require("permission:write")),
) -> dict:
try:
item = database.update_permission(code, body.model_dump(), principal.id, client_ip(request))
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
return {"permission": item, "permissions": database.permission_catalog()}
@app.delete("/api/v2/permissions/{code}")
async def delete_permission(
code: str, request: Request, principal: Principal = Depends(require("permission:delete"))
) -> dict:
try:
database.delete_permission(code, principal.id, client_ip(request))
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
return {"permissions": database.permission_catalog()}
@app.get("/api/v2/custom-menus")
async def custom_menus(principal: Principal = Depends(current)) -> dict:
"""左侧菜单里管理员自己加的链接,只返回当前用户有权看到的。"""
return {"menus": database.custom_menus(principal.permissions)}
@app.get("/api/v2/roles")
async def list_roles(_: Principal = Depends(require("user:read"))) -> dict:
async def list_roles(
# 用户管理页要角色下拉框,角色权限页要列表:两边任一权限都能读。
_: Principal = Depends(require_any("user:read", "role:read")),
) -> dict:
return {"roles": database.roles()}
@app.post("/api/v2/roles")
async def save_role(
body: RoleBody, request: Request, principal: Principal = Depends(require("role:write"))
body: RoleBody,
request: Request,
principal: Principal = Depends(require_any("role:create", "role:write")),
) -> dict:
code = str(body.code or "").strip().lower()
need(principal, "role:write" if any(item["code"] == code for item in database.roles()) else "role:create")
try:
saved = database.save_role(
body.code, body.name, body.permissions, principal.id, client_ip(request)
@@ -759,7 +849,7 @@ def create_app(
@app.delete("/api/v2/roles/{code}")
async def delete_role(
code: str, request: Request, principal: Principal = Depends(require("role:write"))
code: str, request: Request, principal: Principal = Depends(require("role:delete"))
) -> dict:
try:
database.delete_role(code, principal.id, client_ip(request))
@@ -769,12 +859,15 @@ def create_app(
# ── 用户 ─────────────────────────────────────────────────────────────
@app.get("/api/v2/users")
async def list_users(_: Principal = Depends(require("user:read"))) -> dict:
async def list_users(
# 客户端账号的「分配可查看的管理端用户」要从用户里选
_: Principal = Depends(require_any("user:read", "desktop-account:assign")),
) -> dict:
return {"users": _public_users(database)}
@app.post("/api/v2/users")
async def create_user(
body: UserBody, request: Request, principal: Principal = Depends(require("user:write"))
body: UserBody, request: Request, principal: Principal = Depends(require("user:create"))
) -> dict:
if not backend.valid_password(body.password):
raise HTTPException(status_code=400, detail="密码至少 10 位,且需同时含字母和数字")
@@ -794,14 +887,24 @@ def create_app(
user_id: int,
body: UserBody,
request: Request,
principal: Principal = Depends(require("user:write")),
principal: Principal = Depends(require_any("user:write", "user:status")),
) -> dict:
known = {item["code"] for item in database.roles()}
if body.role not in known:
raise HTTPException(status_code=400, detail=f"角色不存在:{body.role}")
target = next((item for item in _public_users(database) if item["id"] == user_id), None)
if target is None:
raise HTTPException(status_code=404, detail="用户不存在")
# 改角色和启停是两个按钮:改了哪样就要哪样的权限
# Password reset is also a user edit; status-only access cannot reset it.
if body.role != target["role"] or body.password:
need(principal, "user:write")
if bool(body.active) != target["active"]:
need(principal, "user:status")
try:
database.update_user(
user_id, body.role, body.active, body.password, principal.id, client_ip(request)
user_id, body.role, body.active, body.password,
actor_id=principal.id, ip=client_ip(request),
)
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
@@ -868,7 +971,7 @@ def create_app(
async def revoke_desktop_devices(
account_id: int,
request: Request,
principal: Principal = Depends(require("desktop-account:write")),
principal: Principal = Depends(require("desktop-account:revoke")),
) -> dict:
tenant = resolve_admin_tenant(principal, account_id)
database.revoke_desktop_devices(account_id, principal.id, client_ip(request))
@@ -894,7 +997,7 @@ def create_app(
account_id: int,
body: DesktopAccountScopeBody,
request: Request,
principal: Principal = Depends(require("desktop-account:write")),
principal: Principal = Depends(require("desktop-account:assign")),
) -> dict:
resolve_admin_tenant(principal, account_id)
try:
@@ -907,7 +1010,10 @@ def create_app(
# ── 模型清单与编排 ───────────────────────────────────────────────────
@app.get("/api/v2/models")
async def list_models(_: Principal = Depends(require("model:read"))) -> dict:
async def list_models(
# 角色编排页也要模型清单来选模型
_: Principal = Depends(require_any("model:read", "model-plan:read")),
) -> dict:
return {
"models": database.model_providers(),
"roles": database.model_roles(),
@@ -919,8 +1025,11 @@ def create_app(
async def save_model(
body: ProviderBody,
request: Request,
principal: Principal = Depends(require("model:write")),
principal: Principal = Depends(require_any("model:create", "model:write")),
) -> dict:
provider_id = str(body.id or "").strip()
exists = any(item["id"] == provider_id for item in database.model_providers())
need(principal, "model:write" if exists else "model:create")
try:
database.save_model_provider(
body.model_dump(), principal.id, client_ip(request)
@@ -933,7 +1042,7 @@ def create_app(
async def delete_model(
provider_id: str,
request: Request,
principal: Principal = Depends(require("model:write")),
principal: Principal = Depends(require("model:delete")),
) -> dict:
try:
database.delete_model_provider(provider_id, principal.id, client_ip(request))
@@ -945,7 +1054,7 @@ def create_app(
async def save_plan(
body: RolesPlanBody,
request: Request,
principal: Principal = Depends(require("model:write")),
principal: Principal = Depends(require("model-plan:write")),
) -> dict:
try:
version = database.save_model_roles(
@@ -971,8 +1080,14 @@ def create_app(
async def save_agent(
body: AgentBody,
request: Request,
principal: Principal = Depends(require("agent:write")),
principal: Principal = Depends(require_any("agent:create", "agent:write")),
) -> dict:
try:
# ID 留空时按名称生成,可能撞上已有的智能体——按最终 ID 判是新增还是编辑
agent_id = backend.validate_agent(body.model_dump())["id"]
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
need(principal, "agent:write" if any(item["id"] == agent_id for item in database.agents()) else "agent:create")
try:
database.save_agent(body.model_dump(), principal.id, client_ip(request))
except ValueError as exc:
@@ -983,7 +1098,7 @@ def create_app(
async def delete_agent(
agent_id: str,
request: Request,
principal: Principal = Depends(require("agent:write")),
principal: Principal = Depends(require("agent:delete")),
) -> dict:
try:
database.delete_agent(agent_id, principal.id, client_ip(request))
@@ -995,7 +1110,7 @@ def create_app(
async def save_agent_plan(
body: AgentPlanBody,
request: Request,
principal: Principal = Depends(require("agent:write")),
principal: Principal = Depends(require("agent-plan:write")),
) -> dict:
try:
version = database.save_agent_plan(
@@ -1127,7 +1242,9 @@ def create_app(
# ── 桌面端版本升级 ───────────────────────────────────────────────────
@app.get("/api/v2/release")
async def get_release(_: Principal = Depends(require("config:read"))) -> dict:
async def get_release(
_: Principal = Depends(require_any("release:read", "release:write")),
) -> dict:
return release_payload(database.release(), direct_download=True)
@app.post("/api/v2/release")
@@ -1180,7 +1297,7 @@ def create_app(
async def prepare_release_package(
body: ReleasePackagePrepareBody,
request: Request,
principal: Principal = Depends(require("release:write")),
principal: Principal = Depends(require("release:upload")),
) -> dict:
"""签发 COS 直传地址;EXE 内容不会进入管理端进程或本机磁盘。"""
@@ -1213,7 +1330,7 @@ def create_app(
async def complete_release_package(
media_id: str,
request: Request,
principal: Principal = Depends(require("release:write")),
principal: Principal = Depends(require("release:upload")),
) -> dict:
try:
package = app.state.archive_store.complete_release_package(media_id)
@@ -1238,7 +1355,7 @@ def create_app(
media_id: str,
body: ReleasePackageMultipartCompleteBody,
request: Request,
principal: Principal = Depends(require("release:write")),
principal: Principal = Depends(require("release:upload")),
) -> dict:
try:
package = app.state.archive_store.complete_multipart_release_package(
@@ -1264,7 +1381,7 @@ def create_app(
@app.get("/api/v2/releases")
async def release_history(
_: Principal = Depends(require("config:read")),
_: Principal = Depends(require_any("release:read", "release:write")),
) -> dict:
current = release_payload(database.release())
return {
@@ -1382,7 +1499,7 @@ def create_app(
async def test_model(
body: ModelTestBody,
request: Request,
principal: Principal = Depends(require("model:write")),
principal: Principal = Depends(require("model:test")),
) -> dict:
"""真的向模型发一次最小请求,返回不含密钥的诊断结果。
@@ -1530,6 +1647,7 @@ def create_app(
knowledge_api.register_knowledge_routes(
app, database, require, client_ip, resolve_admin_tenant, current_desktop,
require_any=require_any,
)
remote_api.register_remote_routes(
@@ -1618,6 +1736,7 @@ def create_app(
return FileResponse(candidate)
return FileResponse(dist / "index.html")
database.sync_code_permissions(used_codes)
return app