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
@@ -51,6 +51,7 @@ class Kernel:
|
||||
*,
|
||||
character_id: str,
|
||||
prompt: str,
|
||||
owner_id: str = "",
|
||||
trace_id: str | None = None,
|
||||
system_contract: str | None = None,
|
||||
origin: str = "kernel",
|
||||
@@ -63,6 +64,7 @@ class Kernel:
|
||||
async with self._sessions() as session:
|
||||
run = Run(
|
||||
character_id=character_id,
|
||||
owner_id=owner_id,
|
||||
status="queued",
|
||||
kind="foreground",
|
||||
goal=prompt[:300] if prompt else None,
|
||||
@@ -75,6 +77,7 @@ class Kernel:
|
||||
self._spawn(
|
||||
run_id=run_id,
|
||||
character_id=character_id,
|
||||
owner_id=owner_id,
|
||||
prompt=prompt,
|
||||
trace_id=trace_id,
|
||||
seat_key=None,
|
||||
@@ -89,13 +92,14 @@ class Kernel:
|
||||
return created
|
||||
|
||||
async def start_rehearsal_run(
|
||||
self, *, embryo_id: str, prompt: str, system_contract: str
|
||||
self, *, embryo_id: str, prompt: str, system_contract: str, owner_id: str = ""
|
||||
) -> Run:
|
||||
"""照心试演(幻境 Run):无正式人物、不占人物命台、不产生人物经历。"""
|
||||
profile = resolve_profile()
|
||||
async with self._sessions() as session:
|
||||
run = Run(
|
||||
character_id=None,
|
||||
owner_id=owner_id,
|
||||
status="queued",
|
||||
kind="rehearsal",
|
||||
goal=prompt[:300] if prompt else None,
|
||||
@@ -108,6 +112,7 @@ class Kernel:
|
||||
self._spawn(
|
||||
run_id=run_id,
|
||||
character_id=None,
|
||||
owner_id=owner_id,
|
||||
prompt=prompt,
|
||||
trace_id=None,
|
||||
seat_key=f"embryo:{embryo_id}",
|
||||
@@ -129,6 +134,7 @@ class Kernel:
|
||||
*,
|
||||
run_id: str,
|
||||
character_id: str | None,
|
||||
owner_id: str,
|
||||
prompt: str,
|
||||
trace_id: str | None,
|
||||
seat_key: str | None,
|
||||
@@ -141,6 +147,7 @@ class Kernel:
|
||||
self.loop.execute(
|
||||
run_id=run_id,
|
||||
character_id=character_id,
|
||||
owner_id=owner_id,
|
||||
prompt=prompt,
|
||||
trace_id=trace_id,
|
||||
seat_key=seat_key,
|
||||
|
||||
@@ -83,6 +83,7 @@ class KernelRunLoop:
|
||||
run_id: str,
|
||||
character_id: str | None,
|
||||
prompt: str,
|
||||
owner_id: str = "",
|
||||
trace_id: str | None = None,
|
||||
seat_key: str | None = None,
|
||||
system_contract: str | None = None,
|
||||
@@ -98,6 +99,7 @@ class KernelRunLoop:
|
||||
await self._execute(
|
||||
run_id=run_id,
|
||||
character_id=character_id,
|
||||
owner_id=owner_id,
|
||||
prompt=prompt,
|
||||
trace_id=trace,
|
||||
seat_key=seat_key,
|
||||
@@ -127,6 +129,7 @@ class KernelRunLoop:
|
||||
*,
|
||||
run_id: str,
|
||||
character_id: str | None,
|
||||
owner_id: str,
|
||||
prompt: str,
|
||||
trace_id: str,
|
||||
seat_key: str | None,
|
||||
@@ -153,6 +156,7 @@ class KernelRunLoop:
|
||||
await self._turn(
|
||||
run_id,
|
||||
character_id,
|
||||
owner_id,
|
||||
trace_id,
|
||||
prompt,
|
||||
system_contract or _SYSTEM_CONTRACT_PLACEHOLDER,
|
||||
@@ -165,6 +169,7 @@ class KernelRunLoop:
|
||||
self,
|
||||
run_id: str,
|
||||
character_id: str | None,
|
||||
owner_id: str,
|
||||
trace_id: str,
|
||||
prompt: str,
|
||||
system_contract: str,
|
||||
@@ -189,6 +194,7 @@ class KernelRunLoop:
|
||||
run_id=run_id,
|
||||
trace_id=trace_id,
|
||||
character_id=character_id,
|
||||
user_id=owner_id or None,
|
||||
temperature=temperature,
|
||||
max_tokens=max_tokens,
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user