Skip to content

Commit 16e8b37

Browse files
committed
fix(client): 连通性测试透传 reasoningEffort(#215)
三条路由各传各的档位键(dreamReasoningEffort / sleepReasoningEffort / entityExtractionReasoning),'none'/未配置省略字段,与后端 src/api.js 同口径。sleep 无回退重试,档位被拒时真实 run 直接失败,测试按钮是事前唯一的暴露口。服务端零改动。
1 parent 26ec125 commit 16e8b37

2 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎dsh-mneme/lib/client.js‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,14 +1875,20 @@ window.__ModuleLoader__.load({
18751875
// 连通性测试:POST /test-model,空 provider/model = 按巩固路由解析
18761876
// (agent 默认)。durationMs 优先后端值,缺失时客户端兜底计时;成功行
18771877
// 附模型的实际回复(reply,后端截 100 字符)——「真的答了 ok」而非只报通。
1878-
const runModelTest = async (provider, model, setTestState) => {
1878+
// reasoningEffort 透传该路由配置的档位(issue #215):sleep 无回退重试,
1879+
// 档位被拒时真实 run 直接失败,测试是事前唯一的暴露口;'none'/未配置
1880+
// 省略字段,与后端 src/api.js 的同口径。
1881+
const runModelTest = async (provider, model, setTestState, reasoningEffort) => {
18791882
setTestState({ running: true });
18801883
const started = Date.now();
18811884
try {
18821885
const res = await apiFetch("/api/dsh-mneme/test-model", {
18831886
method: "POST",
18841887
headers: { "Content-Type": "application/json" },
1885-
body: JSON.stringify({ provider, model })
1888+
body: JSON.stringify({
1889+
provider, model,
1890+
...(reasoningEffort && reasoningEffort !== "none" ? { reasoningEffort } : {})
1891+
})
18861892
});
18871893
const j = await res.json().catch(() => ({}));
18881894
const ms = typeof j.durationMs === "number" ? j.durationMs : Date.now() - started;
@@ -1908,9 +1914,12 @@ window.__ModuleLoader__.load({
19081914
// 适配器,用户不会选到不存在的模型)+ 连通性测试。空值 = 跟随默认
19091915
// 路由;改动即提交(与 embedProvider 下拉一致)。当前值不在枚举里时
19101916
// 保留为额外选项避免静默改值,并显式标记 + 行级提示(issue #191)。
1911-
const routeSelects = (providerKey, modelKey, testState, setTestState) => {
1917+
const routeSelects = (providerKey, modelKey, testState, setTestState, effortKey) => {
19121918
const curP = strs[providerKey] ?? "";
19131919
const curM = strs[modelKey] ?? "";
1920+
// 该路由配置的档位(键名由调用点按路由行传入,issue #215);
1921+
// ''/'none' 由 runModelTest 统一省略。
1922+
const effort = effortKey ? (eff[effortKey] || "") : "";
19141923
const entries = Array.isArray(routes) ? routes : [];
19151924
const entry = entries.find((p) => p && p.provider === curP);
19161925
const models = (entry && Array.isArray(entry.models)) ? entry.models : [];
@@ -1955,7 +1964,7 @@ window.__ModuleLoader__.load({
19551964
h("button", {
19561965
type: "button", className: "mneme-btn",
19571966
disabled: busy || (testState && testState.running),
1958-
onClick: () => runModelTest(curP, curM, setTestState)
1967+
onClick: () => runModelTest(curP, curM, setTestState, effort)
19591968
}, t((testState && testState.running) ? "memory.features.modelTesting" : "memory.features.modelTest")),
19601969
// 结果与说明共用同一行槽位二选一:出结果后说明自动让位,不堆叠。
19611970
(testState && !testState.running
@@ -2001,15 +2010,15 @@ window.__ModuleLoader__.load({
20012010
// 可用时用级联下拉 + 连通性测试;旧后端(端点 404)回退纯文本输入。
20022011
const dreamSub = eff.autoDream && h("div", { className: "mneme-featsub" },
20032012
Array.isArray(routes)
2004-
? routeSelects("dreamProvider", "dreamModel", dreamTest, setDreamTest)
2013+
? routeSelects("dreamProvider", "dreamModel", dreamTest, setDreamTest, "dreamReasoningEffort")
20052014
: h(react.Fragment, null, strRow("dreamProvider"), strRow("dreamModel")),
20062015
h("div", { className: "mneme-featsubhint" }, t("memory.features.dreamModelHint"))
20072016
);
20082017

20092018
// 睡眠模型:sleepModeEnabled 开着才展开(sleepProvider/sleepModel 随本版
20102019
// 进白名单;下拉与测试复用同一 /llm-providers 数据源)。
20112020
const sleepSub = eff.sleepModeEnabled && Array.isArray(routes) && h("div", { className: "mneme-featsub" },
2012-
routeSelects("sleepProvider", "sleepModel", sleepTest, setSleepTest),
2021+
routeSelects("sleepProvider", "sleepModel", sleepTest, setSleepTest, "sleepReasoningEffort"),
20132022
h("div", { className: "mneme-featsubhint" }, t("memory.features.sleepModelHint"))
20142023
);
20152024

@@ -2018,7 +2027,7 @@ window.__ModuleLoader__.load({
20182027
// 枚举即时提交;旧后端(/llm-providers 404)回退纯文本输入。
20192028
const entitySub = eff.entityExtractionEnabled && h("div", { className: "mneme-featsub" },
20202029
Array.isArray(routes)
2021-
? routeSelects("entityExtractionProvider", "entityExtractionModel", entityTest, setEntityTest)
2030+
? routeSelects("entityExtractionProvider", "entityExtractionModel", entityTest, setEntityTest, "entityExtractionReasoning")
20222031
: h(react.Fragment, null, strRow("entityExtractionProvider"), strRow("entityExtractionModel")),
20232032
h("div", { className: "mneme-featnum" },
20242033
h("span", { className: "mneme-featnumlabel" }, t("memory.features.entityExtractionReasoning")),

‎dsh-mneme/test/client.test.js‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -513,16 +513,16 @@ test("consolidation/sleep model routing: provider dropdowns from /llm-providers,
513513
"the probe must only accept a {providers: []} shape"
514514
);
515515
assert.ok(
516-
/Array\.isArray\(routes\)\s*\?\s*routeSelects\("dreamProvider", "dreamModel", dreamTest, setDreamTest\)/.test(clientSource),
517-
"dream routing must upgrade to dropdowns only when the probe succeeded"
516+
/Array\.isArray\(routes\)\s*\?\s*routeSelects\("dreamProvider", "dreamModel", dreamTest, setDreamTest, "dreamReasoningEffort"\)/.test(clientSource),
517+
"dream routing must upgrade to dropdowns only when the probe succeeded (and pass its own effort key)"
518518
);
519519
assert.ok(
520520
/:\s*h\(react\.Fragment, null, strRow\("dreamProvider"\), strRow\("dreamModel"\)\)/.test(clientSource),
521521
"when /llm-providers is unavailable the plain text inputs must remain (old-backend fallback)"
522522
);
523523
// 2. 睡眠侧行:跟随 sleepModeEnabled 门控,与巩固共用数据源
524524
assert.ok(
525-
/const sleepSub = eff\.sleepModeEnabled && Array\.isArray\(routes\) && h\("div", \{ className: "mneme-featsub" \},\s*\n\s*routeSelects\("sleepProvider", "sleepModel", sleepTest, setSleepTest\)/.test(clientSource),
525+
/const sleepSub = eff\.sleepModeEnabled && Array\.isArray\(routes\) && h\("div", \{ className: "mneme-featsub" \},\s*\n\s*routeSelects\("sleepProvider", "sleepModel", sleepTest, setSleepTest, "sleepReasoningEffort"\)/.test(clientSource),
526526
"the sleep route row must gate on sleepModeEnabled and share the providers source"
527527
);
528528
// 2b. 睡眠路由的值必须进初始化草稿:FEATURE_STRINGS 漏键会导致重挂载后
@@ -539,17 +539,17 @@ test("consolidation/sleep model routing: provider dropdowns from /llm-providers,
539539
"the connectivity test state must be per-route, not shared between dream and sleep"
540540
);
541541
assert.ok(
542-
/runModelTest\(curP, curM, setTestState\)/.test(clientSource),
543-
"each route's test button must target its own test state"
542+
/runModelTest\(curP, curM, setTestState, effort\)/.test(clientSource),
543+
"each route's test button must target its own test state and pass the route's configured effort"
544544
);
545545
// 3. 连通性测试:真实最小调用 + 结果展示(成功/失败 + 耗时 + 报错原因)
546546
assert.ok(
547547
clientSource.includes('apiFetch("/api/dsh-mneme/test-model", {'),
548548
"the connectivity test must POST /test-model"
549549
);
550550
assert.ok(
551-
/body: JSON\.stringify\(\{ provider, model \}\)/.test(clientSource),
552-
"the test payload must carry the selected provider/model (empty = follow default route)"
551+
/body: JSON\.stringify\(\{\s*provider, model,\s*\.\.\.\(reasoningEffort && reasoningEffort !== "none" \? \{ reasoningEffort \} : \{\}\)\s*\}\)/.test(clientSource),
552+
"the test payload must carry provider/model plus the configured reasoningEffort, omitted for 'none'/unset (issue #215, same convention as the backend)"
553553
);
554554
assert.ok(
555555
/typeof j\.durationMs === "number" \? j\.durationMs : Date\.now\(\) - started/.test(clientSource),
@@ -628,6 +628,20 @@ test("stale route values are marked and explained at the row level (issue #191)"
628628
!clientSource.includes("provider's model list"),
629629
"the en stale hint must cover provider-absence too, not only the model case"
630630
);
631+
// 4. issue #215:三条路由各自透传自己的档位键——routeSelects 按路由行
632+
// 传入键名、从生效配置取值;sleep 无回退重试,档位被拒时测试是事前唯一
633+
// 的暴露口。
634+
assert.ok(
635+
/const routeSelects = \(providerKey, modelKey, testState, setTestState, effortKey\) => \{/.test(clientSource)
636+
&& /const effort = effortKey \? \(eff\[effortKey\] \|\| ""\) : ""/.test(clientSource),
637+
"routeSelects must take the route's effort key and read the configured value from effective settings"
638+
);
639+
assert.ok(
640+
/routeSelects\("dreamProvider", "dreamModel", dreamTest, setDreamTest, "dreamReasoningEffort"\)/.test(clientSource)
641+
&& /routeSelects\("sleepProvider", "sleepModel", sleepTest, setSleepTest, "sleepReasoningEffort"\)/.test(clientSource)
642+
&& /routeSelects\("entityExtractionProvider", "entityExtractionModel", entityTest, setEntityTest, "entityExtractionReasoning"\)/.test(clientSource),
643+
"each route row must pass its own reasoning effort key (dream/sleep/entityExtraction)"
644+
);
631645
// 4. 连通性测试按钮的说明与结果互斥(同一行槽位二选一,不堆叠)
632646
assert.ok(
633647
/\(testState && !testState\.running\s*\n\s*\? h\("div", \{ className: "mneme-featsubhint" \},/.test(clientSource)

0 commit comments

Comments
 (0)