codebee 0.1.69 → 0.1.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +589 -543
- package/LICENSE +21 -21
- package/README.md +509 -508
- package/app/.playwright-cli/console-2026-09-23T08-26-03-635Z.log +88 -0
- package/app/.playwright-cli/page-2026-09-23T08-26-03-845Z.yml +126 -0
- package/app/.playwright-cli/page-2026-09-23T08-29-44-203Z.png +0 -0
- package/app/.playwright-cli/page-2026-09-23T08-35-42-046Z.yml +210 -0
- package/app/.playwright-cli/page-2026-09-23T08-36-52-858Z.png +0 -0
- package/app/.playwright-cli/page-2026-09-23T08-37-33-938Z.png +0 -0
- package/app/.playwright-cli/run-detail-after.png +0 -0
- package/app/browser-final-1440.png +0 -0
- package/app/browser-final-390.png +0 -0
- package/app/browser-google-fallback.png +0 -0
- package/app/browser-google-test.png +0 -0
- package/app/browser-workbench-1440.png +0 -0
- package/app/browser-workbench-390.png +0 -0
- package/app/browser-workspace-google.png +0 -0
- package/app/browser-workspace-smoke.png +0 -0
- package/app/browser-workspace.png +0 -0
- package/app/core/acceptance.py +100 -100
- package/app/core/aiflavor.py +197 -197
- package/app/core/artifacts.py +148 -148
- package/app/core/assets.py +110 -110
- package/app/core/attachments.py +623 -623
- package/app/core/audit.py +30 -0
- package/app/core/automation.py +107 -12
- package/app/core/backup.py +470 -470
- package/app/core/beekeeper.py +183 -183
- package/app/core/benchstore.py +95 -0
- package/app/core/board.py +209 -209
- package/app/core/bookmeta.py +935 -930
- package/app/core/bookmeta_catalog.py +180 -180
- package/app/core/branching.py +137 -137
- package/app/core/builtin_agent.py +1673 -1234
- package/app/core/capability.py +144 -144
- package/app/core/catalog.py +7 -1
- package/app/core/chaptersafe.py +32 -32
- package/app/core/cleanup.py +303 -303
- package/app/core/compaction.py +201 -201
- package/app/core/covergen.py +356 -356
- package/app/core/defectretro.py +43 -43
- package/app/core/diagnostics.py +114 -114
- package/app/core/dispatch.py +190 -173
- package/app/core/dispatch_log.py +128 -128
- package/app/core/env_scrub.py +85 -85
- package/app/core/error_codes.py +11 -2
- package/app/core/errorlog.py +137 -137
- package/app/core/evalbench.py +720 -0
- package/app/core/evaluation.py +174 -174
- package/app/core/failure_notify.py +290 -290
- package/app/core/flows.py +234 -9
- package/app/core/goal_service.py +167 -167
- package/app/core/health.py +374 -374
- package/app/core/history.py +38 -38
- package/app/core/hooks.py +162 -162
- package/app/core/jobs.py +22 -1
- package/app/core/manager.py +2143 -2122
- package/app/core/market_remote.py +10 -0
- package/app/core/mcp_client.py +287 -0
- package/app/core/mocks.py +64 -64
- package/app/core/modelhub.py +185 -2
- package/app/core/notify.py +201 -106
- package/app/core/novel_quality.py +189 -0
- package/app/core/operations.py +228 -228
- package/app/core/paihang.py +138 -138
- package/app/core/paths.py +4 -0
- package/app/core/pipeline.py +426 -28
- package/app/core/planner.py +243 -22
- package/app/core/plugins.py +525 -0
- package/app/core/portguard.py +111 -111
- package/app/core/preview.py +293 -293
- package/app/core/publish/__init__.py +7 -7
- package/app/core/publish/auto.py +367 -367
- package/app/core/publish/browser.py +655 -539
- package/app/core/publish/fanqie.py +165 -159
- package/app/core/publish/flow.py +589 -440
- package/app/core/publish/flows-fanqie-calibrated.json +336 -332
- package/app/core/publish/ledger.py +229 -203
- package/app/core/publish/manager.py +824 -692
- package/app/core/publish/qimao.py +146 -141
- package/app/core/publish/ws.py +139 -139
- package/app/core/redact.py +38 -38
- package/app/core/remotesync.py +121 -0
- package/app/core/repeat_guard.py +129 -129
- package/app/core/router.py +398 -398
- package/app/core/runner.py +2142 -2067
- package/app/core/selfupdate.py +384 -384
- package/app/core/session_log.py +161 -161
- package/app/core/sessions.py +312 -312
- package/app/core/settings.py +42 -4
- package/app/core/settings_schema.py +270 -262
- package/app/core/share_page.py +114 -114
- package/app/core/skill_scan.py +122 -122
- package/app/core/skillpacks/fanqie-novel.md +80 -80
- package/app/core/skillpacks/market/character-bible.md +66 -66
- package/app/core/skillpacks/market/code-risk-checklist.md +58 -58
- package/app/core/skillpacks/market/git-workflow.md +57 -57
- package/app/core/skillpacks/market/release-notes.md +72 -72
- package/app/core/skillpacks/market/weekly-report.md +71 -71
- package/app/core/skillpacks/market/worldview-consistency.md +70 -70
- package/app/core/step_runner.py +132 -132
- package/app/core/store.py +30 -8
- package/app/core/task_compile.py +199 -199
- package/app/core/telemetry.py +292 -292
- package/app/core/tlsctx.py +64 -64
- package/app/core/token_meter.py +147 -147
- package/app/core/tracing.py +144 -144
- package/app/core/upstream.py +41 -41
- package/app/core/usage.py +1035 -862
- package/app/core/volumes.py +389 -389
- package/app/core/wxdigest.py +858 -858
- package/app/core/zentao.py +2614 -2465
- package/app/current-browser.png +0 -0
- package/app/main.py +316 -17
- package/app/mcp_server.py +175 -0
- package/app/pet.py +83 -22
- package/app/pick_dialog.py +110 -110
- package/app/plugins/code-review-helper/.codex-plugin/plugin.json +18 -0
- package/app/plugins/code-review-helper/skills/review.md +16 -0
- package/app/ui/app.js +1391 -77
- package/app/ui/artdiff.js +74 -74
- package/app/ui/board.html +162 -162
- package/app/ui/board.js +305 -305
- package/app/ui/i18n.js +249 -7
- package/app/ui/icons/bee.svg +79 -79
- package/app/ui/index.html +277 -13
- package/app/ui/manifest.json +16 -16
- package/app/ui/qrcode.js +2297 -2297
- package/app/ui/style.css +845 -12
- package/app//344/275/234/345/223/201/344/277/241/346/201/257-/344/270/203/347/214/253.md +18 -0
- package/bin/tutti.js +147 -147
- package/package.json +47 -46
- package/tools/wx_reader.py +261 -261
package/app/core/settings.py
CHANGED
|
@@ -16,15 +16,31 @@ _FILE = paths.DATA_DIR / "settings.json"
|
|
|
16
16
|
# 「导出诊断包」是用户手动操作不受此开关限制)
|
|
17
17
|
# publish_daily_cap / publish_fail_streak:自动发布护栏——每任务每平台每日
|
|
18
18
|
# 成功发章上限、平台连续失败几次后暂停自动发布(publish/auto.py 读取)
|
|
19
|
-
# pet_enabled / pet_mode:桌面蜜蜂(app/pet.py
|
|
19
|
+
# pet_enabled / pet_mode:桌面蜜蜂(app/pet.py)开关与显示模式(默认关,设置页
|
|
20
|
+
# 可开)。关闭后看护线程不再拉起、在岗蜜蜂轮询到 false 自行退出;mode=always
|
|
20
21
|
# 不再拉起、在岗蜜蜂轮询到 false 自行退出;mode=always 常驻,tasks_only 仅任务
|
|
21
22
|
# 运行时出现(空闲 90s 隐身)。
|
|
22
23
|
# cleanup_enabled / cleanup_retention_days:每日垃圾清理(core/cleanup.py)——
|
|
23
24
|
# 运行过程日志/发布截图/bak 残留等超期自动清理;retention 为保留天数。
|
|
25
|
+
# 个人推送通道(core/notify.py 读取):Bark(iOS)/ ntfy(自托管友好)/
|
|
26
|
+
# Server酱(微信)/ Telegram Bot。密钥只存本机 settings.json,不出网(推送
|
|
27
|
+
# 时才带着发给对应服务)。bark_server 留空回落官方 api.day.app。
|
|
24
28
|
DEFAULTS = {"max_concurrent_jobs": 12, "default_workdir": "", "hooks_token": "",
|
|
25
29
|
"telemetry_errors": True, "publish_daily_cap": 10,
|
|
26
30
|
"publish_fail_streak": 3, "notify_webhook": "", "notify_base_url": "",
|
|
27
|
-
"
|
|
31
|
+
"notify_bark_server": "", "notify_bark_key": "",
|
|
32
|
+
"notify_ntfy_topic": "", "notify_serverchan_key": "",
|
|
33
|
+
"notify_telegram_token": "", "notify_telegram_chat_id": "",
|
|
34
|
+
# 评测台定时回归(evalbench.fire_due,automation tick 调用):
|
|
35
|
+
# enabled=False 关;days 间隔天数控节流;mcp_servers=内置智能体的
|
|
36
|
+
# MCP 服务器清单(JSON 数组字符串,stdio 形态)
|
|
37
|
+
"bench_auto_enabled": False, "bench_auto_days": 7,
|
|
38
|
+
"mcp_servers": "",
|
|
39
|
+
# 备份远程通道(remotesync):导出成功后自动 PUT 到 WebDAV/S3 兼容
|
|
40
|
+
# 端点(Basic auth);密钥只存本机
|
|
41
|
+
"backup_remote_enabled": False, "backup_remote_url": "",
|
|
42
|
+
"backup_remote_user": "", "backup_remote_pass": "",
|
|
43
|
+
"pet_enabled": False, "pet_mode": "always", "pet_skin": "plush",
|
|
28
44
|
"cleanup_enabled": True, "cleanup_retention_days": 14,
|
|
29
45
|
# claude_config_sync:打开/运行前防线是否直写 ~/.claude/settings.json。
|
|
30
46
|
# 关闭后交互 claude 配置归用户手动管理(cc-switch 等),编排步骤经
|
|
@@ -40,8 +56,10 @@ MIN_WORKERS, MAX_WORKERS = 1, 24
|
|
|
40
56
|
|
|
41
57
|
|
|
42
58
|
def builtin_workdir():
|
|
43
|
-
"""
|
|
44
|
-
|
|
59
|
+
"""内置默认保存路径:数据目录内的 workspace/(CodeBee 自己的地盘,
|
|
60
|
+
启动 ensure_dirs 即创建;老版本落在数据目录同级——Windows 上是
|
|
61
|
+
AppData\\Roaming\\workspace,平时不存在点开即报错,已废弃)。"""
|
|
62
|
+
return str(paths.DATA_DIR / "workspace")
|
|
45
63
|
|
|
46
64
|
|
|
47
65
|
def default_workdir():
|
|
@@ -118,6 +136,26 @@ def save(patch):
|
|
|
118
136
|
cur["notify_webhook"] = str(patch.get("notify_webhook") or "").strip()[:300]
|
|
119
137
|
if "notify_base_url" in patch:
|
|
120
138
|
cur["notify_base_url"] = str(patch.get("notify_base_url") or "").strip()[:200]
|
|
139
|
+
for _nk, _nmax in (("notify_bark_server", 200), ("notify_bark_key", 128),
|
|
140
|
+
("notify_ntfy_topic", 200), ("notify_serverchan_key", 128),
|
|
141
|
+
("notify_telegram_token", 128), ("notify_telegram_chat_id", 64)):
|
|
142
|
+
if _nk in patch:
|
|
143
|
+
cur[_nk] = str(patch.get(_nk) or "").strip()[:_nmax]
|
|
144
|
+
if "bench_auto_enabled" in patch:
|
|
145
|
+
cur["bench_auto_enabled"] = bool(patch.get("bench_auto_enabled"))
|
|
146
|
+
if "bench_auto_days" in patch:
|
|
147
|
+
try:
|
|
148
|
+
cur["bench_auto_days"] = max(1, min(90, int(patch.get("bench_auto_days"))))
|
|
149
|
+
except (TypeError, ValueError):
|
|
150
|
+
return cur, "bench_auto_days 必须是 1-90 的整数"
|
|
151
|
+
if "mcp_servers" in patch:
|
|
152
|
+
cur["mcp_servers"] = str(patch.get("mcp_servers") or "").strip()[:4000]
|
|
153
|
+
if "backup_remote_enabled" in patch:
|
|
154
|
+
cur["backup_remote_enabled"] = bool(patch.get("backup_remote_enabled"))
|
|
155
|
+
for _rk, _rmax in (("backup_remote_url", 300), ("backup_remote_user", 128),
|
|
156
|
+
("backup_remote_pass", 128)):
|
|
157
|
+
if _rk in patch:
|
|
158
|
+
cur[_rk] = str(patch.get(_rk) or "").strip()[:_rmax]
|
|
121
159
|
if "pet_enabled" in patch:
|
|
122
160
|
cur["pet_enabled"] = bool(patch.get("pet_enabled"))
|
|
123
161
|
if "pet_mode" in patch:
|
|
@@ -1,263 +1,271 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""Schema 化设置:namespace 注册 + revision CAS + 脱敏 describe。
|
|
3
|
-
|
|
4
|
-
设计稿:docs/migration/05-model-seams.md §4C(按 Tutti 实际架构落地:
|
|
5
|
-
不替换现有 settings.py——它正被并行迭代且已有原子写+钳制;本模块提供
|
|
6
|
-
「schema 驱动 + revision CAS + secret 脱敏」能力,管理自己的
|
|
7
|
-
data/settings_v2.json,供新增配置项使用,存量 key-value 不迁移)。
|
|
8
|
-
|
|
9
|
-
参考 dsh packages/settings/settings/src/index.ts:419-637:
|
|
10
|
-
register(ns, schema, base) / mutate(ops) / describe({redactSecrets}) /
|
|
11
|
-
SettingsConflictError(revision 单调,乐观并发)。
|
|
12
|
-
|
|
13
|
-
冲突语义:mutate 带 expected_revision 时做 CAS;不带则最后写赢。
|
|
14
|
-
"""
|
|
15
|
-
from __future__ import annotations
|
|
16
|
-
|
|
17
|
-
import json
|
|
18
|
-
import re
|
|
19
|
-
import threading
|
|
20
|
-
from pathlib import Path
|
|
21
|
-
|
|
22
|
-
_LOCK = threading.RLock()
|
|
23
|
-
_FILE = None # init() 注入
|
|
24
|
-
_NAMESPACES = {} # ns -> {"fields": {path: FieldDef}, "validate": fn}
|
|
25
|
-
_VALUES = {} # ns -> {path: value}
|
|
26
|
-
_REVISIONS = {} # ns -> int
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
class SettingsConflictError(Exception):
|
|
30
|
-
"""CAS 失败:调用方持有的是陈旧 revision。"""
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
class FieldDef:
|
|
34
|
-
__slots__ = ("path", "ftype", "default", "description", "redact", "choices", "clamp")
|
|
35
|
-
|
|
36
|
-
def __init__(self, path, ftype, default, description="", redact=False,
|
|
37
|
-
choices=None, clamp=None):
|
|
38
|
-
self.path = path
|
|
39
|
-
self.ftype = ftype # "int" | "float" | "str" | "bool"
|
|
40
|
-
self.default = default
|
|
41
|
-
self.description = description
|
|
42
|
-
self.redact = redact # True = describe() 输出 __REDACTED__
|
|
43
|
-
self.choices = choices # 可选:合法值列表
|
|
44
|
-
self.clamp = clamp # 可选:(min, max),int/float 用
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
def init(data_dir=None):
|
|
48
|
-
global _FILE, _NAMESPACES, _VALUES, _REVISIONS
|
|
49
|
-
with _LOCK:
|
|
50
|
-
base = Path(data_dir) if data_dir else Path(_default_dir())
|
|
51
|
-
base.mkdir(parents=True, exist_ok=True)
|
|
52
|
-
_FILE = base / "settings_v2.json"
|
|
53
|
-
_NAMESPACES, _VALUES, _REVISIONS = {}, {}, {}
|
|
54
|
-
try:
|
|
55
|
-
data = json.loads(_FILE.read_text(encoding="utf-8"))
|
|
56
|
-
_VALUES = data.get("values") or {}
|
|
57
|
-
_REVISIONS = data.get("revisions") or {}
|
|
58
|
-
except (OSError, json.JSONDecodeError):
|
|
59
|
-
pass
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
def _default_dir():
|
|
63
|
-
from . import paths
|
|
64
|
-
return str(paths.DATA_DIR)
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
def _persist():
|
|
68
|
-
if _FILE is None:
|
|
69
|
-
return
|
|
70
|
-
tmp = _FILE.with_suffix(".tmp")
|
|
71
|
-
tmp.write_text(json.dumps({"values": _VALUES, "revisions": _REVISIONS},
|
|
72
|
-
ensure_ascii=False, indent=2), encoding="utf-8")
|
|
73
|
-
tmp.replace(_FILE)
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
# ---- 路径读写(支持 "a.b" 点路径;不实现数组下标——Tutti 配置用不到) ----
|
|
77
|
-
|
|
78
|
-
def _get_path(d, path):
|
|
79
|
-
cur = d
|
|
80
|
-
for seg in path.split("."):
|
|
81
|
-
if not isinstance(cur, dict) or seg not in cur:
|
|
82
|
-
return None
|
|
83
|
-
cur = cur[seg]
|
|
84
|
-
return cur
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
def _set_path(d, path, value):
|
|
88
|
-
segs = path.split(".")
|
|
89
|
-
cur = d
|
|
90
|
-
for seg in segs[:-1]:
|
|
91
|
-
cur = cur.setdefault(seg, {})
|
|
92
|
-
if not isinstance(cur, dict):
|
|
93
|
-
raise ValueError("路径冲突:%s" % path)
|
|
94
|
-
cur[segs[-1]] = value
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
# ---- 注册 ----
|
|
98
|
-
|
|
99
|
-
def register_namespace(ns, fields, validate=None):
|
|
100
|
-
"""注册 namespace 与字段 schema。已注册的 namespace 不可重复注册。"""
|
|
101
|
-
with _LOCK:
|
|
102
|
-
if ns in _NAMESPACES:
|
|
103
|
-
raise ValueError("namespace 已注册:%s" % ns)
|
|
104
|
-
fmap = {}
|
|
105
|
-
for f in fields:
|
|
106
|
-
fmap[f.path] = f
|
|
107
|
-
if _get_path(_VALUES.get(ns, {}), f.path) is None:
|
|
108
|
-
_VALUES.setdefault(ns, {})
|
|
109
|
-
_set_path(_VALUES[ns], f.path, f.default)
|
|
110
|
-
_NAMESPACES[ns] = {"fields": fmap, "validate": validate}
|
|
111
|
-
_REVISIONS.setdefault(ns, 1)
|
|
112
|
-
_persist()
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
def coerce(field, value):
|
|
116
|
-
"""按字段类型强转 + 钳制 + choices 校验。返回 (规范化值, 错误)。"""
|
|
117
|
-
try:
|
|
118
|
-
if field.ftype == "int":
|
|
119
|
-
v = int(value)
|
|
120
|
-
elif field.ftype == "float":
|
|
121
|
-
v = float(value)
|
|
122
|
-
elif field.ftype == "bool":
|
|
123
|
-
v = bool(value) if not isinstance(value, str) else (
|
|
124
|
-
value.strip().lower() in ("1", "true", "yes", "on"))
|
|
125
|
-
else:
|
|
126
|
-
v = str(value)
|
|
127
|
-
except (TypeError, ValueError):
|
|
128
|
-
return None, "%s 必须是 %s" % (field.path, field.ftype)
|
|
129
|
-
if field.clamp:
|
|
130
|
-
lo, hi = field.clamp
|
|
131
|
-
v = max(lo, min(hi, v))
|
|
132
|
-
if field.choices is not None and v not in field.choices:
|
|
133
|
-
return None, "%s 必须是 %s 之一" % (field.path, field.choices)
|
|
134
|
-
return v, None
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
# ---- 读写 ----
|
|
138
|
-
|
|
139
|
-
def get(ns, path=None):
|
|
140
|
-
with _LOCK:
|
|
141
|
-
vals = _VALUES.get(ns)
|
|
142
|
-
if vals is None:
|
|
143
|
-
return None
|
|
144
|
-
return _get_path(vals, path) if path else dict(vals)
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
def revision(ns):
|
|
148
|
-
with _LOCK:
|
|
149
|
-
return _REVISIONS.get(ns, 0)
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
def names():
|
|
153
|
-
"""已注册 namespace 清单(GET /api/settings-v2 用)。"""
|
|
154
|
-
with _LOCK:
|
|
155
|
-
return sorted(_NAMESPACES)
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
def mutate(ns, ops, expected_revision=None):
|
|
159
|
-
"""写一组操作。ops = [{"op":"set","path":..., "value":...}, ...]。
|
|
160
|
-
|
|
161
|
-
值按注册的 FieldDef 强转/钳制/校验;namespace 有 validate 钩子时整体验证。
|
|
162
|
-
expected_revision 非 None 时做 CAS。成功返回新 revision。
|
|
163
|
-
"""
|
|
164
|
-
with _LOCK:
|
|
165
|
-
ndef = _NAMESPACES.get(ns)
|
|
166
|
-
if not ndef:
|
|
167
|
-
raise ValueError("namespace 未注册:%s" % ns)
|
|
168
|
-
if expected_revision is not None and _REVISIONS.get(ns) != expected_revision:
|
|
169
|
-
raise SettingsConflictError(
|
|
170
|
-
"%s 期望 rev %s,实际 %s" % (ns, expected_revision, _REVISIONS.get(ns)))
|
|
171
|
-
# 先全部校验,后统一写入(部分失败不落盘)
|
|
172
|
-
staged = []
|
|
173
|
-
for op in ops:
|
|
174
|
-
if op.get("op") != "set":
|
|
175
|
-
raise ValueError("仅支持 set 操作:%r" % op.get("op"))
|
|
176
|
-
path = op.get("path")
|
|
177
|
-
fdef = ndef["fields"].get(path)
|
|
178
|
-
if not fdef:
|
|
179
|
-
raise ValueError("未注册字段:%s" % path)
|
|
180
|
-
v, err = coerce(fdef, op.get("value"))
|
|
181
|
-
if err:
|
|
182
|
-
raise ValueError(err)
|
|
183
|
-
staged.append((path, v))
|
|
184
|
-
ns_values = dict(_VALUES.get(ns, {}))
|
|
185
|
-
for path, v in staged:
|
|
186
|
-
_set_path(ns_values, path, v)
|
|
187
|
-
if ndef["validate"]:
|
|
188
|
-
err = ndef["validate"](ns_values)
|
|
189
|
-
if err:
|
|
190
|
-
raise ValueError("namespace 校验失败:%s" % err)
|
|
191
|
-
_VALUES[ns] = ns_values
|
|
192
|
-
_REVISIONS[ns] = _REVISIONS.get(ns, 1) + 1
|
|
193
|
-
_persist()
|
|
194
|
-
return _REVISIONS[ns]
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
def describe(ns, redact_secrets=True):
|
|
198
|
-
"""给 UI 的视图:默认把 redact 字段替换为 __REDACTED__(不泄露真值)。
|
|
199
|
-
|
|
200
|
-
fields 带回字段元数据(类型/说明/choices/clamp),前端调参卡按 schema
|
|
201
|
-
渲染控件,schema 变更零前端改动。"""
|
|
202
|
-
with _LOCK:
|
|
203
|
-
vals = json.loads(json.dumps(_VALUES.get(ns, {}))) # deep copy
|
|
204
|
-
ndef = _NAMESPACES.get(ns) or {"fields": {}}
|
|
205
|
-
fields = [{"path": f.path, "type": f.ftype, "description": f.description,
|
|
206
|
-
"choices": f.choices, "clamp": f.clamp}
|
|
207
|
-
for f in ndef["fields"].values()]
|
|
208
|
-
for f in ndef["fields"].values():
|
|
209
|
-
if f.redact and redact_secrets:
|
|
210
|
-
if _get_path(vals, f.path) not in (None, ""):
|
|
211
|
-
_set_path(vals, f.path, "__REDACTED__")
|
|
212
|
-
return {"ns": ns, "revision": _REVISIONS.get(ns, 0), "values": vals,
|
|
213
|
-
"fields": fields}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
# ---- 默认 namespace(编排阈值的 schema 化存放处;pipeline 可渐进接入) ----
|
|
217
|
-
|
|
218
|
-
def register_default_namespaces():
|
|
219
|
-
"""注册 Tutti 默认 namespace。幂等(已注册则跳过)。"""
|
|
220
|
-
if "orchestrator" in _NAMESPACES and "budget" in _NAMESPACES:
|
|
221
|
-
return
|
|
222
|
-
if "orchestrator" not in _NAMESPACES:
|
|
223
|
-
register_namespace(
|
|
224
|
-
"orchestrator",
|
|
225
|
-
fields=[
|
|
226
|
-
FieldDef("compaction.enabled", "bool", False,
|
|
227
|
-
"上下文压缩总开关(灰度:与 TUTTI_COMPACTION 任一开启即生效)"),
|
|
228
|
-
FieldDef("compaction.pressure_threshold", "float", 0.8,
|
|
229
|
-
"触发压缩的压力比阈值",
|
|
230
|
-
clamp=(0.1, 0.99)),
|
|
231
|
-
FieldDef("compaction.retain_tail_tokens", "int", 8000,
|
|
232
|
-
"压缩时保留尾部预算(token 估算)",
|
|
233
|
-
clamp=(0, 100000)),
|
|
234
|
-
FieldDef("max_goal_rounds", "int", 5,
|
|
235
|
-
"Goal 续行上限",
|
|
236
|
-
clamp=(1, 20)),
|
|
237
|
-
FieldDef("outline_timeout_s", "int", 900,
|
|
238
|
-
"大纲/规划 CLI 兜底调用的超时秒数(env TUTTI_OUTLINE_TIMEOUT 优先)",
|
|
239
|
-
clamp=(60, 3600)),
|
|
240
|
-
],
|
|
241
|
-
validate=lambda v: None,
|
|
242
|
-
)
|
|
243
|
-
if "budget" not in _NAMESPACES:
|
|
244
|
-
register_namespace(
|
|
245
|
-
"budget",
|
|
246
|
-
fields=[
|
|
247
|
-
# §07 T2.1:0 = 不限;达到上限后 pipeline 停止后续真实调用(ENV_BLOCK)
|
|
248
|
-
FieldDef("max_tokens_per_run", "int", 0,
|
|
249
|
-
"单次运行 token 预算上限(0=不限;超额停止后续步骤,等自动续跑)",
|
|
250
|
-
clamp=(0, 100_000_000)),
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""Schema 化设置:namespace 注册 + revision CAS + 脱敏 describe。
|
|
3
|
+
|
|
4
|
+
设计稿:docs/migration/05-model-seams.md §4C(按 Tutti 实际架构落地:
|
|
5
|
+
不替换现有 settings.py——它正被并行迭代且已有原子写+钳制;本模块提供
|
|
6
|
+
「schema 驱动 + revision CAS + secret 脱敏」能力,管理自己的
|
|
7
|
+
data/settings_v2.json,供新增配置项使用,存量 key-value 不迁移)。
|
|
8
|
+
|
|
9
|
+
参考 dsh packages/settings/settings/src/index.ts:419-637:
|
|
10
|
+
register(ns, schema, base) / mutate(ops) / describe({redactSecrets}) /
|
|
11
|
+
SettingsConflictError(revision 单调,乐观并发)。
|
|
12
|
+
|
|
13
|
+
冲突语义:mutate 带 expected_revision 时做 CAS;不带则最后写赢。
|
|
14
|
+
"""
|
|
15
|
+
from __future__ import annotations
|
|
16
|
+
|
|
17
|
+
import json
|
|
18
|
+
import re
|
|
19
|
+
import threading
|
|
20
|
+
from pathlib import Path
|
|
21
|
+
|
|
22
|
+
_LOCK = threading.RLock()
|
|
23
|
+
_FILE = None # init() 注入
|
|
24
|
+
_NAMESPACES = {} # ns -> {"fields": {path: FieldDef}, "validate": fn}
|
|
25
|
+
_VALUES = {} # ns -> {path: value}
|
|
26
|
+
_REVISIONS = {} # ns -> int
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
class SettingsConflictError(Exception):
|
|
30
|
+
"""CAS 失败:调用方持有的是陈旧 revision。"""
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
class FieldDef:
|
|
34
|
+
__slots__ = ("path", "ftype", "default", "description", "redact", "choices", "clamp")
|
|
35
|
+
|
|
36
|
+
def __init__(self, path, ftype, default, description="", redact=False,
|
|
37
|
+
choices=None, clamp=None):
|
|
38
|
+
self.path = path
|
|
39
|
+
self.ftype = ftype # "int" | "float" | "str" | "bool"
|
|
40
|
+
self.default = default
|
|
41
|
+
self.description = description
|
|
42
|
+
self.redact = redact # True = describe() 输出 __REDACTED__
|
|
43
|
+
self.choices = choices # 可选:合法值列表
|
|
44
|
+
self.clamp = clamp # 可选:(min, max),int/float 用
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def init(data_dir=None):
|
|
48
|
+
global _FILE, _NAMESPACES, _VALUES, _REVISIONS
|
|
49
|
+
with _LOCK:
|
|
50
|
+
base = Path(data_dir) if data_dir else Path(_default_dir())
|
|
51
|
+
base.mkdir(parents=True, exist_ok=True)
|
|
52
|
+
_FILE = base / "settings_v2.json"
|
|
53
|
+
_NAMESPACES, _VALUES, _REVISIONS = {}, {}, {}
|
|
54
|
+
try:
|
|
55
|
+
data = json.loads(_FILE.read_text(encoding="utf-8"))
|
|
56
|
+
_VALUES = data.get("values") or {}
|
|
57
|
+
_REVISIONS = data.get("revisions") or {}
|
|
58
|
+
except (OSError, json.JSONDecodeError):
|
|
59
|
+
pass
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
def _default_dir():
|
|
63
|
+
from . import paths
|
|
64
|
+
return str(paths.DATA_DIR)
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
def _persist():
|
|
68
|
+
if _FILE is None:
|
|
69
|
+
return
|
|
70
|
+
tmp = _FILE.with_suffix(".tmp")
|
|
71
|
+
tmp.write_text(json.dumps({"values": _VALUES, "revisions": _REVISIONS},
|
|
72
|
+
ensure_ascii=False, indent=2), encoding="utf-8")
|
|
73
|
+
tmp.replace(_FILE)
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
# ---- 路径读写(支持 "a.b" 点路径;不实现数组下标——Tutti 配置用不到) ----
|
|
77
|
+
|
|
78
|
+
def _get_path(d, path):
|
|
79
|
+
cur = d
|
|
80
|
+
for seg in path.split("."):
|
|
81
|
+
if not isinstance(cur, dict) or seg not in cur:
|
|
82
|
+
return None
|
|
83
|
+
cur = cur[seg]
|
|
84
|
+
return cur
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
def _set_path(d, path, value):
|
|
88
|
+
segs = path.split(".")
|
|
89
|
+
cur = d
|
|
90
|
+
for seg in segs[:-1]:
|
|
91
|
+
cur = cur.setdefault(seg, {})
|
|
92
|
+
if not isinstance(cur, dict):
|
|
93
|
+
raise ValueError("路径冲突:%s" % path)
|
|
94
|
+
cur[segs[-1]] = value
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
# ---- 注册 ----
|
|
98
|
+
|
|
99
|
+
def register_namespace(ns, fields, validate=None):
|
|
100
|
+
"""注册 namespace 与字段 schema。已注册的 namespace 不可重复注册。"""
|
|
101
|
+
with _LOCK:
|
|
102
|
+
if ns in _NAMESPACES:
|
|
103
|
+
raise ValueError("namespace 已注册:%s" % ns)
|
|
104
|
+
fmap = {}
|
|
105
|
+
for f in fields:
|
|
106
|
+
fmap[f.path] = f
|
|
107
|
+
if _get_path(_VALUES.get(ns, {}), f.path) is None:
|
|
108
|
+
_VALUES.setdefault(ns, {})
|
|
109
|
+
_set_path(_VALUES[ns], f.path, f.default)
|
|
110
|
+
_NAMESPACES[ns] = {"fields": fmap, "validate": validate}
|
|
111
|
+
_REVISIONS.setdefault(ns, 1)
|
|
112
|
+
_persist()
|
|
113
|
+
|
|
114
|
+
|
|
115
|
+
def coerce(field, value):
|
|
116
|
+
"""按字段类型强转 + 钳制 + choices 校验。返回 (规范化值, 错误)。"""
|
|
117
|
+
try:
|
|
118
|
+
if field.ftype == "int":
|
|
119
|
+
v = int(value)
|
|
120
|
+
elif field.ftype == "float":
|
|
121
|
+
v = float(value)
|
|
122
|
+
elif field.ftype == "bool":
|
|
123
|
+
v = bool(value) if not isinstance(value, str) else (
|
|
124
|
+
value.strip().lower() in ("1", "true", "yes", "on"))
|
|
125
|
+
else:
|
|
126
|
+
v = str(value)
|
|
127
|
+
except (TypeError, ValueError):
|
|
128
|
+
return None, "%s 必须是 %s" % (field.path, field.ftype)
|
|
129
|
+
if field.clamp:
|
|
130
|
+
lo, hi = field.clamp
|
|
131
|
+
v = max(lo, min(hi, v))
|
|
132
|
+
if field.choices is not None and v not in field.choices:
|
|
133
|
+
return None, "%s 必须是 %s 之一" % (field.path, field.choices)
|
|
134
|
+
return v, None
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
# ---- 读写 ----
|
|
138
|
+
|
|
139
|
+
def get(ns, path=None):
|
|
140
|
+
with _LOCK:
|
|
141
|
+
vals = _VALUES.get(ns)
|
|
142
|
+
if vals is None:
|
|
143
|
+
return None
|
|
144
|
+
return _get_path(vals, path) if path else dict(vals)
|
|
145
|
+
|
|
146
|
+
|
|
147
|
+
def revision(ns):
|
|
148
|
+
with _LOCK:
|
|
149
|
+
return _REVISIONS.get(ns, 0)
|
|
150
|
+
|
|
151
|
+
|
|
152
|
+
def names():
|
|
153
|
+
"""已注册 namespace 清单(GET /api/settings-v2 用)。"""
|
|
154
|
+
with _LOCK:
|
|
155
|
+
return sorted(_NAMESPACES)
|
|
156
|
+
|
|
157
|
+
|
|
158
|
+
def mutate(ns, ops, expected_revision=None):
|
|
159
|
+
"""写一组操作。ops = [{"op":"set","path":..., "value":...}, ...]。
|
|
160
|
+
|
|
161
|
+
值按注册的 FieldDef 强转/钳制/校验;namespace 有 validate 钩子时整体验证。
|
|
162
|
+
expected_revision 非 None 时做 CAS。成功返回新 revision。
|
|
163
|
+
"""
|
|
164
|
+
with _LOCK:
|
|
165
|
+
ndef = _NAMESPACES.get(ns)
|
|
166
|
+
if not ndef:
|
|
167
|
+
raise ValueError("namespace 未注册:%s" % ns)
|
|
168
|
+
if expected_revision is not None and _REVISIONS.get(ns) != expected_revision:
|
|
169
|
+
raise SettingsConflictError(
|
|
170
|
+
"%s 期望 rev %s,实际 %s" % (ns, expected_revision, _REVISIONS.get(ns)))
|
|
171
|
+
# 先全部校验,后统一写入(部分失败不落盘)
|
|
172
|
+
staged = []
|
|
173
|
+
for op in ops:
|
|
174
|
+
if op.get("op") != "set":
|
|
175
|
+
raise ValueError("仅支持 set 操作:%r" % op.get("op"))
|
|
176
|
+
path = op.get("path")
|
|
177
|
+
fdef = ndef["fields"].get(path)
|
|
178
|
+
if not fdef:
|
|
179
|
+
raise ValueError("未注册字段:%s" % path)
|
|
180
|
+
v, err = coerce(fdef, op.get("value"))
|
|
181
|
+
if err:
|
|
182
|
+
raise ValueError(err)
|
|
183
|
+
staged.append((path, v))
|
|
184
|
+
ns_values = dict(_VALUES.get(ns, {}))
|
|
185
|
+
for path, v in staged:
|
|
186
|
+
_set_path(ns_values, path, v)
|
|
187
|
+
if ndef["validate"]:
|
|
188
|
+
err = ndef["validate"](ns_values)
|
|
189
|
+
if err:
|
|
190
|
+
raise ValueError("namespace 校验失败:%s" % err)
|
|
191
|
+
_VALUES[ns] = ns_values
|
|
192
|
+
_REVISIONS[ns] = _REVISIONS.get(ns, 1) + 1
|
|
193
|
+
_persist()
|
|
194
|
+
return _REVISIONS[ns]
|
|
195
|
+
|
|
196
|
+
|
|
197
|
+
def describe(ns, redact_secrets=True):
|
|
198
|
+
"""给 UI 的视图:默认把 redact 字段替换为 __REDACTED__(不泄露真值)。
|
|
199
|
+
|
|
200
|
+
fields 带回字段元数据(类型/说明/choices/clamp),前端调参卡按 schema
|
|
201
|
+
渲染控件,schema 变更零前端改动。"""
|
|
202
|
+
with _LOCK:
|
|
203
|
+
vals = json.loads(json.dumps(_VALUES.get(ns, {}))) # deep copy
|
|
204
|
+
ndef = _NAMESPACES.get(ns) or {"fields": {}}
|
|
205
|
+
fields = [{"path": f.path, "type": f.ftype, "description": f.description,
|
|
206
|
+
"choices": f.choices, "clamp": f.clamp}
|
|
207
|
+
for f in ndef["fields"].values()]
|
|
208
|
+
for f in ndef["fields"].values():
|
|
209
|
+
if f.redact and redact_secrets:
|
|
210
|
+
if _get_path(vals, f.path) not in (None, ""):
|
|
211
|
+
_set_path(vals, f.path, "__REDACTED__")
|
|
212
|
+
return {"ns": ns, "revision": _REVISIONS.get(ns, 0), "values": vals,
|
|
213
|
+
"fields": fields}
|
|
214
|
+
|
|
215
|
+
|
|
216
|
+
# ---- 默认 namespace(编排阈值的 schema 化存放处;pipeline 可渐进接入) ----
|
|
217
|
+
|
|
218
|
+
def register_default_namespaces():
|
|
219
|
+
"""注册 Tutti 默认 namespace。幂等(已注册则跳过)。"""
|
|
220
|
+
if "orchestrator" in _NAMESPACES and "budget" in _NAMESPACES:
|
|
221
|
+
return
|
|
222
|
+
if "orchestrator" not in _NAMESPACES:
|
|
223
|
+
register_namespace(
|
|
224
|
+
"orchestrator",
|
|
225
|
+
fields=[
|
|
226
|
+
FieldDef("compaction.enabled", "bool", False,
|
|
227
|
+
"上下文压缩总开关(灰度:与 TUTTI_COMPACTION 任一开启即生效)"),
|
|
228
|
+
FieldDef("compaction.pressure_threshold", "float", 0.8,
|
|
229
|
+
"触发压缩的压力比阈值",
|
|
230
|
+
clamp=(0.1, 0.99)),
|
|
231
|
+
FieldDef("compaction.retain_tail_tokens", "int", 8000,
|
|
232
|
+
"压缩时保留尾部预算(token 估算)",
|
|
233
|
+
clamp=(0, 100000)),
|
|
234
|
+
FieldDef("max_goal_rounds", "int", 5,
|
|
235
|
+
"Goal 续行上限",
|
|
236
|
+
clamp=(1, 20)),
|
|
237
|
+
FieldDef("outline_timeout_s", "int", 900,
|
|
238
|
+
"大纲/规划 CLI 兜底调用的超时秒数(env TUTTI_OUTLINE_TIMEOUT 优先)",
|
|
239
|
+
clamp=(60, 3600)),
|
|
240
|
+
],
|
|
241
|
+
validate=lambda v: None,
|
|
242
|
+
)
|
|
243
|
+
if "budget" not in _NAMESPACES:
|
|
244
|
+
register_namespace(
|
|
245
|
+
"budget",
|
|
246
|
+
fields=[
|
|
247
|
+
# §07 T2.1:0 = 不限;达到上限后 pipeline 停止后续真实调用(ENV_BLOCK)
|
|
248
|
+
FieldDef("max_tokens_per_run", "int", 0,
|
|
249
|
+
"单次运行 token 预算上限(0=不限;超额停止后续步骤,等自动续跑)",
|
|
250
|
+
clamp=(0, 100_000_000)),
|
|
251
|
+
# 花费硬顶(¥,按台账标定单价折算:手标单价优先,回落导入价表;
|
|
252
|
+
# 未标定单价的调用不记钱也不计入——宁缺毋滥):0 = 不限。
|
|
253
|
+
FieldDef("daily_cost_yuan", "float", 0.0,
|
|
254
|
+
"每日花费上限(¥,按标定单价折算;0=不限;超额停止后续步骤)",
|
|
255
|
+
clamp=(0, 1_000_000)),
|
|
256
|
+
FieldDef("monthly_cost_yuan", "float", 0.0,
|
|
257
|
+
"每月花费上限(¥,按标定单价折算;0=不限;超额停止后续步骤)",
|
|
258
|
+
clamp=(0, 1_000_000)),
|
|
259
|
+
],
|
|
260
|
+
validate=lambda v: None,
|
|
261
|
+
)
|
|
262
|
+
if "cascade" not in _NAMESPACES:
|
|
263
|
+
register_namespace(
|
|
264
|
+
"cascade",
|
|
265
|
+
fields=[
|
|
266
|
+
# §07 T3.1:easy 任务先走低档模型,质量闸门不过沿 chain 升级
|
|
267
|
+
FieldDef("enabled", "bool", False,
|
|
268
|
+
"FrugalGPT 式级联:easy 任务按 tier 升序重排模型链(需供应商声明 tier)"),
|
|
269
|
+
],
|
|
270
|
+
validate=lambda v: None,
|
|
263
271
|
)
|