From d5f4c57f8d76d7647f926fbb14b3b0166ecd1a65 Mon Sep 17 00:00:00 2001 From: Mauro <99716153+Maurokrekels@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:34:43 +0100 Subject: [PATCH] [feat] canvas: open model settings from an empty model selector When no generation model is configured for the selected node type, the composer showed a disabled selector with no way forward. It now shows a Configure image/video/audio model button that opens Settings on that model category. The composer stays mounted, so the prompt, references and parameters are kept, and nothing is submitted. Refs #370 --- src/canvas/ModelSettings.tsx | 4 +- src/canvas/NodeComposer.tsx | 99 +++++++++++++--------- src/canvas/SettingsDialog.tsx | 9 +- src/canvas/workspace/WorkspaceView.tsx | 14 ++- src/canvas/workspace/state.ts | 4 + tests/browser/composer_configure_model.mjs | 95 +++++++++++++++++++++ tests/browser/manifest.json | 8 ++ 7 files changed, 191 insertions(+), 42 deletions(-) create mode 100644 tests/browser/composer_configure_model.mjs diff --git a/src/canvas/ModelSettings.tsx b/src/canvas/ModelSettings.tsx index cecabaa39..e49611d12 100644 --- a/src/canvas/ModelSettings.tsx +++ b/src/canvas/ModelSettings.tsx @@ -11,9 +11,9 @@ import { ModelServiceForm, type SettingsModelKind } from "./ModelServiceForm"; import { CanvasIcon } from "./CanvasIcon"; import "./model-settings.css"; -export function ModelSettings({ catalog, onClose, guided = false }: { catalog: BackendModels; onClose: () => void; guided?: boolean }) { +export function ModelSettings({ catalog, onClose, guided = false, initialKind = null }: { catalog: BackendModels; onClose: () => void; guided?: boolean; initialKind?: SettingsModelKind | null }) { const t = useT(); - const [category, setCategory] = useState(null); + const [category, setCategory] = useState(initialKind); const [editing, setEditing] = useState<{ kind: SettingsModelKind; model?: ModelConfig; diff --git a/src/canvas/NodeComposer.tsx b/src/canvas/NodeComposer.tsx index fdddec136..5f09de47c 100644 --- a/src/canvas/NodeComposer.tsx +++ b/src/canvas/NodeComposer.tsx @@ -69,6 +69,8 @@ export interface NodeComposerProps { onCheckModels?: (ids: readonly string[]) => Promise; removeWatermark?: boolean; referenceControls?: GenerationReferenceControls; + /** Opens model settings on the category the node needs when none is configured. */ + onConfigureModel?: (kind: "image" | "video" | "audio") => void; } export type ComposerSettings = GenerationSettings; @@ -96,6 +98,7 @@ export function NodeComposer({ onCheckModels, removeWatermark = false, referenceControls, + onConfigureModel, }: NodeComposerProps) { const { t } = useI18n(); const [openPanel, setPanel] = useState(null); @@ -487,44 +490,64 @@ export function NodeComposer({ )}
- ({ - id: `config:${item.id}`, - name: modelLabel(item), - modelId: item.modelId, - description: [modelDescription(item), availabilitySummary(item.availability)].filter(Boolean).join(" · ") || undefined, - group: providerLabel(item), - })), - ]} - /> + {!serviceModels.length && onConfigureModel ? ( + + ) : ( + ({ + id: `config:${item.id}`, + name: modelLabel(item), + modelId: item.modelId, + description: [modelDescription(item), availabilitySummary(item.availability)].filter(Boolean).join(" · ") || undefined, + group: providerLabel(item), + })), + ]} + /> + )}
diff --git a/src/canvas/workspace/WorkspaceView.tsx b/src/canvas/workspace/WorkspaceView.tsx index 46e00f228..3de8c92e2 100644 --- a/src/canvas/workspace/WorkspaceView.tsx +++ b/src/canvas/workspace/WorkspaceView.tsx @@ -274,6 +274,7 @@ export function WorkspaceView({ rt }: { rt: WorkspaceRuntime }) { setSelected, setSelectedEdges, setSettingsCategory, + setSettingsModelKind, setSettingsOpen, setShowEdges, setSubjectImport, @@ -284,6 +285,7 @@ export function WorkspaceView({ rt }: { rt: WorkspaceRuntime }) { setZoom, setZoomMenu, settingsCategory, + settingsModelKind, settingsOpen, showAssistant, showEdges, @@ -1793,6 +1795,11 @@ export function WorkspaceView({ rt }: { rt: WorkspaceRuntime }) { backendModels={backendCatalog.models} onCheckModels={backendCatalog.refreshAvailability} removeWatermark={backendCatalog.settings?.removeWatermark} + onConfigureModel={(kind) => { + setSettingsCategory("models"); + setSettingsModelKind(kind); + setSettingsOpen(true); + }} /> )}
@@ -2817,7 +2824,12 @@ export function WorkspaceView({ rt }: { rt: WorkspaceRuntime }) { catalog={backendCatalog} theme={theme} initialCategory={settingsCategory} - onClose={() => { dismissModelSetup(); setSettingsOpen(false); }} + initialModelKind={settingsModelKind} + onClose={() => { + dismissModelSetup(); + setSettingsModelKind(null); + setSettingsOpen(false); + }} /> )} {exampleEntries && ( diff --git a/src/canvas/workspace/state.ts b/src/canvas/workspace/state.ts index c4e48285f..dc181ba07 100644 --- a/src/canvas/workspace/state.ts +++ b/src/canvas/workspace/state.ts @@ -15,6 +15,7 @@ import type { SubjectMediaSlot } from "../subjectMedia.ts"; import type { CanvasToolId, ToolParameters } from "../toolCatalog.ts"; import type { SubjectImportTab } from "../library/SubjectImportDialog.tsx"; import type { PortSide } from "../connectionPorts.ts"; +import type { SettingsModelKind } from "../ModelServiceForm.tsx"; export type WorkspacePanel = "assets" | "search" | "history" | null; @@ -120,6 +121,7 @@ export type WorkspaceState = { settingsOpen: boolean; businessHistory: { undo: boolean; redo: boolean }; settingsCategory: "general" | "models"; + settingsModelKind: SettingsModelKind | null; welcomeOpen: boolean; activeGenerations: ActiveGeneration[]; arrivingNodes: ReadonlySet; @@ -189,6 +191,7 @@ const workspaceKeys = [ "settingsOpen", "businessHistory", "settingsCategory", + "settingsModelKind", "welcomeOpen", "activeGenerations", "arrivingNodes", @@ -249,6 +252,7 @@ export function createWorkspaceState(): WorkspaceState { settingsOpen: false, businessHistory: { undo: false, redo: false }, settingsCategory: "general", + settingsModelKind: null, welcomeOpen: false, activeGenerations: [], arrivingNodes: new Set(), diff --git a/tests/browser/composer_configure_model.mjs b/tests/browser/composer_configure_model.mjs new file mode 100644 index 000000000..8d8893872 --- /dev/null +++ b/tests/browser/composer_configure_model.mjs @@ -0,0 +1,95 @@ +/** Isolated API only: an empty model selector offers a way to configure that model type. */ +import assert from "node:assert/strict"; +import { launchBrowser } from "./engine.mjs"; +const base = process.env.CREATION_WEB_URL ?? "http://127.0.0.1:5179"; +const api = process.env.CREATION_API_URL ?? "http://127.0.0.1:8019"; +const headers = { + "X-OpenDirector-Request": "1", + "Content-Type": "application/json", +}; +async function call(path, body) { + const response = await fetch(api + path, { + headers, + ...(body ? { method: "POST", body: JSON.stringify(body) } : {}), + }); + assert.ok( + response.ok, + `${response.status}: ${await response.clone().text()}`, + ); + return response.json(); +} +assert.equal((await call("/api/creation-test-health")).isolated, true); +const configs = await call("/api/model-configs"); +const list = Array.isArray(configs) ? configs : (configs.models ?? configs.items ?? []); +assert.equal( + list.some((item) => item.kind === "video"), + false, + "needs a fixture API without a video model", +); +assert.equal( + list.some((item) => item.kind === "image"), + true, + "needs a fixture API with an image model", +); +const projectId = crypto.randomUUID(); +await call(`/api/creation/projects/${projectId}/commands`, { + commandId: crypto.randomUUID(), + projectId, + type: "project.create", + payload: { name: "Configure model " + projectId.slice(0, 8) }, +}); +const browser = await launchBrowser(); +try { + const page = await browser.newPage({ + locale: "zh-CN", + viewport: { width: 1600, height: 1000 }, + }); + await page.addInitScript(() => + localStorage.setItem("opendirector.modelSetup.v1", "dismissed"), + ); + page.setDefaultTimeout(15000); + const errors = []; + const generation = []; + page.on("pageerror", (error) => errors.push(error.message)); + page.on("request", (request) => { + if (request.method() === "POST" && /generat|jobs/i.test(request.url())) + generation.push(request.url()); + }); + await page.goto(`${base}/ai-tool/ai-canvas/${projectId}`); + await page.getByText("已保存到本机", { exact: true }).waitFor(); + const rail = page.getByRole("toolbar", { name: "画布创作工具" }); + + // Another category being configured must not hide the action. + await rail.getByRole("button", { name: "添加图片", exact: true }).click(); + await page.getByRole("textbox", { name: "生成提示词", exact: true }).waitFor(); + assert.equal( + await page.getByRole("button", { name: "配置图片模型", exact: true }).count(), + 0, + ); + + await rail.getByRole("button", { name: "添加视频", exact: true }).click(); + const prompt = page.getByRole("textbox", { name: "生成提示词", exact: true }); + await prompt.fill("保留这段提示词"); + const action = page.getByRole("button", { name: "配置视频模型", exact: true }); + await action.focus(); + await page.keyboard.press("Enter"); + + const dialog = page.locator("dialog#settings-dialog"); + await dialog.waitFor(); + assert.equal( + await dialog + .getByRole("button", { name: "视频", exact: true }) + .getAttribute("aria-pressed"), + "true", + ); + + await dialog.getByRole("button", { name: "关闭设置", exact: true }).click(); + await dialog.waitFor({ state: "detached" }); + assert.equal((await prompt.innerText()).trim(), "保留这段提示词"); + await action.waitFor(); + assert.deepEqual(generation, []); + assert.deepEqual(errors, []); +} finally { + await browser.close(); +} +console.log("composer configure model ok"); diff --git a/tests/browser/manifest.json b/tests/browser/manifest.json index 60f47de9c..edaaff429 100644 --- a/tests/browser/manifest.json +++ b/tests/browser/manifest.json @@ -173,6 +173,14 @@ ], "note": "Real application with controllable local capability HTTP service; no model inference." }, + { + "file": "composer_configure_model.mjs", + "previewSafe": true, + "lanes": [ + "extended" + ], + "note": "Needs a fixture API without a video model; opens model settings from the empty selector and keeps the draft." + }, { "file": "composer_duration.mjs", "previewSafe": true,