M5：百工与司命——能力注册表、授契行契请命、禁域裁决与观察标证
- 百工域 domains/baigong：capabilities（统一能力契约：执行类型 builtin/qiankun/mcp/http + 四维风险标注 + 来源版本）、mandates（授契 grant / 行契 charter 预算时间窗，撤销立即生效）、tool_calls（净化摘要 + 观察标证）；请命复用 pending_confirmations 加 expires_at/brief_json（超时=拒绝执行 HJ-1302，六要素说明） - 司命裁决器 siming.py：四维取最高档（能力/数据/后果/情境）；禁域为代码常量不可配置（递归删根/格式化/写裸设备/fork 炸弹、file:// 协议、密钥材料外发）——专项测试断言恶意标注与篡改对象仍拒 HJ-1301 - 执行链：禁域→裁决（HJ-1303 未授契拒且双留痕）→请命→执行（乾坤经 SandboxClient HMAC；MCP 经 call_tool；内置无副作用）→净化标证（观察非事实，敏感遮蔽+体量截断）→行动账 - MCP 登记/启停/刷新自动派生与撤下 capabilities（博闻登记接入点）；内置能力种子（echo/datetime/qiankun.shell/web.fetch） - 端点：/capabilities /mandates /petitions /tool-calls + /tools 兼容投影；前端百工页四区（能力目录四维标注/授契行契/请命批准拒绝/行动账观察标证） - 退役：modules/safety|skills|tool_runtime|agent、application/tool_runtime、services/skills|safety、tool_policies/skills/model_endpoint_overrides 表（迁移 006）、前端 SkillManager/ToolsConsole/旧 tools 页 - 验收（test_baigong_siming 四用例）：未授契被拒留痕、请命超时不执行、禁域不可关闭、结果为观察不入忆；后端 454、前端 220、BFF 4、神识 5 包全绿（2 个预存环境失败不变）
This commit is contained in:
chenxin committed
1 parent
144415247e
commit
684261f4b4
97 files changed
+3075
-5554
No files matched your search
@@ -15,6 +15,7 @@ from app.models.governance import (
|
||||
)
|
||||
from app.models.idempotency import IdempotencyKey
|
||||
from app.models.imports import CharacterImportJob, ImportItem
|
||||
from app.domains.baigong.models import Capability, Mandate, ToolCall
|
||||
from app.models.jingsheng import Custodianship, EmbryoDraft, IdentityRecord, RuntimeSeat
|
||||
from app.models.lorebook import Lorebook, LorebookEntry
|
||||
from app.models.mcp_servers import McpServer
|
||||
@@ -30,11 +31,13 @@ from app.models.rbac import Permission, Role, RolePermission, UserRole
|
||||
from app.models.runtime import Event, Run
|
||||
from app.models.xirang import FactualRecord, Memory as XirangMemory, MemoryTrigger
|
||||
from app.models.safety import AuditEvent, PendingConfirmationRecord
|
||||
from app.models.skills import Skill
|
||||
from app.models.user import User
|
||||
from app.models.world import CharacterWorldEntity, WorldRelation
|
||||
|
||||
__all__ = [
|
||||
"Capability",
|
||||
"Mandate",
|
||||
"ToolCall",
|
||||
"AgentRosterEntry",
|
||||
"AuditEvent",
|
||||
"BigCycle",
|
||||
@@ -63,7 +66,7 @@ __all__ = [
|
||||
"Role",
|
||||
"RolePermission",
|
||||
"Run",
|
||||
"Skill",
|
||||
|
||||
"User",
|
||||
"UserRole",
|
||||
"WorldEntity",
|
||||
|
||||
@@ -149,49 +149,4 @@ class GenerationPreferences(Base):
|
||||
)
|
||||
|
||||
|
||||
class ToolPolicy(Base):
|
||||
"""百工枢工具策略治理（api-spec §15 / §16）。
|
||||
|
||||
工具的风险/权限策略持久化层；``name`` 为主键。builtin 工具启动时由种子 upsert
|
||||
（``source=builtin``），自定义工具经 API 注册（``source=custom``）。司命决策器
|
||||
（SafetyGovernor）从本表加载覆盖策略；``/tools`` 与 ``/safety/policies`` 两组 API
|
||||
共享本表——前者返回完整元数据，后者只返回策略子集。
|
||||
"""
|
||||
|
||||
__tablename__ = "tool_policies"
|
||||
|
||||
name: Mapped[str] = mapped_column(String(80), primary_key=True)
|
||||
description: Mapped[str] = mapped_column(Text, nullable=False, default="")
|
||||
risk_level: Mapped[str] = mapped_column(String(20), nullable=False, default="L2")
|
||||
permission_policy: Mapped[str] = mapped_column(String(20), nullable=False, default="ask")
|
||||
side_effect: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||
audit_required: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||
source: Mapped[str] = mapped_column(String(20), nullable=False, default="custom")
|
||||
enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), default=utc_now, onupdate=utc_now
|
||||
)
|
||||
|
||||
|
||||
class ModelEndpointOverride(Base):
|
||||
"""模型网关 endpoint 运行时覆盖（DB 优先于 .env / yaml，api-spec §4.4）。
|
||||
|
||||
每个 (logical_model_name, endpoint_name) 一行；字段非空才覆盖同名 endpoint 配置，
|
||||
None = 不覆盖、回退 yaml/env。base_url/api_key 经 resolved_* 优先 endpoint 字段生效，
|
||||
故 DB 写入后即「DB 优先 env」。本地单用户边界下 API key 明文存储，GET 脱敏不回值。
|
||||
"""
|
||||
|
||||
__tablename__ = "model_endpoint_overrides"
|
||||
|
||||
logical_model_name: Mapped[str] = mapped_column(String(120), primary_key=True)
|
||||
endpoint_name: Mapped[str] = mapped_column(String(120), primary_key=True)
|
||||
base_url: Mapped[str | None] = mapped_column(String(500))
|
||||
api_key: Mapped[str | None] = mapped_column(String(500))
|
||||
status: Mapped[str | None] = mapped_column(String(40))
|
||||
weight: Mapped[int | None] = mapped_column(Integer)
|
||||
priority: Mapped[int | None] = mapped_column(Integer)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), default=utc_now, onupdate=utc_now
|
||||
)
|
||||
@@ -50,5 +50,8 @@ class PendingConfirmationRecord(Base):
|
||||
character_id: Mapped[str | None] = mapped_column(String(80), index=True)
|
||||
trace_id: Mapped[str | None] = mapped_column(String(80))
|
||||
status: Mapped[str] = mapped_column(String(40), nullable=False, default="pending", index=True)
|
||||
# M5 请命改造：超时=拒绝执行（HJ-1302）；brief_json 为请命六要素说明
|
||||
expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||||
brief_json: Mapped[str] = mapped_column(Text, nullable=False, default="{}", server_default="{}")
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
|
||||
resolved_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||||
@@ -1,33 +0,0 @@
|
||||
"""百工 Skill 能力包模型（skills-design §4.1；契约字典 §10.5 skill_ 前缀）。
|
||||
|
||||
Skill 是显式注册的能力包：触发时注入 prompt_fragment 到对话 contract，
|
||||
tool_bindings 仅作为 prompt 提示（不改变 ToolRuntime 注册集）。
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import DateTime, String, Text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.core.ids import new_skill_id
|
||||
from app.core.time import utc_now
|
||||
from app.db.base import Base
|
||||
|
||||
|
||||
class Skill(Base):
|
||||
"""Skill 能力包。"""
|
||||
|
||||
__tablename__ = "skills"
|
||||
|
||||
id: Mapped[str] = mapped_column(String(80), primary_key=True, default=new_skill_id)
|
||||
name: Mapped[str] = mapped_column(String(120), nullable=False, unique=True)
|
||||
description: Mapped[str] = mapped_column(Text, nullable=False, default="")
|
||||
trigger: Mapped[str] = mapped_column(Text, nullable=False, default="")
|
||||
prompt_fragment: Mapped[str] = mapped_column(Text, nullable=False, default="")
|
||||
tool_bindings_json: Mapped[str] = mapped_column(Text, nullable=False, default="[]")
|
||||
risk_level: Mapped[str] = mapped_column(String(8), nullable=False, default="L1")
|
||||
status: Mapped[str] = mapped_column(String(40), nullable=False, default="enabled", index=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), default=utc_now, onupdate=utc_now
|
||||
)
|
||||
Reference in new issue
Block a user