Files
kefu/deploy/perm-button-20261008/payload-diff.txt
T
2026-11-16 09:39:42 +08:00

721 lines
41 KiB
Plaintext

--- production/wechat_rpa/rbac.py
+++ release/wechat_rpa/rbac.py
@@ -35,43 +35,89 @@
name: str
group: str # 一级菜单
page: str # 页面(二级菜单);没有页面的纯接口权限也写一个说明性的名字
- kind: str = "action" # page = 能打开这个页面;action = 页面里的操作
- # 新拆出来的页面权限第一次上线时,自动授给已持有旧码的角色,访问范围不变。
- implied_by: str = ""
+ kind: str = "action" # page = 能打开这个页面;action = 页面里的按钮
+ # 新拆出来的权限码第一次上线时,自动授给已持有这些旧码之一的角色,上线前后能做的事不变。
+ implied_by: tuple[str, ...] = ()
# ── 权限菜单 ─────────────────────────────────────────────────────────────────
-# 命名规则 `资源:动作`。读写分开,因为"能看不能改"是最常见的诉求。
+# 命名规则 `资源:动作`。每个页面一个「页面」码(能打开它),页面里**每个按钮**一个码——
+# 角色界面里能单独勾掉「删除」却保留「编辑」。接口按按钮的码判,前端按同一个码显示按钮。
# 加页面或按钮时在这里登记一行;前端 `router/routes/modules/console.ts` 里每个页面的
# `meta.authority` 都必须在这里有,「权限菜单」页会把没登记的码标出来。
+#
+# 2026-10 拆按钮时**保留了原来的码**,只是把它收窄成其中一个按钮(如 model:write 现在只管「编辑」),
+# 新拆出来的按钮码用 implied_by 在第一次上线时授给持有原码的角色——上线前后每个角色能做的事完全一样;
+# 回滚到旧版本时旧码还在,也不会有人突然少了权限。
PERMISSIONS: list[Permission] = [
- Permission("model:read", "查看模型清单与角色编排", "AI 模型", "模型清单、角色编排", "page"),
- Permission("model:write", "增删改模型、测试连通、修改编排", "AI 模型", "模型清单、角色编排"),
- Permission("agent:read", "查看智能体", "AI 模型", "智能体", "page"),
- Permission("agent:write", "增删改智能体与协作方案", "AI 模型", "智能体"),
+ Permission("model:read", "查看模型清单", "AI 模型", "模型清单", "page"),
+ Permission("model:create", "新增模型", "AI 模型", "模型清单", implied_by=("model:write",)),
+ Permission("model:write", "编辑模型(含启用 / 停用、更换密钥)", "AI 模型", "模型清单"),
+ Permission("model:test", "测连通", "AI 模型", "模型清单", implied_by=("model:write",)),
+ Permission("model:delete", "删除模型", "AI 模型", "模型清单", implied_by=("model:write",)),
+ Permission("model-plan:read", "查看角色编排", "AI 模型", "角色编排", "page", ("model:read", "model:write")),
+ Permission("model-plan:write", "保存角色编排(生成新版本)", "AI 模型", "角色编排", implied_by=("model:write",)),
+ Permission("agent:read", "查看智能体与协作方案", "AI 模型", "智能体", "page"),
+ Permission("agent:create", "新增智能体", "AI 模型", "智能体", implied_by=("agent:write",)),
+ Permission("agent:write", "编辑智能体", "AI 模型", "智能体"),
+ Permission("agent:delete", "删除智能体", "AI 模型", "智能体", implied_by=("agent:write",)),
+ Permission("agent-plan:write", "保存协作方案(生成新版本)", "AI 模型", "智能体", implied_by=("agent:write",)),
Permission("stats:read", "查看调用统计、Token 用量与知识引用记录", "AI 模型", "调用统计", "page"),
Permission("desktop-account:read", "查看客户端账号", "桌面端", "客户端账号", "page"),
- Permission("desktop-account:write", "管理客户端账号(启停、下线设备、分配管理员)", "桌面端", "客户端账号"),
+ Permission("desktop-account:write", "修改账号策略(启用 / 禁用、自动备份)", "桌面端", "客户端账号"),
+ Permission("desktop-account:assign", "分配可查看该账号数据的管理端用户", "桌面端", "客户端账号",
+ implied_by=("desktop-account:write",)),
+ Permission("desktop-account:revoke", "强制下线", "桌面端", "客户端账号", implied_by=("desktop-account:write",)),
Permission("desktop-account:all", "查看全部客户端数据(不受账号分配限制)", "桌面端", "客户端账号"),
Permission("config:read", "查看客户端配置", "桌面端", "客户端配置", "page"),
- Permission("config:write", "修改客户端配置(能力开关、审核规则、MCP 等)", "桌面端", "客户端配置"),
- Permission("release:read", "查看版本升级与升级进度", "桌面端", "版本升级", "page", "config:read"),
+ Permission("config:write", "保存并发布客户端配置(能力开关、审核规则、MCP 等)", "桌面端", "客户端配置"),
+ Permission("release:read", "查看版本升级与升级进度", "桌面端", "版本升级", "page", ("config:read",)),
+ Permission("release:upload", "上传安装包", "桌面端", "版本升级", implied_by=("release:write",)),
Permission("release:write", "发布客户端版本", "桌面端", "版本升级"),
Permission("im:read", "查看归档概览", "聊天归档", "归档概览", "page"),
Permission("im:content:read", "查看聊天正文与素材", "聊天归档", "会话与消息", "page"),
- Permission("im:export", "导出聊天记录", "聊天归档", "导出中心", "page"),
- Permission("im:identity:write", "管理人员唯一标识与患者绑定", "聊天归档", "人员唯一标识", "page"),
- Permission("im:storage:write", "管理 COS 素材存储", "聊天归档", "COS 存储", "page"),
+ Permission("im:export", "查看导出记录", "聊天归档", "导出中心", "page"),
+ Permission("im:export:create", "新建导出", "聊天归档", "导出中心", implied_by=("im:export",)),
+ Permission("im:export:download", "下载导出文件", "聊天归档", "导出中心", implied_by=("im:export",)),
+ Permission("im:identity:read", "查看人员唯一标识与患者关联", "聊天归档", "人员唯一标识", "page",
+ ("im:identity:write",)),
+ Permission("im:identity:write", "确认绑定人员标识", "聊天归档", "人员唯一标识"),
+ Permission("im:patient:bind", "搜索并关联患者", "聊天归档", "人员唯一标识", implied_by=("im:identity:write",)),
+ Permission("im:patient:unbind", "解除患者关联", "聊天归档", "人员唯一标识", implied_by=("im:identity:write",)),
+ Permission("im:storage:read", "查看 COS 存储配置与用量", "聊天归档", "COS 存储", "page", ("im:storage:write",)),
+ Permission("im:storage:write", "保存存储配置", "聊天归档", "COS 存储"),
+ Permission("im:storage:test", "测试连接", "聊天归档", "COS 存储", implied_by=("im:storage:write",)),
Permission("im:import", "导入聊天记录", "聊天归档", "导入接口"),
- Permission("knowledge:read", "查看知识中心", "知识中心", "知识加工与检索", "page"),
- Permission("knowledge:write", "加工和编辑知识草稿", "知识中心", "知识加工与检索"),
- Permission("knowledge:review", "审核知识", "知识中心", "知识加工与检索"),
- Permission("knowledge:publish", "发布和停用知识", "知识中心", "知识加工与检索"),
+ Permission("knowledge:read", "查看知识中心(知识列表、详情、整理任务)", "知识中心", "知识加工与检索", "page"),
+ Permission("knowledge:run", "整理聊天记录(新建整理)", "知识中心", "知识加工与检索", implied_by=("knowledge:write",)),
+ Permission("knowledge:run:control", "暂停 / 继续 / 取消整理、换模型", "知识中心", "知识加工与检索",
+ implied_by=("knowledge:write",)),
+ Permission("knowledge:settings", "修改整理设置", "知识中心", "知识加工与检索", implied_by=("knowledge:write",)),
+ Permission("knowledge:watch", "开关新聊天自动整理", "知识中心", "知识加工与检索", implied_by=("knowledge:write",)),
+ Permission("knowledge:write", "编辑知识(保存草稿)", "知识中心", "知识加工与检索"),
+ Permission("knowledge:restore", "恢复历史版本为草稿", "知识中心", "知识加工与检索", implied_by=("knowledge:write",)),
+ Permission("knowledge:delete", "删除已驳回知识", "知识中心", "知识加工与检索", implied_by=("knowledge:write",)),
+ Permission("knowledge:review", "审核通过(含批量审核)", "知识中心", "知识加工与检索"),
+ Permission("knowledge:reject", "驳回", "知识中心", "知识加工与检索", implied_by=("knowledge:review",)),
+ Permission("knowledge:review:auto", "一键审核(后台审核任务)", "知识中心", "知识加工与检索",
+ implied_by=("knowledge:review",)),
+ Permission("knowledge:publish", "发布知识(含发布选中)", "知识中心", "知识加工与检索"),
+ Permission("knowledge:disable", "停用已发布知识", "知识中心", "知识加工与检索", implied_by=("knowledge:publish",)),
+ Permission("knowledge:enable", "开关「客服使用知识」", "知识中心", "知识加工与检索", implied_by=("knowledge:publish",)),
+ Permission("knowledge:search", "检索测试", "知识中心", "知识加工与检索", implied_by=("knowledge:read",)),
Permission("knowledge:export", "导出已发布知识", "知识中心", "知识加工与检索"),
- Permission("role:read", "查看角色与权限菜单", "系统管理", "角色权限、权限菜单", "page", "user:read"),
- Permission("role:write", "管理角色、维护权限菜单", "系统管理", "角色权限、权限菜单"),
+ Permission("role:read", "查看角色", "系统管理", "角色权限", "page", ("user:read",)),
+ Permission("role:create", "新增角色", "系统管理", "角色权限", implied_by=("role:write",)),
+ Permission("role:write", "修改角色名称与权限", "系统管理", "角色权限"),
+ Permission("role:delete", "删除角色", "系统管理", "角色权限", implied_by=("role:write",)),
+ Permission("permission:read", "查看权限菜单", "系统管理", "权限菜单", "page", ("role:read", "role:write")),
+ Permission("permission:create", "新增权限点、菜单链接", "系统管理", "权限菜单", implied_by=("role:write",)),
+ Permission("permission:write", "编辑权限点、菜单链接", "系统管理", "权限菜单", implied_by=("role:write",)),
+ Permission("permission:delete", "删除自定义权限点、菜单链接", "系统管理", "权限菜单", implied_by=("role:write",)),
Permission("user:read", "查看用户", "系统管理", "用户管理", "page"),
- Permission("user:write", "管理用户与角色分配", "系统管理", "用户管理"),
+ Permission("user:create", "新增用户", "系统管理", "用户管理", implied_by=("user:write",)),
+ Permission("user:write", "修改用户角色", "系统管理", "用户管理"),
+ Permission("user:status", "启用 / 停用用户", "系统管理", "用户管理", implied_by=("user:write",)),
Permission("audit:read", "查看审计日志", "系统管理", "审计日志", "page"),
]
@@ -92,19 +138,20 @@
"配置员",
[
"config:read", "config:write",
- "model:read", "model:write",
- "agent:read", "agent:write",
+ "model:read", "model:create", "model:write", "model:test", "model:delete",
+ "model-plan:read", "model-plan:write",
+ "agent:read", "agent:create", "agent:write", "agent:delete", "agent-plan:write",
"stats:read", "audit:read",
- "release:read", "release:write",
- "user:read", "role:read",
+ "release:read", "release:upload", "release:write",
+ "user:read", "role:read", "permission:read",
],
),
(
"viewer",
"只读用户",
[
- "config:read", "model:read", "agent:read",
- "release:read", "stats:read", "user:read", "role:read",
+ "config:read", "model:read", "model-plan:read", "agent:read",
+ "release:read", "stats:read", "user:read", "role:read", "permission:read",
],
),
]
@@ -190,9 +237,10 @@
db.execute(
"DELETE FROM role_permissions WHERE permission_code NOT IN (SELECT code FROM permissions)"
)
- # 从旧码拆出来的页面权限:没有任何角色持有它(刚上线,或被不认识它的旧版本清掉了),
- # 就按旧码补授——原来能进这个页面的角色上线后照样能进。之后管理员总持有全部权限码,
- # 这一步不会再生效,界面上收回的授权不会被重启冲回来。
+ # 从旧码拆出来的页面 / 按钮权限:没有任何角色持有它(刚上线,或被不认识它的旧版本清掉了),
+ # 就按旧码补授——原来能做这件事的角色上线后照样能做。之后管理员总持有全部权限码,
+ # 这一步不会再生效,界面上收回的授权不会被重启冲回来。按登记顺序处理,所以
+ # 「旧码 → 新页面码 → 更新的码」这种链条一次就能补齐。
for item in PERMISSIONS:
if not item.implied_by:
continue
@@ -201,9 +249,10 @@
).fetchone()
if held is None:
db.execute(
- """INSERT OR IGNORE INTO role_permissions (role_code,permission_code)
- SELECT role_code, ? FROM role_permissions WHERE permission_code=?""",
- (item.code, item.implied_by),
+ f"""INSERT OR IGNORE INTO role_permissions (role_code,permission_code)
+ SELECT DISTINCT role_code, ? FROM role_permissions
+ WHERE permission_code IN ({','.join('?' for _ in item.implied_by)})""",
+ (item.code, *item.implied_by),
)
for code, name, defaults in BUILTIN_ROLES:
existing = db.execute("SELECT code FROM roles WHERE code=?", (code,)).fetchone()
--- production/wechat_rpa/admin_api.py
+++ release/wechat_rpa/admin_api.py
@@ -424,6 +424,14 @@
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
@@ -712,13 +720,14 @@
# ── 角色与权限 ───────────────────────────────────────────────────────
@app.get("/api/v2/permissions")
async def permissions(
- _: Principal = Depends(require_any("role:read", "role:write")),
+ # 权限菜单页要看,角色页勾选权限也要用这棵树
+ _: 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("role:write"))
+ body: PermissionBody, request: Request, principal: Principal = Depends(require("permission:create"))
) -> dict:
try:
item = database.create_permission(body.model_dump(), principal.id, client_ip(request))
@@ -731,7 +740,7 @@
code: str,
body: PermissionBody,
request: Request,
- principal: Principal = Depends(require("role:write")),
+ principal: Principal = Depends(require("permission:write")),
) -> dict:
try:
item = database.update_permission(code, body.model_dump(), principal.id, client_ip(request))
@@ -741,7 +750,7 @@
@app.delete("/api/v2/permissions/{code}")
async def delete_permission(
- code: str, request: Request, principal: Principal = Depends(require("role:write"))
+ code: str, request: Request, principal: Principal = Depends(require("permission:delete"))
) -> dict:
try:
database.delete_permission(code, principal.id, client_ip(request))
@@ -763,8 +772,12 @@
@app.post("/api/v2/roles")
async def save_role(
- body: RoleBody, request: Request, principal: Principal = Depends(require("role:write"))
- ) -> dict:
+ 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)
@@ -775,7 +788,7 @@
@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))
@@ -785,12 +798,15 @@
# ── 用户 ─────────────────────────────────────────────────────────────
@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 位,且需同时含字母和数字")
@@ -810,14 +826,23 @@
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="用户不存在")
+ # 改角色和启停是两个按钮:改了哪样就要哪样的权限
+ if body.role != target["role"]:
+ need(principal, "user:write")
+ if bool(body.active) != target["active"]:
+ need(principal, "user:status")
try:
database.update_user(
- user_id, body.role, body.active, principal.id, client_ip(request)
+ user_id, body.role, body.active, "",
+ actor_id=principal.id, ip=client_ip(request),
)
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
@@ -880,7 +905,7 @@
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))
@@ -906,7 +931,7 @@
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:
@@ -919,7 +944,10 @@
# ── 模型清单与编排 ───────────────────────────────────────────────────
@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(),
@@ -931,8 +959,11 @@
async def save_model(
body: ProviderBody,
request: Request,
- principal: Principal = Depends(require("model:write")),
- ) -> dict:
+ 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)
@@ -945,7 +976,7 @@
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))
@@ -957,7 +988,7 @@
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(
@@ -983,8 +1014,14 @@
async def save_agent(
body: AgentBody,
request: Request,
- principal: Principal = Depends(require("agent:write")),
- ) -> dict:
+ 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:
@@ -995,7 +1032,7 @@
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))
@@ -1007,7 +1044,7 @@
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(
@@ -1194,7 +1231,7 @@
async def prepare_release_package(
body: ReleasePackagePrepareBody,
request: Request,
- principal: Principal = Depends(require("release:write")),
+ principal: Principal = Depends(require("release:upload")),
) -> dict:
"""签发 COS 直传地址;EXE 内容不会进入管理端进程或本机磁盘。"""
@@ -1227,7 +1264,7 @@
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)
@@ -1252,7 +1289,7 @@
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(
@@ -1396,7 +1433,7 @@
async def test_model(
body: ModelTestBody,
request: Request,
- principal: Principal = Depends(require("model:write")),
+ principal: Principal = Depends(require("model:test")),
) -> dict:
"""真的向模型发一次最小请求,返回不含密钥的诊断结果。
@@ -1544,6 +1581,7 @@
knowledge_api.register_knowledge_routes(
app, database, require, client_ip, resolve_admin_tenant, current_desktop,
+ require_any=require_any,
)
remote_api.register_remote_routes(
--- production/wechat_rpa/archive_api.py
+++ release/wechat_rpa/archive_api.py
@@ -773,7 +773,7 @@
limit: int = 100,
keyword: str = "",
account_id: int | None = None,
- principal: Any = Depends(require("im:identity:write")),
+ principal: Any = Depends(require("im:identity:read")),
) -> dict[str, Any]:
return {
"items": store.people(
@@ -785,7 +785,7 @@
def archive_person(
person_id: str,
account_id: int | None = None,
- principal: Any = Depends(require("im:identity:write")),
+ principal: Any = Depends(require("im:identity:read")),
) -> dict[str, Any]:
try:
return {
@@ -823,7 +823,7 @@
page_no: int = 1,
page_size: int = 20,
account_id: int | None = None,
- principal: Any = Depends(require("im:identity:write")),
+ principal: Any = Depends(require("im:patient:bind")),
) -> dict[str, Any]:
tenant = single_tenant(
await asyncio.to_thread(resolve_admin_tenant, principal, account_id)
@@ -1261,7 +1261,7 @@
body: PatientBindingBody,
request: Request,
account_id: int | None = None,
- principal: Any = Depends(require("im:identity:write")),
+ principal: Any = Depends(require("im:patient:bind")),
) -> dict[str, Any]:
tenant = single_tenant(resolve_admin_tenant(principal, account_id))
try:
@@ -1287,7 +1287,7 @@
binding_id: str,
request: Request,
account_id: int | None = None,
- principal: Any = Depends(require("im:identity:write")),
+ principal: Any = Depends(require("im:patient:unbind")),
) -> dict[str, Any]:
tenant = single_tenant(resolve_admin_tenant(principal, account_id))
try:
@@ -1304,7 +1304,7 @@
@app.get("/api/v2/archive/storage")
def archive_storage(
- _: Any = Depends(require("im:storage:write")),
+ _: Any = Depends(require("im:storage:read")),
) -> dict[str, Any]:
return {"storage": store.storage_config()}
@@ -1326,7 +1326,7 @@
@app.post("/api/v2/archive/storage/test")
def test_archive_storage(
request: Request,
- principal: Any = Depends(require("im:storage:write")),
+ principal: Any = Depends(require("im:storage:test")),
) -> dict[str, Any]:
try:
result = store.test_storage()
@@ -1484,7 +1484,7 @@
request: Request,
background: BackgroundTasks,
account_id: int | None = None,
- principal: Any = Depends(require("im:export")),
+ principal: Any = Depends(require("im:export:create")),
) -> dict[str, Any]:
try:
job = store.create_export_job(
@@ -1531,7 +1531,7 @@
file_id: str,
request: Request,
account_id: int | None = None,
- principal: Any = Depends(require("im:export")),
+ principal: Any = Depends(require("im:export:download")),
):
try:
item = store.export_file(
--- production/wechat_rpa/knowledge_api.py
+++ release/wechat_rpa/knowledge_api.py
@@ -133,7 +133,19 @@
raise HTTPException(502, "知识索引服务连接失败,当前知识未发布,请检查服务配置后重试") from exc
-def register_knowledge_routes(app, database, require, client_ip, resolve_admin_tenant, current_desktop):
+# 单条知识的操作 → 对应按钮的权限码。都要能看来源聊天原文(审核的证据)。
+ITEM_ACTIONS = {
+ "approve": "knowledge:review",
+ "reject": "knowledge:reject",
+ "publish": "knowledge:publish",
+ "disable": "knowledge:disable",
+ "restore": "knowledge:restore",
+ "delete": "knowledge:delete",
+}
+
+
+def register_knowledge_routes(app, database, require, client_ip, resolve_admin_tenant, current_desktop,
+ require_any=None):
store = KnowledgeStore(database)
store.initialize()
app.state.knowledge_store = store
@@ -173,13 +185,15 @@
# ── 整理批次:一次整理多个账号、全部聊天 ─────────────────────────────────
@app.post('/api/v2/knowledge/runs/preview')
- def preview_run(body: RunScopeBody, principal=Depends(require('knowledge:write', 'im:content:read'))):
+ def preview_run(body: RunScopeBody, principal=Depends(require('knowledge:run', 'im:content:read'))):
with errors():
tenants, label = run_tenants(principal, body.account_ids)
return {**store.preview_run(tenants, body.model_dump()), 'scope_label': label}
@app.post('/api/v2/knowledge/runs')
- def create_run(body: RunBody, request: Request, principal=Depends(require('knowledge:write', 'im:content:read'))):
+ def create_run(body: RunBody, request: Request, principal=Depends(require('knowledge:run', 'im:content:read'))):
+ if body.auto_watch and 'knowledge:watch' not in principal.permissions:
+ raise HTTPException(403, '缺少权限:knowledge:watch') # 「新聊天也自动整理」是另一个按钮
with errors():
tenants, label = run_tenants(principal, body.account_ids)
values = body.model_dump(exclude={'account_ids'})
@@ -192,14 +206,14 @@
@app.put('/api/v2/knowledge/runs/{run_id}/config')
def configure_run(run_id: str, body: RunConfigBody, request: Request,
- principal=Depends(require('knowledge:write', 'im:content:read'))):
+ principal=Depends(require('knowledge:run:control', 'im:content:read'))):
with errors():
return store.configure_run(resolve_admin_tenant(principal, -1), run_id, body.model_dump(),
principal.id, client_ip(request))
@app.post('/api/v2/knowledge/runs/{run_id}/{action}')
def run_action(run_id: str, action: str, request: Request,
- principal=Depends(require('knowledge:write', 'im:content:read'))):
+ principal=Depends(require('knowledge:run:control', 'im:content:read'))):
with errors():
return store.run_action(resolve_admin_tenant(principal, -1), run_id, action, principal.id, client_ip(request))
@@ -209,12 +223,12 @@
@app.put('/api/v2/knowledge/config')
def put_config(body: KnowledgeConfigBody, request: Request,
- principal=Depends(require('knowledge:write', 'im:content:read'))):
+ principal=Depends(require('knowledge:settings'))):
with errors():
return store.save_config(body.model_dump(), principal.id, client_ip(request))
@app.post('/api/v2/knowledge/models/test')
- async def test_model(body: ModelTestBody, principal=Depends(require('knowledge:write'))):
+ async def test_model(body: ModelTestBody, principal=Depends(require_any('knowledge:run', 'knowledge:settings'))):
"""用一条虚构问答试一次整理,确认模型能连通、能按格式输出。不读任何真实聊天。"""
from knowledge_model_output import ModelOutputError, normalize_output
from knowledge_models import SAMPLE, extract, resolve_model, safe_model_error
@@ -246,29 +260,29 @@
@app.post('/api/v2/knowledge/review-tasks/preview')
def preview_reviews(request: Request, account_id: int = -1,
- principal=Depends(require('knowledge:read', 'knowledge:review', 'im:content:read'))):
+ principal=Depends(require('knowledge:read', 'knowledge:review:auto', 'im:content:read'))):
with errors():
return reviews.preview(resolve_admin_tenant(principal, account_id), account_id, principal.id, client_ip(request))
@app.get('/api/v2/knowledge/review-tasks')
- def review_tasks(principal=Depends(require('knowledge:read', 'knowledge:review', 'im:content:read'))):
+ def review_tasks(principal=Depends(require('knowledge:read', 'knowledge:review:auto', 'im:content:read'))):
return {'items': reviews.jobs(principal.id)}
@app.get('/api/v2/knowledge/review-tasks/{job_id}/results')
def review_results(job_id: str, result: str = 'skipped', page: int = Query(default=1, ge=1),
page_size: int = Query(default=30, ge=1, le=100),
- principal=Depends(require('knowledge:read', 'knowledge:review', 'im:content:read'))):
+ principal=Depends(require('knowledge:read', 'knowledge:review:auto', 'im:content:read'))):
with errors():
return reviews.results(job_id, principal.id, resolve_admin_tenant(principal, -1), result, page, page_size)
@app.get('/api/v2/knowledge/review-tasks/{job_id}')
- def review_task(job_id: str, principal=Depends(require('knowledge:read', 'knowledge:review', 'im:content:read'))):
+ def review_task(job_id: str, principal=Depends(require('knowledge:read', 'knowledge:review:auto', 'im:content:read'))):
with errors():
return reviews.get(job_id, principal.id)
@app.post('/api/v2/knowledge/review-tasks/{job_id}/{action}')
def review_action(job_id: str, action: str, body: ReviewConfirmBody, request: Request,
- principal=Depends(require('knowledge:read', 'knowledge:review', 'im:content:read'))):
+ principal=Depends(require('knowledge:read', 'knowledge:review:auto', 'im:content:read'))):
with errors():
return reviews.action(job_id, action, principal.id, client_ip(request), body.confirmed)
@@ -285,25 +299,26 @@
@app.put("/api/v2/knowledge/settings")
def settings(body: SettingsBody, request: Request, account_id: int | None = None,
- principal=Depends(require("knowledge:publish"))):
+ principal=Depends(require("knowledge:enable"))):
with errors():
return store.set_enabled(single(principal, account_id), body.enabled, principal.id, client_ip(request))
@app.put("/api/v2/knowledge/watch/{source_id}")
def watch(source_id: str, body: SettingsBody, request: Request, account_id: int | None = None,
- principal=Depends(require("knowledge:write", "im:content:read"))):
+ principal=Depends(require("knowledge:watch", "im:content:read"))):
with errors():
return store.set_watch(single(principal, account_id), source_id, body.enabled, principal.id, client_ip(request))
@app.get('/api/v2/knowledge/models')
- def models(account_id: int | None = None, principal=Depends(require('knowledge:write', 'im:content:read'))):
+ def models(account_id: int | None = None,
+ principal=Depends(require_any('knowledge:run', 'knowledge:run:control', 'knowledge:settings'))):
# 模型清单是全局的,「全部账号」下也能选
from knowledge_models import model_choices
return {'items': model_choices(database)}
@app.put('/api/v2/knowledge/jobs/{job_id}/config')
def job_config(job_id: str, body: JobConfigBody, request: Request, account_id: int | None = None,
- principal=Depends(require('knowledge:write', 'im:content:read'))):
+ principal=Depends(require('knowledge:run:control', 'im:content:read'))):
with errors():
return store.configure_job(single(principal, account_id), job_id, body.model_dump(), principal.id, client_ip(request))
@@ -313,19 +328,21 @@
@app.post("/api/v2/knowledge/jobs/preview")
def preview_job(body: JobBody, account_id: int | None = None,
- principal=Depends(require("knowledge:write", "im:content:read"))):
+ principal=Depends(require("knowledge:run", "im:content:read"))):
with errors():
return store.preview_job(single(principal, account_id), body.model_dump())
@app.post("/api/v2/knowledge/jobs")
def create_job(body: JobBody, request: Request, account_id: int | None = None,
- principal=Depends(require("knowledge:write", "im:content:read"))):
+ principal=Depends(require("knowledge:run", "im:content:read"))):
+ if body.auto_watch and 'knowledge:watch' not in principal.permissions:
+ raise HTTPException(403, '缺少权限:knowledge:watch')
with errors():
return store.create_job(single(principal, account_id), body.model_dump(), principal.id, client_ip(request))
@app.post("/api/v2/knowledge/jobs/{job_id}/{action}")
def job_action(job_id: str, action: str, request: Request, account_id: int | None = None,
- principal=Depends(require("knowledge:write", "im:content:read"))):
+ principal=Depends(require("knowledge:run:control", "im:content:read"))):
with errors():
return store.job_action(single(principal, account_id), job_id, action, principal.id, client_ip(request))
@@ -357,13 +374,18 @@
return store.save(item_tenant(principal, account_id, item_id), item_id, body.model_dump(), principal.id,
client_ip(request))
+ for code in ITEM_ACTIONS.values():
+ require(code) # 只为把码登记进权限菜单;真正的判断在 transition 里按操作做
+
@app.post("/api/v2/knowledge/items/{item_id}/{action}")
def transition(item_id: str, action: str, body: ActionBody, request: Request,
account_id: int | None = None, principal=Depends(require("knowledge:read"))):
- permission = "knowledge:publish" if action in {"publish", "disable"} else (
- "knowledge:write" if action in {"restore", "delete"} else "knowledge:review")
- if permission not in principal.permissions or "im:content:read" not in principal.permissions:
- raise HTTPException(403, "缺少知识操作或来源正文查看权限")
+ permission = ITEM_ACTIONS.get(action)
+ if permission is None:
+ raise HTTPException(400, "未知操作")
+ missing = [code for code in (permission, "im:content:read") if code not in principal.permissions]
+ if missing:
+ raise HTTPException(403, f"缺少权限:{'、'.join(missing)}")
tenant = item_tenant(principal, account_id, item_id)
with errors():
if action == 'delete':
@@ -385,7 +407,7 @@
return store.transition(tenant, item_id, body.revision, action, principal.id, client_ip(request), body.confirmed)
@app.post("/api/v2/knowledge/search")
- def search(body: SearchBody, account_id: int | None = None, principal=Depends(require("knowledge:read"))):
+ def search(body: SearchBody, account_id: int | None = None, principal=Depends(require("knowledge:search"))):
return KnowledgeRetriever(store).search(single(principal, account_id), body.query)
@app.get("/api/v2/knowledge/retrievals")
--- production/wechat_rpa/knowledge_review.py
+++ release/wechat_rpa/knowledge_review.py
@@ -36,7 +36,8 @@
'changed_item': '预览后知识版本或状态已变化', 'deleted': '知识已删除',
'unauthorized': '该账号已不在当前授权范围',
}
-REVIEW_PERMISSIONS = {'knowledge:read', 'knowledge:review', 'im:content:read'}
+# 「一键审核」按钮的权限。后台每跑一步都重新核对:中途收回权限,任务就停。
+REVIEW_PERMISSIONS = {'knowledge:read', 'knowledge:review:auto', 'im:content:read'}
def reason_sql(alias='k'):