chenxin
144415247e
- 神识 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 标记完成、能力矩阵神识行升已验证
72 lines
2.4 KiB
Python
72 lines
2.4 KiB
Python
"""用户面 API（神识阁数据源）：BYOK 密钥管理与用量查询。
|
|
|
|
灵台是神识唯一调用方：本端点鉴权后以 ``X-Hunjing-User-Id`` 代理转发；
|
|
密钥明文只进不出（登记请求体 → 神识加密落库，响应永远脱敏）。
|
|
"""
|
|
|
|
from fastapi import APIRouter, Depends, Request, status
|
|
|
|
from app.api.v1.deps import get_current_user
|
|
from app.core.errors import AppError
|
|
from app.kernel import Kernel
|
|
from app.schemas.auth import CurrentUser
|
|
from app.schemas.me import (
|
|
ByokKeyListResponse,
|
|
MyUsageResponse,
|
|
RegisterByokKeyRequest,
|
|
)
|
|
from app.shenshi_client.client import ShenshiClient
|
|
from app.shenshi_client.types import ShenshiError
|
|
|
|
router = APIRouter(prefix="/me", tags=["me"])
|
|
|
|
|
|
def _shenshi(request: Request) -> ShenshiClient:
|
|
kernel: Kernel | None = getattr(request.app.state, "kernel", None)
|
|
if kernel is None:
|
|
raise AppError("service_unavailable", "Kernel 未就绪。", status_code=503)
|
|
return kernel.shenshi
|
|
|
|
|
|
@router.get("/byok-keys", response_model=ByokKeyListResponse)
|
|
async def list_byok_keys(
|
|
request: Request, user: CurrentUser = Depends(get_current_user)
|
|
) -> ByokKeyListResponse:
|
|
keys = await _shenshi(request).list_byok_keys(user.owner_scope)
|
|
return ByokKeyListResponse(keys=keys)
|
|
|
|
|
|
@router.post("/byok-keys", status_code=status.HTTP_201_CREATED)
|
|
async def register_byok_key(
|
|
payload: RegisterByokKeyRequest,
|
|
request: Request,
|
|
user: CurrentUser = Depends(get_current_user),
|
|
) -> dict:
|
|
key = await _shenshi(request).register_byok_key(
|
|
user.owner_scope,
|
|
name=payload.name,
|
|
type=payload.type,
|
|
base_url=payload.base_url,
|
|
api_key=payload.api_key,
|
|
model=payload.model,
|
|
)
|
|
return key
|
|
|
|
|
|
@router.delete("/byok-keys/{key_id}", status_code=status.HTTP_204_NO_CONTENT)
|
|
async def revoke_byok_key(
|
|
key_id: str, request: Request, user: CurrentUser = Depends(get_current_user)
|
|
) -> None:
|
|
try:
|
|
await _shenshi(request).revoke_byok_key(user.owner_scope, key_id)
|
|
except ShenshiError as exc:
|
|
raise AppError(exc.code, exc.message, status_code=404) from None
|
|
|
|
|
|
@router.get("/usage", response_model=MyUsageResponse)
|
|
async def my_usage(
|
|
request: Request, user: CurrentUser = Depends(get_current_user)
|
|
) -> MyUsageResponse:
|
|
data = await _shenshi(request).get_my_usage(user.owner_scope)
|
|
return MyUsageResponse(rows=data.get("rows", []), quota=data.get("quota"))
|