M4 收口:神识用户面与计量闭环——BYOK/配额三段式/usage 落库/Anthropic+Gemini 适配器/神识阁
- 神识 Go:store 双实现(PG 自动建表+60s 就绪重试 / 内存回退)承载 usage_logs·byok_keys·quota_balances;BYOK 密钥库(AES-GCM 加密、API 脱敏、撤回即失效、主密钥未配置 fail-closed);配额三段式(预扣 max_tokens 钳位 1M→结算实际 token→全败幂等退款,HJ-2004);计量归属(IR user_id→usage_logs,/me/usage 用户维度聚合+配额总览,/admin/usage/sample 对账抽样);Anthropic/Gemini 出站适配器(SSE 解析、system 提升、用量映射);stub 端点补名修复计量空 endpoint - IR 契约:user_id/byok_key_id 双端同步(Go types.go + Py types.py) - 灵台:runs.owner_id(迁移 005,server_default 兼容存量)经 kernel 全链透传为 IR user_id;shenshi_client 扩展用户面方法(X-Hunjing-User-Id 代理,Echo 桩带内存实现);/me/byok-keys 登记·列表·撤回与 /me/usage 端点(4 用例) - 前端神识阁(/models 重建):偏好(生成参数表单)/自带密钥(登记加密保存、脱敏列表、撤回二次确认)/用量(聚合表+配额进度条)三区;me API 库+mock+5 用例;侧栏恢复入口 - 配置与部署:.env.example 增 SHENSHI_DATABASE_URL/SHENSHI_BYOK_MASTER_KEY/SHENSHI_USER_BUDGET_TOKENS;compose 神识容器接自有库(init-shenshi.sql 预建 hunjing_shenshi,与灵台不共库共表) - 证据:Go 34 用例(BYOK 独占/配额拒绝/结算退款/归属聚合)、后端 532、前端 210、BFF 4 全绿;跨进程 E2E 四场景(灵台 HttpShenshiClient→真 Go 神识:登记脱敏/BYOK 独占不可达整体失败/用量归属聚合/撤回即失效)通过;rewrite-plan M4 标记完成、能力矩阵神识行升已验证
This commit is contained in:
1 parent
462d570751
commit
144415247e
51 files changed
+3533
-90
No files matched your search
@@ -0,0 +1,36 @@
|
||||
"""用户面 API schema(神识阁数据源:BYOK 密钥与用量)。"""
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
ByokType = str # openai_compatible / anthropic / gemini(契约词典 §14.2,神识侧校验)
|
||||
|
||||
|
||||
class ByokKeyView(BaseModel):
|
||||
"""BYOK 密钥脱敏形态(API 永不回明文)。"""
|
||||
|
||||
model_config = {"extra": "allow"} # 神识侧字段直通(id/name/type/base_url/model/api_key_mask/…)
|
||||
|
||||
|
||||
class ByokKeyListResponse(BaseModel):
|
||||
keys: list[dict] = Field(default_factory=list, description="脱敏密钥清单。")
|
||||
|
||||
|
||||
class RegisterByokKeyRequest(BaseModel):
|
||||
"""登记用户自带密钥。"""
|
||||
|
||||
name: str = Field(min_length=1, max_length=120, description="密钥备注名。")
|
||||
type: ByokType = Field(description="端点类型:openai_compatible / anthropic / gemini。")
|
||||
base_url: str = Field(min_length=1, max_length=500, description="Provider Base URL。")
|
||||
api_key: str = Field(min_length=8, max_length=500, description="密钥明文(仅本次请求可见,落库即加密)。")
|
||||
model: str = Field(min_length=1, max_length=200, description="该密钥承载的上游模型名。")
|
||||
|
||||
|
||||
class UsageRow(BaseModel):
|
||||
"""用量聚合行(用户×模型×端点)。"""
|
||||
|
||||
model_config = {"extra": "allow"}
|
||||
|
||||
|
||||
class MyUsageResponse(BaseModel):
|
||||
rows: list[dict] = Field(default_factory=list, description="用量聚合行。")
|
||||
quota: dict | None = Field(default=None, description="配额总览(budget/used/reserved)。")
|
||||
Reference in new issue
Block a user