第三十一轮收尾: 结构化保存走文本级合并(保住手写注释) + 别名卡片文案按老板口径删减
一、结构化 PUT /config 不再整份重渲染(这次真踩过的事故)
- 起因:模型页「保存映射」只改 aliases 一段,却走 render_yaml 整份重渲染,把 gateway.yaml 里
历轮手写的现场注释(协议线实测结论、各家鉴权差异、会话头要求…)整段抹掉(90 → 48 行)。
- app/settings.py 新增 merge_submitted_sections():把本次提交的段替换进原文,其余字节一个都不动。
三条边界都是实测踩出来的:
① 只重写**值真的变了**的段(write_config_merged 拿 raw_old 逐段比对)—— 面板 PUT 的是整份视图,
没变的段必须原样留着,否则一次无关保存就把 server.retry 那类行尾注释冲掉;
② 被替换段的**段尾说明/页脚**用 _split_tail 留在原位 —— 改 providers 不能顺手动掉 server 上方的说明书;
③ 新增段用 _doc_start 插在下一段**说明书之前** —— 否则别人的说明书会变成新段的抬头;
④ 合并后回读校验:解析失败或与提交内容不等 → 退回整份重渲染(配置一定正确,只赔注释)并记 ERROR。
- app/main.py:结构化保存改调 write_config_merged;日志升级为 写盘=merged|rendered / 重写段=<清单>。
- 结构化的唯一调用方是模型页(只提交 aliases 一段);网关配置页走 YAML 原文,两路都不丢注释。
二、别名卡片文案(老板 2026-09-18 口径)
- 删掉卡头副标题(aliasSub:客户端固定写 model: {id},网关转发到你选的模型)与 member 的只读行
(aliasReadonly:只读:映射由管理员在网关配置里选择),两行说明保留;Models.vue 连带删掉 .alias-ro 样式,
中英 i18n 753 → 751(仍对称)。
三、验证
- 单测 189 passed / 0 failed:新增 test_merged_write_keeps_neighbour_docs_and_skips_unchanged(上面三条边界);
改写 test_alias_panel_round_trip_and_save_validation —— 旧写法 PUT 整份视图,而 view_to_raw 会把面板默认值
materialize 进 providers(token ''/rate_limit_rps null/requires_session_header false/endpoints/vision false…),
providers 因此被判"变了"、注释被重写,断言必挂;改成面板真实载荷 {config:{aliases:…}} 后绿。
- scripts/ci_check.sh 全绿(compileall + 单测 + i18n/SVG 体检 + vue-tsc + build)。
- 生产实测(重启后 pid 1912449):值没变的保存 → gateway.yaml 逐字节一致;临时改 note → 差异只有 2 行;
改回 → md5 回到 64ca52b83ab1bb3a7db40d0073554887;页面点「保存映射」→ 日志 重写段=无、文件未变。
前端新入口 index-B5GZJuR8.js(旧 index-BJNJXWEY.js 404),admin/member 双角色真浏览器复验通过。
四、data/gateway.yaml
- 提交的是**注释完整的生产版**:HEAD 里那版是被抹过的 render 产物,工作区这版恢复了被误删的手写注释
并补了带说明的 aliases 段(注释行 100,⊇ 上一版)。
遗留(未动,等老板定):整份视图 PUT 仍会在 providers 上 materialize 面板默认值(那段行内注释会赔);
当前无 UI 走这条路,根治需让 view_to_raw 不再补默认值。
This commit is contained in:
1 parent
fb5769047f
commit
fff84aef44
7 files changed
+628
-402
No files matched your search
+136
-7
@@ -3444,6 +3444,10 @@ def test_config_save_applies_without_restart():
|
||||
tmp = tempfile.TemporaryDirectory()
|
||||
cfg_path = P(tmp.name) / "gateway.yaml"
|
||||
cfg_path.write_text(P(CONFIG).read_text(encoding="utf-8"), encoding="utf-8")
|
||||
# 注入一行人工注释:结构化保存**不许**把它抹掉(第三十一轮修的正是这个事故)
|
||||
with cfg_path.open("a", encoding="utf-8") as fh:
|
||||
fh.write("\n# 人工注释:别动我\n")
|
||||
comments_before = cfg_path.read_text(encoding="utf-8").count("#")
|
||||
old_path, old_cfg = m.CONFIG_PATH, m.config
|
||||
m.CONFIG_PATH = cfg_path
|
||||
try:
|
||||
@@ -4770,6 +4774,10 @@ def test_alias_panel_round_trip_and_save_validation():
|
||||
tmp = tempfile.TemporaryDirectory()
|
||||
cfg_path = P(tmp.name) / "gateway.yaml"
|
||||
cfg_path.write_text(P(CONFIG).read_text(encoding="utf-8"), encoding="utf-8")
|
||||
# 注入一行人工注释:结构化保存**不许**把它抹掉(第三十一轮修的正是这个事故)
|
||||
with cfg_path.open("a", encoding="utf-8") as fh:
|
||||
fh.write("\n# 人工注释:别动我\n")
|
||||
comments_before = cfg_path.read_text(encoding="utf-8").count("#")
|
||||
old_path, old_cfg = m.CONFIG_PATH, m.config
|
||||
m.CONFIG_PATH = cfg_path
|
||||
try:
|
||||
@@ -4779,18 +4787,23 @@ def test_alias_panel_round_trip_and_save_validation():
|
||||
assert "aliases" in view, view.keys()
|
||||
# 换一个和生产默认不同的目标,才能证明写入真的生效了
|
||||
target = "ark-code-latest"
|
||||
view["aliases"] = {"wjd": {"enabled": True, "target": target, "note": "客户入口"}}
|
||||
r = client.put("/config", headers=ah, json={"config": view})
|
||||
payload = {"wjd": {"enabled": True, "target": target, "note": "客户入口"}}
|
||||
# 面板真实载荷:模型页「保存映射」只提交 aliases 一段(Models.vue saveAlias),
|
||||
# 不是整份视图 —— 服务端按段合并,其余段沿用文件原文(连行尾注释都不动)。
|
||||
r = client.put("/config", headers=ah, json={"config": {"aliases": payload}})
|
||||
assert r.status_code == 200, r.text
|
||||
assert m.config.resolve_alias("wjd") == target, "保存即生效"
|
||||
# 落盘 yaml 里也确实有这一段(面板下次读得回来)
|
||||
assert _yaml.safe_load(cfg_path.read_text(encoding="utf-8"))["aliases"]["wjd"]["target"] == target
|
||||
# 落盘 yaml 里也确实有这一段(面板下次读得回来),且**人工注释一行不少**
|
||||
disk = cfg_path.read_text(encoding="utf-8")
|
||||
assert _yaml.safe_load(disk)["aliases"]["wjd"]["target"] == target
|
||||
assert "人工注释:别动我" in disk, "结构化保存把人工注释抹掉了"
|
||||
assert disk.count("#") == comments_before, "结构化保存不该改动其他段的注释"
|
||||
lm = client.get("/v1/models", headers=ah).json()["data"]
|
||||
assert next(x for x in lm if x["id"] == "wjd")["alias_of"] == target
|
||||
# 非法目标:400 + 不写盘(盘上仍是上一个合法值)
|
||||
bad = client.get("/config", headers=ah).json()["config"]
|
||||
bad["aliases"]["wjd"]["target"] = "根本没有这个模型"
|
||||
r2 = client.put("/config", headers=ah, json={"config": bad})
|
||||
r2 = client.put("/config", headers=ah,
|
||||
json={"config": {"aliases": {"wjd": {"enabled": True,
|
||||
"target": "根本没有这个模型"}}}})
|
||||
assert r2.status_code == 400 and "wjd" in r2.text, r2.text
|
||||
assert _yaml.safe_load(cfg_path.read_text(encoding="utf-8"))["aliases"]["wjd"]["target"] == target
|
||||
assert m.config.resolve_alias("wjd") == target
|
||||
@@ -4831,6 +4844,122 @@ def test_alias_streaming_uses_one_name_throughout():
|
||||
assert frames[0]["served_model"] == "m-chat", frames[0] # 真实目标在这里说清楚
|
||||
|
||||
|
||||
def test_merged_write_keeps_neighbour_docs_and_skips_unchanged():
|
||||
"""第三十一轮补测:文本级合并的三个边界(都是这次真踩过的坑)。
|
||||
|
||||
① 被替换段的**段尾说明**(那是下一段的抬头注释 / 文件页脚)必须留在原位 ——
|
||||
否则"改 providers"会顺手把 `server:` 上方的说明书删掉;
|
||||
② 新增的段要插在下一段**说明注释之前**,不能插进"说明与键行"之间(否则别人的
|
||||
说明书就成了新段的抬头);
|
||||
③ 提交了但值没变的段一个字节都不许动 —— 面板 PUT 的是整份视图,段内行尾注释
|
||||
(如 `timeout: 120 # …`)不该因为一次无关保存而蒸发。"""
|
||||
import tempfile
|
||||
import yaml as _yaml
|
||||
from pathlib import Path as P
|
||||
from app.settings import merge_submitted_sections, write_config_merged
|
||||
|
||||
text = (
|
||||
"# 抬头:手写说明\n"
|
||||
"providers:\n"
|
||||
" p:\n"
|
||||
" name: P\n"
|
||||
" base_url: http://x/v1\n"
|
||||
" models:\n"
|
||||
" - id: m-chat\n"
|
||||
" display_name: Chat\n"
|
||||
"# ── server 的说明书(人工)────────────────\n"
|
||||
"# host/port 改完要重启进程才生效。\n"
|
||||
"server:\n"
|
||||
" timeout: 120 # 行尾注释:同一模型的超时,别动\n"
|
||||
)
|
||||
prov = {"p": {"name": "P", "base_url": "http://x/v1",
|
||||
"models": [{"id": "m-chat", "display_name": "Chat"}]}}
|
||||
alias = {"wjd": {"enabled": True, "target": "m-chat", "note": "客户入口"}}
|
||||
plain = {"providers": prov, "server": {"timeout": 120}}
|
||||
|
||||
# ① 改 providers:它的段尾正是 server 的说明书 → 说明与段序都得在
|
||||
m = merge_submitted_sections(text, plain, {"providers"})
|
||||
assert _yaml.safe_load(m) == plain, m
|
||||
assert "── server 的说明书" in m and "host/port 改完要重启进程才生效。" in m, m
|
||||
assert m.index("说明书") < m.index("server:"), "说明必须还在 server 上方"
|
||||
|
||||
# ② 新增 aliases:插点在 server 的说明注释之前
|
||||
m2 = merge_submitted_sections(text, {**plain, "aliases": alias}, {"aliases"})
|
||||
assert _yaml.safe_load(m2) == {**plain, "aliases": alias}, m2
|
||||
assert m2.index("aliases:") < m2.index("── server 的说明书") < m2.index("server:"), m2
|
||||
assert m2.startswith("# 抬头:手写说明"), "抬头不许被跳过"
|
||||
|
||||
# ③ 值没变的段不重写:server 的行尾注释要活下来(写盘端到端)
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
f = P(d) / "gateway.yaml"
|
||||
f.write_text(text, encoding="utf-8")
|
||||
raw_old = _yaml.safe_load(text)
|
||||
info = write_config_merged(f, {**plain, "aliases": alias}, raw_old,
|
||||
{"aliases", "providers", "server"})
|
||||
disk = f.read_text(encoding="utf-8")
|
||||
assert info["mode"] == "merged" and info["sections"] == ["aliases"], info
|
||||
assert "行尾注释:同一模型的超时,别动" in disk, "没变的段被重写了"
|
||||
assert _yaml.safe_load(disk) == {**plain, "aliases": alias}, disk
|
||||
|
||||
|
||||
def test_structured_save_only_touches_submitted_section():
|
||||
"""第三十一轮修的真实事故:结构化保存(模型页「保存映射」)原来走 render_yaml 整份重写,
|
||||
把 gateway.yaml 里历轮手写的现场注释全抹了。现在只替换**提交过的那一段**,其余字节不动。
|
||||
|
||||
这里用一个带"人工注释"的小配置文件端到端验:改别名 → 注释还在、别的段一个字节没变;
|
||||
再加一段定位失败的怪文本,确认回退整份重渲染(配置正确优先,注释其次)。
|
||||
"""
|
||||
from app.settings import merge_submitted_sections, write_config_merged, render_yaml
|
||||
import yaml as _yaml
|
||||
text = (
|
||||
"# 抬头注释(人工)\n"
|
||||
"providers:\n"
|
||||
" p:\n"
|
||||
" # 这里也是人工注释:别动我\n"
|
||||
" name: P\n"
|
||||
" base_url: http://x/v1\n"
|
||||
" models:\n"
|
||||
" - id: m-chat\n"
|
||||
" display_name: Chat 模型\n"
|
||||
"server:\n"
|
||||
" timeout: 120\n"
|
||||
)
|
||||
new = {"providers": {"p": {"name": "P", "base_url": "http://x/v1",
|
||||
"models": [{"id": "m-chat", "display_name": "Chat 模型"}]}},
|
||||
"aliases": {"wjd": {"enabled": True, "target": "m-chat", "note": "客户入口"}},
|
||||
"server": {"timeout": 120}}
|
||||
merged = merge_submitted_sections(text, new, {"aliases"})
|
||||
assert merged is not None
|
||||
assert "别动我" in merged and "抬头注释(人工)" in merged, "人工注释必须原样保留"
|
||||
assert merged.startswith(text.split("aliases")[0][:20]), "前面的文本不该被重排"
|
||||
# 新增段插到它该在的位置(aliases 在 _SECTION_ORDER 里紧跟 providers → 应在 server 之前)
|
||||
assert merged.index("aliases:") < merged.index("server:"), merged
|
||||
assert "wjd" in merged and _yaml.safe_load(merged) == new, "合并结果必须与提交内容一致"
|
||||
assert "provider 与 server 的原文都在" # 语义检查由上面 safe_load 相等保证
|
||||
|
||||
# 段已存在 → 只替换该段
|
||||
merged2 = merge_submitted_sections(merged, {**new, "server": {"timeout": 999}}, {"server"})
|
||||
assert "timeout: 999" in merged2 and "别动我" in merged2 and _yaml.safe_load(merged2)["aliases"] == new["aliases"]
|
||||
|
||||
# 怪文本(没有顶层段)→ 让调用方回退整份重渲染
|
||||
assert merge_submitted_sections("这不是 yaml::\n- 1\n- 2\n", new, {"aliases"}) is None
|
||||
|
||||
# write_config_merged: 不变量对不上时自动回退 rendered 模式(且写出的一定是正确配置)
|
||||
import tempfile
|
||||
from pathlib import Path as P
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
f = P(d) / "g.yaml"
|
||||
f.write_text(text, encoding="utf-8")
|
||||
info = write_config_merged(f, new, {}, {"aliases"})
|
||||
assert info["mode"] == "merged" and "别动我" in f.read_text(encoding="utf-8"), info
|
||||
# 提交一个"面板不认识"的段 → 仍然要能写对(追加到末尾),且回读一致
|
||||
weird = {**new, "custom_x": {"a": 1}}
|
||||
info2 = write_config_merged(f, weird, {}, {"aliases", "custom_x"})
|
||||
assert _yaml.safe_load(f.read_text(encoding="utf-8")) == weird, info2
|
||||
assert ("别动我" in f.read_text(encoding="utf-8")) if info2["mode"] == "merged" else True
|
||||
assert render_yaml(new).startswith("#"), "整份重渲染路径仍在(回退用)"
|
||||
|
||||
|
||||
# 直接运行(非 pytest)—— 必须留在文件末尾,见上方 `test_image_request_goes_to_requested_model`
|
||||
# 之前的旁注:运行器只会收集执行到这一行时已经存在的 globals。
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in new issue
Block a user