Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
35899bf53e | ||
|
|
f356826e9f | ||
|
|
003f3408fc |
@@ -2,6 +2,79 @@
|
||||
|
||||
---
|
||||
|
||||
## v0.3.90
|
||||
|
||||
### 機能拡張: Labタブの進化(ワークフロー呼び出し・T2I対応・Run時インデックス画像Output保存+Eagle連携・プラン接頭辞)+Galleryタブのルート表示簡略化
|
||||
|
||||
v0.3.87〜v0.3.89で実装したLabタブ(GenerateUI)に対する、実際の運用を通じたユーザーからの一連の追加要望をまとめて対応。
|
||||
|
||||
**1. Plan JSONへのワークフロー記録+呼び出し(Open Workflowボタン)**: これまでLabのPlanには「どのワークフローに対して」実行したキーフレーム設定なのかが記録されておらず、後日Planを見返しても再現できない問題があった。`_buildPlanData()`(`lab-tab.js`)が`#wfm-gen-wf-name`の`dataset.filename`(GenerateUIに現在ロード中のワークフローファイル名)を読み取り`workflow_filename`としてPlan JSONに保存するようにし、Plan読込後にPLANボックス内へ表示される**Open Workflow**ボタンから、その記録されたワークフローファイルを`/api/wfm/workflows/raw`経由で取得し`loadWorkflowIntoEditor()`へ渡してGenerateUIへ読み込み直せるようにした。自動読込はせず、常に`window.confirm`で確認を挟む(現在編集中のワークフローを不意に上書きしない安全策、ユーザー指定)。`loadWorkflowIntoEditor`は`generate-tab.js`にあり、`generate-tab.js`は既に`lab-tab.js`から`initLabTab`をimportしているため、静的importすると循環import(`generate-tab.js`→`lab-tab.js`→`generate-tab.js`)になる。v0.3.87で`getEagleSettings`/`saveToEagle`を`util.js`へ移設して回避した前例があるが、`loadWorkflowIntoEditor`はgenerate-tab.js固有の依存が多く移設は非現実的なため、今回はボタンのクリックハンドラ内で`const { loadWorkflowIntoEditor } = await import("./generate-tab.js");`と**動的import**する方式を採用(`gallery-tab.js`が`tagger-tab.js`に対して既に使っている前例パターンを踏襲)。
|
||||
|
||||
**2. T2Iワークフロー対応**: LabはもともとI2Iバッチ生成専用で、ソース画像が無いと`_runLabBatch()`が`labNoSourceImage`エラーで実行をブロックしていた。Imageペイン最上部に**T2I workflow (no source image)**チェックボックスを追加し、ON時は(a) ソース画像必須チェックをスキップ、(b) `_buildWorkflowForIteration()`でLoadImageノードへの書き込みを完全にスキップ(`imageRef = null`)、(c) Imageドロップゾーンと「Use generated image for next」をグレーアウト(既存の画像は削除せず、I2Iに戻したときのため保持)。Resultsパネルのソース画像欄には代わりに「T2I workflow (no source image)」の注記を表示。設定は`t2i_mode`としてPlan JSONに保存。実機確認では、実際にT2Iワークフロー(`EmptyLatentImage`使用、LoadImageノード無し)で画像生成に成功し、Eagle自動保存も正常動作することを確認した(検証中、テスト対象ワークフローのCheckpointが存在しないモデル名だったことによる`/prompt` 400エラーに遭遇したが、これはT2I機能自体のバグではなくテスト環境のモデル設定の問題だった)。
|
||||
|
||||
**3. Run時にインデックス画像をOutputフォルダへ保存+Eagle連携**: 右ペインに**Save index image to Output on Run**チェックボックスを追加。ONの場合、Run完了ごとに`_buildIndexImageDataUrl()`で作った9枚コンタクトシートを新設バックエンドAPI `POST /api/wfm/lab/index-image/save-to-output`へ送信し、`py/services/lab_plan_service.py`の`save_index_image_to_output()`が`folder_paths.get_output_directory()` + `folder_paths.get_save_image_path("Lab_index", output_dir)`を使って、通常の生成画像と同じ自動採番規則で`Lab_index_00001_.png`のように保存する(上書きしない)。Plan Save側の動作(`lab_plan/`への保存)は完全に独立したまま変更していない。続けて「インデックス画像もEagleに保存したい」という追加要望を受け、Output保存が成功した後に既存のグローバル設定(Settingsタブの`eagleAutoSave`、生成画像のEagle保存と同じ仕組み)を流用して`saveToEagle()`を呼ぶだけの実装を追加——Lab専用の別トグルは増やさず、既存パターンにそのまま乗せた。設定は`save_index_on_run`としてPlan JSONに保存。バックエンドのルート登録はComfyUI起動時の1回のみのため、この機能だけはPythonファイル変更を伴い**ComfyUI再起動後に実機確認**(Outputフォルダへの`Lab_index_00001_.png`保存、コンソールの`[Eagle] Saved: Lab_index_00002_.png`ログの両方を確認)。StabilityMatrix環境では`custom_nodes/.../output`が実体`Images/Text2Img`へのsymlinkになっている点に留意(`folder_paths.get_output_directory()`はsymlink越しに正しく解決される)。
|
||||
|
||||
**4. プランファイル名への`ws_labplan_`接頭辞自動付与**: `_savePlan()`(Plan Save/Save As共通処理)で、プロンプトに入力された名前から`_stripLabPlanPrefix()`で既存の接頭辞を除去してから`ws_labplan_`を付け直す方式にし、二重接頭辞を防止(ユーザーが手動で接頭辞込みの名前を入力しても安全)。JSON内部の`"name"`フィールドは接頭辞なしのプレーンな名前のまま(表示用と実ファイル名を分離)。Plan JSONサブタブのプレビュー(`_syncLabJsonView`)も同じ接頭辞除去ロジックで統一。
|
||||
|
||||
**5. Galleryタブ — ルートフォルダ表示の簡略化**: フォルダツリーのルートエントリが実際のディレクトリ名(例: StabilityMatrix環境の`Text2Img` — outputフォルダが`Images/Text2Img`へのsymlinkになっているため)をそのまま付けて「[root] Text2Img」と表示していたが、ルートにはT2I以外の画像(Lab_indexなど各種生成物)も含まれるため実態と合わず紛らわしいという指摘を受け、`gallery-tab.js`の`renderTreeNode()`で単に「[root]」とだけ表示するよう変更(`label.textContent = isRoot ? "[root]" : node.name;`)。
|
||||
|
||||
**README構成の見直し**: Featuresセクションが17個の`### <タブ名>`セクションで非常に長くなっていたため、GitHub Flavored MarkdownのHTML `<details><summary>`要素で各タブセクションを折りたたみ可能にした(見出しレベルは`<summary><h3>...</h3></summary>`として維持)。Changelog等の他セクションは対象外(ユーザー指定は「タブの項目ごと」=Featuresセクションのみ)。
|
||||
|
||||
**検証**: 4機能とも実機(Kapture経由でComfyUIの`http://127.0.0.1:8189/wfm`を直接操作)で確認済み。ワークフロー呼び出しはPlan保存直後にファイル名とボタンが表示されること・クリックで確認ダイアログ→再読込を確認(当初Save経路でUI更新関数`_updatePlanWorkflowUI()`を呼び忘れる不具合があり、実機確認で発覚・修正)。T2Iモードは実際の画像生成成功、Output保存はComfyUI再起動後に`Lab_index_00001_.png`の生成、Eagle連携はコンソールログとファイル両方で確認、Galleryルート表示はスクリーンショットで確認。いずれもテスト用に生成したファイルは検証後に削除(Output画像の削除はユーザー側で実施)。
|
||||
|
||||
**How to apply**: (1) Lab関連でstateを更新する処理(Save/Load/Clear)を追加・変更する際は、対応するUI更新関数を**全ての状態変更経路**で呼び忘れていないか確認すること — 今回まさにSave経路で呼び忘れて実機確認で発覚した。(2) `lab-tab.js`から`generate-tab.js`の関数を使いたい場合、`util.js`への機能移設が大げさすぎるなら動的import(`await import("./generate-tab.js")`)を検討する。(3) 新しいLabのRun時副作用(Output保存等)を追加する際は、可能な限り既存のグローバル設定(Eagle自動保存など)に乗せ、機能ごとに新しいトグルを増やさないこと。(4) StabilityMatrix環境のようにComfyUIのoutputフォルダがsymlinkになっている場合でも`folder_paths.get_output_directory()`は正しく解決されるが、`ls -lt`等で直接調査する際はsymlinkの実体を辿る必要がある。
|
||||
|
||||
---
|
||||
|
||||
## v0.3.89
|
||||
|
||||
### バグ修正: v0.3.88で追加したLab機能への実動作確認フィードバック3件を反映
|
||||
|
||||
v0.3.88で追加したLabタブのPromptセル拡張機能について、実際に触ったユーザーから3件の修正依頼を受けた。
|
||||
|
||||
**1. Get from Imageが任意のファイルを選ばせる仕様だった**: 当初はファイル選択ダイアログで別途画像を選ぶ実装だったが、「Labタブで現在読み込んでいる画像から取得したい」という指摘を受け、`_lab.sourceImageFilename`(IMAGE欄に既にドロップ・アップロード済みの画像)を`/view?filename=...&type=input`経由で取得し`File`オブジェクトへ変換した上で`extractAllMetadata()`にかける方式に変更。ファイル選択ダイアログ(隠し`<input type="file">`)は不要になったため削除。画像未読込の場合は既存の`labNoSourceImage`トーストで案内する。
|
||||
|
||||
**2. スタイル適用が`{prompt}`プレースホルダを置換していた**: `generate-tab.js`の`_applyNamedStyle()`と同じ「スタイルテンプレートの`{prompt}`を既存テキストで置換する」ロジックを流用していたが、「既存のプロンプトはクリアしないで追加したい。既存があればカンマ区切り、なければそのまま」という明確な要望を受け、`_applyStyleToText()`をプレースホルダ置換なしの単純追記(`既存 + ", " + style.prompt`、既存が空ならstyle.promptをそのまま)に書き換えた。GenerateUI本来のStyle機能(`_applyNamedStyle`)とは意図的に異なる仕様になったため、コード上にその旨のコメントを残した。
|
||||
|
||||
**3. GenerateUIタブ Modelサブタブの各フィルターにクリアボタンがなかった**: Checkpoint/VAE/Diffusion Model/ControlNet/Hypernetwork(`comfyui-editor.js`の`renderModelTab`、ループでフィルター入力を動的生成)とLora Single(`renderLoraPane`)のフィルター入力に、Models/Nodes/Workflow/Galleryタブの検索ボックスやLabタブのCheckpoint/VAEフィルターと同じ`setupSearchClearBtn()`(`util.js`)+`.wfm-search-wrap`/`.wfm-search-clear-btn`パターンでオーバーレイ✕クリアボタンを追加。`renderModelTab`は複数フィルターをループ生成するため、各入力に`id="wfm-model-${s.key}-filter"`/クリアボタンに`id="wfm-model-${s.key}-filter-clear"`を採番し、フィルター再構築処理を`input`イベントと`setupSearchClearBtn`のコールバックで共有する形にした。
|
||||
|
||||
**あわせてヘルプを更新**: Labサブタブのヘルプ(`helpLab8`、index.html+i18n.js日英中)を新しい挙動(Get from Imageの取得元、スタイルの追記方式)に合わせて修正。
|
||||
|
||||
**検証**: Kaptureで実ブラウザ確認 — GenerateUI Modelタブの各フィルター(Checkpoint/Lora)で入力→✕クリア→リスト復元、Labタブで画像未読込時のGet from Imageのエラートースト、既存Positiveテキストへのスタイル追記結果(`{prompt}`が置換されずそのまま末尾に追加され、既存テキストが先頭に保持されることを確認)。いずれもコンソールエラーなし(既存の無関係なOllama接続エラーを除く)。
|
||||
|
||||
**How to apply**: 新機能を実装した直後の「実際に触ってみた」フィードバックは、当初の設計判断(本実装ではEagle本来のUI流用や`{prompt}`置換の踏襲)を覆す具体的な仕様変更を伴うことが多い。既存の類似機能(ここでは`generate-tab.js`の`_applyNamedStyle`)のロジックをそのまま流用するのではなく、要望に応じて意図的に別実装へ分岐させてよい場面があることを踏まえ、分岐させた箇所には理由をコメントで残すこと。フィルター入力を動的ループで生成するコード(`renderModelTab`等)にクリアボタンを追加する際は、ループ内で一意なIDを採番し`setupSearchClearBtn`をループ内で呼び出す。
|
||||
|
||||
---
|
||||
|
||||
## v0.3.88
|
||||
|
||||
### 機能拡張: Labタブ Promptセルにスタイル適用・画像/GenerateUIからのプロンプト取得、Checkpoint/VAEフィルター、Plan JSONサブタブを追加
|
||||
|
||||
v0.3.87で追加したLabタブ(GenerateUI)に対するユーザーからの一連の改善要望をまとめて対応。
|
||||
|
||||
**Promptセル編集モーダルの拡張**:
|
||||
- **Get from GenerateUI**: 現在GenerateUIに読み込まれているワークフローの`comfyUI.currentAnalysis.prompt_nodes`からPositive/Negativeを直接取得
|
||||
- **Get from Image**: 画像/ワークフローJSONをドロップ/選択すると、Metadataタブの抽出ロジック(`metadata-tab.js`の`extractAllMetadata()`。新たに`export`して再利用)でプロンプトを抽出
|
||||
- **Style適用**: 当初はモーダル内に独自のスタイルドロップダウンを設けたが、ユーザーから「GenerateUIツールバー上部の`#wfm-style-enabled`チェックボックス/`#wfm-style-select`ドロップダウンをそのまま使えないか」と指摘を受け設計変更。モーダル内の選択UIを廃し、Applyボタンが常にツールバー側の現在値を読んで適用する方式にした(チェックボックスOFFまたは未選択ならエラートースト)。ボタンラベルにも選択中のスタイル名を動的表示(例:「Apply: cinematic-diva」)。プロンプトへのマージ処理自体は`generate-tab.js`の`_applyNamedStyle()`と同じ置換ルール(`{prompt}`プレースホルダ置換/ネガティブ追記)を、ワークフローではなく文字列に対して行う`_applyStyleToText()`として実装
|
||||
|
||||
**Checkpoint/VAEセルにフィルター機能追加**:
|
||||
- GenerateUIのModelサブタブ(`comfyui-editor.js`の`renderModelTab`)と同じ「Filter...」テキスト入力で`<select>`の候補を絞り込み
|
||||
- 続けて「オーバーレイ✕でクリア可能にしたい、Modelタブの各フィルタリング機能・Raw JSON検索と同様に」という要望を受け、Models/Nodes/Workflow/Gallery各タブの検索ボックスやRaw JSON検索と同じ`setupSearchClearBtn()`(`util.js`)+`.wfm-search-wrap`/`.wfm-search-clear-btn`(`main.css`)パターンを流用し、入力欄内に✕クリアボタンをオーバーレイ表示するよう変更
|
||||
|
||||
**Plan JSONサブタブ追加**:
|
||||
- Setting/Resultsに続く3つ目のサブタブとして新設。現在のLab状態(列のキーフレーム・Note・Batch数・画像連鎖設定・元画像・結果一覧)を、プランファイル保存時と同じ構造のJSONとして`json-highlight.js`の`syncJsonHighlight()`で構文ハイライト表示する
|
||||
- **Refresh**: Settingタブの現在値で再同期(未適用の編集は破棄)
|
||||
- **Apply to Setting**: テキストエリアの内容を`JSON.parse`し、Plan Load(`_loadPlanFromFile`/`_loadPlanFromServer`)と共通の`_applyPlanData(filename, data)`を呼んでSettingタブへ反映。不正なJSONの場合は`JSON.parse`の例外メッセージをそのままエラートーストに出し、状態は変更しない
|
||||
- 保存用のプランオブジェクト構築ロジックが`_savePlan()`内にインライン実装されていたのを`_buildPlanData(name)`として切り出し、Save・Plan JSON表示の双方から共用するようリファクタリング
|
||||
|
||||
**あわせてヘルプを更新**: Labサブタブのヘルプページ(`index.html`+`i18n.js`日英中+`app.js`の`helpIdMap`)に、Promptモーダルの追加ボタン群とPlan JSONサブタブの説明を追記。
|
||||
|
||||
**検証**: 各機能をKaptureで実ブラウザ確認 — Get from GenerateUI/Get from Imageでの実際のプロンプト取得、Style Apply(トップバーOFF時のエラートースト・ON時の`{prompt}`置換とネガティブ追記)、Checkpoint/VAEフィルターの絞り込みと✕クリア、Plan JSONの表示→編集→Apply→Setting反映、および不正JSON入力時のエラーハンドリング。いずれもコンソールエラーなし(既存の無関係なOllama接続エラーを除く)。
|
||||
|
||||
**How to apply**: 複数モジュールで使う汎用UI部品(`setupSearchClearBtn`、`extractAllMetadata`等)は積極的にexportして使い回すこと。「モーダル内に専用UIを新設する」より「既存のツールバー等の状態をそのまま参照する」方がユーザーにとって一貫性があり実装も軽い場合があるため、要望の意図が既存UIの流用にあるかどうかを都度確認する。プラン保存構造とJSONビュー表示は同じビルダー関数(`_buildPlanData`)を共有させ、二重管理を避ける。
|
||||
|
||||
---
|
||||
|
||||
## v0.3.87
|
||||
|
||||
### 追加機能: GenerateUIタブに実験的な「Lab」サブタブを追加(I2Iバッチ生成・キーフレーム方式)
|
||||
|
||||
@@ -22,7 +22,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- Built-in AI tools (translation and more)
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## Screenshots
|
||||
|
||||
@@ -58,7 +58,8 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
|
||||
## Features
|
||||
|
||||
### Workflow Tab
|
||||
<details>
|
||||
<summary><h3>Workflow Tab</h3></summary>
|
||||
|
||||
- **Thumbnail / Table views** — switch between view modes to browse your workflow library
|
||||
- **Thumbnail side panel** — preview workflow canvas snapshots in the side panel
|
||||
@@ -72,14 +73,20 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
|
||||
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, group filter, and badge filter (ALL) in one click
|
||||
|
||||
### Canvas Snapshot (v0.1.2)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Canvas Snapshot (v0.1.2)</h3></summary>
|
||||
|
||||
- **One-click capture** — click the camera button in ComfyUI's top bar to snapshot the current workflow canvas
|
||||
- **Auto-save as thumbnail** — the snapshot is saved directly to the workflow data folder as a PNG thumbnail
|
||||
- **Embedded workflow metadata** — workflow JSON is embedded in the PNG (tEXt chunk), compatible with ComfyUI's drag-and-drop import
|
||||
- **Auto-import** — the captured workflow is automatically imported and appears in the Workflow tab
|
||||
|
||||
### GenerateUI Tab (v0.3.5)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>GenerateUI Tab (v0.3.5)</h3></summary>
|
||||
|
||||
- **6-tab layout** — Input / Model / Settings / Feeder / Batch / **Lab** tabs; Input, Model, and Settings each include a Raw JSON column on the right for instant preview and direct editing
|
||||
- **Save button** — located at the right end of the subtab row; opens a filename dialog (default: current workflow name) and saves the current workflow as a `.json` file to the Workflow tab via the import API
|
||||
@@ -103,7 +110,10 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- **UI-to-API conversion** — automatic conversion supporting subgraphs (nested workflows), COMBO types, and display-only node exclusion; improved analysis covers SDXL multi-hop CONDITIONING chains, CLIPTextEncodeSDXL, SDXLPromptStyler, KSamplerAdvanced, and Guider-based "Advanced Sampling" workflows (`SamplerCustomAdvanced`/`SamplerCustom` + `CFGGuider`/`DualCFGGuider`/`BasicGuider` + `RandomNoise` + `KSamplerSelect` + `*Scheduler` — Flux.2 Klein, LongCat, Boogu, HiDream E1, etc.)
|
||||
- **Eagle integration** — auto-save generated images to [Eagle](https://eagle.cool/) with metadata
|
||||
|
||||
### Feeder subtab (v0.3.5 / v0.3.42)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Feeder subtab (v0.3.5 / v0.3.42)</h3></summary>
|
||||
|
||||
Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons at the top of the left pane (persisted in `localStorage`).
|
||||
|
||||
@@ -128,18 +138,30 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
|
||||
- **After Gen modes** — Loop (wrap at end and continue indefinitely), Increment (stop automatically when last image is reached), Fixed (always use the same index)
|
||||
- **Run / Stop controls** — left pane Run / Stop buttons manage the generation loop; After Gen combo (loop / increment / fixed), ▶ Run, and ■ Stop widgets are also available directly on the WFS_GalleryFeeder node in the ComfyUI canvas (`gallery_feeder_extension.js`)
|
||||
|
||||
### Lab subtab (v0.3.87)
|
||||
</details>
|
||||
|
||||
An experimental I2I batch generator: runs the workflow currently loaded in GenerateUI N times, letting Checkpoint / VAE / Prompt / KSampler each change independently starting at a chosen iteration — unlike the Batch tab's single-axis queue, every column keeps its own list of change points. Never mutates the loaded workflow; every iteration runs on a fresh clone.
|
||||
<details>
|
||||
<summary><h3>Lab subtab (v0.3.87 – v0.3.90)</h3></summary>
|
||||
|
||||
- **Setting / Results sub-panels** — Setting: image drop zone + 4 keyframe columns + run controls; Results: source image and up to 9 generated thumbnails (click to enlarge)
|
||||
An experimental batch generator: runs the workflow currently loaded in GenerateUI N times, letting Checkpoint / VAE / Prompt / KSampler each change independently starting at a chosen iteration — unlike the Batch tab's single-axis queue, every column keeps its own list of change points. Never mutates the loaded workflow; every iteration runs on a fresh clone. Works with both I2I and T2I workflows (v0.3.90).
|
||||
|
||||
- **Setting / Results / Plan JSON sub-panels** — Setting: image drop zone + 4 keyframe columns + run controls; Results: source image and up to 9 generated thumbnails (click to enlarge); Plan JSON: the current plan as raw editable JSON (v0.3.88)
|
||||
- **Per-column keyframes** — Checkpoint, VAE, Prompt, KSampler each hold an independent list of `{iteration, value}` keyframes; +/− per column adds/removes a keyframe (iteration #1 is fixed and can't be removed); click a cell to edit its value, the iteration it starts applying from, and a "revert to #1's setting" checkbox; the effective value at iteration N is the latest keyframe with iteration ≤ N, carried forward until the next one changes it
|
||||
- **Use generated image for next** — optional checkbox that chains iterations: from iteration 2 onward the previous iteration's first output image is fed back in as the I2I source instead of the original dropped image, using ComfyUI's `"name [type]"` annotated-filename reference (no re-upload needed)
|
||||
- **Plan files** — Plan Save (silently overwrites the loaded plan) / Save As (always asks for a new name) / Plan Clear; plans are stored as `<name>.json` in `user/default/Workflow-Studio/lab_plan/`, alongside an auto-generated `<name>.png` index image (a 3-per-row contact sheet of up to 9 result thumbnails)
|
||||
- **Checkpoint / VAE cell filtering** (v0.3.88) — a Filter... box above the value dropdown narrows the list live, same as GenerateUI's Model tab; overlay ✕ clear button matches the Models/Nodes/Workflow/Gallery tab search boxes
|
||||
- **Prompt cell extras** (v0.3.88, refined in v0.3.89) — **Get from GenerateUI** fills Positive/Negative from the workflow currently loaded in GenerateUI; **Get from Image** extracts a prompt from the image currently loaded in Lab's own Image drop zone (same detection as the Metadata tab; no separate file picker); **Style** appends whichever style is currently selected in GenerateUI's own top-bar Style checkbox/dropdown to the Positive/Negative text below, comma-separated after any existing text — it never clears what's already there (Lab has no separate style picker of its own)
|
||||
- **T2I workflow support** (v0.3.90) — a **T2I workflow (no source image)** checkbox in the Image pane skips the source-image requirement and never touches a LoadImage node, so workflows with no image input (e.g. plain `EmptyLatentImage` txt2img) can also use the Checkpoint/VAE/Prompt/KSampler keyframes; the Image drop zone and "Use generated image for next" are greyed out (not cleared) while it's on; saved with the plan as `t2i_mode`
|
||||
- **Use generated image for next** — optional checkbox that chains iterations: from iteration 2 onward the previous iteration's first output image is fed back in as the I2I source instead of the original dropped image, using ComfyUI's `"name [type]"` annotated-filename reference (no re-upload needed); disabled together with the Image drop zone in T2I mode
|
||||
- **Workflow recall** (v0.3.90) — every saved plan records the filename of the workflow that was loaded in GenerateUI at save time (`workflow_filename` in the Plan JSON); after loading a plan, an **Open Workflow** button appears next to it — click to load that exact workflow file back into GenerateUI (asks for confirmation first, since it replaces whatever is currently loaded)
|
||||
- **Plan files** — Plan Save (silently overwrites the loaded plan) / Save As (always asks for a new name) / Plan Clear; plans are stored as `ws_labplan_<name>.json` in `user/default/Workflow-Studio/lab_plan/` (the `ws_labplan_` prefix is added automatically, v0.3.90 — type just the plain name when prompted), alongside an auto-generated `ws_labplan_<name>.png` index image (a 3-per-row contact sheet of up to 9 result thumbnails)
|
||||
- **Plan Load** — same drag-and-drop / click-to-browse drop zone as the Image slot; drop a plan's `.json` (read directly in the browser) or its `.png` index-image thumbnail (fetches the matching `.json` by filename)
|
||||
- **Eagle integration** — every image Lab generates is auto-saved to Eagle the same way as GenerateUI's own Generate button, if enabled in the Settings tab
|
||||
- **Plan JSON tab** (v0.3.88) — view/edit the current plan as raw JSON (same shape saved to disk); Refresh re-reads it from the Setting tab, Apply to Setting parses your edits and writes them back into the Setting tab's columns/note/batch/chain-image/source-image/results — the same effect as loading that JSON as a plan file, without saving it first
|
||||
- **Save index image to Output on Run** (v0.3.90) — optional checkbox in the run controls; when checked, every completed Run also builds the same contact-sheet index image used for Plan files and saves it directly into ComfyUI's own Output folder as `Lab_index_<counter>_.png` (auto-numbered like a normal generated image, right alongside the images that Run just generated); independent of Plan Save, which always writes its own copy next to the plan file regardless of this checkbox; saved with the plan as `save_index_on_run`
|
||||
- **Eagle integration** — every image Lab generates is auto-saved to Eagle the same way as GenerateUI's own Generate button, if enabled in the Settings tab; the Output-folder index image above is included too (v0.3.90) once saved
|
||||
|
||||
### Prompt Tab
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Prompt Tab</h3></summary>
|
||||
|
||||
- **3-column layout** — AI Assistant (left), Presets/Preset Manager tab-panel (center), Wildcard support (right)
|
||||
- **AI chat assistant** — powered by [Ollama](https://ollama.com/), generate and refine prompts interactively
|
||||
@@ -153,7 +175,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **Wildcard input toolbar** — one-click buttons to insert `{|}`, `{n$|}`, `__|__`, `<lora::1:LBW=;>` and other wildcard syntax; wraps selected text when applicable
|
||||
- **Wildcard file manager** — create, view, and edit `.txt` / `.yaml` wildcard files stored in `user/default/Workflow-Studio/wildcard/`; click a filename in the file picker to insert `__filename__` at cursor
|
||||
|
||||
### Metadata Tab (v0.3.8)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Metadata Tab (v0.3.8)</h3></summary>
|
||||
|
||||
- **3-column layout** — Drop zone (left) | Model info (center) | LoRA + Prompt (right)
|
||||
- **File drop** — drop a ComfyUI-generated PNG / WebP or workflow JSON onto the drop zone (or click to open a file picker); PNG/WebP images are shown as a preview
|
||||
@@ -164,7 +189,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **Format support** — ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Ernie Image / WAN2.2 / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed subgraph workflows), SD WebUI, SD Forge, Fooocus
|
||||
- **Format note** — supported formats and covered model types are always shown in the left column
|
||||
|
||||
### Settings Tab
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Settings Tab</h3></summary>
|
||||
|
||||
- **2-column layout** — left column for all settings; right column shows the Theme panel fixed in place (sticky)
|
||||
- **Collapsible sections** — all settings organized in accordion panels for a clean layout
|
||||
@@ -185,9 +213,13 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **G'MIC-Qt Integration** — set the path to `gmic_qt.exe` for the Image Edit Filter tool; download G'MIC-Qt Standalone from `gmic.eu/download.html` (Windows: `gmic_qt-win64.zip`), extract anywhere, then enter the full path to `gmic_qt.exe` and click Save
|
||||
- **Language** — English / Japanese / Chinese
|
||||
|
||||
### Gallery Tab (v0.3.44)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Gallery Tab (v0.3.44)</h3></summary>
|
||||
|
||||
- **Image browser** — browse ComfyUI output images (Thumbnail / Table views) with server-side scanning optimized for 6,000+ image libraries
|
||||
- **Folder tree root label** (v0.3.90) — the root entry in the folder tree is labeled simply **[root]**, no longer suffixed with the scanned folder's own directory name (which could be a misleading, environment-specific name — e.g. StabilityMatrix installs where the output folder is a symlink named `Text2Img` — even though the folder holds every kind of generated output, not just text-to-image results)
|
||||
- **Thumbnail / Table views** — switch view modes; Favorites column shown leftmost in Table view
|
||||
- **Folder management** — create subfolders ("+ New") or delete the selected folder with all contents ("Del") from the folder tree header
|
||||
- **File operations** — move or delete individual images from the detail panel's Info tab; bulk Move To..., Export, and Delete File from the multi-select bar
|
||||
@@ -212,7 +244,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **SVG file support** (v0.3.77) — `.svg` files are browsable, previewable (detail panel and lightbox), and included in favorites/tags/groups/move/delete/export alongside raster formats; served as-is with no rasterized thumbnail, since `<img>` scales vector graphics natively at any size
|
||||
- **Performance** — server-side 256px JPEG thumbnail generation with disk cache (`data/thumb_cache/`); infinite-scroll paging (50 images per page, IntersectionObserver); folder-level mtime cache (60s TTL); bulk operations use single-request API endpoints
|
||||
|
||||
### Nodes Tab (v0.1.7)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Nodes Tab (v0.1.7)</h3></summary>
|
||||
|
||||
- **Node Browser** — browse all installed ComfyUI nodes from `/object_info` API with Card/Table views
|
||||
- **Search & Filter** — full-text search, filter by category, package, tags, groups, and favorites
|
||||
@@ -224,7 +259,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
|
||||
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, category, package, tag, group, and favorites filter in one click
|
||||
|
||||
### Models Tab (v0.2.3)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Models Tab (v0.2.3)</h3></summary>
|
||||
|
||||
- **Model Browser** — browse all installed ComfyUI models (Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder, Hypernetwork, Embedding) with sub-tab switching
|
||||
- **Thumbnail / Table views** — switch between view modes with pagination (24 items per page); Table view includes **Type** and **Base Model** columns sourced from cached CivitAI data, displayed between the Subdirectory and Extension columns; Enable/Disable column labeled **E/D**
|
||||
@@ -249,7 +287,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
|
||||
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, tag filter, folder filter, group filter, favorites filter, and status filter in one click
|
||||
|
||||
### Tagger Tab (v0.3.38)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Tagger Tab (v0.3.38)</h3></summary>
|
||||
|
||||
- **3 sub-tabs** — Single / Batch / DB for single-image tagging, folder batch processing, and tag database management
|
||||
- **Model support** — WD Tagger (ONNX, NCHW/NHWC auto-detect), SwinV2 (ONNX), DeepDanbooru (.h5, requires TensorFlow); place each model in its own subfolder under `ComfyUI/models/tagger/<model-name>/` containing the `.onnx` + `selected_tags.csv` (or `.h5` + label file)
|
||||
@@ -261,7 +302,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **DB tab** — searchable SQLite database of all tagged images; click a row to open the edit panel and modify WD Tags / VLM Tags; Save updates the record, Delete removes it; Export CSV downloads all records
|
||||
- **Dependencies** — install into ComfyUI's embedded Python: `python_embedded\python.exe -m pip install -r requirements.txt`; for GPU inference use `onnxruntime-gpu`; TensorFlow (DeepDanbooru) is optional and commented out in `requirements.txt`
|
||||
|
||||
### Image Edit Tab (v0.3.65)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Image Edit Tab (v0.3.65)</h3></summary>
|
||||
|
||||
- **Layer-based image editor** — compose images with multiple layers (Image, Text, Draw, Mask types) and export the composite as PNG
|
||||
- **Loading images** — drag & drop onto the canvas, Upload button, or send from the Gallery tab via the **Image Edit** toolbar button; first image becomes Layer 1 (auto-locked), subsequent images are added as new layers scaled to fit the canvas
|
||||
@@ -283,7 +327,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **Canvas navigation** — scroll-wheel zoom, Space + drag to pan; zoom indicator in the bottom bar
|
||||
- **Undo / Redo** — Ctrl+Z / Ctrl+Y (or toolbar buttons); keyboard shortcuts: V (Select), B (Draw), T (Text), S (Shape), Delete (remove selected layer when 2+ exist)
|
||||
|
||||
### AI TOOL Tab (v0.3.14)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>AI TOOL Tab (v0.3.14)</h3></summary>
|
||||
|
||||
- **4-pane layout** — Translation | Chat | TOOLS | Settings; all panes always visible simultaneously; no sub-tab switching required
|
||||
- **Translation pane** — translate text between Japanese, English, Chinese, or a custom Free language using Ollama, LM Studio, or Lemonade; language selectors with ⇄ swap button (swaps both language selectors and text content); selections saved automatically
|
||||
@@ -303,7 +350,10 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **URL security** — backend URL validated via `new URL()` to enforce `http://` or `https://` scheme
|
||||
- **Lemonade's other endpoints (not integrated)** — Lemonade Server also exposes OpenAI-compatible image generation (`/v1/images/generations`), text-to-speech (`/v1/audio/speech`), and transcription (`/v1/audio/transcriptions`) endpoints; these are not wired up — image generation would duplicate the existing ComfyUI-workflow-based `generate_image` tool call, and audio/TTS has no corresponding UI yet, so both are future considerations rather than a natural extension of the current backend switch
|
||||
|
||||
### Workflow Studio Library (ComfyUI Side Panel) (v0.3.9)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Workflow Studio Library (ComfyUI Side Panel) (v0.3.9)</h3></summary>
|
||||
|
||||
- **Tab layout (W / N / P / M / I / A)** — compact single-letter tabs with full name shown on hover
|
||||
- **W — Workflows tab** — browse favorite workflows (All / ★ Favorites / Groups / By Badge sub-tabs), ★ star shown for favorites in All view
|
||||
@@ -326,13 +376,18 @@ An experimental I2I batch generator: runs the workflow currently loaded in Gener
|
||||
- **Search** — search within each sub-tab to quickly find items
|
||||
- **⚙ Theme settings** — customize panel background, sub-header background, text, border, and secondary text colors; saved to localStorage and applied on every open
|
||||
|
||||
### Help & Support Tab (v0.1.3)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Help & Support Tab (v0.1.3)</h3></summary>
|
||||
|
||||
- **Sidebar navigation** — 2-column layout: left sidebar (15 topics) + right content pane; click any topic to switch the displayed content
|
||||
- **Support** — fixed at the bottom of the sidebar; shows GitHub, Ko-fi, **ComfyUI Image Feeder**, and **Mask Editor One** repository links in the right pane
|
||||
- **Feature list** — overview of all features organized by tab
|
||||
- **Keyboard Shortcuts** and **Troubleshooting** sections included
|
||||
|
||||
</details>
|
||||
|
||||
---
|
||||
|
||||
## Installation
|
||||
@@ -422,6 +477,26 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
|
||||
|
||||
## Changelog
|
||||
|
||||
### v0.3.90
|
||||
|
||||
- **Lab tab — Workflow recall** — every saved plan now records the filename of the workflow that was loaded in GenerateUI at save time (`workflow_filename`); an **Open Workflow** button on a loaded plan reloads that exact workflow into GenerateUI (with confirmation, since it replaces what's currently loaded)
|
||||
- **Lab tab — T2I workflow support** — a **T2I workflow (no source image)** checkbox skips the source-image requirement and the LoadImage write step entirely, so workflows without an image input (plain txt2img) can now use Lab's Checkpoint/VAE/Prompt/KSampler keyframes too
|
||||
- **Lab tab — Save index image to Output on Run** — new checkbox; when on, every completed Run also saves the contact-sheet index image directly into ComfyUI's Output folder (`Lab_index_<counter>_.png`, auto-numbered) alongside the images just generated, and through Eagle auto-save if enabled — independent of Plan Save's own index image
|
||||
- **Lab tab — plan filenames get a `ws_labplan_` prefix** — Plan Save/Save As now prefix the saved `.json`/`.png` with `ws_labplan_` automatically (type just the plain name when prompted), so plan files are easy to pick out among other files in `lab_plan/`
|
||||
- **Gallery tab — simplified root folder label** — the folder tree's root entry now reads just **[root]** instead of `[root] <folder name>`, since that name was the scanned folder's own (sometimes misleading, environment-specific) directory name rather than anything meaningful to the user
|
||||
|
||||
### v0.3.89
|
||||
|
||||
- **Lab tab — Get from Image now reads Lab's own loaded image** — instead of opening a separate file picker, it fetches the image already loaded in Lab's Image drop zone (`/view` on the uploaded input file) and extracts its embedded prompt metadata
|
||||
- **Lab tab — Style now always appends, never clears** — instead of substituting a `{prompt}` placeholder into the style template (as GenerateUI's own Style feature does), Lab's Style button appends the style's text after any existing Positive/Negative content with a comma, or uses it as-is if the field was empty
|
||||
- **GenerateUI Model tab — overlay ✕ clear buttons** — Checkpoint, VAE, Diffusion Model, ControlNet, Hypernetwork, and LoRA (Single) filter boxes now have the same overlay ✕ clear button as the Models/Nodes/Workflow/Gallery tab search boxes
|
||||
|
||||
### v0.3.88
|
||||
|
||||
- **Lab tab — Prompt cell extras** — Get from GenerateUI (fills Positive/Negative from the currently loaded workflow), Get from Image (extracts a prompt from a dropped/selected image or workflow JSON, reusing the Metadata tab's `extractAllMetadata()`), and Style (applies whichever style is currently selected in GenerateUI's own top-bar Style checkbox/dropdown — no separate style picker inside Lab)
|
||||
- **Lab tab — Checkpoint/VAE cell filtering** — a Filter... box narrows the dropdown live, same as GenerateUI's Model tab, with the same overlay ✕ clear button used by the Models/Nodes/Workflow/Gallery search boxes (`setupSearchClearBtn()`)
|
||||
- **Lab tab — new Plan JSON subtab** — view/edit the current plan as raw JSON (syntax highlighted, same shape as the saved file); Refresh re-syncs it from the Setting tab, Apply to Setting parses your edits and writes them back into the Setting tab's columns/note/batch/chain-image/source-image/results, the same as loading that JSON as a plan file without saving it first
|
||||
|
||||
### v0.3.87
|
||||
|
||||
- **New: GenerateUI — Lab subtab** — experimental I2I batch generation. Runs the workflow currently loaded in GenerateUI N times, with Checkpoint/VAE/Prompt/KSampler each independently overridable via a per-column list of keyframes (`{iteration, value}`) instead of the Batch tab's single shared axis; the effective value at iteration N carries forward from the latest keyframe ≤ N, and a "revert to #1" option reuses the baseline value. Every iteration runs on a cloned workflow, so the loaded workflow (and the Input/Model/Settings/Batch tabs) is never modified. Includes an optional "use generated image for next" chain mode (iteration 2+ feeds the previous output back in as the I2I source via ComfyUI's `"name [type]"` reference, no re-upload needed), Eagle auto-save integration, and Plan Save/Save As/Load (drag-and-drop `.json` or its `.png` index-image thumbnail) with plans stored under `user/default/Workflow-Studio/lab_plan/` alongside an auto-generated contact-sheet thumbnail (up to 9 result images, 3 per row).
|
||||
|
||||
@@ -18,6 +18,7 @@ def setup_routes(app: web.Application):
|
||||
app.router.add_get("/api/wfm/lab/plans/content", handle_get_content)
|
||||
app.router.add_post("/api/wfm/lab/plans/save", handle_save)
|
||||
app.router.add_post("/api/wfm/lab/plans/delete", handle_delete)
|
||||
app.router.add_post("/api/wfm/lab/index-image/save-to-output", handle_save_index_to_output)
|
||||
|
||||
|
||||
async def handle_list(request: web.Request) -> web.Response:
|
||||
@@ -69,3 +70,16 @@ async def handle_delete(request: web.Request) -> web.Response:
|
||||
except Exception as e:
|
||||
logger.error("Error deleting lab plan: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
|
||||
async def handle_save_index_to_output(request: web.Request) -> web.Response:
|
||||
try:
|
||||
body = await request.json()
|
||||
image_base64 = body.get("image_base64", "")
|
||||
if not image_base64:
|
||||
return web.json_response({"error": "image_base64 required"}, status=400)
|
||||
result = await asyncio.to_thread(_service.save_index_image_to_output, image_base64)
|
||||
return web.json_response({"status": "ok", **result})
|
||||
except Exception as e:
|
||||
logger.error("Error saving lab index image to output: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
@@ -110,6 +110,23 @@ class LabPlanService:
|
||||
with open(thumb_path, "wb") as f:
|
||||
f.write(image_bytes)
|
||||
|
||||
def save_index_image_to_output(self, image_base64: str, filename_prefix: str = "Lab_index") -> dict:
|
||||
"""Saves the contact-sheet index image into ComfyUI's own output folder,
|
||||
alongside the images generated during the run (unlike save_index_image,
|
||||
which saves it next to the plan file in plan_dir)."""
|
||||
b64 = image_base64
|
||||
if "," in b64 and b64.strip().lower().startswith("data:"):
|
||||
b64 = b64.split(",", 1)[1]
|
||||
image_bytes = base64.b64decode(b64)
|
||||
|
||||
import folder_paths # type: ignore
|
||||
output_dir = folder_paths.get_output_directory()
|
||||
full_output_folder, filename, counter, subfolder, _ = folder_paths.get_save_image_path(filename_prefix, output_dir)
|
||||
save_name = f"{filename}_{counter:05}_.png"
|
||||
save_path = Path(full_output_folder) / save_name
|
||||
save_path.write_bytes(image_bytes)
|
||||
return {"filename": save_name, "subfolder": subfolder}
|
||||
|
||||
def delete_plan(self, filename: str) -> None:
|
||||
path = self._safe_path(filename)
|
||||
if path is None:
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
[project]
|
||||
name = "comfyui-workflow-studio"
|
||||
description = "A comprehensive workflow, asset management, and generation UI plugin for ComfyUI. Manage workflows, models, images, and prompts; batch generation and Image Feeder in the GenerateUI tab; library side panel with canvas drag & drop and AI tools."
|
||||
version = "0.3.87"
|
||||
version = "0.3.90"
|
||||
license = "MIT"
|
||||
requires-python = ">= 3.10"
|
||||
dependencies = ["jinja2"]
|
||||
|
||||
@@ -37,6 +37,14 @@
|
||||
|
||||
.wfm-lab-panel.active { display: flex; }
|
||||
|
||||
.wfm-lab-planjson-toolbar {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
padding: 8px 10px;
|
||||
border-bottom: 1px solid var(--wfm-border);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.wfm-lab-pane-header {
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
@@ -78,6 +86,27 @@
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.wfm-lab-plan-workflow-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-top: 8px;
|
||||
padding: 6px 8px;
|
||||
background: var(--wfm-bg-secondary);
|
||||
border: 1px solid var(--wfm-border);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.wfm-lab-plan-workflow-name {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
font-size: 11px;
|
||||
color: var(--wfm-text-secondary);
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.wfm-lab-field-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -218,6 +247,13 @@
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.wfm-lab-modal-btnrow {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.wfm-lab-modal-inline > div {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
|
||||
@@ -2948,6 +2948,12 @@ body {
|
||||
background: rgba(74, 158, 255, 0.08);
|
||||
}
|
||||
|
||||
.wfm-i2i-drop-zone.wfm-disabled {
|
||||
opacity: 0.4;
|
||||
pointer-events: none;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.wfm-i2i-drop-label {
|
||||
font-size: 12px;
|
||||
color: var(--wfm-text-secondary);
|
||||
|
||||
+4
-2
@@ -400,12 +400,14 @@ function applyI18nToHtml() {
|
||||
"wfm-help-lab-1": "helpLab1", "wfm-help-lab-2": "helpLab2",
|
||||
"wfm-help-lab-3": "helpLab3", "wfm-help-lab-4": "helpLab4",
|
||||
"wfm-help-lab-5": "helpLab5", "wfm-help-lab-6": "helpLab6",
|
||||
"wfm-help-lab-7": "helpLab7",
|
||||
"wfm-help-lab-7": "helpLab7", "wfm-help-lab-8": "helpLab8",
|
||||
"wfm-help-lab-9": "helpLab9",
|
||||
"wfm-help-lab-card-plan-title": "helpLabCardPlanTitle",
|
||||
"wfm-help-lab-plan-1": "helpLabPlan1", "wfm-help-lab-plan-2": "helpLabPlan2",
|
||||
"wfm-help-lab-plan-3": "helpLabPlan3", "wfm-help-lab-plan-4": "helpLabPlan4",
|
||||
"wfm-help-lab-plan-5": "helpLabPlan5", "wfm-help-lab-plan-6": "helpLabPlan6",
|
||||
"wfm-help-lab-plan-7": "helpLabPlan7",
|
||||
"wfm-help-lab-plan-7": "helpLabPlan7", "wfm-help-lab-plan-8": "helpLabPlan8",
|
||||
"wfm-help-lab-plan-9": "helpLabPlan9", "wfm-help-lab-plan-10": "helpLabPlan10",
|
||||
"wfm-help-lab-card-results-title": "helpLabCardResultsTitle",
|
||||
"wfm-help-lab-results-1": "helpLabResults1", "wfm-help-lab-results-2": "helpLabResults2",
|
||||
"wfm-help-lab-results-3": "helpLabResults3",
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import { comfyUI } from "./comfyui-client.js";
|
||||
import { syncJsonHighlight } from "./json-highlight.js";
|
||||
import { t } from "./i18n.js";
|
||||
import { escapeHtml } from "./util.js";
|
||||
import { escapeHtml, setupSearchClearBtn } from "./util.js";
|
||||
|
||||
// ── Latent Image preset state ─────────────────────────────
|
||||
const _LATENT_PRESET_KEY = "wfm_latent_presets";
|
||||
@@ -541,7 +541,10 @@ export const comfyEditor = {
|
||||
return `
|
||||
<div class="wfm-form-group" style="border-bottom:1px solid var(--wfm-border);padding-bottom:12px;">
|
||||
<label>${s.label}</label>
|
||||
<input type="text" class="wfm-input wfm-model-filter" placeholder="Filter..." data-target="wfm-model-${s.key}" style="margin-bottom:4px;">
|
||||
<div class="wfm-search-wrap" style="margin-bottom:4px;width:100%;">
|
||||
<input type="text" class="wfm-input wfm-search-input wfm-model-filter" id="wfm-model-${s.key}-filter" placeholder="Filter..." data-target="wfm-model-${s.key}">
|
||||
<button type="button" class="wfm-search-clear-btn" id="wfm-model-${s.key}-filter-clear" title="Clear search">✕</button>
|
||||
</div>
|
||||
<select class="wfm-select ${isMissing ? "wfm-select-missing" : ""}" id="wfm-model-${s.key}" style="margin-bottom:4px;">
|
||||
${isMissing ? `<option value="${escapeHtml(currentVal)}" selected>⚠ ${escapeHtml(currentVal)} (${t("modelNotFound")})</option>` : ""}
|
||||
${models.map((m) => `<option value="${m}" ${m === currentVal ? "selected" : ""}>${m}</option>`).join("")}
|
||||
@@ -559,8 +562,8 @@ export const comfyEditor = {
|
||||
|
||||
// Filter inputs
|
||||
el.querySelectorAll(".wfm-model-filter").forEach((input) => {
|
||||
input.addEventListener("input", () => {
|
||||
const targetId = input.dataset.target;
|
||||
const targetId = input.dataset.target;
|
||||
const rebuild = () => {
|
||||
const select = document.getElementById(targetId);
|
||||
if (!select) return;
|
||||
const filter = input.value.toLowerCase();
|
||||
@@ -570,7 +573,9 @@ export const comfyEditor = {
|
||||
.filter((m) => m.toLowerCase().includes(filter))
|
||||
.map((m) => `<option value="${m}">${m}</option>`)
|
||||
.join("");
|
||||
});
|
||||
};
|
||||
input.addEventListener("input", rebuild);
|
||||
setupSearchClearBtn(input.id, `${input.id}-clear`, rebuild);
|
||||
});
|
||||
|
||||
// Apply buttons
|
||||
@@ -704,7 +709,10 @@ export const comfyEditor = {
|
||||
|
||||
<!-- Single tab -->
|
||||
<div class="wfm-lora-tab-content" id="wfm-lora-panel-single">
|
||||
<input type="text" class="wfm-input" id="wfm-lora-filter" placeholder="Filter...">
|
||||
<div class="wfm-search-wrap" style="width:100%;">
|
||||
<input type="text" class="wfm-input wfm-search-input" id="wfm-lora-filter" placeholder="Filter...">
|
||||
<button type="button" class="wfm-search-clear-btn" id="wfm-lora-filter-clear" title="Clear search">✕</button>
|
||||
</div>
|
||||
<select class="wfm-select" id="wfm-lora-select">
|
||||
${loras.map((m) => `<option value="${m}" ${m === currentVal ? "selected" : ""}>${m}</option>`).join("")}
|
||||
</select>
|
||||
@@ -804,8 +812,9 @@ export const comfyEditor = {
|
||||
}
|
||||
|
||||
// ── Single: filter ───────────────────────────────────
|
||||
document.getElementById("wfm-lora-filter")?.addEventListener("input", (e) => {
|
||||
const filter = e.target.value.toLowerCase();
|
||||
const loraFilterInput = document.getElementById("wfm-lora-filter");
|
||||
const rebuildLoraSingleList = () => {
|
||||
const filter = loraFilterInput?.value.toLowerCase() || "";
|
||||
const select = document.getElementById("wfm-lora-select");
|
||||
if (!select) return;
|
||||
select.innerHTML = loras
|
||||
@@ -813,7 +822,9 @@ export const comfyEditor = {
|
||||
.map((m) => `<option value="${m}">${m}</option>`)
|
||||
.join("");
|
||||
_refreshLoraSingleDynamic(metadata, civitaiCache);
|
||||
});
|
||||
};
|
||||
loraFilterInput?.addEventListener("input", rebuildLoraSingleList);
|
||||
setupSearchClearBtn("wfm-lora-filter", "wfm-lora-filter-clear", rebuildLoraSingleList);
|
||||
|
||||
// ── Single: update SYNTAX/TRIGGERS on model or strength change ──
|
||||
document.getElementById("wfm-lora-select")?.addEventListener("change", () => _refreshLoraSingleDynamic(metadata, civitaiCache));
|
||||
|
||||
@@ -401,7 +401,7 @@ function renderTreeNode(node, container, depth, isRoot) {
|
||||
// フォルダ名
|
||||
const label = document.createElement("span");
|
||||
label.className = "wfm-gallery-tree-label";
|
||||
label.textContent = isRoot ? `[root] ${node.name}` : node.name;
|
||||
label.textContent = isRoot ? "[root]" : node.name;
|
||||
if (node.image_count > 0) {
|
||||
const badge = document.createElement("span");
|
||||
badge.className = "wfm-gallery-tree-count";
|
||||
|
||||
+72
-3
@@ -241,6 +241,24 @@ const LANGUAGES = {
|
||||
labPlanLoadFailed: "Failed to load plan",
|
||||
labPlanInvalidFile: "Drop a .json plan file or its .png index image",
|
||||
labConfirmClear: "Clear all Lab settings (image, columns, note, results)?",
|
||||
labGetFromGenUI: "Get from GenerateUI",
|
||||
labGetFromImage: "Get from Image",
|
||||
labStyle: "Style",
|
||||
labApply: "Apply",
|
||||
labNoStyles: "No styles",
|
||||
labEnableStyleFirst: "Enable the Style checkbox and pick a style at the top of the GenerateUI tab first",
|
||||
labPlanJsonRefreshed: "Refreshed from the current Setting tab",
|
||||
labPlanJsonApplied: "Plan JSON applied to Setting",
|
||||
labPlanJsonInvalid: "Invalid JSON",
|
||||
labStyleApplied: "Style applied",
|
||||
labPromptFetched: "Prompt loaded",
|
||||
labNoPromptInImage: "No prompt found in that file",
|
||||
labMetadataExtractFailed: "Failed to read metadata",
|
||||
labConfirmLoadWorkflow: (filename) => `Load "${filename}" into GenerateUI? This replaces the currently loaded workflow.`,
|
||||
labWorkflowLoadFailed: "Failed to load the workflow",
|
||||
labT2IImageIgnored: "T2I mode is on — image upload is not needed and was skipped",
|
||||
labIndexImageSaved: (filename) => `Index image saved to Output: ${filename}`,
|
||||
labIndexImageSaveFailed: "Failed to save the index image to Output",
|
||||
|
||||
connectedToComfyUI: "Connected to ComfyUI",
|
||||
failedToConnect: "Failed to connect",
|
||||
@@ -720,14 +738,19 @@ const LANGUAGES = {
|
||||
helpLab5: "Click a cell to edit it: iteration #1 sets the baseline value (leave it blank to keep the loaded workflow's own setting); iteration #2+ also lets you choose which iteration it starts applying from, plus a \"revert to #1's setting\" checkbox",
|
||||
helpLab6: "Effective value at iteration N: the latest keyframe with iteration ≤ N is used and carries forward until the next keyframe changes it; \"revert to #1\" reuses iteration #1's value (or the workflow default if #1 is blank) instead of specifying a new one",
|
||||
helpLab7: "Lab never edits the workflow shown in Input/Model/Settings — every iteration runs on a fresh clone of the loaded workflow, so keyframes here never affect the other subtabs",
|
||||
helpLab8: "Prompt cell editor extras: Get from GenerateUI fills Positive/Negative from the workflow currently loaded in GenerateUI; Get from Image extracts a prompt from the image currently loaded in Lab's own Image drop zone (same detection as the Metadata tab; no separate file picker); Style appends whichever style is currently selected in the Style checkbox/dropdown at the top of the GenerateUI toolbar to the Positive/Negative text below, comma-separated after any existing text (never clears it) — enable that checkbox and pick a style first, Lab doesn't have its own separate style picker",
|
||||
helpLab9: "Left pane — T2I workflow (no source image): check this when the loaded workflow is text-to-image (no LoadImage node). It skips the \"drop a source image first\" requirement, ignores any dropped image, and the Checkpoint/VAE/Prompt/KSampler keyframes still apply normally; the Image drop zone and \"Use generated image for next\" are greyed out while it's on (any previously dropped image is kept, not deleted, in case you switch back to I2I); the setting is saved with the plan as t2i_mode",
|
||||
helpLabCardPlanTitle: "Setting subtab — Run & Plan files",
|
||||
helpLabPlan1: "Right pane — Batch: number of iterations to run; Note: free-text memo saved together with the plan",
|
||||
helpLabPlan2: "Run / Pause / Cancel: Run starts the batch loop; Pause/Resume freezes it between iterations; Cancel interrupts the current generation and stops the loop",
|
||||
helpLabPlan3: "Plan Save vs Save As: Plan Save silently overwrites the currently loaded plan (or asks for a name the first time); Save As always asks for a new name, even while a plan is already loaded",
|
||||
helpLabPlan4: "Plan Load: drop a plan's .json file, or its .png index-image thumbnail, onto the PLAN box (or click it to browse) — a dropped .json is read directly; a dropped .png fetches the matching .json (same filename) from the server",
|
||||
helpLabPlan5: "Plan Clear resets the Setting tab to an empty plan (asks for confirmation first)",
|
||||
helpLabPlan6: "Plan files are stored in user/default/Workflow-Studio/lab_plan/ as <name>.json plus a <name>.png index image — a contact sheet of up to 9 result thumbnails (3 per row) generated automatically whenever a plan with results is saved",
|
||||
helpLabPlan6: "Plan files are stored in user/default/Workflow-Studio/lab_plan/ as ws_labplan_<name>.json plus a ws_labplan_<name>.png index image — a contact sheet of up to 9 result thumbnails (3 per row) generated automatically whenever a plan with results is saved. The ws_labplan_ prefix is added automatically by Plan Save/Save As (type just the plain name when prompted) so plan files are easy to pick out among other files in that folder",
|
||||
helpLabPlan7: "Eagle auto-save (configured in the Settings tab) applies to every image Lab generates, the same as GenerateUI's own Generate button",
|
||||
helpLabPlan8: "Plan JSON subtab: shows the current Setting tab's plan as raw JSON; Refresh re-reads it from the Setting tab (discarding any unapplied text edits), Apply to Setting parses your edits and writes them back into the Setting tab (columns, note, batch count, chain-image, source image, results) — the same effect as loading that JSON as a plan file, without needing to save it first",
|
||||
helpLabPlan9: "Each saved plan records the filename of the workflow that was loaded in GenerateUI at save time (workflow_filename in the Plan JSON). After loading a plan, an Open Workflow button appears in the PLAN box — click it to load that exact workflow file back into GenerateUI (asks for confirmation, since it replaces whatever is currently loaded)",
|
||||
helpLabPlan10: "Right pane — Save index image to Output on Run: when checked, every time Run finishes it builds the same contact-sheet index image used for Plan files and saves it directly into ComfyUI's own Output folder as Lab_index_<counter>_.png (auto-numbered like a normal generated image, never overwriting a previous run's). Once saved, it also goes through Eagle auto-save (if enabled in the Settings tab) just like every other Lab-generated image — no separate checkbox for that, it follows the same global toggle. This is independent of Plan Save, which still always writes its own index image next to the plan file in lab_plan/ regardless of this checkbox; this setting is saved with the plan as save_index_on_run",
|
||||
helpLabCardResultsTitle: "Results subtab",
|
||||
helpLabResults1: "Left pane shows the source image used for the run",
|
||||
helpLabResults2: "Center pane shows up to 9 generated images in generation order; click a thumbnail to view it enlarged",
|
||||
@@ -1373,6 +1396,24 @@ const LANGUAGES = {
|
||||
labPlanLoadFailed: "プランの読み込みに失敗しました",
|
||||
labPlanInvalidFile: "プランの.jsonファイル、またはそのインデックス画像(.png)をドロップしてください",
|
||||
labConfirmClear: "Labの設定(画像・列・メモ・結果)をすべてクリアしますか?",
|
||||
labGetFromGenUI: "GenerateUIから取得",
|
||||
labGetFromImage: "画像から取得",
|
||||
labStyle: "スタイル",
|
||||
labApply: "適用",
|
||||
labNoStyles: "スタイルがありません",
|
||||
labEnableStyleFirst: "先にGenerateUIタブ上部のStyleチェックボックスをオンにし、スタイルを選択してください",
|
||||
labPlanJsonRefreshed: "現在のSettingタブの内容で更新しました",
|
||||
labPlanJsonApplied: "Plan JSONをSettingに適用しました",
|
||||
labPlanJsonInvalid: "JSONが不正です",
|
||||
labStyleApplied: "スタイルを適用しました",
|
||||
labPromptFetched: "プロンプトを取得しました",
|
||||
labNoPromptInImage: "このファイルにはプロンプトが見つかりませんでした",
|
||||
labMetadataExtractFailed: "メタデータの読み取りに失敗しました",
|
||||
labConfirmLoadWorkflow: (filename) => `「${filename}」をGenerateUIに読み込みますか?現在読み込まれているワークフローは置き換えられます。`,
|
||||
labWorkflowLoadFailed: "ワークフローの読み込みに失敗しました",
|
||||
labT2IImageIgnored: "T2Iモードが有効なため、画像のアップロードは不要としてスキップしました",
|
||||
labIndexImageSaved: (filename) => `インデックス画像をOutputへ保存しました: ${filename}`,
|
||||
labIndexImageSaveFailed: "インデックス画像のOutputへの保存に失敗しました",
|
||||
|
||||
connectedToComfyUI: "ComfyUIに接続しました",
|
||||
failedToConnect: "接続に失敗しました",
|
||||
@@ -1852,14 +1893,19 @@ const LANGUAGES = {
|
||||
helpLab5: "セルをクリックすると編集できます。1回目は基準となる設定値です(空欄のままにするとワークフロー本来の設定を使用)。2回目以降はさらに「何回目から適用するか」の指定と「1回目の設定に戻す」チェックボックスがあります",
|
||||
helpLab6: "N回目時点での実効値は、N以下で最も大きい回数目のキーフレームが次のキーフレームまで引き継がれます。「1回目に戻す」を使うと、新しい値を指定する代わりに1回目の値(空欄ならワークフロー本来の設定)がそのまま使われます",
|
||||
helpLab7: "LabはInput/Model/Settingsに表示されているワークフローを直接編集しません。各回の実行はワークフローの複製に対して行われるため、Labでのキーフレーム設定が他のサブタブに影響することはありません",
|
||||
helpLab8: "Promptセル編集モーダルの追加機能:「Get from GenerateUI」で現在GenerateUIに読み込まれているワークフローからPositive/Negativeを取得、「Get from Image」でLab左ペインのIMAGEに現在読み込まれている画像からプロンプトを抽出(Metadataタブと同じ検出ロジック。別途ファイル選択は不要)、「Style」でGenerateUIツールバー上部のStyleチェックボックス/ドロップダウンで現在選択されているスタイルを、既存のPositive/Negativeテキストを消さずにカンマ区切りで追記(先に上部でチェックボックスをオンにしスタイルを選択しておく必要あり。Lab独自のスタイル選択はありません)",
|
||||
helpLab9: "左ペイン — 「T2I workflow (no source image)」:読み込んでいるワークフローがT2I(LoadImageノードなし)の場合にオンにします。「先に元になる画像をドロップしてください」という要求をスキップし、ドロップ済みの画像があっても無視します。Checkpoint/VAE/Prompt/KSamplerのキーフレームは通常どおり適用されます。オンの間はImageドロップ領域と「Use generated image for next」がグレーアウトします(既にドロップ済みの画像は削除されず、I2Iに戻したときのために保持されます)。この設定はプランに t2i_mode として保存されます",
|
||||
helpLabCardPlanTitle: "Settingサブタブ — 実行とプランファイル",
|
||||
helpLabPlan1: "右ペイン — Batch:実行する回数。Note:プランと一緒に保存される自由記述のメモ",
|
||||
helpLabPlan2: "Run/Pause/Cancel:Runでバッチループを開始、Pause/Resumeで回と回の間を一時停止・再開、Cancelで現在の生成を中断してループを止めます",
|
||||
helpLabPlan3: "Plan SaveとSave Asの違い:Plan Saveは読込済みのプランがあればダイアログなしで上書き保存します(未読込の場合のみ名前を確認)。Save Asはプラン読込中でも常に新しい名前を確認します",
|
||||
helpLabPlan4: "Plan Load:プランの.jsonファイル、またはそのインデックス画像(.png)をPLAN欄にドロップします(クリックでファイル選択も可)。.jsonをドロップした場合はそのまま読み込み、.pngをドロップした場合は同名の.jsonをサーバーから取得します",
|
||||
helpLabPlan5: "Plan ClearはSettingタブの内容を空のプランにリセットします(確認あり)",
|
||||
helpLabPlan6: "プランファイルは user/default/Workflow-Studio/lab_plan/ に <名前>.json として保存され、結果がある場合は最大9枚(1行3枚)のサムネイルを並べたインデックス画像 <名前>.png も自動生成されます",
|
||||
helpLabPlan6: "プランファイルは user/default/Workflow-Studio/lab_plan/ に ws_labplan_<名前>.json として保存され、結果がある場合は最大9枚(1行3枚)のサムネイルを並べたインデックス画像 ws_labplan_<名前>.png も自動生成されます。ws_labplan_ の接頭辞はPlan Save/Save Asが自動的に付与するため、プロンプトには接頭辞なしの名前だけを入力すればよく、フォルダ内でプランファイルを見分けやすくなります",
|
||||
helpLabPlan7: "設定タブで構成したEagle自動保存は、GenerateUI本来のGenerateボタンと同様にLabで生成したすべての画像に適用されます",
|
||||
helpLabPlan8: "Plan JSONサブタブ:現在のSettingタブのプラン内容をそのままJSONで表示します。「Refresh」でSettingタブの現在の内容から再読込(未適用の編集は破棄)、「Apply to Setting」で編集内容を解析しSettingタブへ書き戻します(列・メモ・Batch数・画像連鎖・元画像・結果)。保存せずにそのままプランファイルとして読み込んだのと同じ効果があります",
|
||||
helpLabPlan9: "保存されたプランには、保存時にGenerateUIで読み込まれていたワークフローのファイル名が記録されます(Plan JSON内のworkflow_filename)。プランを読み込むとPLANボックスに「Open Workflow」ボタンが表示され、クリックするとその記録された正確なワークフローファイルをGenerateUIへ読み込み直せます(現在読み込まれているワークフローを置き換えるため、確認が入ります)",
|
||||
helpLabPlan10: "右ペイン — 「Save index image to Output on Run」:チェックすると、Run実行が終わるたびにPlanファイル用と同じコンタクトシート形式のインデックス画像を作成し、ComfyUI本来のOutputフォルダへ Lab_index_<counter>_.png として直接保存します(通常の生成画像と同様に自動採番され、前回の実行結果を上書きしません)。保存後は他のLab生成画像と同様にEagle自動保存(設定タブで有効な場合)にも渡されます——これ専用のチェックボックスはなく、同じ設定タブのグローバルなトグルに従います。Plan Saveの動作とは独立しており、Plan Saveは常にこのチェックボックスに関係なく lab_plan/ 内のプランファイルの隣に自分専用のインデックス画像を書き込みます。この設定はプランに save_index_on_run として保存されます",
|
||||
helpLabCardResultsTitle: "Resultsサブタブ",
|
||||
helpLabResults1: "左ペインには実行に使用した元画像が表示されます",
|
||||
helpLabResults2: "中央ペインには生成順に最大9枚の画像が表示されます。サムネイルをクリックすると拡大表示されます",
|
||||
@@ -2504,6 +2550,24 @@ const LANGUAGES = {
|
||||
labPlanLoadFailed: "方案加载失败",
|
||||
labPlanInvalidFile: "请拖入方案的.json文件或其索引图片(.png)",
|
||||
labConfirmClear: "确定要清除所有Lab设置(图片、列、备注、结果)吗?",
|
||||
labGetFromGenUI: "从GenerateUI获取",
|
||||
labGetFromImage: "从图片获取",
|
||||
labStyle: "风格",
|
||||
labApply: "应用",
|
||||
labNoStyles: "暂无风格",
|
||||
labEnableStyleFirst: "请先在GenerateUI标签页顶部勾选Style复选框并选择一个风格",
|
||||
labPlanJsonRefreshed: "已根据当前Setting标签页内容刷新",
|
||||
labPlanJsonApplied: "已将Plan JSON应用到Setting",
|
||||
labPlanJsonInvalid: "JSON格式无效",
|
||||
labStyleApplied: "已应用风格",
|
||||
labPromptFetched: "已获取提示词",
|
||||
labNoPromptInImage: "该文件中未找到提示词",
|
||||
labMetadataExtractFailed: "读取元数据失败",
|
||||
labConfirmLoadWorkflow: (filename) => `将"${filename}"加载到GenerateUI?这将替换当前已加载的工作流。`,
|
||||
labWorkflowLoadFailed: "工作流加载失败",
|
||||
labT2IImageIgnored: "T2I模式已开启,无需上传图片,已跳过",
|
||||
labIndexImageSaved: (filename) => `索引图片已保存到Output:${filename}`,
|
||||
labIndexImageSaveFailed: "索引图片保存到Output失败",
|
||||
|
||||
connectedToComfyUI: "已连接到ComfyUI",
|
||||
failedToConnect: "连接失败",
|
||||
@@ -2983,14 +3047,19 @@ const LANGUAGES = {
|
||||
helpLab5: "点击单元格即可编辑:第1个关键帧设置基准值(留空则保持工作流本身的设置);第2个及以后的关键帧还可以选择从第几次开始应用,以及是否勾选\"恢复第1次的设置\"",
|
||||
helpLab6: "第N次迭代的实际生效值:使用迭代序号≤N中序号最大的关键帧,并一直延续到下一个关键帧改变它为止;勾选\"恢复第1次的设置\"时会直接复用第1次的值(若第1次为空则使用工作流默认值),而不是指定新值",
|
||||
helpLab7: "Lab不会修改Input/Model/Settings中显示的工作流——每次迭代都在加载工作流的一个副本上运行,因此这里的关键帧设置不会影响其他子标签",
|
||||
helpLab8: "Prompt单元格编辑弹窗的附加功能:「Get from GenerateUI」从GenerateUI当前加载的工作流中获取Positive/Negative;「Get from Image」从Lab左侧IMAGE区域当前加载的图片中提取提示词(与Metadata标签相同的检测逻辑,无需另外选择文件);「Style」会将GenerateUI工具栏顶部Style复选框/下拉菜单中当前选中的风格,以逗号分隔追加到下方的Positive/Negative文本之后(不会清空已有内容)——需先在顶部勾选复选框并选择风格,Lab没有自己独立的风格选择器",
|
||||
helpLab9: "左侧面板 — 「T2I workflow (no source image)」:当加载的工作流是文生图(T2I,没有LoadImage节点)时勾选此项。它会跳过\"请先拖入源图片\"的要求,忽略任何已拖入的图片,Checkpoint/VAE/Prompt/KSampler的关键帧仍会正常应用;开启期间Image拖放区域和「Use generated image for next」会变灰(之前拖入的图片不会被删除,以便切回I2I时使用);该设置会作为 t2i_mode 保存在方案中",
|
||||
helpLabCardPlanTitle: "Setting子标签 — 运行与方案文件",
|
||||
helpLabPlan1: "右侧面板 — Batch:要运行的迭代次数;Note:与方案一起保存的自由备注",
|
||||
helpLabPlan2: "Run/Pause/Cancel:Run开始批量循环;Pause/Resume在各次迭代之间暂停/继续;Cancel会中断当前生成并停止循环",
|
||||
helpLabPlan3: "Plan Save与Save As的区别:Plan Save会在已加载方案时静默覆盖保存(未加载时才会询问名称);Save As无论是否已加载方案都会始终询问新名称",
|
||||
helpLabPlan4: "Plan Load:将方案的.json文件或其索引图片(.png)拖入PLAN区域(也可点击浏览选择)——拖入.json会直接读取;拖入.png会从服务器获取同名的.json",
|
||||
helpLabPlan5: "Plan Clear会将Setting标签重置为空方案(会先确认)",
|
||||
helpLabPlan6: "方案文件保存在 user/default/Workflow-Studio/lab_plan/ 下,命名为<名称>.json,若方案含有结果,还会自动生成<名称>.png索引图片——最多9张结果缩略图组成的联系表(每行3张)",
|
||||
helpLabPlan6: "方案文件保存在 user/default/Workflow-Studio/lab_plan/ 下,命名为ws_labplan_<名称>.json,若方案含有结果,还会自动生成ws_labplan_<名称>.png索引图片——最多9张结果缩略图组成的联系表(每行3张)。ws_labplan_前缀由Plan Save/Save As自动添加,输入时只需填写不带前缀的名称,方便在该文件夹中辨认方案文件",
|
||||
helpLabPlan7: "设置标签页中配置的Eagle自动保存,会像GenerateUI自身的Generate按钮一样应用于Lab生成的每一张图片",
|
||||
helpLabPlan8: "Plan JSON子标签:以原始JSON形式显示当前Setting标签页的方案内容。「Refresh」会从Setting标签页重新读取(放弃尚未应用的编辑);「Apply to Setting」会解析你的编辑并写回Setting标签页(列、备注、Batch数量、图片链式生成、源图片、结果)——效果与直接将该JSON作为方案文件加载相同,无需先保存",
|
||||
helpLabPlan9: "每个已保存的方案都会记录保存时GenerateUI中加载的工作流文件名(Plan JSON中的workflow_filename)。加载方案后,PLAN框中会出现「Open Workflow」按钮——点击即可将该确切的工作流文件重新加载到GenerateUI中(会先弹出确认,因为这会替换当前已加载的工作流)",
|
||||
helpLabPlan10: "右侧面板 — 「Save index image to Output on Run」:勾选后,每次Run结束都会生成与方案文件相同的联系表索引图片,并直接保存到ComfyUI自身的Output文件夹,命名为 Lab_index_<counter>_.png(像普通生成图片一样自动编号,不会覆盖上一次运行的结果)。保存后还会像其他Lab生成的图片一样经过Eagle自动保存(若在设置标签页中启用)——没有单独的复选框,遵循同一个全局开关。这与Plan Save的行为相互独立——无论是否勾选此项,Plan Save都会照常在 lab_plan/ 中的方案文件旁写入自己的索引图片;该设置会作为 save_index_on_run 保存在方案中",
|
||||
helpLabCardResultsTitle: "Results子标签",
|
||||
helpLabResults1: "左侧面板显示本次运行使用的源图片",
|
||||
helpLabResults2: "中间面板按生成顺序显示最多9张生成图片;点击缩略图可放大查看",
|
||||
|
||||
+324
-19
@@ -12,11 +12,14 @@ import { comfyUI } from "./comfyui-client.js";
|
||||
import { comfyEditor } from "./comfyui-editor.js";
|
||||
import { showToast, openModal, closeModal } from "./app.js";
|
||||
import { t } from "./i18n.js";
|
||||
import { escapeHtml, getEagleSettings, saveToEagle } from "./util.js";
|
||||
import { escapeHtml, getEagleSettings, saveToEagle, setupSearchClearBtn } from "./util.js";
|
||||
import { extractAllMetadata } from "./metadata-tab.js";
|
||||
import { syncJsonHighlight } from "./json-highlight.js";
|
||||
|
||||
const COLUMN_KEYS = ["checkpoint", "vae", "prompt", "ksampler"];
|
||||
const MAX_RESULTS = 9;
|
||||
const RESULTS_GRID_COLS = 3;
|
||||
const LAB_PLAN_PREFIX = "ws_labplan_";
|
||||
|
||||
function _defaultValueFor(col) {
|
||||
if (col === "prompt") return { positive: "", negative: "" };
|
||||
@@ -39,7 +42,10 @@ function _emptyLabState() {
|
||||
note: "",
|
||||
batchCount: 4,
|
||||
chainImage: false,
|
||||
t2iMode: false,
|
||||
saveIndexOnRun: false,
|
||||
sourceImageFilename: null,
|
||||
workflowFilename: null,
|
||||
columns: _emptyColumns(),
|
||||
results: { images: [] },
|
||||
};
|
||||
@@ -62,8 +68,10 @@ export function initLabTab() {
|
||||
_initColumnButtons();
|
||||
_initRunControls();
|
||||
_initPlanButtons();
|
||||
_initPlanJsonTab();
|
||||
_renderAllColumns();
|
||||
_renderResultsGrid();
|
||||
_updateT2IModeUI();
|
||||
}
|
||||
|
||||
function _initDropZone() {
|
||||
@@ -72,7 +80,16 @@ function _initDropZone() {
|
||||
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
|
||||
const previewImg = document.getElementById("wfm-lab-preview-img");
|
||||
|
||||
document.getElementById("wfm-lab-t2i-mode")?.addEventListener("change", (e) => {
|
||||
_lab.t2iMode = e.target.checked;
|
||||
_updateT2IModeUI();
|
||||
});
|
||||
|
||||
const applyFile = async (file) => {
|
||||
if (_lab.t2iMode) {
|
||||
showToast(t("labT2IImageIgnored"), "info");
|
||||
return;
|
||||
}
|
||||
if (!file || !file.type.startsWith("image/")) return;
|
||||
const url = URL.createObjectURL(file);
|
||||
if (previewImg) previewImg.src = url;
|
||||
@@ -144,11 +161,65 @@ function _initSubtabToggle() {
|
||||
btn.classList.add("active");
|
||||
document.getElementById("wfm-lab-panel-setting")?.classList.toggle("active", target === "setting");
|
||||
document.getElementById("wfm-lab-panel-results")?.classList.toggle("active", target === "results");
|
||||
document.getElementById("wfm-lab-panel-planjson")?.classList.toggle("active", target === "planjson");
|
||||
if (target === "results") _updateResultsSourceImage();
|
||||
if (target === "planjson") _syncLabJsonView();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function _initPlanJsonTab() {
|
||||
document.getElementById("wfm-lab-planjson-refresh")?.addEventListener("click", () => {
|
||||
_syncLabJsonView();
|
||||
showToast(t("labPlanJsonRefreshed"), "success");
|
||||
});
|
||||
|
||||
document.getElementById("wfm-lab-planjson-apply")?.addEventListener("click", () => {
|
||||
const editor = document.getElementById("wfm-lab-planjson-editor");
|
||||
let data;
|
||||
try {
|
||||
data = JSON.parse(editor?.value || "{}");
|
||||
} catch (err) {
|
||||
showToast(`${t("labPlanJsonInvalid")}: ${err.message}`, "error");
|
||||
return;
|
||||
}
|
||||
_applyPlanData(_lab.planFilename, data);
|
||||
_syncLabJsonView();
|
||||
showToast(t("labPlanJsonApplied"), "success");
|
||||
});
|
||||
}
|
||||
|
||||
// Serializes the live Setting-tab state into the same shape saved to disk by
|
||||
// _savePlan(), for display/editing in the Plan JSON panel.
|
||||
function _buildPlanData(name) {
|
||||
// The workflow currently loaded in GenerateUI is what this plan actually ran
|
||||
// against — read it live so Save/Save As always records the up-to-date file.
|
||||
const wfNameEl = document.getElementById("wfm-gen-wf-name");
|
||||
const workflowFilename = wfNameEl?.dataset.filename || _lab.workflowFilename || "";
|
||||
return {
|
||||
name,
|
||||
note: _lab.note,
|
||||
batch_count: _lab.batchCount,
|
||||
chain_image: _lab.chainImage,
|
||||
t2i_mode: _lab.t2iMode,
|
||||
save_index_on_run: _lab.saveIndexOnRun,
|
||||
source_image: _lab.sourceImageFilename,
|
||||
workflow_filename: workflowFilename,
|
||||
columns: _lab.columns,
|
||||
results: { images: _lab.results.images },
|
||||
};
|
||||
}
|
||||
|
||||
function _syncLabJsonView() {
|
||||
const editor = document.getElementById("wfm-lab-planjson-editor");
|
||||
const highlight = document.getElementById("wfm-lab-planjson-highlight");
|
||||
if (!editor) return;
|
||||
const name = _lab.planFilename ? _stripLabPlanPrefix(_lab.planFilename.replace(/\.json$/i, "")) : "";
|
||||
const json = JSON.stringify(_buildPlanData(name), null, 2);
|
||||
editor.value = json;
|
||||
syncJsonHighlight(highlight, json);
|
||||
}
|
||||
|
||||
function _initRunControls() {
|
||||
document.getElementById("wfm-lab-batch-count")?.addEventListener("change", (e) => {
|
||||
const v = parseInt(e.target.value, 10);
|
||||
@@ -157,6 +228,7 @@ function _initRunControls() {
|
||||
});
|
||||
document.getElementById("wfm-lab-note")?.addEventListener("input", (e) => { _lab.note = e.target.value; });
|
||||
document.getElementById("wfm-lab-chain-image")?.addEventListener("change", (e) => { _lab.chainImage = e.target.checked; });
|
||||
document.getElementById("wfm-lab-save-index-on-run")?.addEventListener("change", (e) => { _lab.saveIndexOnRun = e.target.checked; });
|
||||
|
||||
document.getElementById("wfm-lab-run-btn")?.addEventListener("click", () => _runLabBatch());
|
||||
document.getElementById("wfm-lab-cancel-btn")?.addEventListener("click", async () => {
|
||||
@@ -177,6 +249,7 @@ function _initPlanButtons() {
|
||||
document.getElementById("wfm-lab-plan-save-btn")?.addEventListener("click", () => _savePlan());
|
||||
document.getElementById("wfm-lab-plan-saveas-btn")?.addEventListener("click", () => _savePlan(null, true));
|
||||
document.getElementById("wfm-lab-plan-clear-btn")?.addEventListener("click", () => _clearPlan());
|
||||
document.getElementById("wfm-lab-plan-workflow-load-btn")?.addEventListener("click", () => _loadPlanWorkflow());
|
||||
}
|
||||
|
||||
// ============================================
|
||||
@@ -282,6 +355,10 @@ function _openCellModal(col, idx) {
|
||||
valueFieldsHtml = `
|
||||
<div class="wfm-lab-modal-row">
|
||||
<label>${col === "checkpoint" ? "Checkpoint" : "VAE"}</label>
|
||||
<div class="wfm-search-wrap" style="margin-bottom:4px;width:100%;">
|
||||
<input type="text" id="wfm-lab-modal-value-filter" class="wfm-input wfm-search-input" placeholder="Filter...">
|
||||
<button type="button" class="wfm-search-clear-btn" id="wfm-lab-modal-value-filter-clear" title="Clear search">✕</button>
|
||||
</div>
|
||||
<select id="wfm-lab-modal-value" class="wfm-select">
|
||||
<option value="">${t("labUseWorkflowDefault")}</option>
|
||||
${options.map((m) => `<option value="${escapeHtml(m)}" ${m === kf.value ? "selected" : ""}>${escapeHtml(m)}</option>`).join("")}
|
||||
@@ -290,6 +367,10 @@ function _openCellModal(col, idx) {
|
||||
} else if (col === "prompt") {
|
||||
const v = kf.value || {};
|
||||
valueFieldsHtml = `
|
||||
<div class="wfm-lab-modal-btnrow">
|
||||
<button type="button" id="wfm-lab-modal-get-genui" class="wfm-btn wfm-btn-sm">${t("labGetFromGenUI")}</button>
|
||||
<button type="button" id="wfm-lab-modal-get-image" class="wfm-btn wfm-btn-sm">${t("labGetFromImage")}</button>
|
||||
</div>
|
||||
<div class="wfm-lab-modal-row">
|
||||
<label>Positive</label>
|
||||
<textarea id="wfm-lab-modal-positive" class="wfm-input" rows="3">${escapeHtml(v.positive || "")}</textarea>
|
||||
@@ -297,6 +378,10 @@ function _openCellModal(col, idx) {
|
||||
<div class="wfm-lab-modal-row">
|
||||
<label>Negative</label>
|
||||
<textarea id="wfm-lab-modal-negative" class="wfm-input" rows="3">${escapeHtml(v.negative || "")}</textarea>
|
||||
</div>
|
||||
<div class="wfm-lab-modal-row">
|
||||
<label>${t("labStyle")}</label>
|
||||
<button type="button" id="wfm-lab-modal-style-apply" class="wfm-btn wfm-btn-sm">${t("labApply")}</button>
|
||||
</div>`;
|
||||
} else if (col === "ksampler") {
|
||||
const v = kf.value || {};
|
||||
@@ -352,6 +437,8 @@ function _openCellModal(col, idx) {
|
||||
<button id="wfm-lab-modal-save" class="wfm-btn wfm-btn-primary">${t("save")}</button>
|
||||
</div>`;
|
||||
openModal(`${col} #${idx + 1}`, html);
|
||||
if (col === "prompt") _wireLabPromptModalExtras();
|
||||
if (col === "checkpoint" || col === "vae") _wireLabValueFilter(col);
|
||||
|
||||
const revertCb = document.getElementById("wfm-lab-modal-revert");
|
||||
const fieldsWrap = document.getElementById("wfm-lab-modal-fields");
|
||||
@@ -409,6 +496,122 @@ function _openCellModal(col, idx) {
|
||||
});
|
||||
}
|
||||
|
||||
// Merges a style ({prompt, negative_prompt}, from Workflow-Studio/style/*.json) into
|
||||
// plain positive/negative text. Unlike generate-tab.js's _applyNamedStyle() (which
|
||||
// substitutes a {prompt} placeholder into the style template for the main Generate
|
||||
// flow), Lab always appends: existing text is never cleared or reordered, the style's
|
||||
// text is just added after a comma (or used as-is if the field was empty).
|
||||
function _applyStyleToText(positive, negative, style) {
|
||||
const append = (existing, addition) => {
|
||||
if (!addition) return existing;
|
||||
return existing ? `${existing}, ${addition}` : addition;
|
||||
};
|
||||
return {
|
||||
positive: append(positive, style.prompt),
|
||||
negative: append(negative, style.negative_prompt),
|
||||
};
|
||||
}
|
||||
|
||||
// Filter box above the Checkpoint/VAE modal's <select>, same behavior as the
|
||||
// Model tab's filter inputs (comfyui-editor.js renderModelTab): rebuild the
|
||||
// option list on every keystroke, always keeping the "workflow default" option.
|
||||
// The overlay ✕ clear button reuses the same setupSearchClearBtn() helper as the
|
||||
// Models/Nodes/Workflow/Gallery tab search boxes and the Raw JSON search bar.
|
||||
function _wireLabValueFilter(col) {
|
||||
const filterInput = document.getElementById("wfm-lab-modal-value-filter");
|
||||
const select = document.getElementById("wfm-lab-modal-value");
|
||||
if (!filterInput || !select) return;
|
||||
const options = comfyEditor.models[col === "checkpoint" ? "checkpoints" : "vaes"] || [];
|
||||
|
||||
const applyFilter = () => {
|
||||
const filter = filterInput.value.toLowerCase();
|
||||
select.innerHTML = `<option value="">${t("labUseWorkflowDefault")}</option>` +
|
||||
options.filter((m) => m.toLowerCase().includes(filter))
|
||||
.map((m) => `<option value="${escapeHtml(m)}">${escapeHtml(m)}</option>`).join("");
|
||||
};
|
||||
|
||||
filterInput.addEventListener("input", applyFilter);
|
||||
setupSearchClearBtn("wfm-lab-modal-value-filter", "wfm-lab-modal-value-filter-clear", applyFilter);
|
||||
}
|
||||
|
||||
// Wires the Prompt-column modal's extra actions: fetch the live GenerateUI prompt,
|
||||
// extract a prompt from a dropped image/workflow file, and apply a saved Style.
|
||||
function _wireLabPromptModalExtras() {
|
||||
// Reuses the Style checkbox/dropdown already at the top of the GenerateUI toolbar
|
||||
// (populated by generate-tab.js's _loadStyles()) instead of duplicating a second
|
||||
// style picker inside this modal.
|
||||
const styleApplyBtn = document.getElementById("wfm-lab-modal-style-apply");
|
||||
const topStyleName = document.getElementById("wfm-style-select")?.value;
|
||||
const topStyleEnabled = !!document.getElementById("wfm-style-enabled")?.checked;
|
||||
if (styleApplyBtn) {
|
||||
styleApplyBtn.textContent = (topStyleEnabled && topStyleName) ? `${t("labApply")}: ${topStyleName}` : t("labApply");
|
||||
}
|
||||
|
||||
styleApplyBtn?.addEventListener("click", async () => {
|
||||
const enabled = !!document.getElementById("wfm-style-enabled")?.checked;
|
||||
const styleName = document.getElementById("wfm-style-select")?.value;
|
||||
if (!enabled || !styleName) {
|
||||
showToast(t("labEnableStyleFirst"), "error");
|
||||
return;
|
||||
}
|
||||
let styles = [];
|
||||
try {
|
||||
const res = await fetch("/api/wfm/styles");
|
||||
styles = res.ok ? await res.json() : [];
|
||||
} catch { styles = []; }
|
||||
const style = styles.find((s) => s.name === styleName);
|
||||
if (!style) { showToast(t("labNoStyles"), "error"); return; }
|
||||
|
||||
const posEl = document.getElementById("wfm-lab-modal-positive");
|
||||
const negEl = document.getElementById("wfm-lab-modal-negative");
|
||||
const merged = _applyStyleToText(posEl?.value || "", negEl?.value || "", style);
|
||||
if (posEl) posEl.value = merged.positive;
|
||||
if (negEl) negEl.value = merged.negative;
|
||||
showToast(t("labStyleApplied"), "success");
|
||||
});
|
||||
|
||||
document.getElementById("wfm-lab-modal-get-genui")?.addEventListener("click", () => {
|
||||
const analysis = comfyUI.currentAnalysis;
|
||||
if (!analysis) { showToast(t("labNoWorkflowLoaded"), "error"); return; }
|
||||
const posNode = analysis.prompt_nodes?.find((n) => n.role === "positive");
|
||||
const negNode = analysis.prompt_nodes?.find((n) => n.role === "negative");
|
||||
const posEl = document.getElementById("wfm-lab-modal-positive");
|
||||
const negEl = document.getElementById("wfm-lab-modal-negative");
|
||||
if (posEl) posEl.value = posNode?.text ?? "";
|
||||
if (negEl) negEl.value = negNode?.text ?? "";
|
||||
showToast(t("labPromptFetched"), "success");
|
||||
});
|
||||
|
||||
// Reads metadata from the image already loaded in Lab's own Image drop zone
|
||||
// (_lab.sourceImageFilename, already uploaded to ComfyUI's input folder) rather
|
||||
// than asking the user to pick a separate file.
|
||||
document.getElementById("wfm-lab-modal-get-image")?.addEventListener("click", async () => {
|
||||
if (!_lab.sourceImageFilename) {
|
||||
showToast(t("labNoSourceImage"), "error");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const res = await fetch(`/view?filename=${encodeURIComponent(_lab.sourceImageFilename)}&type=input`);
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const blob = await res.blob();
|
||||
const file = new File([blob], _lab.sourceImageFilename, { type: blob.type || "image/png" });
|
||||
|
||||
const meta = await extractAllMetadata(file);
|
||||
if (!meta || (!meta.positives?.length && !meta.negatives?.length)) {
|
||||
showToast(t("labNoPromptInImage"), "error");
|
||||
return;
|
||||
}
|
||||
const posEl = document.getElementById("wfm-lab-modal-positive");
|
||||
const negEl = document.getElementById("wfm-lab-modal-negative");
|
||||
if (posEl && meta.positives?.[0]) posEl.value = meta.positives[0];
|
||||
if (negEl && meta.negatives?.[0]) negEl.value = meta.negatives[0];
|
||||
showToast(t("labPromptFetched"), "success");
|
||||
} catch (err) {
|
||||
showToast(`${t("labMetadataExtractFailed")}: ${err.message}`, "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Effective-value resolution & workflow build
|
||||
// ============================================
|
||||
@@ -467,7 +670,7 @@ function _buildWorkflowForIteration(iteration, chainImageRef) {
|
||||
if (ks.seed != null) seed = ks.seed;
|
||||
}
|
||||
|
||||
const imageRef = chainImageRef || _lab.sourceImageFilename;
|
||||
const imageRef = _lab.t2iMode ? null : (chainImageRef || _lab.sourceImageFilename);
|
||||
if (imageRef && analysis.load_image_nodes?.[0]) {
|
||||
write(analysis.load_image_nodes[0].id, "image", imageRef);
|
||||
}
|
||||
@@ -508,7 +711,7 @@ async function _runLabBatch() {
|
||||
showToast(t("labNoWorkflowLoaded"), "error");
|
||||
return;
|
||||
}
|
||||
if (!_lab.sourceImageFilename) {
|
||||
if (!_lab.t2iMode && !_lab.sourceImageFilename) {
|
||||
showToast(t("labNoSourceImage"), "error");
|
||||
return;
|
||||
}
|
||||
@@ -532,7 +735,7 @@ async function _runLabBatch() {
|
||||
if (_aborted) break;
|
||||
|
||||
if (progressText) progressText.textContent = `[${i}/${_lab.batchCount}] ...`;
|
||||
const chainRef = (_lab.chainImage && i > 1) ? _lastGeneratedImageRef : null;
|
||||
const chainRef = (!_lab.t2iMode && _lab.chainImage && i > 1) ? _lastGeneratedImageRef : null;
|
||||
const { workflow, seed } = _buildWorkflowForIteration(i, chainRef);
|
||||
|
||||
try {
|
||||
@@ -571,6 +774,8 @@ async function _runLabBatch() {
|
||||
_setRunUiState(false);
|
||||
}
|
||||
|
||||
await _maybeSaveIndexImageOnRun();
|
||||
|
||||
if (progressBar) progressBar.style.width = "100%";
|
||||
if (_aborted) {
|
||||
showToast(t("batchStopped", completed, failed), "info");
|
||||
@@ -608,13 +813,31 @@ function _renderResultsGrid() {
|
||||
|
||||
function _updateResultsSourceImage() {
|
||||
const img = document.getElementById("wfm-lab-results-source-img");
|
||||
const t2iNote = document.getElementById("wfm-lab-results-t2i-note");
|
||||
if (!img) return;
|
||||
if (_lab.sourceImageFilename) {
|
||||
if (!_lab.t2iMode && _lab.sourceImageFilename) {
|
||||
img.src = `/view?filename=${encodeURIComponent(_lab.sourceImageFilename)}&type=input`;
|
||||
img.style.display = "";
|
||||
} else {
|
||||
img.style.display = "none";
|
||||
}
|
||||
if (t2iNote) t2iNote.style.display = _lab.t2iMode ? "" : "none";
|
||||
}
|
||||
|
||||
// Greys out image-related controls that don't apply to a T2I workflow (no
|
||||
// LoadImage node to feed): the drop zone and the "use generated image for
|
||||
// next" chain checkbox. Doesn't clear any already-uploaded source image, so
|
||||
// toggling back to I2I restores prior state.
|
||||
function _updateT2IModeUI() {
|
||||
const t2iEl = document.getElementById("wfm-lab-t2i-mode");
|
||||
const dropZone = document.getElementById("wfm-lab-drop-zone");
|
||||
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
|
||||
const chainEl = document.getElementById("wfm-lab-chain-image");
|
||||
if (t2iEl) t2iEl.checked = _lab.t2iMode;
|
||||
if (dropZone) dropZone.classList.toggle("wfm-disabled", _lab.t2iMode);
|
||||
if (previewWrap && _lab.t2iMode) previewWrap.style.display = "none";
|
||||
if (chainEl) chainEl.disabled = _lab.t2iMode;
|
||||
_updateResultsSourceImage();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
@@ -655,30 +878,61 @@ async function _buildIndexImageDataUrl() {
|
||||
return canvas.toDataURL("image/png");
|
||||
}
|
||||
|
||||
// When "Save index image to Output on Run" is checked, builds the same
|
||||
// contact-sheet used for Plan files and writes it into ComfyUI's own Output
|
||||
// folder (auto-numbered, like a normal generated image) — independent of
|
||||
// Plan Save, which always writes its own copy next to the plan file. Once it
|
||||
// has a real file in Output, it also feeds it through the same Eagle
|
||||
// auto-save path as every other Lab-generated image (single global toggle
|
||||
// in Settings, no separate checkbox here).
|
||||
async function _maybeSaveIndexImageOnRun() {
|
||||
if (!_lab.saveIndexOnRun) return;
|
||||
try {
|
||||
const dataUrl = await _buildIndexImageDataUrl();
|
||||
if (!dataUrl) return;
|
||||
const res = await fetch("/api/wfm/lab/index-image/save-to-output", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ image_base64: dataUrl }),
|
||||
});
|
||||
const json = await res.json();
|
||||
if (!res.ok) throw new Error(json.error || `HTTP ${res.status}`);
|
||||
showToast(t("labIndexImageSaved", json.filename), "success");
|
||||
|
||||
if (getEagleSettings().autoSave) {
|
||||
const viewUrl = `/view?filename=${encodeURIComponent(json.filename)}&subfolder=${encodeURIComponent(json.subfolder || "")}&type=output`;
|
||||
saveToEagle(viewUrl, json.filename, [], { filename: json.filename, subfolder: json.subfolder || "", type: "output" });
|
||||
}
|
||||
} catch (err) {
|
||||
showToast(`${t("labIndexImageSaveFailed")}: ${err.message}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Plan save / load / clear
|
||||
// ============================================
|
||||
|
||||
// Plan files are always saved with the ws_labplan_ prefix so they're easy to
|
||||
// spot (and script against) among other files in lab_plan/. Existing plans
|
||||
// that already carry it are re-saved as-is rather than double-prefixed.
|
||||
function _stripLabPlanPrefix(base) {
|
||||
return base.toLowerCase().startsWith(LAB_PLAN_PREFIX) ? base.slice(LAB_PLAN_PREFIX.length) : base;
|
||||
}
|
||||
|
||||
async function _savePlan(filenameOverride, forceNewName = false) {
|
||||
let filename = filenameOverride;
|
||||
if (!filename) {
|
||||
let inputName = filenameOverride;
|
||||
if (!inputName) {
|
||||
if (forceNewName || !_lab.planFilename) {
|
||||
filename = window.prompt(t("labEnterPlanName"), forceNewName ? "" : (_lab.planFilename || ""));
|
||||
if (!filename) return;
|
||||
inputName = window.prompt(t("labEnterPlanName"), "");
|
||||
if (!inputName) return;
|
||||
} else {
|
||||
filename = _lab.planFilename;
|
||||
inputName = _lab.planFilename;
|
||||
}
|
||||
}
|
||||
|
||||
const data = {
|
||||
name: filename.replace(/\.json$/i, ""),
|
||||
note: _lab.note,
|
||||
batch_count: _lab.batchCount,
|
||||
chain_image: _lab.chainImage,
|
||||
source_image: _lab.sourceImageFilename,
|
||||
columns: _lab.columns,
|
||||
results: { images: _lab.results.images },
|
||||
};
|
||||
const baseName = _stripLabPlanPrefix(inputName.replace(/\.json$/i, ""));
|
||||
const filename = `${LAB_PLAN_PREFIX}${baseName}.json`;
|
||||
const data = _buildPlanData(baseName);
|
||||
|
||||
let indexImageBase64 = null;
|
||||
try {
|
||||
@@ -694,6 +948,8 @@ async function _savePlan(filenameOverride, forceNewName = false) {
|
||||
const json = await res.json();
|
||||
if (!res.ok) throw new Error(json.error || `HTTP ${res.status}`);
|
||||
_lab.planFilename = json.filename;
|
||||
_lab.workflowFilename = data.workflow_filename || null;
|
||||
_updatePlanWorkflowUI();
|
||||
showToast(t("labPlanSaved"), "success");
|
||||
} catch (err) {
|
||||
showToast(`${t("labPlanSaveFailed")}: ${err.message}`, "error");
|
||||
@@ -705,16 +961,23 @@ function _applyPlanData(filename, data) {
|
||||
_lab.note = data.note || "";
|
||||
_lab.batchCount = data.batch_count || 1;
|
||||
_lab.chainImage = !!data.chain_image;
|
||||
_lab.t2iMode = !!data.t2i_mode;
|
||||
_lab.saveIndexOnRun = !!data.save_index_on_run;
|
||||
_lab.sourceImageFilename = data.source_image || null;
|
||||
_lab.workflowFilename = data.workflow_filename || null;
|
||||
_lab.columns = data.columns || _emptyColumns();
|
||||
_lab.results = { images: (data.results?.images || []).slice(0, MAX_RESULTS) };
|
||||
_updatePlanWorkflowUI();
|
||||
_updateT2IModeUI();
|
||||
|
||||
const noteEl = document.getElementById("wfm-lab-note");
|
||||
const batchEl = document.getElementById("wfm-lab-batch-count");
|
||||
const chainEl = document.getElementById("wfm-lab-chain-image");
|
||||
const saveIndexEl = document.getElementById("wfm-lab-save-index-on-run");
|
||||
if (noteEl) noteEl.value = _lab.note;
|
||||
if (batchEl) batchEl.value = _lab.batchCount;
|
||||
if (chainEl) chainEl.checked = _lab.chainImage;
|
||||
if (saveIndexEl) saveIndexEl.checked = _lab.saveIndexOnRun;
|
||||
|
||||
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
|
||||
const previewImg = document.getElementById("wfm-lab-preview-img");
|
||||
@@ -772,9 +1035,11 @@ function _clearPlan() {
|
||||
const noteEl = document.getElementById("wfm-lab-note");
|
||||
const batchEl = document.getElementById("wfm-lab-batch-count");
|
||||
const chainEl = document.getElementById("wfm-lab-chain-image");
|
||||
const saveIndexEl = document.getElementById("wfm-lab-save-index-on-run");
|
||||
if (noteEl) noteEl.value = "";
|
||||
if (batchEl) batchEl.value = _lab.batchCount;
|
||||
if (chainEl) chainEl.checked = false;
|
||||
if (saveIndexEl) saveIndexEl.checked = false;
|
||||
|
||||
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
|
||||
if (previewWrap) previewWrap.style.display = "none";
|
||||
@@ -782,4 +1047,44 @@ function _clearPlan() {
|
||||
_renderAllColumns();
|
||||
_renderResultsGrid();
|
||||
_updateResultsSourceImage();
|
||||
_updatePlanWorkflowUI();
|
||||
_updateT2IModeUI();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Plan → workflow recall
|
||||
// ============================================
|
||||
|
||||
// Shows/hides the recorded-workflow row in the Plan pane based on _lab.workflowFilename.
|
||||
function _updatePlanWorkflowUI() {
|
||||
const row = document.getElementById("wfm-lab-plan-workflow-row");
|
||||
const nameEl = document.getElementById("wfm-lab-plan-workflow-name");
|
||||
if (!row || !nameEl) return;
|
||||
if (_lab.workflowFilename) {
|
||||
nameEl.textContent = _lab.workflowFilename;
|
||||
nameEl.title = _lab.workflowFilename;
|
||||
row.style.display = "";
|
||||
} else {
|
||||
row.style.display = "none";
|
||||
}
|
||||
}
|
||||
|
||||
// Loads the plan's recorded workflow file into GenerateUI, replacing whatever is
|
||||
// currently loaded there. Requires explicit confirmation — Lab never swaps the
|
||||
// active workflow on its own (e.g. when a plan is loaded via drag & drop).
|
||||
// Uses a dynamic import to avoid a static circular import with generate-tab.js,
|
||||
// which already imports initLabTab from this file.
|
||||
async function _loadPlanWorkflow() {
|
||||
const filename = _lab.workflowFilename;
|
||||
if (!filename) return;
|
||||
if (!window.confirm(t("labConfirmLoadWorkflow", filename))) return;
|
||||
try {
|
||||
const resp = await fetch(`/api/wfm/workflows/raw?filename=${encodeURIComponent(filename)}`);
|
||||
if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
|
||||
const data = await resp.json();
|
||||
const { loadWorkflowIntoEditor } = await import("./generate-tab.js");
|
||||
await loadWorkflowIntoEditor(data, filename);
|
||||
} catch (err) {
|
||||
showToast(`${t("labWorkflowLoadFailed")}: ${err.message}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -556,7 +556,7 @@ function parseFooocusMetadata(raw) {
|
||||
}
|
||||
|
||||
// ── Master extractAllMetadata ─────────────────────────────────
|
||||
async function extractAllMetadata(file) {
|
||||
export async function extractAllMetadata(file) {
|
||||
const name = file.name.toLowerCase();
|
||||
const isJSON = file.type === "application/json" || name.endsWith(".json");
|
||||
const isWebP = file.type === "image/webp" || name.endsWith(".webp");
|
||||
|
||||
+32
-1
@@ -508,6 +508,7 @@
|
||||
<div class="wfm-lab-subtab-nav">
|
||||
<button class="wfm-lab-subtab-btn active" data-lab-subtab="setting">Setting</button>
|
||||
<button class="wfm-lab-subtab-btn" data-lab-subtab="results">Results</button>
|
||||
<button class="wfm-lab-subtab-btn" data-lab-subtab="planjson">Plan JSON</button>
|
||||
</div>
|
||||
|
||||
<!-- Setting panel -->
|
||||
@@ -516,6 +517,10 @@
|
||||
<!-- Left: source image + plan load/clear -->
|
||||
<div class="wfm-lab-pane wfm-lab-left">
|
||||
<div class="wfm-lab-pane-header">Image</div>
|
||||
<label class="wfm-lab-checkbox-label">
|
||||
<input type="checkbox" id="wfm-lab-t2i-mode">
|
||||
T2I workflow (no source image)
|
||||
</label>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-lab-preview-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-lab-preview-img" alt="">
|
||||
</div>
|
||||
@@ -537,6 +542,10 @@
|
||||
Drop plan (.json/.png) here or click to select
|
||||
</label>
|
||||
</div>
|
||||
<div class="wfm-lab-plan-workflow-row" id="wfm-lab-plan-workflow-row" style="display:none;">
|
||||
<span id="wfm-lab-plan-workflow-name" class="wfm-lab-plan-workflow-name"></span>
|
||||
<button type="button" id="wfm-lab-plan-workflow-load-btn" class="wfm-btn wfm-btn-xs" title="Load this plan's recorded workflow into GenerateUI">Open Workflow</button>
|
||||
</div>
|
||||
<div class="wfm-lab-side-btns">
|
||||
<button id="wfm-lab-plan-clear-btn" class="wfm-btn">Plan Clear</button>
|
||||
</div>
|
||||
@@ -607,6 +616,10 @@
|
||||
<label>Batch:</label>
|
||||
<input type="number" id="wfm-lab-batch-count" class="wfm-input" value="4" min="1" max="50">
|
||||
</div>
|
||||
<label class="wfm-lab-checkbox-label" style="margin-top:6px;">
|
||||
<input type="checkbox" id="wfm-lab-save-index-on-run">
|
||||
Save index image to Output on Run
|
||||
</label>
|
||||
|
||||
<div class="wfm-lab-pane-header" style="margin-top:12px;">Note</div>
|
||||
<textarea id="wfm-lab-note" class="wfm-input wfm-lab-note" rows="6"></textarea>
|
||||
@@ -623,6 +636,7 @@
|
||||
<div class="wfm-lab-pane wfm-lab-results-left">
|
||||
<div class="wfm-lab-pane-header">Image</div>
|
||||
<img id="wfm-lab-results-source-img" class="wfm-i2i-preview-img" style="display:none;" alt="">
|
||||
<p id="wfm-lab-results-t2i-note" class="wfm-placeholder" style="display:none;">T2I workflow (no source image)</p>
|
||||
</div>
|
||||
<div class="wfm-lab-pane wfm-lab-results-center">
|
||||
<div class="wfm-lab-pane-header">Results</div>
|
||||
@@ -632,6 +646,18 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Plan JSON panel -->
|
||||
<div id="wfm-lab-panel-planjson" class="wfm-lab-panel">
|
||||
<div class="wfm-lab-planjson-toolbar">
|
||||
<button type="button" id="wfm-lab-planjson-refresh" class="wfm-btn wfm-btn-sm">Refresh</button>
|
||||
<button type="button" id="wfm-lab-planjson-apply" class="wfm-btn wfm-btn-primary wfm-btn-sm">Apply to Setting</button>
|
||||
</div>
|
||||
<div class="wfm-json-container">
|
||||
<pre id="wfm-lab-planjson-highlight" class="wfm-json-highlight"></pre>
|
||||
<textarea id="wfm-lab-planjson-editor" class="wfm-json-editor" spellcheck="false"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tab: Feeder — full-width: settings(left) + library(center) -->
|
||||
@@ -1338,6 +1364,8 @@
|
||||
<li id="wfm-help-lab-5">Click a cell to edit it: iteration #1 sets the baseline value (leave it blank to keep the loaded workflow's own setting); iteration #2+ also lets you choose which iteration it starts applying from, plus a "revert to #1's setting" checkbox</li>
|
||||
<li id="wfm-help-lab-6">Effective value at iteration N: the latest keyframe with iteration ≤ N is used and carries forward until the next keyframe changes it; "revert to #1" reuses iteration #1's value (or the workflow default if #1 is blank) instead of specifying a new one</li>
|
||||
<li id="wfm-help-lab-7">Lab never edits the workflow shown in Input/Model/Settings — every iteration runs on a fresh clone of the loaded workflow, so keyframes here never affect the other subtabs</li>
|
||||
<li id="wfm-help-lab-8">Prompt cell editor extras: <b>Get from GenerateUI</b> fills Positive/Negative from the workflow currently loaded in GenerateUI; <b>Get from Image</b> extracts a prompt from the image currently loaded in Lab's own Image drop zone (same detection as the Metadata tab; no separate file picker); <b>Style</b> appends whichever style is currently selected in the Style checkbox/dropdown at the top of the GenerateUI toolbar to the Positive/Negative text below, comma-separated after any existing text (never clears it) — enable that checkbox and pick a style first, Lab doesn't have its own separate style picker</li>
|
||||
<li id="wfm-help-lab-9">Left pane — <b>T2I workflow (no source image)</b>: check this when the loaded workflow is text-to-image (no LoadImage node). It skips the "drop a source image first" requirement, ignores any dropped image and the Checkpoint/VAE/Prompt/KSampler keyframes still apply normally; the Image drop zone and "Use generated image for next" are greyed out while it's on (any previously dropped image is kept, not deleted, in case you switch back to I2I); the setting is saved with the plan as <code>t2i_mode</code></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -1349,8 +1377,11 @@
|
||||
<li id="wfm-help-lab-plan-3">Plan Save vs Save As: Plan Save silently overwrites the currently loaded plan (or asks for a name the first time); Save As always asks for a new name, even while a plan is already loaded</li>
|
||||
<li id="wfm-help-lab-plan-4">Plan Load: drop a plan's .json file, or its .png index-image thumbnail, onto the PLAN box (or click it to browse) — a dropped .json is read directly; a dropped .png fetches the matching .json (same filename) from the server</li>
|
||||
<li id="wfm-help-lab-plan-5">Plan Clear resets the Setting tab to an empty plan (asks for confirmation first)</li>
|
||||
<li id="wfm-help-lab-plan-6">Plan files are stored in <code>user/default/Workflow-Studio/lab_plan/</code> as <code><name>.json</code> plus a <code><name>.png</code> index image — a contact sheet of up to 9 result thumbnails (3 per row) generated automatically whenever a plan with results is saved</li>
|
||||
<li id="wfm-help-lab-plan-6">Plan files are stored in <code>user/default/Workflow-Studio/lab_plan/</code> as <code>ws_labplan_<name>.json</code> plus a <code>ws_labplan_<name>.png</code> index image — a contact sheet of up to 9 result thumbnails (3 per row) generated automatically whenever a plan with results is saved. The <code>ws_labplan_</code> prefix is added automatically by Plan Save/Save As (type just the plain name when prompted) so plan files are easy to pick out among other files in that folder</li>
|
||||
<li id="wfm-help-lab-plan-7">Eagle auto-save (configured in the Settings tab) applies to every image Lab generates, the same as GenerateUI's own Generate button</li>
|
||||
<li id="wfm-help-lab-plan-8">Plan JSON subtab: shows the current Setting tab's plan as raw JSON; <b>Refresh</b> re-reads it from the Setting tab (discarding any unapplied text edits), <b>Apply to Setting</b> parses your edits and writes them back into the Setting tab (columns, note, batch count, chain-image, source image, results) — the same effect as loading that JSON as a plan file, without needing to save it first</li>
|
||||
<li id="wfm-help-lab-plan-9">Each saved plan records the filename of the workflow that was loaded in GenerateUI at save time (<code>workflow_filename</code> in the Plan JSON). After loading a plan, an <b>Open Workflow</b> button appears in the PLAN box — click it to load that exact workflow file back into GenerateUI (asks for confirmation, since it replaces whatever is currently loaded)</li>
|
||||
<li id="wfm-help-lab-plan-10">Right pane — <b>Save index image to Output on Run</b>: when checked, every time Run finishes it builds the same contact-sheet index image used for Plan files and saves it directly into ComfyUI's own Output folder as <code>Lab_index_<counter>_.png</code> (auto-numbered like a normal generated image, never overwriting a previous run's). Once saved, it also goes through Eagle auto-save (if enabled in the Settings tab) just like every other Lab-generated image — no separate checkbox for that, it follows the same global toggle. This is independent of Plan Save, which still always writes its own index image next to the plan file in <code>lab_plan/</code> regardless of this checkbox; this setting is saved with the plan as <code>save_index_on_run</code></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user