Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd4b721d51 | ||
|
|
46c789c492 | ||
|
|
ede39ec715 | ||
|
|
ad3b380929 | ||
|
|
c589e562e4 |
@@ -2,6 +2,10 @@
|
||||
|
||||
Condensed version-by-version index of DEVLOG.md (each line: version + one-line summary of what changed and why). Full rationale, code details, and "How to apply" lessons live in the excluded DEVLOG.md itself; this index exists so graphify can extract a queryable semantic node per release without feeding the full log to the local Ollama model. Regenerate with `python tools/generate_doc_index.py devlog` whenever DEVLOG.md changes.
|
||||
|
||||
- **v0.5.2** — 機能追加: GenerateUI/Labタブの動画ワークフロー対応 + VideoタブにFrame抽出/GIF変換機能 + データ管理監査とZIPフルバックアップ + Send to LI node統一
|
||||
- **v0.5.1** — 機能追加: mp4動画の埋め込みメタデータ対応(Gallery Prompt/JSON・Metadataサブタブ・サイドパネルIタブ)+ Gallery Infoタブに寸法/再生時間表示 + MiniMax H3等オールインワン動画ノードのプロンプト抽出バグ修正
|
||||
- **v0.5.0** — 機能追加: mp4動画Gallery対応 + Videoタブ新設(MiniMax H3専用) + バグ修正: Galleryのタグ/メモが再起動後に消える
|
||||
- **v0.4.8** — 機能追加: LabタブにPromptグループ一括適用+キーフレーム並べ替え + バグ修正: デフォルトワークフローの上書き保存が反映されない + Styleテーブルの「このファイルへ追加」対応
|
||||
- **v0.4.7** — 機能追加: Prompt Tab内部リファクタ + Gallery Promptタブ新設 + Send to Canvas改善 + Presetsソート
|
||||
- **v0.4.6** — 機能追加: MetadataタブをGalleryタブへ統合 + Promptタブに一覧編集可能なTable表示を新設
|
||||
- **v0.4.5** — 調査: トップバー保存ワークフローのRMBG不具合報告(原因なし) + バグ修正: LabタブModel列の無意味な空キーフレーム表示を解消
|
||||
|
||||
@@ -2,6 +2,113 @@
|
||||
|
||||
---
|
||||
|
||||
## v0.5.2
|
||||
|
||||
### 機能追加: GenerateUI/Labタブの動画ワークフロー対応 + VideoタブにFrame抽出/GIF変換機能 + データ管理監査とZIPフルバックアップ + Send to LI node統一
|
||||
|
||||
v0.5.0/v0.5.1で専用Videoタブを整備したMiniMax H3動画生成ワークフローを、GenerateUI/Labタブ本体でも扱えるようにする要望を起点に着手。1セッションで複数の要望・バグ報告・監査依頼を順に実装した一連の作業。
|
||||
|
||||
**1. GenerateUI/Labタブの動画ワークフロー対応**: 「MiniMax H3の動画生成ワークフローを生成UIタブ、Labタブでも生成できるようにしたい」との要望。実際には`comfyWorkflow.convertUiToApi()`+`comfyUI.generate()`が既に汎用的で生成自体は動いていたが、`analyzeWorkflow()`が`MiniMaxH3ImageToVideo`のようなCLIPTextEncodeを介さないオールインワン動画ノードのpromptを検出できず、GenerateUIのInput>Promptタブが空になっていた。クラス名が`ImageToVideo`/`TextToVideo`を含み`inputs.prompt`が文字列のノードを汎用的に拾う分岐を追加(`metadata-tab.js`/`node_sets_menu.js`に既にあったプロンプト抽出と同じ判定パターン)。GenerateUIとLabタブは共に同じ`comfyUI.currentAnalysis`を参照する設計だったため、この一箇所の修正でPromptタブとLabのキーフレーム書き込みの両方が動画ワークフローに対応した。画像(first_frame)は既存のLoadImage検出がそのまま拾う。あわせて、動画生成は静止画より大幅に時間がかかるため`comfyWorkflow.isVideoWorkflow(analysis)`ヘルパーを新設し、動画ワークフロー検出時はGenerateUI/Labとも生成タイムアウトを30分に延長。GenerateUIの結果プレビューは`<img>`固定だったため動画結果が正しく表示できなかった問題も、`<video>`要素を追加し出力ファイルの拡張子で出し分けるよう修正した。
|
||||
|
||||
**2. バグ修正: Labタブのindex imageが真っ黒になる**: 実機確認で発覚。コンタクトシート生成(`_buildIndexImageDataUrl`)が各結果を`<img>`要素として読み込もうとしており、mp4は画像として読み込めず失敗、そのセルはcanvasの黒背景がそのまま残っていた。動画結果は既存のchain image機能で使っていた最終フレーム抽出ロジック(`extractLastFrameBlob`、`<video>`+`<canvas>`でクライアント側完結)を再利用してフレームを取り出してから描画するよう修正。
|
||||
|
||||
**3. バグ修正: LabタブKsampler列が動画ワークフローでも表示される**: 「Model同様に該当ノードがなければ非表示にしたい」との要望に対し当初`sampler_nodes.length > 0`で判定したが、実機確認で「まだ表示される」との報告。原因はMiniMax H3のサブグラフ内部に実際に`SamplerCustomAdvanced`が配線されており(内部プリセットの一部で、ユーザーが調整すべきものではない)、単純な有無判定では引っかからなかったこと。判定を`comfyWorkflow.isVideoWorkflow(analysis)`ベースに切り替え、動画ワークフロー全体ではKsampler列自体を常に非表示にするよう修正した。
|
||||
|
||||
**4. Videoタブ拡張: Frame抽出 / アニメーションGIF変換**: Eagleプラグイン(video-to-frame, video2gif)を参考に要望された2機能。Eagle版はNode.js+ffmpegバイナリ直接呼び出しの実装だったため、ComfyUI-Workflow-Studioの構成(Python/aiohttpバックエンド)に合わせて設計し直した。フレーム抽出は`<video>`+`<canvas>`でブラウザ完結(サーバー往復・追加依存なし)。GIF変換はユーザー確認の上サーバー側実装を選択:PyAV(デコード)+ Pillow(GIFエンコード)— どちらもComfyUI本体が既に要求している依存のため、ffmpegバイナリや新規ライブラリの追加インストールは不要。`py/services/video_service.py` / `py/routes/video_routes.py`を新規追加し、`folder_paths.get_save_image_path()`でComfyUI標準の自動採番保存パターンをそのまま踏襲。合成テスト動画(PyAVで生成)を使いvenv環境でデコード→GIFエンコードの実処理を検証済み。
|
||||
- あわせてVideoタブの中央パネルを再設計:「結果」見出し/「まだ結果がありません」表示を廃止し、生成結果とドロップされた任意のローカル動画を同じプレビュー枠に統合、横に**Video Source**ドロップ/クリック選択エリア(Clearボタン付き)を新設。右パネルの「Properties」プレースホルダーを**Frame**/**GIF**の2タブに置き換え。生成結果に限らず任意の動画に対してFrame/GIF機能が使える設計にした。
|
||||
|
||||
**5. データ管理の監査とZIPフルバックアップ機能の新規実装**: 「設定のデータ管理を現在のバージョンで対応できているか確認してほしい」との依頼を受け、既存の`_DATA_FILES`(単一JSONバンドル方式)と実際のデータディレクトリを突き合わせ監査。**`civitai_cache.json`(3.6MB、CivitAI連携キャッシュ)がエクスポート対象から漏れていた**ことを発見し即修正。また、ヘルプが謳う「export all plugin data」に反し、フォルダ形式のデータ(`ai_skills/`、`lab_plan/`、`style/`)とSQLite DB(`tagger.db`)が単一JSONバンドル方式では原理的に扱えず完全に対象外になっていた点をユーザーに報告、ZIP形式のフルバックアップ機能を新規実装する方針で合意。`DATA_DIR`配下を丸ごとZIP化する`GET /api/wfm/settings/export-full`/`POST /api/wfm/settings/import-full`を追加(一時ファイル系`gmic_temp`/`thumb_cache`と、他custom_node(comfyui-impact-pack)へのシンボリックリンクである`wildcard/`のみ除外、`settings.json`はAPIキーを除外してから含める)。復元側はZip Slip対策(`../`等でDATA_DIR外に書き込もうとするエントリは`relative_to()`チェックでスキップ)を実装し、悪意あるZIPでの検証済み。
|
||||
- 追加要望「デフォルトワークフローフォルダー(`user/default/workflows`)とwildcardフォルダー(`comfyui-impact-pack/wildcards`)もオプションでバックアップに含めたいが、インポートは除外し手動対応としたい」に対応:エクスポート画面にオプトインのチェックボックスを2つ追加、有効時はZIP内に`_external/`プレフィックスで格納し、復元処理は`_external/`配下のエントリを常にスキップする実装にした(他プラグイン/ComfyUI本体が管理する領域を自動上書きしないため)。実データ(ワークフロー535件・wildcard 34件)で検証済み。
|
||||
|
||||
**6. Send to LI node機能をGalleryタブにも追加 + ボタン名統一**: Image Editタブに既にあった「選択画像をComfyUIキャンバス上の選択中ノードのimageウィジェットへ送る」機能(`window.opener.wfmSendImageToSelectedNode`、`node_sets_menu.js`で定義されたクロスウィンドウ橋渡し)を、Galleryタブの選択画像にも使えるよう追加。Galleryの画像は任意のフォルダにあり得るため、既存の「Send GenUI Image」と異なりLoadImageノードの有無に依存せず、`/upload/image`でinputフォルダへアップロードしてからファイル名を書き込む方式にした。あわせてImage Edit側の既存ボタン名「Send to Workflow」を「Send to LI node」に統一(トースト文言・コメント・ヘルプも合わせて更新)。
|
||||
|
||||
**7. Galleryタブ ✕クリアボタンの位置移動**: 「表示形式切替ボタン左隣に移動したい」との要望どおり、`wfm-gallery-clear-filters-btn`をSort selectとView切替ボタンの間から、View切替ボタン(Thumbnail/Table)の左隣へ移動。
|
||||
|
||||
**ヘルプ・README更新**: `project_v0336_conventions`の慣習(index.html + i18n.js 3言語 + app.jsのhelpIdMapの3点セット)に従い、Video Tab(Video Source/Frame/GIFの3項目)、Lab subtab(Ksampler非表示・chain image動画対応の項目文言修正)、Settings(Data Managementのフルバックアップ・オプション外部フォルダの2項目)、Gallery Tab(Send to LI nodeボタンの項目)のヘルプ本文を英語・日本語・中国語の3言語で追加・更新。README.mdはVideo Tab(Frame/GIFタブ、Video Sourceパネル)、GenerateUI Tab(動画ワークフロー対応)、Lab subtab(動画ワークフロー対応・chain image動画対応、バージョン見出し範囲更新)、Settings Tab(Data Management更新)、Gallery Tab(Send to LI node・✕クリアボタン位置)、Image Edit Tab(ボタン名統一)を更新。
|
||||
|
||||
**検証**: 全JS/Pythonファイルを`node --check`/`ast.parse()`で構文確認。GIF変換・フルバックアップZIP・Zip Slipガードはvenv Python環境で実データ・合成テストデータに対する実処理検証を実施(PyAVで生成した合成テスト動画のフレーム抽出→Pillow GIFエンコード、実際のデータディレクトリ(civitai_cache.json含む36ファイル・約2.6MB)のZIP化、悪意あるパストラバーサルZIPでのスキップ確認、外部フォルダオプション有効時のワークフロー535件・wildcard 34件の`_external/`格納とインポート時全skipの確認)。開発元gitリポジトリと実行時`custom_nodes`フォルダは別実体のため([[project_dev_deploy_sync]]参照)、変更・新規ファイルを都度両フォルダへ同期し改行コード差異を除いた`diff`で完全一致を確認、Pythonファイル追加時は`__pycache__`を都度クリア。動画ワークフロー対応・Labバグ修正・Videoタブ新機能・Send to LI node機能はユーザー自身の実機確認で動作を確認済み。
|
||||
|
||||
**How to apply**: `analyzeWorkflow()`のような中央解析関数に新しいノードパターンの検出を1箇所追加するだけで、それを参照する複数タブ(GenerateUI/Lab)に同時に効果が及ぶ設計は、機能追加のコストを大きく下げる — 逆に言えば、新しいワークフロータイプに対応する際はまずこの中央解析関数を疑うべき。「該当ノードが無ければ列を非表示にする」系の判定は、`sampler_nodes.length`のような表面的なノード種別の有無だけでなく、そのノードが「ユーザーが調整すべき設定」を表しているか(動画生成モデル内部に固定配線されたサンプラーのように、単に存在するだけでは判定材料にならない場合がある)を意識する必要がある。「all plugin data」のような謳い文句を持つ機能は、実装が実際にその範囲をカバーしているか定期的に実データと突き合わせて監査する価値がある — 今回`civitai_cache.json`の漏れは3.6MBというサイズながら発見されていなかった。
|
||||
|
||||
関連: [[project_v050_video_tab]], [[project_v051_mp4_metadata]], [[project_dev_deploy_sync]], [[project_v0336_conventions]]
|
||||
|
||||
---
|
||||
|
||||
## v0.5.1
|
||||
|
||||
### 機能追加: mp4動画の埋め込みメタデータ対応(Gallery Prompt/JSON・Metadataサブタブ・サイドパネルIタブ)+ Gallery Infoタブに寸法/再生時間表示 + MiniMax H3等オールインワン動画ノードのプロンプト抽出バグ修正
|
||||
|
||||
v0.5.0で追加したmp4 Gallery対応(一覧・サムネイル・再生のみ)に続き、「ギャラリータブでmp4のメタデータのプロンプトを表示できるようにしたい。メタデータタブでもプロンプト、表示可能ならモデル等も表示させたい。またInfoタブで画像サイズ、再生時間も表示したい」との要望を起点に着手。Eagleでmp4のプロンプト/Steps/Sampler/Seed/Modelが見えている実例(MiniMax H3で生成した`.mp4`)を手がかりに、ComfyUIの`SaveVideo`がmp4にどう埋め込んでいるかを`ffprobe`/実PyAVで直接確認した上で実装した。
|
||||
|
||||
**1. 埋め込み形式の実地調査**: `ffprobe -show_format`で対象mp4を調べたところ、PNGのtEXtチャンクと全く同じキー名(`workflow`=UI形式寄りの内容、`prompt`=API形式)でJSON文字列がコンテナレベルのformatタグとして書き込まれていた。バイト単位で追うと`moov > udta > meta > (hdlr, keys, ilst)`という、iTunes系メタデータ(`mdta`名前空間の`keys`/`ilst`)の構造になっており、FFmpegの`movflags=+use_metadata_tags`相当の書き込み方だと判明。ComfyUI側は`comfy_api/latest/_input_impl/video_types.py`の`write_output_metadata()`がPyAV経由で`container.metadata[key] = json文字列`する実装。
|
||||
|
||||
**2. バックエンド(`py/services/gallery_service.py`)**: 既存の`serve_thumbnail()`が動画フレーム抽出に使っていた`av`(PyAV)依存を再利用し、`_read_mp4_metadata()`(`container.metadata`からタグ辞書を取得)と`_read_media_dimensions()`(画像はPillowの`Image.size`、動画はPyAVの`stream.width/height`+`container.duration`)を追加。`get_image_metadata()`・`_extract_embedded_workflow()`にmp4分岐を追加し、既存のPNG向けワークフロー抽出ロジック(`workflow`/`prompt`優先順位の切り替え)をそのままmp4にも適用した。venv Pythonで`GalleryService`を直接呼び出すE2E検証、および実mp4に対する`ffprobe`/PyAVの値の突き合わせ(幅高さ608×352, 再生時間3.042秒, workflow/promptタグ長一致)で正しさを確認済み。
|
||||
|
||||
**3. Galleryタブ Infoサブタブ**: 幅×高さ(画像)または再生時間(動画)を表示する行を追加(`gallery-tab.js` `renderDimensionInfo()`)。既存のPrompt/JSONタブは`extract_workflow_from_metadata`系のAPIをそのまま叩いているため、バックエンド対応だけでmp4でも自動的に動くようになった。
|
||||
|
||||
**4. Metadataサブタブ(Iタブ、`metadata-tab.js`)とサイドパネルIタブ(`web/comfyui/node_sets_menu.js`)**: どちらもドラッグ&ドロップされたFile自体(サーバー未経由のバイト列)を直接パースする設計のため、MP4のボックス構造(`moov→udta→meta→keys/ilst`)をブラウザ上で直接読む`readMP4MetaTags()`/`_readMP4MetaTags()`をゼロから実装(`findMP4Box`でサイズ/タイプ解決→ `keys`ボックスからキー名一覧 → `ilst`ボックスの`data`アトムから値を取り出し名前に対応付け)。Node.jsで実mp4のバイト列に対して単体テストし、`workflow`/`prompt`タグの内容がPyAV/`ffprobe`の結果と完全一致することを確認した。サイドパネルIタブは`metadata-tab.js`と同一ロジックを保持する独立した複製実装(ComfyUIネイティブ拡張のため別ファイル)のため、同じ変更を両方に適用。
|
||||
|
||||
**5. バグ発見・修正: オールインワン動画ノードのプロンプトが抽出されない**: 上記の実装後、実際のMiniMax H3出力mp4でPromptタブを確認したところ「プロンプトなし」と表示される問題を発見。原因は`MiniMaxH3ImageToVideo`のような、`CLIPTextEncode`系ノードを介さずノード自身の`prompt`入力に直接テキストを持つ「動画生成オールインワンノード」を、既存の`isTextEncoderNode()`判定(クラス名に`TextEncode`を含むかで判定)が拾えていなかったこと。`extractPromptsAPI()`(`metadata-tab.js`・`node_sets_menu.js`の両方)に、クラス名が`ImageToVideo`/`TextToVideo`を含み`inputs.prompt`が文字列のノードをtextMapへ直接投入する分岐を追加して解決(positive/negativeの区別が無いノードのため、フォールバックの`texts`バケットに載る)。
|
||||
|
||||
**6. ヘルプ更新**: Gallery Tab(Infoタブの寸法/再生時間表示、Formats行のMP4追加)、Metadata Tab(Supported Formatsカード)、Workflow Studio Library / Iタブ(サイドパネル)のヘルプ本文を英語・日本語・中国語の3言語(`i18n.js`)+ `templates/index.html`で更新。
|
||||
|
||||
**検証**: Python側は`GalleryService`をvenv Pythonで直接呼び出すE2Eテストと実mp4への`ffprobe`/PyAVでの突き合わせ、JS側のMP4パーサーとプロンプト抽出ロジックはNode.jsで実バイト列/実JSONに対する単体テストで検証。開発元gitリポジトリと実行時`custom_nodes`フォルダは別実体のため([[project_dev_deploy_sync]]参照)、変更ファイル(`gallery_service.py`, `gallery-tab.js`, `metadata-tab.js`, `node_sets_menu.js`, `i18n.js`, `templates/index.html`, `README.md`, `pyproject.toml`)を両フォルダへ同期し改行コード差異を除いた`diff`で完全一致を確認。ComfyUI実機でのブラウザ操作確認はユーザー側で実施済み(Gallery Prompt/JSON表示、サイドパネルIタブとも問題なしとの回答)。
|
||||
|
||||
関連: [[project_v050_video_tab]]
|
||||
|
||||
---
|
||||
|
||||
## v0.5.0
|
||||
|
||||
### 機能追加: mp4動画Gallery対応 + Videoタブ新設(MiniMax H3専用) + バグ修正: Galleryのタグ/メモが再起動後に消える
|
||||
|
||||
動画生成ワークフロー対応の第一弾。「1. 動画ファイルmp4対応 2. 動画生成に対応していきたい。まずはminimax_H3動画生成ワークフローに対応させたい」との要望を起点に、実機フィードバックを重ねながら仕上げた一連の作業。ブランチ`feature/mp4-video-gallery-and-video-tab`で実施。
|
||||
|
||||
**1. Galleryタブのmp4動画対応**: `.mp4`を`IMAGE_EXTENSIONS`に追加し、一覧・お気に入り・タグ・グループ・移動・削除・エクスポートなど既存の画像操作全てにmp4も対象として乗るようにした。サムネイルはPillowで開けないため、PyAV (`av`) で先頭フレームを抽出しJPEGとしてディスクキャッシュする専用ロジックを追加(ComfyUI本体が既に`av>=17.0.0`を要求しており追加インストール不要。未導入環境ではサムネイル生成のみ失敗しプレースホルダー表示にフォールバックする設計)。フロントエンドは詳細パネル・lightbox・Compareビューで拡張子に応じて`<img>`/`<video controls>`を出し分け、サムネイルグリッドには▶バッジを重ねて動画であることを示す。
|
||||
|
||||
**2. 新規Videoタブ(MiniMax H3専用、GenerateUIタブとは完全に独立)**: `C:\Users\...\ComfyUI_5\user\default\workflows\minimax_test.json`をリファレンスに、first_frame/last_frame/prompt/aspect_ratio/megapixels/multiple/duration/noise_seedのフォームを持つ新規タブ`video-tab.js`を作成。モデル選択(UNet/CLIP/VAE/Audio VAE)はワークフローの既定値に固定し編集不可とした(ユーザー確認済み)。`comfyWorkflow.convertUiToApi()`が既にサブグラフのflatten処理を内蔵していたため、Videoタブ独自のグラフ→プロンプト変換は不要で、生成そのものは既存の`comfyUI.generate()`をそのまま再利用できた(ComfyUI本体の`SaveVideo`/`PreviewVideo`が`{"images":[...], "animated":true}`という画像と同じレスポンス形式で動画を返すため)。
|
||||
|
||||
**3. 実機フィードバックへの追随(ボタン配置・色・レイアウト)**: 一連の実機確認を経て、(a) Galleryの詳細パネルのダウンロードオーバーレイが動画の再生コントロール操作をブロックするため廃止し、Taggerボタン右隣に常時表示の「Download」ボタン(識別しやすいようオレンジ色)を新設、「Load GenUI」ボタンは「GenUI」に短縮、(b) Workflowタブのモーダルにあった「生成UIに読み込み」「Videoに読み込み」「キャンバスへ送る」の3ボタンを廃止し、一覧選択時のサイドパネルツールバー(生成UIに読み込みの右隣に新規追加した「Videoに読み込み」)へ統合、(c) Videoタブの結果パネルの位置・サイズを繰り返し調整 — 最終的に**3ペイン構成**(左:フォーム/中央:プレビュー+将来の編集機能用プレースホルダー/右:将来のプロパティ機能用プレースホルダー)に落ち着いた。各ペインを独立したflexカラムにしたことで、中央の生成結果の高さがどれだけ変わっても左右のペインの位置が動かなくなる(`max-height`だけで高さを抑えていた前段の実装では、動画のコントロールバー分だけ実高さが伸び、下のフォームパネルを押し下げてしまっていた)。Kapture経由で実際のブラウザDOM(`getBoundingClientRect()`)とスクリーンショットを直接確認しながら調整した。
|
||||
|
||||
**4. First Frame/Last Frameを両方optionalに、LoadImageノードが無いワークフローにも対応**: 「First Frameなしでも動作させたい(ノードをバイパスで処理)。またノードのないワークフローにも対応させたい」との要望。`minimax_test1.json`(first_frame/last_frame双方とも未接続、対応するLoadImageノードがトップレベルに存在しない構成)を新たに確認し、`locateMiniMaxNodes()`のLoadImageノード必須チェックを撤廃。first_frame未指定時はリンクなしのまま実行(バイパス)し、画像が指定された場合のみその場でLoadImageノードを動的に注入する設計に変更(ノードID/リンクIDはclone内の実際の最大値+1で採番するため重複の心配がない)。first_frameスロットにもlast_frameと同様のClearボタンを追加した。
|
||||
|
||||
**5. バグ修正: mp4のタグ/メモがComfyUI再起動後に消える**: 「タグ、メモadd、保存操作はできるが記録されていない。画像ファイルもできていない。エラー表示はなし、ブラウザもなし」との報告を受け、`comfyui_8189.log`を直接確認したところ`Cleaned up 189 stale metadata entries from ...\Text2Img`という決定的なログを発見。**根本原因**: `cleanup_stale_images()`は「現在表示中のフォルダ配下」のメタデータキーを全階層(サブフォルダ含む)対象にstale判定するが、Galleryがルートフォルダを非再帰スキャンした場合、`existing_paths`(現在のファイル一覧)にはルート直下のファイルしか含まれない。Videoタブで生成した動画は`SaveVideo`の`filename_prefix`設定で`video/MiniMax_H3/`というサブフォルダに保存されるため、ルートフォルダを開くたびに「サブフォルダ内ファイルは非再帰スキャンには映らない→存在しないと誤判定→メタデータ削除」が発生し、189件ものタグ/メモ/お気に入り情報が消えていた。`cleanup_stale_images()`に`recursive`引数を追加し、非再帰スキャン時はfolder_path直下のみを対象にするよう修正(`gallery_service.py`の`list_images()`から`recursive`をそのまま伝播)。既に削除済みのデータはバックアップが無く復元不可能だった旨をユーザーに伝えた。
|
||||
- 副次的に発見したフロントエンドのバグも合わせて修正: `saveMetaField()`がサーバーのレスポンス(`{"ok": bool}`)を一切チェックせず常に成功したかのようにローカル状態を楽観的更新していたため、サーバー側で保存が拒否されてもUI上はエラーなく成功したように見えてしまう作りになっていた。レスポンスの`ok`フィールドを検証し失敗時は例外を投げるよう変更、`addTag`/`removeTag`/メモ保存ハンドラは戻り値を見て成功時のみローカル状態を更新するよう修正した。保険的措置として`save_image_meta`(バックエンド)の保存キーも`get_image_metadata`と同じ`resolve()`後のパスに統一した。
|
||||
|
||||
**ヘルプ・README更新**: `project_v0336_conventions`の慣習(index.html + i18n.js 3言語 + app.jsのhelpIdMapの3点セット)に従い、新規Video Tabヘルプページを追加。README.mdはバージョンバッジ更新、Workflow Tab(サイドパネルツールバーの3ボタン構成)、Gallery Tab(Downloadボタンの新配置・mp4対応・GenUIボタンへの改名)、新規Video Tabセクション(3ペイン構成・optional First/Last Frame・ノードなしワークフロー対応)を追加した。
|
||||
|
||||
**検証**: 全JS/Pythonファイルを`node --check`/`ast.parse()`で構文確認。開発元gitリポジトリと実行時`custom_nodes`フォルダは別実体のため([[project_dev_deploy_sync]]参照)、変更した全11ファイルを都度同期しmd5ハッシュ比較で完全一致を確認、Pythonファイル変更時は`__pycache__`を全クリア。Kapture(ブラウザDevTools連携)で実際のブラウザに接続し、DOM要素の`getComputedStyle()`/`getBoundingClientRect()`とスクリーンショットで3ペインレイアウトの実測検証、生成後状態はダミー画像をDOMに直接注入して左右ペインが動かないことを確認。mp4のGallery表示・再生、タグ/メモ保存とComfyUI再起動後の永続性、Workflowタブの新規ボタン導線はユーザー自身の実機で確認済み。
|
||||
|
||||
**How to apply**: サーバーAPIが常にHTTP 200を返し成否をレスポンスボディの`ok`フィールドで表す設計(このプロジェクト全体で頻出するパターン)では、呼び出し側で必ずそのフィールドをチェックする — でないと「操作はできるがエラーも出ず、実は保存されていない」というサイレント障害が発生し得る。複数のパネルを横並びに配置するレイアウトで「あるパネルの内容量に応じて他のパネルの位置がずれる」不具合が出た場合、`max-height`のような上限指定では実コンテンツが小さいときに縮んでしまい根本解決にならない — 各パネルを独立したflexカラムに分離し、パネル間で高さを共有させない構造にするのが確実。「フォルダ配下」を対象にした一括処理(今回のstale cleanup)を書く際は、その処理が使う「現在のファイル一覧」がフォルダの全階層をカバーしているか(非再帰スキャンならサブフォルダは含まれない)を必ず確認し、範囲の不一致がないか意識する。ブラウザで実際に何が起きているか切り分けが必要な場面では、コードを読むだけでなくKapture等でDOMの実測値を直接取得するのが最も確実。
|
||||
|
||||
関連: [[project_dev_deploy_sync]], [[project_v0336_conventions]]
|
||||
|
||||
---
|
||||
|
||||
## v0.4.8
|
||||
|
||||
### 機能追加: LabタブにPromptグループ一括適用+キーフレーム並べ替え + バグ修正: デフォルトワークフローの上書き保存が反映されない + Styleテーブルの「このファイルへ追加」対応
|
||||
|
||||
ユーザーからの複数の要望・不具合報告を1セッションで順に実装した一連の作業。
|
||||
|
||||
**1. LabタブPrompt列に「PG」ボタン — Promptタブのグループをキーフレームへ一括変換**: 「生成UIタブのLabのプロンプトにプロンプトタブのグループを使用できるようにしたい。'PG'ボタンを配置、モーダルでプロンプトのグループを選択、決定するとプロンプトのキーフレームが#1から自動で作成されます(#1は上書き)」との要望。`prompt-presets.js`の`pmGroups`(グループ名→プリセットID配列)を参照する`getPresetsInGroup()`を新設してexportし、`lab-tab.js`側にPresetManagerの一覧UI(`.wfm-pm-item`)を再利用したグループ選択モーダルを実装。選択→適用で`_lab.columns.prompt`をグループ内プリセット順に#1から全置換(#1は上書き、以降は#2,#3...)する。グループのプリセット数がBatch数を超える場合はBatch数を自動引き上げ(Batch入力欄自体の上限50でキャップ)、それでも収まらない分は既存の「Batchを超えたキーフレーム」警告トースト(`_warnIfKeyframesExceedBatch`)をそのまま再利用して通知する形にした。
|
||||
|
||||
**2. Lab: Model/Prompt/KSampler キーフレームの並べ替え**: 続けて「モデル、プロンプト、Ksamplerそれぞれでキーフレームの順変更を可能にしたい。キーフレームのモーダル展開をWクリックに変更しシングルクリックでキーフレームを選択、PGボタン左隣に上下ボタンを設置し操作可能にしたい」との要望。キーフレームセルのクリック挙動を分離し、シングルクリックは選択状態(列ごとに`_selectedIdx[col]`で管理、青枠でハイライト)、ダブルクリックで従来の編集モーダルを開くように変更。各列ヘッダーに▲/▼ボタンを追加し(Promptは要望通りPGボタンの左隣)、選択中のキーフレームと隣接するキーフレームの`atIteration`を入れ替えることで並び順を変更する実装にした。キーフレーム#1(ベースライン — GenerateUIのライブ値を表示する特別な行)は移動不可、かつ他のキーフレームが#1の位置に入れ替わることもないよう制約した。Prompt Group適用・Plan読込・Plan Clearなど列を丸ごと置き換える操作では選択状態を自動リセットするようにし、配列外を指す不整合を防いだ。
|
||||
|
||||
**3. バグ修正: デフォルトワークフローに設定した状態で同名上書き保存すると変更が反映されない**: 「生成UIタブで読み込んだデフォルトワークフローのモデルを変更しワークフローを同名で上書き保存した。ワークフロータブでJSONでモデルが変更していることを確認。ブラウザハード再読み込みを行うと以前のモデルが表示される」との不具合報告(スクリーンショット添付、旧モデル名がインストール済みモデルの一覧に無く「見つかりません」警告が出ている状態)。調査の結果、「デフォルトワークフローに設定」機能(`workflow-tab.js`)は設定した時点のワークフローJSON全体を`localStorage`(`wfm_settings.defaultWorkflowData`)へスナップショットとして保存し、起動時の自動読込(`generate-tab.js`)はこのスナップショットを読む仕様であることが判明。GenerateUIタブでの同名上書き保存はファイル自体は更新するが、このスナップショットまでは更新していなかったため、リロードのたびに保存前の古い内容が復活していた。`saveCurrentWorkflow()`の保存成功後処理に、保存したファイル名が現在の`defaultWorkflow`と一致する場合は`defaultWorkflowData`も同時に更新する処理を追加して修正した。
|
||||
|
||||
**4. Prompt Tab Tableビュー Styleタブに「+ Add to this file」対応**: 「プロンプトタブ、テーブルのスタイルにForm同様に既存のjsonファイルに追加する方法が欲しい(custom.json以外の場合)。該当jsonのスタイルを選択状態で+ Add to this fileボタンで追加できるようにしたい」との要望。Formタブのスタイルマネージャー(`prompt-styles.js`)には既にこの機能があったが、Tableビュー(`prompt-table.js`)の新規スタイル作成は常に`custom.json`固定(`styleApiCreate(..., null)`)だった。行選択が1件かつそのスタイルの`file`が`custom.json`以外の場合のみ有効化される「+ Add to this file」ボタンをツールバーに追加し、クリックすると保存先ファイルを保持したまま空の新規行を追加(File列に保存前からバッジ表示)、保存時に`styleApiCreate(name, pos, neg, pendingNewStyleFile)`で対象ファイルへ追記する実装にした。バックエンド(`settings_routes.py`)は元々`file`パラメータでの追記に対応済みだったため、フロントエンドの導線を追加するだけで実現できた。
|
||||
|
||||
**ヘルプ・README更新**: `project_v0336_conventions`の慣習(index.html + i18n.js 3言語 + app.jsのhelpIdMapの3点セット)に従い、Lab subtab(Setting/Columnsカードへ選択・並べ替えとPGボタンの説明2項目)とPrompt Tab(Table Viewカードへ「+ Add to this file」の説明1項目)を追加。README.mdはGenerateUI Tab(Saveボタン説明にデフォルトワークフロースナップショット修正の注記)、Lab subtab(見出しのバージョン範囲をv0.4.8へ更新、選択/並べ替えとPGボタンの新規項目)、Prompt Tab(Styleテーブルの項目に「+ Add to this file」のTableビュー対応を追記)を更新した。
|
||||
|
||||
**検証**: 全JSファイルを`node --check`で構文確認。開発元gitリポジトリと実行時`custom_nodes`フォルダは別実体のため([[project_dev_deploy_sync]]参照)、変更ファイルごとに改行コード(CRLF/LF)の一致を確認してから同期し、都度`diff`で完全一致を検証した。デフォルトワークフローのバグ修正はユーザー自身の実機(GenerateUIでの上書き保存→ハード再読み込み)で確認済み。PGボタン・キーフレーム並べ替え・Styleの「+ Add to this file」もユーザー自身の実機確認で動作を確認済み。
|
||||
|
||||
**How to apply**: 開発元リポジトリと実行時`custom_nodes`フォルダへの同期前には必ず`file`コマンドで両ファイルの改行コードが一致しているか確認する(過去に一部ファイルだけLF化していた事例があるため — [[project_dev_deploy_sync]]参照)。一致していれば単純な`cp`で安全にデプロイでき、`diff`で完全一致を最終確認する。キーフレームや行の「並べ替え」機能を実装する際、内部的にソート順を保持する配列(今回は`atIteration`昇順)に対しては、配列そのものの並べ替えではなく「隣接要素同士でソートキーの値を交換する」実装にすると、他のロジック(`_resolveKeyframe`等)が前提とする「配列は常にソート済み」という不変条件を崩さずに済む。
|
||||
|
||||
関連: [[project_dev_deploy_sync]], [[project_v0336_conventions]]
|
||||
|
||||
---
|
||||
|
||||
## v0.4.7
|
||||
|
||||
### 機能追加: Prompt Tab内部リファクタ + Gallery Promptタブ新設 + Send to Canvas改善 + Presetsソート
|
||||
|
||||
+10
-7
@@ -26,24 +26,24 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- Built-in AI tools (translation and more)
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## Features (tab -> feature names)
|
||||
|
||||
### Workflow Tab
|
||||
Thumbnail / Table views, Thumbnail side panel, Badge filtering, Search, Side panel tabs, Badge management, AI summary, Import / Export, Default view setting, Search clear (✕), Clear all filters (✕ Clear)
|
||||
Thumbnail / Table views, Thumbnail side panel, Badge filtering, Search, Side panel tabs, Badge management, AI summary, Import / Export, Side panel toolbar buttons, Default view setting, Search clear (✕), Clear all filters (✕ Clear)
|
||||
|
||||
### Canvas Snapshot (v0.1.2)
|
||||
One-click capture, Auto-save as thumbnail, Embedded workflow metadata, Auto-import
|
||||
|
||||
### GenerateUI Tab (v0.3.5)
|
||||
6-tab layout, Save button, Input tab, Model tab, Settings tab, Always-visible Raw JSON, Bypass/Mute node handling, One-click generation, Seed control, Style selector, Create Catalog / Catalog buttons, Batch type selector, Batch tab, UI-to-API conversion, Eagle integration
|
||||
6-tab layout, Save button, Input tab, Model tab, Settings tab, Always-visible Raw JSON, Bypass/Mute node handling, One-click generation, Seed control, Style selector, Create Catalog / Catalog buttons, Batch type selector, Batch tab, UI-to-API conversion, Video workflow support, Eagle integration
|
||||
|
||||
### Feeder subtab (v0.3.5 / v0.3.42)
|
||||
ImageFeeder node control, Image library, Selection management, Presets, Continuous Run loop, Index sync, Seed, WFS_GalleryFeeder node, Node & group selector, Image grid, After Gen modes, Run / Stop controls
|
||||
|
||||
### Lab subtab (v0.3.87 – v0.4.5)
|
||||
Setting / Results / Plan JSON sub-panels, Per-column keyframes, Model column — Checkpoint / LoRA Single / VAE, Empty state when no matching node exists, Wildcards, Prompt cell extras, Keyframe #1 live-reflect, Bypass checkbox, LoRA node bypass & prompt injection, T2I workflow support, Use generated image for next, Workflow recall, Plan files, Plan Load, Plan JSON tab, Save index image to Output on Run, Index images are self-contained plan files, Eagle integration
|
||||
### Lab subtab (v0.3.87 – v0.5.2)
|
||||
Setting / Results / Plan JSON sub-panels, Per-column keyframes, Model column — Checkpoint / LoRA Single / VAE, Empty state when no matching node exists, Wildcards, Prompt cell extras, Keyframe #1 live-reflect, Bypass checkbox, LoRA node bypass & prompt injection, T2I workflow support, Use generated image for next, Workflow recall, Plan files, Plan Load, Plan JSON tab, Save index image to Output on Run, Index images are self-contained plan files, Eagle integration, Select vs. edit, and keyframe reordering, PG — apply a Prompt tab preset group, Video workflow support, Use generated image for next, now video-aware
|
||||
|
||||
### Prompt Tab
|
||||
3-column layout, AI chat assistant, Image attachment, Translation, Prompt presets, Preset Manager, Group management, Clipboard copy, GenUI Set, Wildcard/Style tab bar, Wildcard input toolbar, Wildcard file manager, Style manager, Form / Table toggle, Table view — Presets / Presets Group / Wildcards / Style
|
||||
@@ -52,7 +52,7 @@ Setting / Results / Plan JSON sub-panels, Per-column keyframes, Model column —
|
||||
2-column layout, Collapsible sections, Theme selection, Theme customization, Workflows directory, Gallery output directory, Eagle connection, Ollama connection, CivitAI Host, CivitAI API Key, Default workflow, Default Checkpoint, Data Management, Text Size, RAW JSON Colors, GenerateUI Model Tab Highlight, Wildcard Integration, G'MIC-Qt Integration, Language
|
||||
|
||||
### Gallery Tab (v0.3.44)
|
||||
Output / ImagePrompt / Style_Catalog / Metadata sub-tabs, Image browser, Folder tree root label, Thumbnail / Table views, Folder management, File operations, Download, Multi-select, Image Compare, Prompt search, Server-side filtering, Group management, Thumbnail F button, Favorites, Detail panel, Prompt tab, Workflow viewer, Load GenUI button, Image Edit button, Send GenUI Image button, Send CC button, Search clear (✕), Clear all filters (✕ Clear), Workflow auto-save, Output folder configurable, SVG file support, Performance
|
||||
Output / ImagePrompt / Style_Catalog / Metadata sub-tabs, Image browser, Folder tree root label, Thumbnail / Table views, Folder management, File operations, Download, MP4 video support, MP4 embedded metadata, Info tab: dimensions & duration, Multi-select, Image Compare, Prompt search, Server-side filtering, Group management, Thumbnail F button, Favorites, Detail panel, Prompt tab, Workflow viewer, GenUI button, Image Edit button, Send GenUI Image button, Send to LI node button, Send CC button, Search clear (✕), Clear all filters (✕ Clear), Workflow auto-save, Output folder configurable, SVG file support, Performance
|
||||
|
||||
### ImagePrompt Gallery subtab (v0.3.94, renamed from Style/Prompt in v0.3.95)
|
||||
Visual prompt library, 3-column layout, Prompt builder (right pane), Plain-text prompt storage, ponyxlWildcardsVault format support, Seed data importer
|
||||
@@ -61,7 +61,7 @@ Visual prompt library, 3-column layout, Prompt builder (right pane), Plain-text
|
||||
Visual Style picker, 3-column layout, Positive/Negative panel, Select as Style button, Load in GenerateUI / Open in Metadata Tab buttons, Double-click to enlarge
|
||||
|
||||
### Metadata Gallery subtab (v0.3.8, moved from a top-level tab in v0.4.6)
|
||||
Now inside Gallery, 3-column layout, File drop, Model extraction, LoRA extraction, Prompt extraction, Prompt actions, Format support, Format note
|
||||
Now inside Gallery, 3-column layout, File drop, MP4 embedded metadata, Model extraction, LoRA extraction, Prompt extraction, Prompt actions, Format support, Format note
|
||||
|
||||
### Nodes Tab (v0.1.7)
|
||||
Node Browser, Search & Filter, Package badges, Node detail panel, Node Sets, Right-click context menu, Multi-select, Search clear (✕), Clear all filters (✕ Clear)
|
||||
@@ -75,6 +75,9 @@ Model Browser, Thumbnail / Table views, Table column sort, Search & Filter, User
|
||||
### Image Edit Tab (v0.3.65)
|
||||
Layer-based image editor, Loading images, New button, Tools, Layer panel, Layer lock, Text quality, Export, Canvas navigation, Undo / Redo
|
||||
|
||||
### Video Tab (v0.5.0 – v0.5.2)
|
||||
Dedicated MiniMax H3 video generation UI, independent of GenerateUI, 3-pane layout, First Frame / Last Frame are both optional, Node lookup instead of hardcoded IDs, Load in Video, Preview frame + Video Source panel, Frame tab, GIF tab
|
||||
|
||||
### AI TOOL Tab (v0.3.14)
|
||||
4-pane layout, Translation pane, Chat pane, Chat pane — image generation via Tool Calling, Chat pane — generate_image extra parameters, TOOLS pane (VLM), TOOLS pane — shared Chat attachment, TOOLS pane (Wildcards), Chat pane — image-to-image (I2I), Chat pane — SVG generation, no ComfyUI workflow involved, Chat pane — Skills, Settings pane, Unsloth backend, Settings pane — Chat Image Generation, Settings pane — Chat I2I Generation, Settings pane — Generation, Settings shared, Backend support, URL security, Lemonade's other endpoints (not integrated)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- Built-in AI tools (translation and more)
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
## Screenshots
|
||||
|
||||
@@ -69,6 +69,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- **Badge management** — add, rename, delete badges with custom colors shared with the Models tab (⚙ Badge button)
|
||||
- **AI summary** — generate workflow descriptions using Ollama
|
||||
- **Import / Export** — import workflows from files or clipboard; **Send to Canvas** button sends the selected workflow directly to the ComfyUI canvas (UI and API formats both supported)
|
||||
- **Side panel toolbar buttons** (v0.5.0) — selecting a card shows three buttons in the top toolbar: **Load in GenerateUI**, **Load in Video** (new — loads a MiniMax H3 Image-to-Video workflow into the Video tab; shows an error toast for workflows that don't contain that node), and **Send to Canvas**; the detail modal's duplicate copies of these three buttons were removed in favor of this single toolbar location
|
||||
- **Default view setting** — persist your preferred view mode (Thumbnail / Table)
|
||||
- **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
|
||||
@@ -90,6 +91,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
|
||||
- **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; hidden while the Batch or Lab subtab is active (v0.4.6), since those work on workflow copies / their own Plan files rather than the currently loaded workflow
|
||||
- **Default-workflow snapshot fix** (v0.4.8) — overwriting the loaded workflow under a filename that's currently set as the auto-load **Default workflow** (Settings tab, see below) now also refreshes that cached snapshot; previously only the file on disk was updated, so the old (pre-edit) version — including any checkpoint no longer installed — kept reappearing after every page reload until the default was re-set by hand
|
||||
- **Input tab** — Prompt and Image inner tabs (drag-and-drop upload); Prompt tab shows Positive Prompt and Negative Prompt textareas, plus an **Embeddings selector** at the bottom (Filter + Select + Weight input + Paste button); Paste inserts `(embedding:Name:weight)` at the cursor position of the last focused textarea (defaults to Positive when neither is focused); Raw JSON (540px) in the right column
|
||||
- **Revert button** (v0.3.70) — a ↺ button next to each Apply button reverts the textarea to the node's currently applied value (the reverse of Apply)
|
||||
- **Emphasis weight editing** (v0.3.70) — select text (or just place the cursor on a word/parenthesis block) and press Ctrl+↑/↓ to adjust `(text:weight)` by ±0.05, A1111/native-ComfyUI style; parentheses are removed automatically when the weight returns to 1.0
|
||||
@@ -115,6 +117,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
|
||||
- **Right pane (Batch Queue)** — 7 columns: Checkpoint / Lora / Prompt / Workflow / Sampler / Scheduler / **Style**; each column header has an enable checkbox (radio behavior: only one at a time); count shown per column; Style batch applies each selected style sequentially to a workflow copy
|
||||
- **Lora batch prompt sync** (v0.3.69) — for each selected LoRA, its syntax (`<lora:name:strength_model:strength_clip>`) and CivitAI trained words are automatically appended to the Positive prompt (rebuilt from the original prompt each time, not accumulated), then restored to the pre-batch state when the batch completes or is stopped; if a selected LoRA is not yet recognized by ComfyUI's model list, a warning toast suggests a Refresh or restart
|
||||
- **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.)
|
||||
- **Video workflow support** (v0.5.2) — loading a MiniMax H3 (or other all-in-one video-generation) workflow now works from GenerateUI too, not just the dedicated Video tab: the Input tab's Prompt field picks up its `prompt` widget, the Image tab picks up its LoadImage-based `first_frame` the same way any other I2I workflow does, and generation runs with a longer timeout since video generation takes much longer than a still image; the result preview shows the generated mp4 inline (`<video>`) instead of trying to render it as an image
|
||||
- **Eagle integration** — auto-save generated images to [Eagle](https://eagle.cool/) with metadata
|
||||
|
||||
</details>
|
||||
@@ -148,7 +151,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Lab subtab (v0.3.87 – v0.4.5)</h3></summary>
|
||||
<summary><h3>Lab subtab (v0.3.87 – v0.5.2)</h3></summary>
|
||||
|
||||
An experimental batch generator: runs the workflow currently loaded in GenerateUI N times, letting Model (Checkpoint/LoRA Single/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).
|
||||
|
||||
@@ -170,6 +173,10 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Save index image to Output on Run** (v0.3.90, on by default since v0.3.93) — 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`
|
||||
- **Index images are self-contained plan files** (v0.3.91) — every index-image PNG, whether from Plan Save/Save As or from Save index image to Output on Run, carries the entire plan embedded directly in the file as a PNG `wfm_lab_plan` chunk; this is what lets the Output-folder copy above work as a Plan Load source even though it has no matching `.json` anywhere
|
||||
- **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
|
||||
- **Select vs. edit, and keyframe reordering** (v0.4.8) — a single click on a keyframe cell now only selects it (blue outline); double-click to open its edit modal as before. Each column's header (Model / Prompt / KSampler) also gets **▲ / ▼** buttons that swap the selected keyframe with its immediate neighbor, reordering keyframes without retyping them; keyframe #1 (the live-reflecting baseline) can never move, and nothing can be swapped into its slot
|
||||
- **PG — apply a Prompt tab preset group** (v0.4.8) — a **PG** button on the Prompt column header opens a picker for the Prompt tab's Table-view preset groups (the same groups the Batch tab's checklist uses); choosing one replaces the entire Prompt column with one keyframe per preset in that group's order, starting at #1 (#1 is overwritten, not appended after). If the group has more presets than the current Batch count, Batch count is raised automatically to fit (capped at 50, the Batch input's own limit); anything still beyond that shows the existing "keyframes beyond Batch count" warning instead of being dropped
|
||||
- **Video workflow support** (v0.5.2) — loading a MiniMax H3 (or other all-in-one video-generation) workflow into GenerateUI and running Lab now works end to end: the Prompt column writes to its `prompt` widget, the KSampler column auto-hides (same "no matching node" treatment as Model sub-columns) since the sampler wired internally is a fixed part of the model's own preset rather than something meant to be tuned per keyframe, the Results grid plays mp4 results inline, and the contact-sheet index image draws each video result's last frame instead of failing silently onto a black square
|
||||
- **Use generated image for next, now video-aware** (v0.5.2) — when a Run's output is a video, the "Use generated image for next" chain extracts its last frame client-side (canvas) and uploads it as the next iteration's source image, instead of trying to feed the raw mp4 into a LoadImage node
|
||||
|
||||
</details>
|
||||
|
||||
@@ -204,6 +211,7 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Presets Group table** — create, rename, and delete groups, with each group's members shown as removable badges; the reserved **Batch** group is not listed here — it's managed entirely through the Presets table's B column and BC button instead
|
||||
- **Wildcards table** — same files as the Form tab's Wildcard file manager above; editing the File path or the Ext dropdown renames the file (saves the content under the new name, then removes the old file)
|
||||
- **Style table** — same styles as the Form tab's Style manager above, editable inline the same way as Presets
|
||||
- **+ Add to this file** (v0.4.8) — select exactly one row whose File badge isn't `custom.json` to enable this toolbar button, bringing the Form tab's same-file-add capability (above) to the Table view too; it adds a blank row targeting that same file (shown as a badge in the File column even before saving); custom.json entries and multi-row selections leave it disabled — use the regular + New Style button for those instead
|
||||
|
||||
</details>
|
||||
|
||||
@@ -222,7 +230,8 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **CivitAI API Key** — optional Bearer token for authenticated CivitAI access; stored in `settings.json` (excluded from data exports); environment variable `CIVITAI_API_KEY` takes priority if set
|
||||
- **Default workflow** — set a workflow to auto-load on startup
|
||||
- **Default Checkpoint** (v0.3.73) — optional checkbox to force every checkpoint loader node's model to a chosen default whenever a workflow is loaded into GenerateUI; a safeguard against generation errors or garbled images from a stale/mismatched checkpoint saved in the workflow file
|
||||
- **Data Management** — export all plugin data (settings, metadata, prompts, etc.) to a single JSON file; import to restore data (useful when migrating or reinstalling); API keys are excluded from exports for security
|
||||
- **Data Management** — export core settings/metadata/prompts/CivitAI cache to a single JSON file; import to restore data (useful when migrating or reinstalling); API keys are excluded from exports for security
|
||||
- **Full Backup (ZIP)** (v0.5.2) — additionally covers what the JSON bundle can't represent: folder-based data (AI Skills, Lab Plans, Style presets) and the Tagger SQLite database; two opt-in checkboxes can also include ComfyUI's default workflows folder (`user/default/workflows`) and the Impact Pack's wildcard folder in the export — both of those are export-only and stored under an `_external/` prefix in the ZIP that Restore always skips, since auto-overwriting files a different plugin/ComfyUI core manages would be unsafe; copy them back by hand if needed. Restoring overwrites existing files; restart ComfyUI afterward for either restore path
|
||||
- **Text Size** — one slider (10–28 px) adjusts font size for all prompt and chat textareas at once: Generate UI positive/negative prompts, AI Assistant chat input, Preset prompts, Wildcard prompt and file editor, and Metadata prompt full preview; takes effect immediately and saved with Save Settings
|
||||
- **RAW JSON Colors** — customize the 6 syntax highlight colors for the Raw JSON editor in Generate UI: Default Text (base), Name/Scheduler (yellow), Title (pink), Width/Height (green), Prompt/Text (cyan), Image/File (red); changes apply immediately on color pick; Reset Defaults restores the original scheme; saved to `localStorage` under `wfm_settings.jsonColors` and applied on startup
|
||||
- **GenerateUI Model Tab Highlight** (v0.3.98) — pick the color used to mark Checkpoint/VAE/Diffusion Model/Text Encoder/ControlNet/Hypernetwork labels and the LoRA column header in GenerateUI's Model tab when the loaded workflow actually contains that type of node; default bright green; changes apply immediately, Reset Defaults restores it; saved to `localStorage` under `wfm_settings.modelTabActiveColor`
|
||||
@@ -241,7 +250,10 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **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
|
||||
- **Download** — hover over the image preview in the detail panel to reveal a download icon (⬇); click to download the single image
|
||||
- **Download** (v0.5.0) — a dedicated orange **Download** button in the detail panel's action-button row (next to Tagger); replaces the old preview-image hover overlay, which blocked video playback controls
|
||||
- **MP4 video support** (v0.5.0) — `.mp4` files are browsable, previewable (detail panel with native `<video controls>`, lightbox, and Compare), and included in favorites/tags/groups/move/delete/export alongside images; server-side thumbnails are generated from the first video frame via PyAV (falls back to a placeholder if PyAV/ffmpeg decoding isn't available); a small ▶ badge overlays video thumbnails in the grid
|
||||
- **MP4 embedded metadata** (v0.5.1) — the Prompt and JSON tabs now also work for `.mp4` files: reads the `workflow`/`prompt` container tags ComfyUI's `SaveVideo` writes into the mp4 (via PyAV server-side), including all-in-one video-generation nodes that carry their prompt directly on a `prompt` input rather than a separate `CLIPTextEncode`-style node (e.g. `MiniMaxH3ImageToVideo`)
|
||||
- **Info tab: dimensions & duration** (v0.5.1) — the detail panel's Info tab now also shows image dimensions (width×height) or video duration, in addition to filename, size, date, tags, and memo
|
||||
- **Multi-select** — Ctrl+click to select multiple images; Bulk Bar appears for batch operations: select group → "Add to Group" / "Remove from Group"; Favorite All / Unfavorite All; Compare (2–4 images); Move To...; **Export** (downloads all selected images as a ZIP file); Delete File
|
||||
- **Image Compare** — select 2–4 images with Ctrl+click, then click "Compare" in the Bulk Bar to open a side-by-side lightbox; grid adapts to the number of selected images
|
||||
- **Prompt search** — text search covers filename, tags, memo, and prompt text (A1111 `parameters` field cached on first detail panel open)
|
||||
@@ -252,12 +264,13 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Detail panel** — view filename, path, tags, groups, and metadata in a slide-out panel; four tabs — **Info** / **JSON** / **Groups** / **Prompt**
|
||||
- **Prompt tab** (v0.4.7) — selected by default (the most frequently checked piece of info shouldn't need an extra click); lists every positive/negative prompt candidate found in the embedded workflow with POS/NEG badges, reusing the exact same list→click→full-text UI as the Metadata tab; extracts from the API-format embedding when available rather than the UI-format one, since a workflow with independent top-level and subgraph sampling chains (e.g. Krea-2) can otherwise have some of its prompts missed
|
||||
- **Workflow viewer** — Metadata tab displays workflow JSON from PNG embedded data (`prompt` / `workflow` keys) or from workflow saved by the Generate UI tab; **Copy & Send Canvas** button copies the JSON to the clipboard and sends the workflow directly to the ComfyUI canvas (UI and API formats both supported)
|
||||
- **Load GenUI button** — loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; shows a warning toast if no workflow is embedded or the format is unsupported; Metadata button is styled green, Load GenUI button uses the primary accent color
|
||||
- **GenUI button** (renamed from "Load GenUI" in v0.5.0 for readability) — loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; shows a warning toast if no workflow is embedded or the format is unsupported; Metadata button is styled green, GenUI button uses the primary accent color
|
||||
- **Image Edit button** — toolbar button; sends the selected image directly to the Image Edit tab as the base layer
|
||||
- **Send GenUI Image button** — toolbar button (next to Image Edit); uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded
|
||||
- **Send to LI node button** (v0.5.2) — toolbar button (next to Send GenUI Image); uploads the selected image and writes its filename into the `image` widget of the node currently selected on the ComfyUI canvas (falling back to the first LoadImage-type node found) — same destination and cross-window bridge as the Image Edit tab's **Send to LI node** button (renamed from "Send to Workflow" in this same release), so both entry points now share one consistent name; requires Workflow Studio to have been opened from ComfyUI's top menu button
|
||||
- **Send CC button** (v0.3.69) — toolbar button, shown only when this Gallery tab is embedded as an iframe inside ComfyUI Comic Creator (a separate custom node); sends the selected image directly into Comic Creator's currently selected panel/overlay
|
||||
- **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, group filter, and favorites filter in one click (sort order is preserved)
|
||||
- **Clear all filters (✕ Clear)** — toolbar button next to the view-mode (Thumbnail/Table) switch (v0.5.2, moved from the toolbar's rightmost position so it sits with the other display-affecting controls); resets search text, tag filter, group filter, and favorites filter in one click (sort order is preserved)
|
||||
- **Workflow auto-save** — images generated from the Generate UI tab have their workflow automatically saved to gallery metadata
|
||||
- **Output folder configurable** — set the scanned output folder from Settings tab
|
||||
- **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
|
||||
@@ -294,13 +307,14 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
|
||||
- **Now inside Gallery** (v0.4.6) — this used to be its own top-level tab; it's now the fourth Gallery sub-tab, to the right of Style_Catalog — everything below works exactly the same as before
|
||||
- **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
|
||||
- **File drop** — drop a ComfyUI-generated PNG / WebP / MP4 or workflow JSON onto the drop zone (or click to open a file picker); PNG/WebP images are shown as a preview
|
||||
- **MP4 embedded metadata** (v0.5.1) — reads the `workflow`/`prompt` container tags ComfyUI's `SaveVideo` writes into the mp4's `moov/udta/meta` box (parsed client-side, no server round-trip); also recognizes all-in-one video-generation nodes that carry their prompt directly on a `prompt` input instead of a separate `CLIPTextEncode`-style node (e.g. `MiniMaxH3ImageToVideo`)
|
||||
- **Model extraction** — automatically extracts Checkpoint, VAE, Diffusion Model, and Text Encoder names from the workflow; supports both standard and subgraph-based workflows (Flux.2 Dev/Klein, Qwen-Image-Edit/2511/Layered, Z-Image Base/Turbo, Ernie Image, WAN2.2, Mage-Flow, LongCat, Boogu, HiDream E1, FireRed, Krea-2 Turbo); node types covered: UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, QuadrupleCLIPLoader (e.g. HiDream 4-CLIP)
|
||||
- **LoRA extraction** — lists all LoRA models with `strength_model / strength_clip` values
|
||||
- **Prompt extraction** — lists prompts with POS / NEG badges when positive/negative can be determined; when distinction is not possible (e.g. `SamplerCustomAdvanced`, intermediate nodes, cross-level connections), prompts are shown without a badge as plain **Text**; click any entry to view the full text below
|
||||
- **CLIP Text Encode edit+ support** (v0.3.92) — `CLIPTextEncodeEditPlus` nodes are resolved using the same RAW / EDIT / front / back combination rule as the node itself, correctly merging the linked `text1` (e.g. a Lora Manager's trigger words) with the editable `text_edit` field instead of showing only one side
|
||||
- **Prompt actions** — Copy to clipboard, **GenUI:P/N** (set GenerateUI positive/negative prompt), **Prompt:P/N** (set Prompt tab preset positive/negative)
|
||||
- **Format support** — ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Ernie Image / WAN2.2 / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Krea-2 Turbo subgraph workflows), SD WebUI, SD Forge, Fooocus
|
||||
- **Format support** — ComfyUI PNG/WebP/MP4/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Ernie Image / WAN2.2 / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Krea-2 Turbo subgraph workflows), SD WebUI, SD Forge, Fooocus
|
||||
- **Format note** — supported formats and covered model types are always shown in the left column
|
||||
|
||||
</details>
|
||||
@@ -374,7 +388,7 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Draw** — freehand brush; options: color, brush size, blend mode; paints directly onto the active draw layer while all other layers remain visible; brush cursor shown as a size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
|
||||
- **Text** — click to place; configure font, size, bold/italic, align, and color; placed as an exact-size text layer sized to the measured bounding box; double-click to re-edit
|
||||
- **Shape** — drag to draw geometric shapes (Rect / Ellipse / Line / FreeLine); options: shape type, Rounded toggle (Rect/Ellipse), Fill color, Stroke color + width, Opacity; each committed shape becomes an independent draw layer; Stroke None hidden for Line/FreeLine (stroke always active)
|
||||
- **Mask** — 7 sub-tools for painting masks onto a dedicated mask layer; click **M** in the Layers header to add a mask layer (Mask tool activates automatically); clicking a mask layer in the list also switches to the Mask tool; **Tool Options bar**: sub-tool buttons (Paint / Color / Alpha / Text / Vector / Shape / SAM3), Invert checkbox, Overlay color picker (default red), Blur slider (0–50 px); the overlay is only shown for the currently active mask layer, other mask layers stay hidden until selected (v0.3.70); SAM3 requires Mask Editor One (disabled when not installed); Color / Alpha / Text / Vector / Shape work without Mask Editor One; **Properties pane — Paint**: Mode (Add / Erase), Size (1–200 px), Hardness (0–100%); **MASK EDITOR ONE section** (Paint sub-tool, visible when installed): Select opens the ABR stamp-brush library; ✕ clears back to Circle; when an image brush is active, Hardness is disabled and Spacing (5–100%), Angle (0–359°), Sz Jitter (0–100%), Rot. Jitter (on/off) appear; **Edit in Mask Editor One →** (v0.4.0) — sends the current canvas composite (plus the active mask layer's content, if one is selected) to a MaskEditorOne node on the ComfyUI canvas — the currently selected node if it is one, otherwise the first MaskEditorOne node found in the graph (same selection logic as **Send to Workflow**) — and opens its full interactive editor (paint, SAM3, BiRefNet, shapes, etc.) in the ComfyUI browser tab; clicking Apply there imports the result back here as a new mask layer; requires Workflow Studio to have been launched from ComfyUI's top-menu button and at least one MaskEditorOne node to exist on the ComfyUI canvas; **Properties pane — Color**: click canvas to flood-select pixels by color similarity; Mode (Add / Subtract), Tolerance (0–255), Feather % (0–100); **Properties pane — Alpha**: extract the active layer's transparency as a mask; Threshold, Invert checkbox, Extract Alpha button; **Properties pane — Text**: click canvas to open a stamp overlay — enter text, set Font / Size / Bold / Italic / Align / Mode (Add / Erase), Stamp or Ctrl+Enter to apply; multi-line supported; **Properties pane — Vector**: click to add Catmull-Rom spline points; Enter (or click first point) closes and fills the polygon; Backspace removes the last point; Esc resets; Mode (Add / Erase); **Properties pane — Shape**: drag to draw Rect or Ellipse; hold Shift for square/circle; blue dashed outline preview while dragging; Mode (Add / Erase); **Properties pane — SAM3**: enter a text prompt, set Max candidates (3/6/9/12), click Segment; select candidate thumbnails (multi-select), Apply Selected (N) applies with current Mode; **Mask layer A/S operation**: A/S toggle — Add (green) composites normally, Subtract (red) cuts the mask from below; **✂ clipping mask button** clips the layer below to the painted area; brush cursor shown as size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
|
||||
- **Mask** — 7 sub-tools for painting masks onto a dedicated mask layer; click **M** in the Layers header to add a mask layer (Mask tool activates automatically); clicking a mask layer in the list also switches to the Mask tool; **Tool Options bar**: sub-tool buttons (Paint / Color / Alpha / Text / Vector / Shape / SAM3), Invert checkbox, Overlay color picker (default red), Blur slider (0–50 px); the overlay is only shown for the currently active mask layer, other mask layers stay hidden until selected (v0.3.70); SAM3 requires Mask Editor One (disabled when not installed); Color / Alpha / Text / Vector / Shape work without Mask Editor One; **Properties pane — Paint**: Mode (Add / Erase), Size (1–200 px), Hardness (0–100%); **MASK EDITOR ONE section** (Paint sub-tool, visible when installed): Select opens the ABR stamp-brush library; ✕ clears back to Circle; when an image brush is active, Hardness is disabled and Spacing (5–100%), Angle (0–359°), Sz Jitter (0–100%), Rot. Jitter (on/off) appear; **Edit in Mask Editor One →** (v0.4.0) — sends the current canvas composite (plus the active mask layer's content, if one is selected) to a MaskEditorOne node on the ComfyUI canvas — the currently selected node if it is one, otherwise the first MaskEditorOne node found in the graph (same selection logic as **Send to LI node**) — and opens its full interactive editor (paint, SAM3, BiRefNet, shapes, etc.) in the ComfyUI browser tab; clicking Apply there imports the result back here as a new mask layer; requires Workflow Studio to have been launched from ComfyUI's top-menu button and at least one MaskEditorOne node to exist on the ComfyUI canvas; **Properties pane — Color**: click canvas to flood-select pixels by color similarity; Mode (Add / Subtract), Tolerance (0–255), Feather % (0–100); **Properties pane — Alpha**: extract the active layer's transparency as a mask; Threshold, Invert checkbox, Extract Alpha button; **Properties pane — Text**: click canvas to open a stamp overlay — enter text, set Font / Size / Bold / Italic / Align / Mode (Add / Erase), Stamp or Ctrl+Enter to apply; multi-line supported; **Properties pane — Vector**: click to add Catmull-Rom spline points; Enter (or click first point) closes and fills the polygon; Backspace removes the last point; Esc resets; Mode (Add / Erase); **Properties pane — Shape**: drag to draw Rect or Ellipse; hold Shift for square/circle; blue dashed outline preview while dragging; Mode (Add / Erase); **Properties pane — SAM3**: enter a text prompt, set Max candidates (3/6/9/12), click Segment; select candidate thumbnails (multi-select), Apply Selected (N) applies with current Mode; **Mask layer A/S operation**: A/S toggle — Add (green) composites normally, Subtract (red) cuts the mask from below; **✂ clipping mask button** clips the layer below to the painted area; brush cursor shown as size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
|
||||
- **Blur** — **Whole Blur**: Gaussian blur to the entire active layer with intensity slider (1–50 px); **Whole Mosaic**: pixelation mosaic with block-size slider (5–100 px); **Rect Blur / Rect Mosaic**: enable the toggle then drag a rectangle on the canvas to apply blur or mosaic to that region only (blue preview for blur, orange for mosaic); Rect Blur and Rect Mosaic are mutually exclusive; all operations support Undo
|
||||
- **BG Remove** — remove the background from the active layer; **Lightweight (@imgly)**: runs entirely in the browser via CDN (no server required; ~40 MB model downloaded on first use); **BiRefNet**: high-quality removal via Mask Editor One's Python backend (requires Mask Editor One installed and `birefnet.safetensors` in `ComfyUI/models/background_removal/`); **New Layer** option (default on) adds the result as a new layer above the original; when off, replaces the active layer in-place
|
||||
- **Filter (G'MIC)** — apply G'MIC-Qt filter effects to the active image layer; click **Edit with G'MIC** to launch G'MIC-Qt GUI; select a filter and click OK — a "G'MIC-Qt filter output" window appears; close it to save the result back as the active layer; requires G'MIC-Qt Standalone installed and path configured in Settings → G'MIC-Qt Executable Path
|
||||
@@ -382,12 +396,26 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Layer panel** — layer list with visibility (👁/🚫), lock (🔒/🔓), and clipping-mask (✂) toggles; opacity slider; type icons (🖼 image / T text / ✏ draw / ⬚ mask); Layer 1 is automatically locked on first image load
|
||||
- **Layer lock** — locked layers show an orange bounding box and 🔒 icon on the canvas; move/resize/rotate are disabled while locked; click the 🔓 button in the layer row to unlock
|
||||
- **Text quality** — text layers are rendered at their measured bounding-box size; resizing with the Select tool regenerates the canvas at the new display resolution so text stays sharp
|
||||
- **Export** — Save PNG (download composite locally); **Save to Gallery** (saves to Gallery root folder with a timestamped default name `wfs-image-YYYYMMDDHHmmss`); **Save to Input** (uploads to ComfyUI input folder for use in Load Image nodes); **Send to Workflow** (v0.4.0) — uploads the same way, then writes the resulting filename directly into the `image` widget of the node currently selected on the ComfyUI canvas (falls back to the first LoadImage-type node found); requires Workflow Studio to have been launched from ComfyUI's top-menu button so the ComfyUI tab is reachable
|
||||
- **Export** — Save PNG (download composite locally); **Save to Gallery** (saves to Gallery root folder with a timestamped default name `wfs-image-YYYYMMDDHHmmss`); **Send to LI node** (renamed from "Send to Workflow" in v0.5.2) — uploads to ComfyUI's input folder via `/upload/image`, then writes the resulting filename directly into the `image` widget of the node currently selected on the ComfyUI canvas (falls back to the first LoadImage-type node found); requires Workflow Studio to have been launched from ComfyUI's top-menu button so the ComfyUI tab is reachable; the Gallery tab's toolbar has the same button (v0.5.2, see Gallery Tab below) so a selected Gallery image can be sent the same way without going through Image Edit first
|
||||
- **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)
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>Video Tab (v0.5.0 – v0.5.2)</h3></summary>
|
||||
|
||||
- **Dedicated MiniMax H3 video generation UI, independent of GenerateUI** — a purpose-built tab for the MiniMax H3 (Image to Video) workflow; does not share state with the GenerateUI tab, and model selection (UNet/CLIP/VAE/Audio VAE) is fixed to the loaded workflow's own defaults rather than editable here
|
||||
- **3-pane layout** — left: form (First Frame / Last Frame / Prompt / Aspect Ratio / Megapixels / Multiple / Duration / Noise Seed / Generate); center: preview frame + Video Source panel, plus an Editing pane reserved for future video-editing tools; right: **Frame** / **GIF** property tabs (v0.5.2, see below)
|
||||
- **First Frame / Last Frame are both optional** — leaving First Frame empty runs the workflow text-only (the node is simply left unconnected — a "bypass"); workflows that don't even include a LoadImage node for First Frame are supported out of the box, and a LoadImage node is only injected into the graph on the fly if an image is actually supplied
|
||||
- **Node lookup instead of hardcoded IDs** — locates the MiniMax H3 subgraph instance, its linked Resolution Selector, and (if present) its linked LoadImage node by walking the workflow's subgraph definitions and links, so a workflow doesn't need to match the reference `minimax_test.json`'s exact node IDs
|
||||
- **Load in Video** (Workflow tab) — load any workflow containing a MiniMax H3 Image-to-Video node straight into this tab from the Workflow tab's side-panel toolbar (next to Load in GenerateUI); unsupported workflows show an error toast instead of loading
|
||||
- **Preview frame + Video Source panel** (v0.5.2, replaces the old Result panel) — the center pane's preview shows either a just-generated video or one loaded independently of generation; a **Video Source** drop zone next to it accepts any local video file (drag-and-drop or click to pick), with a **Clear** button to reset back to empty — the Frame/GIF tools below work on whatever is currently shown here, generated or not; generated results are still saved to Gallery metadata (embedded workflow JSON) automatically, so the Gallery tab's Workflow/Prompt panels work on generated videos the same way they do for images
|
||||
- **Frame tab** (v0.5.2) — captures the preview video's current playback position as a still frame: play/seek to the position you want, click **Capture Frame** (client-side canvas, no server round-trip), then **Save to Output** to write it as a PNG into ComfyUI's own Output folder (auto-numbered, same pattern as other generated images)
|
||||
- **GIF tab** (v0.5.2) — converts the preview video to an animated GIF; set Start/End (seconds), FPS, and an optional Max Width, then **Convert to GIF** — the server decodes the video (PyAV) and encodes an animated GIF (Pillow), both dependencies ComfyUI itself already requires, so no ffmpeg binary or extra install is needed; the result is saved into ComfyUI's Output folder and previewed inline
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><h3>AI TOOL Tab (v0.3.14)</h3></summary>
|
||||
|
||||
@@ -425,7 +453,8 @@ An experimental batch generator: runs the workflow currently loaded in GenerateU
|
||||
- **Package sub-tab** — dropdown to filter nodes by custom node package name
|
||||
- **M — Models tab** — browse installed models (All / ★ Favorites / Groups / By Type sub-tabs); LoRA groups show an **All N LoRAs** item — drag to canvas to place a `Lora Loader (LoraManager)` node with all LoRAs pre-loaded
|
||||
- **P — Prompts tab** — browse prompt presets with All / ★ Favorites / Categories sub-tabs; **Groups sub-tab** (row 2) — view presets by group (shared with the Batch tab's `wfm_prompt_preset_groups`)
|
||||
- **I — Information tab** — drop a ComfyUI-generated PNG/WebP or workflow JSON in the side panel to view its metadata; detects LoRAs from `LoraLoader`, `LoraLoaderModelOnly`, and `Lora Loader (LoraManager)` nodes (API format supported); supports `UnetLoaderGGUF` and `QuadrupleCLIPLoader` node types; preview area fixed at 110px
|
||||
- **I — Information tab** — drop a ComfyUI-generated PNG/WebP/MP4 or workflow JSON in the side panel to view its metadata; detects LoRAs from `LoraLoader`, `LoraLoaderModelOnly`, and `Lora Loader (LoraManager)` nodes (API format supported); supports `UnetLoaderGGUF` and `QuadrupleCLIPLoader` node types; preview area fixed at 110px
|
||||
- **MP4 embedded metadata** (v0.5.1) — reads the `workflow`/`prompt` container tags ComfyUI's `SaveVideo` writes into the mp4's `moov/udta/meta` box, parsed entirely client-side (same box-walking logic as the Gallery tab's Metadata sub-tab); also recognizes all-in-one video-generation nodes that carry their prompt directly on a `prompt` input rather than a separate `CLIPTextEncode`-style node (e.g. `MiniMaxH3ImageToVideo`)
|
||||
- **A — AI TOOL tab** — Translation, Chat, TOOLS, and Settings sub-tabs powered by Ollama, LM Studio, Lemonade, or Unsloth; Chat supports multi-turn conversations (full history sent each turn); TOOLS includes VLM image analysis and wildcard generation; settings (backend, URL, model) shared with the SPA AI TOOL tab via `localStorage`
|
||||
- **model sub-tab** — Checkpoint, VAE, Diffusion Model, and Text Encoder; drag items to canvas to place the corresponding loader node (Checkpoint → `CheckpointLoaderSimple`, VAE → `VAELoader`, Diffusion Model → `UNETLoader`, Text Encoder → `CLIPLoader`); double-click also places at canvas center
|
||||
- **lora sub-tab** — detects LoRAs from `LoraLoader`, `LoraLoaderModelOnly`, and `Lora Loader (LoraManager)` nodes (API format `inputs.loras.__value__` supported); shows `strength_model / strength_clip` values; drag individual LoRA to place `LoraLoader`; **Multiple LORA** section (appears for 1+ LoRAs) drags all LoRAs into a single `Lora Loader (LoraManager)` node with LoRA syntax pre-filled
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
"""Settings API routes."""
|
||||
|
||||
import asyncio
|
||||
import io
|
||||
import json
|
||||
import logging
|
||||
import shutil
|
||||
import zipfile
|
||||
from pathlib import Path
|
||||
|
||||
from aiohttp import web
|
||||
@@ -24,6 +27,7 @@ _DATA_FILES = [
|
||||
"model_metadata.json",
|
||||
"gallery_metadata.json",
|
||||
"tagger_settings.json",
|
||||
"civitai_cache.json",
|
||||
]
|
||||
|
||||
|
||||
@@ -37,6 +41,8 @@ def setup_routes(app: web.Application):
|
||||
app.router.add_post("/api/wfm/settings/output-dir", handle_set_output_dir)
|
||||
app.router.add_get("/api/wfm/settings/export", handle_export)
|
||||
app.router.add_post("/api/wfm/settings/import", handle_import)
|
||||
app.router.add_get("/api/wfm/settings/export-full", handle_export_full)
|
||||
app.router.add_post("/api/wfm/settings/import-full", handle_import_full)
|
||||
app.router.add_get("/api/wfm/styles", handle_get_styles)
|
||||
app.router.add_post("/api/wfm/styles", handle_create_style)
|
||||
app.router.add_put("/api/wfm/styles/{name}", handle_update_style)
|
||||
@@ -248,6 +254,152 @@ async def handle_import(request: web.Request) -> web.Response:
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
|
||||
# Full-backup (ZIP) export/import: unlike the flat _DATA_FILES JSON bundle above, this
|
||||
# covers the whole DATA_DIR — directory-shaped data (ai_skills/, lab_plan/, style/) and
|
||||
# the SQLite tagger.db that the JSON bundle can't represent. Excludes transient/cache
|
||||
# dirs, and wildcard/ specifically because it's typically a symlink into a *different*
|
||||
# custom_node's folder (comfyui-impact-pack) rather than this plugin's own data.
|
||||
_FULL_BACKUP_EXCLUDE_NAMES = {"gmic_temp", "thumb_cache", "wildcard"}
|
||||
|
||||
|
||||
def _add_file_to_zip(zf: zipfile.ZipFile, path: Path, base: Path):
|
||||
rel = str(path.relative_to(base)).replace("\\", "/")
|
||||
if path.name == "settings.json":
|
||||
# Same API-key scrubbing as the JSON-bundle export — fall through to a raw
|
||||
# copy if the file turns out to be unreadable/corrupt rather than skipping it.
|
||||
try:
|
||||
with open(path, "r", encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
data = {k: v for k, v in data.items() if k not in _SETTINGS_EXPORT_EXCLUDE}
|
||||
zf.writestr(rel, json.dumps(data, ensure_ascii=False, indent=2))
|
||||
return
|
||||
except Exception:
|
||||
pass
|
||||
zf.write(path, rel)
|
||||
|
||||
|
||||
# Two folders this plugin doesn't own but users often want backed up alongside their
|
||||
# own data: ComfyUI's own default workflows dir, and the Impact Pack's wildcard
|
||||
# library (a separate custom_node — the plugin's own wildcard/ is usually just a
|
||||
# symlink into this same folder, see _FULL_BACKUP_EXCLUDE_NAMES above). Opt-in only
|
||||
# (see handle_export_full's include_workflows/include_wildcard query params), and
|
||||
# stored under an "_external/" prefix so _apply_full_backup_zip can recognize and
|
||||
# skip them on restore — see that function's docstring for why.
|
||||
def _default_workflows_dir() -> Path:
|
||||
from ..config import COMFYUI_ROOT
|
||||
return COMFYUI_ROOT / "user" / "default" / "workflows"
|
||||
|
||||
|
||||
def _impact_pack_wildcard_dir() -> Path:
|
||||
from ..config import COMFYUI_ROOT
|
||||
return COMFYUI_ROOT / "custom_nodes" / "comfyui-impact-pack" / "wildcards"
|
||||
|
||||
|
||||
def _add_external_dir_to_zip(zf: zipfile.ZipFile, src_dir: Path, zip_prefix: str):
|
||||
if not src_dir.is_dir() or src_dir.is_symlink():
|
||||
return
|
||||
for path in src_dir.rglob("*"):
|
||||
if path.is_dir() or path.is_symlink():
|
||||
continue
|
||||
rel = f"{zip_prefix}/{path.relative_to(src_dir)}".replace("\\", "/")
|
||||
zf.write(path, rel)
|
||||
|
||||
|
||||
def _build_full_backup_zip(include_workflows: bool = False, include_wildcard: bool = False) -> bytes:
|
||||
"""Zips everything under DATA_DIR except the excluded names above. Walks
|
||||
top-level entries first so an excluded symlinked directory (wildcard/) is never
|
||||
even opened, rather than filtering after a recursive walk has already followed it.
|
||||
Optionally also includes the two external folders above under "_external/"."""
|
||||
buf = io.BytesIO()
|
||||
with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
|
||||
for top in sorted(DATA_DIR.iterdir()):
|
||||
if top.name in _FULL_BACKUP_EXCLUDE_NAMES or top.is_symlink():
|
||||
continue
|
||||
if top.is_file():
|
||||
_add_file_to_zip(zf, top, DATA_DIR)
|
||||
elif top.is_dir():
|
||||
for path in top.rglob("*"):
|
||||
if path.is_dir() or path.is_symlink():
|
||||
continue
|
||||
_add_file_to_zip(zf, path, DATA_DIR)
|
||||
|
||||
if include_workflows:
|
||||
_add_external_dir_to_zip(zf, _default_workflows_dir(), "_external/default_workflows")
|
||||
if include_wildcard:
|
||||
_add_external_dir_to_zip(zf, _impact_pack_wildcard_dir(), "_external/wildcard")
|
||||
return buf.getvalue()
|
||||
|
||||
|
||||
def _apply_full_backup_zip(zip_bytes: bytes) -> dict:
|
||||
"""Extracts a full-backup ZIP into DATA_DIR, overwriting existing files. Guards
|
||||
against Zip Slip (entries whose path resolves outside DATA_DIR via '..' or an
|
||||
absolute path) by checking each entry before writing it.
|
||||
|
||||
Entries under "_external/" (default workflows dir, Impact Pack wildcards — see
|
||||
_build_full_backup_zip) are always skipped here rather than restored: they live
|
||||
outside DATA_DIR and are managed by ComfyUI core / a different custom_node, so
|
||||
auto-restoring them could silently overwrite files this plugin doesn't own. They
|
||||
stay in the ZIP for the user to copy back manually if they want them."""
|
||||
summary = {"extracted": [], "skipped": []}
|
||||
DATA_DIR.mkdir(parents=True, exist_ok=True)
|
||||
base = DATA_DIR.resolve()
|
||||
with zipfile.ZipFile(io.BytesIO(zip_bytes)) as zf:
|
||||
for info in zf.infolist():
|
||||
if info.is_dir():
|
||||
continue
|
||||
if info.filename.startswith("_external/"):
|
||||
summary["skipped"].append(info.filename)
|
||||
continue
|
||||
target = (base / info.filename).resolve()
|
||||
try:
|
||||
target.relative_to(base)
|
||||
except ValueError:
|
||||
summary["skipped"].append(info.filename)
|
||||
continue
|
||||
target.parent.mkdir(parents=True, exist_ok=True)
|
||||
with zf.open(info) as src, open(target, "wb") as dst:
|
||||
shutil.copyfileobj(src, dst)
|
||||
summary["extracted"].append(info.filename)
|
||||
return summary
|
||||
|
||||
|
||||
async def handle_export_full(request: web.Request) -> web.Response:
|
||||
"""GET /api/wfm/settings/export-full - Download a ZIP of the entire data
|
||||
directory, including data the flat JSON bundle (handle_export) can't represent.
|
||||
Optional query params include_workflows=1 / include_wildcard=1 additionally bundle
|
||||
ComfyUI's default workflows dir / the Impact Pack's wildcard dir (see
|
||||
_build_full_backup_zip) — both restore-excluded, export-only, manual-copy-back."""
|
||||
try:
|
||||
include_workflows = request.rel_url.query.get("include_workflows") == "1"
|
||||
include_wildcard = request.rel_url.query.get("include_wildcard") == "1"
|
||||
zip_bytes = await asyncio.to_thread(_build_full_backup_zip, include_workflows, include_wildcard)
|
||||
return web.Response(
|
||||
body=zip_bytes,
|
||||
content_type="application/zip",
|
||||
headers={"Content-Disposition": 'attachment; filename="wfm-full-backup.zip"'},
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error("Error building full backup: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
|
||||
async def handle_import_full(request: web.Request) -> web.Response:
|
||||
"""POST /api/wfm/settings/import-full - Upload and restore a full-backup ZIP."""
|
||||
try:
|
||||
reader = await request.multipart()
|
||||
field = await reader.next()
|
||||
if field is None or field.name != "file":
|
||||
return web.json_response({"error": "file field required"}, status=400)
|
||||
zip_bytes = await field.read(decode=False)
|
||||
summary = await asyncio.to_thread(_apply_full_backup_zip, zip_bytes)
|
||||
return web.json_response({"status": "ok", **summary})
|
||||
except zipfile.BadZipFile:
|
||||
return web.json_response({"error": "Not a valid ZIP file"}, status=400)
|
||||
except Exception as e:
|
||||
logger.error("Error importing full backup: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
|
||||
def _style_files() -> list:
|
||||
style_dir = DATA_DIR / "style"
|
||||
if not style_dir.is_dir():
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
"""Video tab utility API routes: last-frame capture, animated GIF conversion."""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from aiohttp import web
|
||||
|
||||
from ..services.video_service import VideoService
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_service = VideoService()
|
||||
|
||||
|
||||
def setup_routes(app: web.Application):
|
||||
app.router.add_post("/api/wfm/video/frame/save-to-output", handle_save_frame)
|
||||
app.router.add_post("/api/wfm/video/to-gif", handle_to_gif)
|
||||
|
||||
|
||||
async def handle_save_frame(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_frame_to_output, image_base64)
|
||||
return web.json_response({"status": "ok", **result})
|
||||
except Exception as e:
|
||||
logger.error("Error saving video frame to output: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
|
||||
|
||||
async def handle_to_gif(request: web.Request) -> web.Response:
|
||||
try:
|
||||
body = await request.json()
|
||||
filename = body.get("filename", "")
|
||||
subfolder = body.get("subfolder", "")
|
||||
type_ = body.get("type", "output")
|
||||
start_time = float(body.get("start_time") or 0)
|
||||
end_time_raw = body.get("end_time")
|
||||
end_time = float(end_time_raw) if end_time_raw not in (None, "") else None
|
||||
fps = float(body.get("fps") or 10)
|
||||
max_width_raw = body.get("max_width")
|
||||
max_width = int(max_width_raw) if max_width_raw not in (None, "") else None
|
||||
|
||||
if not filename:
|
||||
return web.json_response({"error": "filename required"}, status=400)
|
||||
|
||||
result = await asyncio.to_thread(
|
||||
_service.convert_to_gif, filename, subfolder, type_, start_time, end_time, fps, max_width
|
||||
)
|
||||
return web.json_response({"status": "ok", **result})
|
||||
except FileNotFoundError as e:
|
||||
return web.json_response({"error": str(e)}, status=404)
|
||||
except ValueError as e:
|
||||
return web.json_response({"error": str(e)}, status=400)
|
||||
except Exception as e:
|
||||
logger.error("Error converting video to GIF: %s", e)
|
||||
return web.json_response({"error": str(e)}, status=500)
|
||||
@@ -191,17 +191,33 @@ class GalleryMetadataStore:
|
||||
return self._save_to_disk()
|
||||
return True
|
||||
|
||||
def cleanup_stale_images(self, folder_path: str, existing_paths: set) -> int:
|
||||
def cleanup_stale_images(self, folder_path: str, existing_paths: set, recursive: bool = True) -> int:
|
||||
"""folder_path 配下の存在しないファイルのメタデータを削除する。
|
||||
existing_paths: そのフォルダの現在のファイルパス集合(_normalize_path 済み)
|
||||
recursive: False の場合、folder_path 直下のファイルのみを対象にする。
|
||||
呼び出し元(list_images)が非recursiveスキャン(フォルダ直下のみ列挙)の
|
||||
結果を existing_paths として渡してくる場合、サブフォルダ内のファイルは
|
||||
existing_paths に含まれない。それにもかかわらず対象範囲を「folder_path配下
|
||||
全階層」のままにすると、サブフォルダ内画像のメタデータ(tags/memo等)を
|
||||
"存在しない"と誤判定して全削除してしまう(実際に発生した不具合: サブフォルダ
|
||||
に動画を保存する運用で、ルートフォルダを非recursiveで開くたびに
|
||||
サブフォルダ内の全メタデータが失われていた)。
|
||||
"""
|
||||
folder_key = self._normalize_path(folder_path)
|
||||
if not folder_key.endswith("/"):
|
||||
folder_key += "/"
|
||||
|
||||
def _in_scope(key: str) -> bool:
|
||||
if not key.startswith(folder_key):
|
||||
return False
|
||||
if recursive:
|
||||
return True
|
||||
return "/" not in key[len(folder_key):]
|
||||
|
||||
with self._lock:
|
||||
stale = [
|
||||
key for key in self._data["images"]
|
||||
if key.startswith(folder_key) and key not in existing_paths
|
||||
if _in_scope(key) and key not in existing_paths
|
||||
]
|
||||
if not stale:
|
||||
return 0
|
||||
|
||||
@@ -16,8 +16,8 @@ from typing import Any
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# サポートする画像拡張子
|
||||
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg"}
|
||||
# サポートする画像拡張子(.mp4は動画だがGalleryでは静止画と同じ一覧・配信経路を共有する)
|
||||
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg", ".mp4"}
|
||||
|
||||
# data URL の MIME タイプ -> 拡張子(save_image_to_gallery / save_image_to_folder共用)
|
||||
_SAVE_EXT_BY_MIME = {
|
||||
@@ -385,9 +385,12 @@ class GalleryService:
|
||||
# os.scandir() でファイル情報を一括取得(stat()の個別呼び出しを排除)
|
||||
raw_entries = self._scan_folder_recursive(folder) if recursive else self._scan_folder(folder)
|
||||
|
||||
# 孤立メタデータを自動クリーンアップ(移動・削除されたファイルの残骸を除去)
|
||||
# 孤立メタデータを自動クリーンアップ(移動・削除されたファイルの残骸を除去)。
|
||||
# recursive=False(非再帰スキャン)の場合、existing_pathsにはfolder直下の
|
||||
# ファイルしか含まれないため、cleanup側にもrecursive=Falseを伝えて対象範囲を
|
||||
# 直下のみに限定する(でないとサブフォルダ内ファイルのメタデータを誤削除する)。
|
||||
existing_paths = {abs_path for _, abs_path, _, _ in raw_entries}
|
||||
self.metadata_store.cleanup_stale_images(str(folder), existing_paths)
|
||||
self.metadata_store.cleanup_stale_images(str(folder), existing_paths, recursive=recursive)
|
||||
|
||||
results = []
|
||||
for name, abs_path, size, mtime in raw_entries:
|
||||
@@ -584,7 +587,10 @@ class GalleryService:
|
||||
embedded = self._read_png_metadata(path)
|
||||
elif ext in {".jpg", ".jpeg"}:
|
||||
embedded = self._read_jpeg_metadata(path)
|
||||
elif ext == ".mp4":
|
||||
embedded = self._read_mp4_metadata(path)
|
||||
|
||||
dims = self._read_media_dimensions(path, ext)
|
||||
saved = self.metadata_store.get(str(path))
|
||||
|
||||
# workflow キーを除く文字列フィールドをプロンプトキャッシュとして保存(検索用)
|
||||
@@ -603,6 +609,9 @@ class GalleryService:
|
||||
"mtime": stat.st_mtime,
|
||||
"ext": ext,
|
||||
"embedded": embedded,
|
||||
"width": dims["width"],
|
||||
"height": dims["height"],
|
||||
"duration": dims["duration"],
|
||||
"favorite": saved.get("favorite", False),
|
||||
"tags": saved.get("tags", []),
|
||||
"memo": saved.get("memo", ""),
|
||||
@@ -682,8 +691,43 @@ class GalleryService:
|
||||
logger.debug("JPEG metadata read error: %s", e)
|
||||
return result
|
||||
|
||||
def _read_mp4_metadata(self, path: Path) -> dict:
|
||||
"""MP4コンテナのformat-levelメタデータタグ(workflow/prompt等)をPyAVで抽出する。
|
||||
ComfyUIのSaveVideoはPNGのtEXtチャンクと同じキー名(workflow=UI形式, prompt=API形式)で
|
||||
moov/udta/meta(mdta)にJSON文字列を書き込む。"""
|
||||
result = {}
|
||||
try:
|
||||
import av
|
||||
with av.open(str(path)) as container:
|
||||
for k, v in (container.metadata or {}).items():
|
||||
result[k] = v
|
||||
except Exception as e:
|
||||
logger.debug("MP4 metadata read error: %s", e)
|
||||
return result
|
||||
|
||||
def _read_media_dimensions(self, path: Path, ext: str) -> dict:
|
||||
"""画像は幅高さ、動画は幅高さ+再生時間(秒)を返す。取得できない項目はNone。"""
|
||||
info: dict = {"width": None, "height": None, "duration": None}
|
||||
try:
|
||||
if ext == ".mp4":
|
||||
import av
|
||||
with av.open(str(path)) as container:
|
||||
if container.streams.video:
|
||||
stream = container.streams.video[0]
|
||||
info["width"] = stream.width
|
||||
info["height"] = stream.height
|
||||
if container.duration:
|
||||
info["duration"] = container.duration / 1_000_000
|
||||
elif ext != ".svg":
|
||||
from PIL import Image
|
||||
with Image.open(path) as img:
|
||||
info["width"], info["height"] = img.size
|
||||
except Exception as e:
|
||||
logger.debug("dimension read error for %s: %s", path, e)
|
||||
return info
|
||||
|
||||
def _extract_embedded_workflow(self, image_path: str, prefer: str = "workflow") -> dict | None:
|
||||
"""埋め込みワークフローを抽出する(PNG[workflow]/PNG[prompt]の優先順位を選べる)。
|
||||
"""埋め込みワークフローを抽出する(PNG/MP4の[workflow]/[prompt]の優先順位を選べる)。
|
||||
|
||||
prefer="workflow": UI形式(ノード位置・グループ等を保持)優先。GenerateUIへの
|
||||
ロードやJSON表示などエディタ復元が必要な用途向け。
|
||||
@@ -696,8 +740,14 @@ class GalleryService:
|
||||
if not self._check_path_allowed(path):
|
||||
return None
|
||||
|
||||
if path.suffix.lower() == ".png":
|
||||
ext = path.suffix.lower()
|
||||
embedded = None
|
||||
if ext == ".png":
|
||||
embedded = self._read_png_metadata(path)
|
||||
elif ext == ".mp4":
|
||||
embedded = self._read_mp4_metadata(path)
|
||||
|
||||
if embedded:
|
||||
key_groups = (("workflow", "Workflow"), ("prompt", "Prompt"))
|
||||
if prefer == "prompt":
|
||||
key_groups = tuple(reversed(key_groups))
|
||||
@@ -729,9 +779,14 @@ class GalleryService:
|
||||
# ──────────────────────────────────────────────────────────────
|
||||
|
||||
def save_image_meta(self, image_path: str, data: dict) -> bool:
|
||||
if not self._check_path_allowed(Path(image_path).resolve()):
|
||||
resolved = Path(image_path).resolve()
|
||||
if not self._check_path_allowed(resolved):
|
||||
logger.warning("save_image_meta: path not allowed: %s", resolved)
|
||||
return False
|
||||
return self.metadata_store.save(image_path, data)
|
||||
# get_image_metadata() 側は resolve() 済みパスをキーにして取得するため、
|
||||
# ここでも resolve() 後の文字列で統一して保存する(キー不一致による
|
||||
# 「保存はできるが表示されない」というサイレントな食い違いを防ぐ)。
|
||||
return self.metadata_store.save(str(resolved), data)
|
||||
|
||||
def toggle_favorite(self, image_path: str) -> bool:
|
||||
if not self._check_path_allowed(Path(image_path).resolve()):
|
||||
@@ -934,6 +989,8 @@ class GalleryService:
|
||||
ディスクキャッシュがあればそれを返し、なければPillowで生成して保存する。
|
||||
GIFはアニメーション保持のため元ファイルをそのまま返す。
|
||||
Pillowが使えない場合は元ファイルにフォールバック。
|
||||
MP4はPillowで開けないためPyAVで先頭フレームを抽出しJPEGとしてキャッシュする
|
||||
(元ファイルへのフォールバックはできないため、失敗時はNoneを返す)。
|
||||
"""
|
||||
p = Path(image_path).resolve()
|
||||
if not p.is_file():
|
||||
@@ -966,6 +1023,24 @@ class GalleryService:
|
||||
if thumb_path.exists():
|
||||
return thumb_path
|
||||
|
||||
# MP4は動画のためPillowで開けない。PyAV(av)で先頭フレームを抽出しJPEGとしてキャッシュする。
|
||||
# avが未導入/デコード失敗の場合、元mp4ファイルは<img>的な経路に渡せないため
|
||||
# (GIF/SVGと違い元ファイルへフォールバックできない) Noneを返しプレースホルダー表示に委ねる。
|
||||
if p.suffix.lower() == ".mp4":
|
||||
try:
|
||||
import av
|
||||
from PIL import Image
|
||||
with av.open(str(p)) as container:
|
||||
stream = container.streams.video[0]
|
||||
frame = next(container.decode(stream))
|
||||
img = frame.to_image().convert("RGB")
|
||||
img.thumbnail((width, width), Image.LANCZOS)
|
||||
img.save(thumb_path, "JPEG", quality=85, optimize=True)
|
||||
return thumb_path
|
||||
except Exception as e:
|
||||
logger.warning("serve_thumbnail: mp4 frame extraction failed for %s: %s", p, e)
|
||||
return None
|
||||
|
||||
try:
|
||||
from PIL import Image
|
||||
with Image.open(p) as img:
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
"""Video tab utilities: last-frame capture and animated GIF conversion.
|
||||
|
||||
Runs entirely on dependencies ComfyUI itself already requires — PyAV for
|
||||
decoding (ComfyUI core already needs av>=17.0.0) and Pillow for GIF encoding
|
||||
— so no ffmpeg binary and no new pip installs, unlike a typical ffmpeg-based
|
||||
implementation (e.g. Eagle's video2gif/video-to-frame plugins).
|
||||
"""
|
||||
|
||||
import base64
|
||||
import logging
|
||||
from pathlib import Path
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
try:
|
||||
from PIL import Image
|
||||
_RESAMPLE = getattr(getattr(Image, "Resampling", Image), "LANCZOS")
|
||||
except Exception: # pragma: no cover - Pillow is a hard ComfyUI dependency
|
||||
_RESAMPLE = None
|
||||
|
||||
|
||||
class VideoService:
|
||||
def _resolve_media_path(self, filename: str, subfolder: str, type_: str) -> Path:
|
||||
"""Resolves a ComfyUI-style {filename, subfolder, type} reference to an
|
||||
absolute path, guarding against path traversal outside the matching
|
||||
input/output/temp directory."""
|
||||
import folder_paths # type: ignore
|
||||
|
||||
base_dir = folder_paths.get_directory_by_type(type_)
|
||||
if not base_dir:
|
||||
raise ValueError(f"Invalid type: {type_}")
|
||||
base = Path(base_dir).resolve()
|
||||
target = (base / (subfolder or "") / filename).resolve()
|
||||
try:
|
||||
target.relative_to(base)
|
||||
except ValueError:
|
||||
raise ValueError("Access denied: path outside allowed directory")
|
||||
if not target.is_file():
|
||||
raise FileNotFoundError(f"File not found: {filename}")
|
||||
return target
|
||||
|
||||
def save_frame_to_output(self, image_base64: str, filename_prefix: str = "video/Frame") -> dict:
|
||||
"""Saves a client-captured video frame (PNG data URL) into ComfyUI's own
|
||||
output folder — same auto-numbered pattern as Lab's index-image save
|
||||
(see LabPlanService.save_index_image_to_output)."""
|
||||
import folder_paths # type: ignore
|
||||
|
||||
b64 = image_base64
|
||||
if "," in b64 and b64.strip().lower().startswith("data:"):
|
||||
b64 = b64.split(",", 1)[1]
|
||||
image_bytes = base64.b64decode(b64)
|
||||
|
||||
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 convert_to_gif(
|
||||
self,
|
||||
filename: str,
|
||||
subfolder: str,
|
||||
type_: str,
|
||||
start_time: float = 0.0,
|
||||
end_time=None,
|
||||
fps: float = 10.0,
|
||||
max_width=None,
|
||||
filename_prefix: str = "video/GIF",
|
||||
) -> dict:
|
||||
"""Decodes the given video (PyAV), samples it down to `fps`, optionally
|
||||
downscales to `max_width`, and encodes the result as an animated GIF
|
||||
(Pillow) into ComfyUI's own output folder."""
|
||||
import av # type: ignore
|
||||
import folder_paths # type: ignore
|
||||
|
||||
if _RESAMPLE is None:
|
||||
raise RuntimeError("Pillow is not available")
|
||||
|
||||
src_path = self._resolve_media_path(filename, subfolder, type_)
|
||||
fps = max(0.1, float(fps))
|
||||
|
||||
container = av.open(str(src_path))
|
||||
try:
|
||||
stream = container.streams.video[0]
|
||||
source_fps = float(stream.average_rate) if stream.average_rate else 24.0
|
||||
step = max(1, round(source_fps / fps))
|
||||
|
||||
pil_frames = []
|
||||
idx = 0
|
||||
for frame in container.decode(stream):
|
||||
t = float(frame.pts * stream.time_base) if frame.pts is not None else None
|
||||
if t is not None:
|
||||
if t < start_time:
|
||||
idx += 1
|
||||
continue
|
||||
if end_time is not None and t > end_time:
|
||||
break
|
||||
if idx % step == 0:
|
||||
im = frame.to_image()
|
||||
if max_width and im.width > max_width:
|
||||
ratio = max_width / im.width
|
||||
im = im.resize((max_width, max(1, round(im.height * ratio))), _RESAMPLE)
|
||||
pil_frames.append(im.convert("RGB"))
|
||||
idx += 1
|
||||
finally:
|
||||
container.close()
|
||||
|
||||
if not pil_frames:
|
||||
raise ValueError("No frames found in the specified range")
|
||||
|
||||
output_dir = folder_paths.get_output_directory()
|
||||
full_output_folder, out_filename, counter, out_subfolder, _ = folder_paths.get_save_image_path(filename_prefix, output_dir)
|
||||
save_name = f"{out_filename}_{counter:05}_.gif"
|
||||
save_path = Path(full_output_folder) / save_name
|
||||
|
||||
duration_ms = max(20, round(1000 / fps))
|
||||
pil_frames[0].save(
|
||||
save_path,
|
||||
format="GIF",
|
||||
save_all=True,
|
||||
append_images=pil_frames[1:],
|
||||
duration=duration_ms,
|
||||
loop=0,
|
||||
optimize=True,
|
||||
)
|
||||
return {"filename": save_name, "subfolder": out_subfolder, "frame_count": len(pil_frames)}
|
||||
@@ -80,7 +80,7 @@ class WorkflowStudio:
|
||||
app.router.add_get("/wfm", serve_index_page)
|
||||
|
||||
# API routes
|
||||
from .routes import workflow_routes, settings_routes, ollama_routes, unsloth_routes, eagle_routes, nodes_routes, prompts_routes, models_routes, gallery_routes, wildcard_routes, tagger_routes, gmic_routes, skill_routes, lab_routes
|
||||
from .routes import workflow_routes, settings_routes, ollama_routes, unsloth_routes, eagle_routes, nodes_routes, prompts_routes, models_routes, gallery_routes, wildcard_routes, tagger_routes, gmic_routes, skill_routes, lab_routes, video_routes
|
||||
|
||||
workflow_routes.setup_routes(app)
|
||||
settings_routes.setup_routes(app)
|
||||
@@ -96,5 +96,6 @@ class WorkflowStudio:
|
||||
gmic_routes.setup_routes(app)
|
||||
skill_routes.setup_routes(app)
|
||||
lab_routes.setup_routes(app)
|
||||
video_routes.setup_routes(app)
|
||||
|
||||
logger.info("Workflow Studio: Routes registered successfully")
|
||||
|
||||
+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.4.7"
|
||||
version = "0.5.2"
|
||||
license = "MIT"
|
||||
requires-python = ">= 3.10"
|
||||
dependencies = ["jinja2"]
|
||||
|
||||
@@ -22,3 +22,10 @@ piexif>=1.1.3
|
||||
|
||||
# -- Required to load UNSLOTH_API_KEY from a local .env file (Unsloth backend, AI TOOL tab) --
|
||||
python-dotenv>=1.0,<2.0
|
||||
|
||||
# -- MP4 thumbnail generation (Gallery tab) --
|
||||
# Uses PyAV (av) to decode the first frame. ComfyUI core already requires av>=17.0.0,
|
||||
# so it is normally pre-installed in python_embeded and no action is needed here.
|
||||
# If missing, mp4 thumbnail generation simply fails and falls back to a placeholder
|
||||
# (Gallery itself keeps working). Not pinned here on purpose — see torch note above.
|
||||
# av>=17.0.0
|
||||
|
||||
+28
-37
@@ -290,6 +290,24 @@
|
||||
color: #38bdf8;
|
||||
}
|
||||
|
||||
/* 動画ファイル(mp4)の再生アイコンバッジ(サムネイル中央) */
|
||||
.wfm-gallery-thumb-video-badge {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
border-radius: 50%;
|
||||
background: rgba(0,0,0,0.55);
|
||||
color: #fff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 14px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
/* テーブルビューのお気に入りボタン */
|
||||
.wfm-gallery-table-fav-btn {
|
||||
background: none;
|
||||
@@ -465,43 +483,6 @@
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.wfm-gallery-preview-overlay {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: rgba(0,0,0,0.5);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
opacity: 0;
|
||||
transition: opacity 0.2s;
|
||||
}
|
||||
|
||||
.wfm-gallery-preview-wrapper:hover .wfm-gallery-preview-overlay {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.wfm-gallery-download-btn {
|
||||
background: var(--wfm-accent, #4f8ef7);
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
font-size: 20px;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.wfm-gallery-download-btn:hover {
|
||||
background: var(--wfm-accent-hover, #3f7fe7);
|
||||
}
|
||||
|
||||
/* タブコンテンツ */
|
||||
.wfm-gallery-detail-tab-content {
|
||||
flex: 1;
|
||||
@@ -836,6 +817,16 @@
|
||||
border-color: #6a4de0;
|
||||
}
|
||||
|
||||
.wfm-gallery-action-btn-orange {
|
||||
background: #f59e0b;
|
||||
border-color: #f59e0b;
|
||||
color: #1a1a2e;
|
||||
}
|
||||
.wfm-gallery-action-btn-orange:hover {
|
||||
background: #d97f06;
|
||||
border-color: #d97f06;
|
||||
}
|
||||
|
||||
/* ── ファイル操作ボタン (詳細パネル) ─────────────────────────── */
|
||||
|
||||
.wfm-gallery-file-actions {
|
||||
|
||||
@@ -280,6 +280,13 @@
|
||||
color: var(--wfm-danger);
|
||||
}
|
||||
|
||||
/* Single-click selection target for the column header's up/down reorder buttons —
|
||||
layered as a box-shadow (not border-color) so it never conflicts with the
|
||||
revert/live/bypassed/node-bypassed border-color signaling above. */
|
||||
.wfm-lab-cell.wfm-lab-cell-selected {
|
||||
box-shadow: 0 0 0 2px var(--wfm-primary);
|
||||
}
|
||||
|
||||
.wfm-lab-cell-applied {
|
||||
margin-top: 3px;
|
||||
padding-top: 3px;
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
/* =============================================
|
||||
Video Tab (MiniMax H3専用・GenerateUIタブとは独立)
|
||||
3ペイン構成: 左=フォーム / 中央=プレビュー+編集 / 右=プロパティ
|
||||
各ペインは独立したカラムとして高さ100%を占め、内部でスクロールする。
|
||||
中央ペインのコンテンツ量(生成結果の有無・動画の縦横比)が変わっても
|
||||
左右のペインの位置が動かないよう、意図的に高さを共有させない構造にしている。
|
||||
============================================= */
|
||||
|
||||
#wfm-tab-video {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.wfm-video-layout {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* ── 左ペイン: フォーム ── */
|
||||
.wfm-video-form-panel {
|
||||
width: 380px;
|
||||
flex: none;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 16px;
|
||||
overflow-y: auto;
|
||||
border-right: 1px solid var(--wfm-border);
|
||||
}
|
||||
|
||||
.wfm-video-form-panel label {
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
color: var(--wfm-text-secondary);
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.wfm-video-header {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.wfm-video-header h3 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.wfm-video-wf-name {
|
||||
color: var(--wfm-text-secondary);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.wfm-video-frame-slots {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.wfm-video-frame-slot {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.wfm-video-resolution-row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr 1fr;
|
||||
gap: 10px;
|
||||
align-items: end;
|
||||
}
|
||||
|
||||
.wfm-video-seed-randomize-wrap {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
||||
/* ── 中央ペイン: プレビュー + 編集 ── */
|
||||
.wfm-video-center-panel {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: auto;
|
||||
padding: 16px;
|
||||
gap: 16px;
|
||||
border-right: 1px solid var(--wfm-border);
|
||||
}
|
||||
|
||||
/* 生成結果 or ソース選択エリアで読み込んだ動画を横並びで表示する行。
|
||||
プレビュー枠が主役、ソースパネルは選択UIのみの固定幅。 */
|
||||
.wfm-video-preview-row {
|
||||
flex: none;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.wfm-video-preview-frame {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
min-height: 260px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px dashed var(--wfm-border);
|
||||
border-radius: 6px;
|
||||
background: var(--wfm-bg-hover, #111);
|
||||
}
|
||||
|
||||
.wfm-video-preview-el {
|
||||
max-width: 100%;
|
||||
max-height: 60vh;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.wfm-video-source-panel {
|
||||
width: 220px;
|
||||
flex: none;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.wfm-video-pane-header {
|
||||
font-weight: 600;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.wfm-video-prop-hint {
|
||||
font-size: 12px;
|
||||
color: var(--wfm-text-secondary);
|
||||
margin: 0 0 8px 0;
|
||||
}
|
||||
|
||||
/* 将来の動画編集機能(トリミング等)用のプレースホルダー領域 */
|
||||
.wfm-video-edit-panel {
|
||||
flex: 1;
|
||||
min-height: 160px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px dashed var(--wfm-border);
|
||||
border-radius: 6px;
|
||||
color: var(--wfm-text-secondary);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
/* ── 右ペイン: プロパティ (Frame抽出 / GIF変換タブ) ── */
|
||||
.wfm-video-properties-panel {
|
||||
width: 240px;
|
||||
flex: none;
|
||||
padding: 16px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.wfm-video-prop-tabnav {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid var(--wfm-border);
|
||||
}
|
||||
|
||||
.wfm-video-prop-tab {
|
||||
flex: 1;
|
||||
background: none;
|
||||
border: none;
|
||||
padding: 6px 4px;
|
||||
cursor: pointer;
|
||||
color: var(--wfm-text-secondary);
|
||||
border-bottom: 2px solid transparent;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.wfm-video-prop-tab.active {
|
||||
color: var(--wfm-text);
|
||||
border-bottom-color: var(--wfm-primary);
|
||||
}
|
||||
|
||||
.wfm-video-prop-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
+20
-3
@@ -112,7 +112,7 @@ function initTabs() {
|
||||
|
||||
function applyI18nToHtml() {
|
||||
// Tab labels
|
||||
const tabMap = { workflow: "tabWorkflow", nodes: "tabNodes", models: "tabModels", generate: "tabGenerate", prompt: "tabPrompt", gallery: "tabGallery", "image-edit": "tabImageEdit", settings: "tabSettings", help: "tabHelp", ai: "tabAi", tagger: "tabTagger" };
|
||||
const tabMap = { workflow: "tabWorkflow", nodes: "tabNodes", models: "tabModels", generate: "tabGenerate", prompt: "tabPrompt", gallery: "tabGallery", "image-edit": "tabImageEdit", video: "tabVideo", settings: "tabSettings", help: "tabHelp", ai: "tabAi", tagger: "tabTagger" };
|
||||
document.querySelectorAll(".wfm-tab").forEach((tab) => {
|
||||
const key = tabMap[tab.dataset.tab];
|
||||
if (key) tab.textContent = t(key);
|
||||
@@ -134,6 +134,12 @@ function applyI18nToHtml() {
|
||||
if (listLoadBtn.disabled) listLoadBtn.title = t("selectCardFirst");
|
||||
}
|
||||
|
||||
const listLoadVideoBtn = document.getElementById("wfm-list-load-video-btn");
|
||||
if (listLoadVideoBtn) {
|
||||
listLoadVideoBtn.textContent = t("loadInVideo");
|
||||
if (listLoadVideoBtn.disabled) listLoadVideoBtn.title = t("selectCardFirst");
|
||||
}
|
||||
|
||||
const listOpenComfyBtn = document.getElementById("wfm-list-open-comfyui-btn");
|
||||
if (listOpenComfyBtn) {
|
||||
listOpenComfyBtn.textContent = t("sendToCanvas");
|
||||
@@ -507,6 +513,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-lab-13": "helpLab13", "wfm-help-lab-14": "helpLab14",
|
||||
"wfm-help-lab-15": "helpLab15",
|
||||
"wfm-help-lab-16": "helpLab16", "wfm-help-lab-17": "helpLab17",
|
||||
"wfm-help-lab-18": "helpLab18", "wfm-help-lab-19": "helpLab19",
|
||||
"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",
|
||||
@@ -534,6 +541,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-prompt-20": "helpPrompt20", "wfm-help-prompt-21": "helpPrompt21",
|
||||
"wfm-help-prompt-22": "helpPrompt22", "wfm-help-prompt-23": "helpPrompt23",
|
||||
"wfm-help-prompt-24": "helpPrompt24", "wfm-help-prompt-25": "helpPrompt25",
|
||||
"wfm-help-prompt-26": "helpPrompt26",
|
||||
"wfm-help-settings-1": "helpSettings1", "wfm-help-settings-2": "helpSettings2",
|
||||
"wfm-help-settings-3": "helpSettings3", "wfm-help-settings-4": "helpSettings4",
|
||||
"wfm-help-settings-5": "helpSettings5", "wfm-help-settings-6": "helpSettings6",
|
||||
@@ -541,6 +549,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-settings-9": "helpSettings9", "wfm-help-settings-10": "helpSettings10",
|
||||
"wfm-help-settings-11": "helpSettings11", "wfm-help-settings-12": "helpSettings12",
|
||||
"wfm-help-settings-13": "helpSettings13", "wfm-help-settings-14": "helpSettings14",
|
||||
"wfm-help-settings-15": "helpSettings15", "wfm-help-settings-16": "helpSettings16",
|
||||
"wfm-help-nodes-1": "helpNodes1", "wfm-help-nodes-2": "helpNodes2",
|
||||
"wfm-help-nodes-3": "helpNodes3", "wfm-help-nodes-4": "helpNodes4",
|
||||
"wfm-help-nodes-5": "helpNodes5", "wfm-help-nodes-6": "helpNodes6",
|
||||
@@ -560,7 +569,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-gallery-11": "helpGallery11", "wfm-help-gallery-12": "helpGallery12",
|
||||
"wfm-help-gallery-13": "helpGallery13", "wfm-help-gallery-14": "helpGallery14",
|
||||
"wfm-help-gallery-15": "helpGallery15", "wfm-help-gallery-16": "helpGallery16",
|
||||
"wfm-help-gallery-17": "helpGallery17",
|
||||
"wfm-help-gallery-17": "helpGallery17", "wfm-help-gallery-27": "helpGallery27",
|
||||
"wfm-help-gallery-18": "helpGallery18", "wfm-help-gallery-19": "helpGallery19",
|
||||
"wfm-help-gallery-20": "helpGallery20", "wfm-help-gallery-21": "helpGallery21",
|
||||
"wfm-help-gallery-22": "helpGallery22", "wfm-help-gallery-23": "helpGallery23",
|
||||
@@ -613,7 +622,7 @@ function applyI18nToHtml() {
|
||||
"wfm-help-imageedit-12": "helpImageEdit12", "wfm-help-imageedit-13": "helpImageEdit13",
|
||||
"wfm-help-imageedit-14": "helpImageEdit14", "wfm-help-imageedit-15": "helpImageEdit15",
|
||||
"wfm-help-imageedit-16": "helpImageEdit16", "wfm-help-imageedit-17": "helpImageEdit17",
|
||||
"wfm-help-imageedit-18": "helpImageEdit18", "wfm-help-imageedit-19": "helpImageEdit19",
|
||||
"wfm-help-imageedit-18": "helpImageEdit18",
|
||||
"wfm-help-imageedit-19b": "helpImageEdit19b",
|
||||
"wfm-help-imageedit-20": "helpImageEdit20", "wfm-help-imageedit-21": "helpImageEdit21",
|
||||
"wfm-help-imageedit-22": "helpImageEdit22", "wfm-help-imageedit-23": "helpImageEdit23",
|
||||
@@ -722,6 +731,12 @@ function applyI18nToHtml() {
|
||||
"wfm-help-trouble-card-connection-title": "helpTroubleCardConnection",
|
||||
"wfm-help-trouble-card-workflow-title": "helpTroubleCardWorkflow",
|
||||
"wfm-help-trouble-card-tagger-title": "helpTroubleCardTagger",
|
||||
"wfm-help-video-title": "helpVideoTitle",
|
||||
"wfm-help-video-desc": "helpVideoDesc",
|
||||
"wfm-help-video-1": "helpVideo1", "wfm-help-video-2": "helpVideo2",
|
||||
"wfm-help-video-3": "helpVideo3", "wfm-help-video-4": "helpVideo4",
|
||||
"wfm-help-video-5": "helpVideo5", "wfm-help-video-6": "helpVideo6",
|
||||
"wfm-help-video-7": "helpVideo7",
|
||||
};
|
||||
for (const [id, key] of Object.entries(helpIdMap)) {
|
||||
const el = document.getElementById(id);
|
||||
@@ -812,6 +827,7 @@ import { initMetadataTab } from "./metadata-tab.js";
|
||||
import { initAiTab } from "./ai-tab.js";
|
||||
import { initTaggerTab } from "./tagger-tab.js";
|
||||
import { imageEditTab } from "./image-edit-tab.js";
|
||||
import { initVideoTab } from "./video-tab.js";
|
||||
|
||||
// Apply saved theme immediately to prevent flash of default theme
|
||||
applyTheme(getSavedTheme());
|
||||
@@ -863,6 +879,7 @@ document.addEventListener("DOMContentLoaded", () => {
|
||||
initAiTab();
|
||||
initTaggerTab();
|
||||
imageEditTab.init();
|
||||
initVideoTab();
|
||||
|
||||
console.log("Workflow Studio: App initialized");
|
||||
});
|
||||
|
||||
@@ -1336,6 +1336,19 @@ export const comfyWorkflow = {
|
||||
});
|
||||
}
|
||||
|
||||
// Video all-in-one nodes (e.g. MiniMaxH3ImageToVideo) — hold their own "prompt"
|
||||
// widget directly instead of going through a separate CLIPTextEncode, and have
|
||||
// no negative counterpart. Matched generically by class name (ImageToVideo /
|
||||
// TextToVideo) rather than a fixed list so future models sharing this pattern
|
||||
// (WAN, HunyuanVideo, etc.) work without a code change — same detection metadata-tab.js
|
||||
// and node_sets_menu.js already use for prompt extraction (see extractPromptsAPI).
|
||||
if ((ct.includes("ImageToVideo") || ct.includes("TextToVideo")) && typeof inputs.prompt === "string") {
|
||||
result.prompt_nodes.push({
|
||||
id, type: ct, title, role: "positive",
|
||||
text: inputs.prompt, textKey: "prompt",
|
||||
});
|
||||
}
|
||||
|
||||
// --- Latent nodes ---
|
||||
// EmptyFlux2LatentImage (Flux.2 templates) often has width/height wired to a
|
||||
// GetImageSize node (auto-follows the reference image) rather than a direct number —
|
||||
@@ -1519,6 +1532,14 @@ export const comfyWorkflow = {
|
||||
return result;
|
||||
},
|
||||
|
||||
// True if this analysis found a video all-in-one node (see analyzeWorkflow's
|
||||
// ImageToVideo/TextToVideo prompt_nodes branch). Callers use this to pick a longer
|
||||
// generation timeout (video generation runs far longer than a still image) — see
|
||||
// generate-tab.js _coreGenerate and lab-tab.js _runLabBatch.
|
||||
isVideoWorkflow(analysis) {
|
||||
return (analysis?.prompt_nodes || []).some((n) => /ImageToVideo|TextToVideo/.test(n.type));
|
||||
},
|
||||
|
||||
applyParams(workflow, params) {
|
||||
for (const [key, value] of Object.entries(params)) {
|
||||
// Parse key format: nodeId.paramName
|
||||
|
||||
+110
-16
@@ -46,6 +46,13 @@ const API = {
|
||||
|
||||
export const FEEDER_GROUP = "__Feeder__";
|
||||
|
||||
// 拡張子から動画ファイル(mp4)かどうかを判定する。
|
||||
// 一覧アイテムは path/filename、詳細メタ(get_image_metadata)は ext フィールドを持つため両対応。
|
||||
function isVideoFile(img) {
|
||||
const source = img?.ext || img?.filename || img?.path || "";
|
||||
return source.toLowerCase().endsWith(".mp4");
|
||||
}
|
||||
|
||||
// ComfyUI Comic Creater からiframe越しに画像を受け取り、Generate UIのImage入力スロットへ直接セットする(I2I連携)。
|
||||
// Comic Creater側の「I2Iへ送る」ボタンから
|
||||
// iframe.contentWindow._wfmReceiveImageForI2I(blob, name, workflowData?, workflowFilename?) として呼ばれる。
|
||||
@@ -253,6 +260,13 @@ function formatDate(mtime) {
|
||||
return new Date(mtime * 1000).toLocaleString();
|
||||
}
|
||||
|
||||
function formatDuration(seconds) {
|
||||
const total = Math.round(seconds);
|
||||
const m = Math.floor(total / 60);
|
||||
const s = total % 60;
|
||||
return `${m}:${String(s).padStart(2, "0")}`;
|
||||
}
|
||||
|
||||
async function openImageInMetadataTab(img) {
|
||||
try {
|
||||
const res = await fetch(API.serveImage(img.path));
|
||||
@@ -578,6 +592,14 @@ function createThumbCard(img) {
|
||||
};
|
||||
card.appendChild(imgEl);
|
||||
|
||||
// 動画ファイルは再生アイコンバッジを重ねて表示(サムネイル自体は先頭フレームのJPEG)
|
||||
if (isVideoFile(img)) {
|
||||
const playBadge = document.createElement("div");
|
||||
playBadge.className = "wfm-gallery-thumb-video-badge";
|
||||
playBadge.textContent = "▶";
|
||||
card.appendChild(playBadge);
|
||||
}
|
||||
|
||||
// お気に入りトグルボタン(カード右上)
|
||||
const favBtn = document.createElement("button");
|
||||
favBtn.className = `wfm-gallery-thumb-fav-btn${img.favorite ? " active" : ""}`;
|
||||
@@ -877,18 +899,18 @@ async function loadImageDetail(img) {
|
||||
if (moveBtn) moveBtn.disabled = false;
|
||||
if (delBtn) delBtn.disabled = false;
|
||||
|
||||
// プレビュー
|
||||
// プレビュー(mp4は<video controls>、それ以外は<img>)
|
||||
const preview = document.getElementById("wfm-gallery-detail-preview");
|
||||
const isVideo = isVideoFile(img);
|
||||
const mediaHtml = isVideo
|
||||
? `<video src="${API.serveImage(img.path)}" class="wfm-gallery-detail-img" controls title="Double-click to enlarge"></video>`
|
||||
: `<img src="${API.serveImage(img.path)}" class="wfm-gallery-detail-img" alt="${escapeHtml(img.filename)}" title="Double-click to enlarge">`;
|
||||
preview.innerHTML = `
|
||||
<div class="wfm-gallery-preview-wrapper">
|
||||
<img src="${API.serveImage(img.path)}" class="wfm-gallery-detail-img" alt="${escapeHtml(img.filename)}" title="Double-click to enlarge">
|
||||
<div class="wfm-gallery-preview-overlay">
|
||||
<button class="wfm-gallery-download-btn" title="Download image">⬇</button>
|
||||
</div>
|
||||
${mediaHtml}
|
||||
</div>
|
||||
`;
|
||||
preview.querySelector("img").addEventListener("dblclick", () => openLightbox(img));
|
||||
preview.querySelector(".wfm-gallery-download-btn").addEventListener("click", () => downloadImage(img));
|
||||
preview.querySelector(isVideo ? "video" : "img").addEventListener("dblclick", () => openLightbox(img));
|
||||
|
||||
// ファイル名
|
||||
document.getElementById("wfm-gallery-detail-filename").textContent = img.filename;
|
||||
@@ -914,6 +936,7 @@ async function loadImageDetail(img) {
|
||||
renderWorkflowJson(state.embeddedWorkflow);
|
||||
_updateCopyCanvasBtn();
|
||||
renderImagePromptSection(metaRes.image_prompt);
|
||||
renderDimensionInfo(metaRes);
|
||||
// Promptタブは prompt_workflow (API形式優先) を使う。トップレベルとサブグラフに
|
||||
// 独立した複数系統を持つワークフローでは workflow (UI形式) からの抽出だと
|
||||
// トップレベル系統しか拾えないことがあるため(Metadataタブと同じ優先順位に揃える)。
|
||||
@@ -922,6 +945,7 @@ async function loadImageDetail(img) {
|
||||
renderWorkflowJson(null);
|
||||
_updateCopyCanvasBtn();
|
||||
renderImagePromptSection(null);
|
||||
renderDimensionInfo(null);
|
||||
renderPromptTab(null);
|
||||
}
|
||||
|
||||
@@ -929,6 +953,15 @@ async function loadImageDetail(img) {
|
||||
renderDetailGroup(img);
|
||||
}
|
||||
|
||||
function renderDimensionInfo(metaRes) {
|
||||
const el = document.getElementById("wfm-gallery-info-dim");
|
||||
if (!el) return;
|
||||
const parts = [];
|
||||
if (metaRes?.width && metaRes?.height) parts.push(`${metaRes.width}×${metaRes.height}`);
|
||||
if (metaRes?.duration) parts.push(formatDuration(metaRes.duration));
|
||||
el.textContent = parts.length ? parts.join(" · ") : "";
|
||||
}
|
||||
|
||||
function renderImagePromptSection(imagePrompt) {
|
||||
const section = document.getElementById("wfm-gallery-image-prompt-section");
|
||||
const text = document.getElementById("wfm-gallery-image-prompt-text");
|
||||
@@ -1014,7 +1047,8 @@ async function addTag(tag) {
|
||||
const tags = [...(state.selectedImage.tags || [])];
|
||||
if (tags.includes(tag.trim())) return;
|
||||
tags.push(tag.trim());
|
||||
await saveMetaField({ tags });
|
||||
const ok = await saveMetaField({ tags });
|
||||
if (!ok) return;
|
||||
state.selectedImage.tags = tags;
|
||||
renderTagsDisplay(tags);
|
||||
updateTagFilter(state.images);
|
||||
@@ -1023,24 +1057,38 @@ async function addTag(tag) {
|
||||
async function removeTag(tag) {
|
||||
if (!state.selectedImage) return;
|
||||
const tags = (state.selectedImage.tags || []).filter(t => t !== tag);
|
||||
await saveMetaField({ tags });
|
||||
const ok = await saveMetaField({ tags });
|
||||
if (!ok) return;
|
||||
state.selectedImage.tags = tags;
|
||||
renderTagsDisplay(tags);
|
||||
updateTagFilter(state.images);
|
||||
}
|
||||
|
||||
// 戻り値: 保存が実際にサーバーへ永続化されたか(true/false)。呼び出し元はこれを見て
|
||||
// ローカル状態(state.selectedImage等)の更新可否を判断すること — でないと、サーバーが
|
||||
// 保存を拒否した場合にもUI上は成功したように見えてしまう(リロードすると消える不具合の原因)。
|
||||
async function saveMetaField(fields) {
|
||||
if (!state.selectedImage) return;
|
||||
if (!state.selectedImage) return false;
|
||||
try {
|
||||
await fetch(API.saveImageMeta, {
|
||||
const res = await fetch(API.saveImageMeta, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ path: state.selectedImage.path, ...fields }),
|
||||
});
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const json = await res.json();
|
||||
// サーバー側は常にHTTP 200を返し、成否は body.ok (bool) で表す設計
|
||||
// (gallery_routes.py save_image_meta)。ここをチェックしないと、
|
||||
// 許可パス外などでサーバーが保存を拒否してもUI上は成功したように見えてしまう。
|
||||
if (json.error || json.ok === false) {
|
||||
throw new Error(json.error || "Save rejected by server");
|
||||
}
|
||||
const idx = state.images.findIndex(i => i.path === state.selectedImage.path);
|
||||
if (idx >= 0) Object.assign(state.images[idx], fields);
|
||||
return true;
|
||||
} catch (e) {
|
||||
showToast(t("saveFailed", e.message), "error");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1583,9 +1631,12 @@ async function bulkSetFavorite(favoriteValue) {
|
||||
function openLightbox(img) {
|
||||
const overlay = document.createElement("div");
|
||||
overlay.className = "wfm-gallery-lightbox";
|
||||
const mediaHtml = isVideoFile(img)
|
||||
? `<video src="${API.serveImage(img.path)}" class="wfm-gallery-lightbox-img" controls autoplay></video>`
|
||||
: `<img src="${API.serveImage(img.path)}" class="wfm-gallery-lightbox-img" alt="${escapeHtml(img.filename)}">`;
|
||||
overlay.innerHTML = `
|
||||
<div class="wfm-gallery-lightbox-inner">
|
||||
<img src="${API.serveImage(img.path)}" class="wfm-gallery-lightbox-img" alt="${escapeHtml(img.filename)}">
|
||||
${mediaHtml}
|
||||
<div class="wfm-gallery-lightbox-footer">${escapeHtml(img.filename)}</div>
|
||||
<button class="wfm-gallery-lightbox-close">×</button>
|
||||
</div>
|
||||
@@ -1607,12 +1658,17 @@ function openCompare(paths) {
|
||||
const overlay = document.createElement("div");
|
||||
overlay.className = "wfm-gallery-lightbox wfm-lightbox-compare";
|
||||
|
||||
const itemsHtml = imgs.map(img => `
|
||||
const itemsHtml = imgs.map(img => {
|
||||
const mediaHtml = isVideoFile(img)
|
||||
? `<video src="${API.serveImage(img.path)}" class="wfm-lightbox-compare-img" controls></video>`
|
||||
: `<img src="${API.serveImage(img.path)}" class="wfm-lightbox-compare-img" alt="${escapeHtml(img.filename)}" loading="lazy">`;
|
||||
return `
|
||||
<div class="wfm-lightbox-compare-item">
|
||||
<img src="${API.serveImage(img.path)}" class="wfm-lightbox-compare-img" alt="${escapeHtml(img.filename)}" loading="lazy">
|
||||
${mediaHtml}
|
||||
<div class="wfm-lightbox-compare-label">${escapeHtml(img.filename)}</div>
|
||||
</div>
|
||||
`).join("");
|
||||
`;
|
||||
}).join("");
|
||||
|
||||
overlay.innerHTML = `
|
||||
<div class="wfm-lightbox-compare-inner">
|
||||
@@ -1751,6 +1807,34 @@ function bindEvents() {
|
||||
}
|
||||
});
|
||||
|
||||
// 選択画像をComfyUIキャンバス上で選択中のノード(LoadImage系)のimageウィジェットへ送信。
|
||||
// Image Editタブの「Send to LI node」と同じ橋渡し(window.opener.wfmSendImageToSelectedNode、
|
||||
// node_sets_menu.js側で定義)を使う。Galleryの画像はGalleryルート配下の任意フォルダにあり得るため、
|
||||
// GenUI送信と違いLoadImageノードの有無に依存しない — /upload/imageでinputフォルダへ
|
||||
// アップロードしてから、そのファイル名を書き込む。
|
||||
document.getElementById("wfm-gallery-send-li-node-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedImage) {
|
||||
showToast(t("gallerySelectImageFirst"), "info");
|
||||
return;
|
||||
}
|
||||
if (!window.opener || typeof window.opener.wfmSendImageToSelectedNode !== "function") {
|
||||
showToast(t("sendToLiNodeNoOpener"), "error");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const res = await fetch(API.serveImage(state.selectedImage.path));
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const blob = await res.blob();
|
||||
const file = new File([blob], state.selectedImage.filename || "gallery-image.png", { type: blob.type || "image/png" });
|
||||
const result = await comfyUI.uploadImage(file, file.name);
|
||||
const filename = result.subfolder ? `${result.subfolder}/${result.name}` : result.name;
|
||||
window.opener.wfmSendImageToSelectedNode(filename);
|
||||
showToast(t("sendToLiNodeSuccess", filename), "success");
|
||||
} catch (e) {
|
||||
showToast(t("errorWithMsg", e.message), "error");
|
||||
}
|
||||
});
|
||||
|
||||
// 選択画像を ComfyUI Comic Creator の選択コマ/オーバーレイへ送信
|
||||
// (ComfyUI Comic CreaterからこのGalleryタブがiframe埋め込みされている場合のみ表示・動作する)
|
||||
const sendCcBtn = document.getElementById("wfm-gallery-send-cc-btn");
|
||||
@@ -1884,7 +1968,7 @@ function bindEvents() {
|
||||
// メモ保存
|
||||
document.getElementById("wfm-gallery-memo-save-btn")?.addEventListener("click", () => {
|
||||
const memo = document.getElementById("wfm-gallery-memo").value;
|
||||
saveMetaField({ memo }).then(() => showToast(t("memoSaved"), "success"));
|
||||
saveMetaField({ memo }).then((ok) => { if (ok) showToast(t("memoSaved"), "success"); });
|
||||
});
|
||||
|
||||
// ワークフローコピー&キャンバスへ送る
|
||||
@@ -2017,6 +2101,16 @@ function bindEvents() {
|
||||
openImageInTaggerTab(state.selectedImage);
|
||||
});
|
||||
|
||||
// Downloadボタン: プレビューのオーバーレイだと動画の再生コントロール操作を妨げるため、
|
||||
// アクションボタン行に常時表示のボタンとして配置している
|
||||
document.getElementById("wfm-gallery-download-btn")?.addEventListener("click", () => {
|
||||
if (!state.selectedImage) {
|
||||
showToast(t("gallerySelectImageFirst"), "error");
|
||||
return;
|
||||
}
|
||||
downloadImage(state.selectedImage);
|
||||
});
|
||||
|
||||
// Load in GenerateUI ボタン: 埋め込みワークフローをGenerateUIタブに読み込む
|
||||
document.getElementById("wfm-gallery-load-genui-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedImage) {
|
||||
|
||||
@@ -11,6 +11,7 @@ import { syncJsonHighlight, syncScroll } from "./json-highlight.js";
|
||||
import { initFeederTab, refreshFeederNodeList } from "./feeder-tab.js";
|
||||
import { initLabTab, refreshLabLiveDefaults } from "./lab-tab.js";
|
||||
import { getSettings, readJsonStorage, escapeHtml, getEagleSettings, saveToEagle } from "./util.js";
|
||||
import { isVideoFilename } from "./video-utils.js";
|
||||
|
||||
// ============================================
|
||||
// Gallery Metadata - ワークフロー保存
|
||||
@@ -164,6 +165,17 @@ async function saveCurrentWorkflow() {
|
||||
nameEl.dataset.filename = filename;
|
||||
}
|
||||
}
|
||||
|
||||
// このファイル名が「デフォルトワークフロー」(workflow-tab.jsの「デフォルトに設定」で
|
||||
// localStorageにスナップショットされたAPI形式JSON、ページ起動時に自動読込される)に
|
||||
// 一致する場合、保存内容と食い違ったまま残らないようスナップショットも更新する。
|
||||
// 更新しないと、ここで上書き保存しても次回リロード時に古いモデル等が復活する。
|
||||
const settings = getSettings();
|
||||
if (settings.defaultWorkflow === filename) {
|
||||
settings.defaultWorkflowData = workflow;
|
||||
localStorage.setItem("wfm_settings", JSON.stringify(settings));
|
||||
}
|
||||
|
||||
showToast(t("savedAs", filename), "success");
|
||||
} catch (err) {
|
||||
showToast(t("saveFailed", err.message), "error");
|
||||
@@ -1447,6 +1459,7 @@ async function _coreGenerate(silent = false, workflowOverride = null, genOptions
|
||||
const progressBar = document.getElementById("wfm-gen-progress-bar");
|
||||
const progressText = document.getElementById("wfm-gen-progress-text");
|
||||
const resultImg = document.getElementById("wfm-gen-result-img");
|
||||
const resultVideo = document.getElementById("wfm-gen-result-video");
|
||||
const resultThumbs = document.getElementById("wfm-gen-result-thumbs");
|
||||
|
||||
// genOptions.seedValue lets a caller (e.g. AI TOOL Chat's generate_image tool)
|
||||
@@ -1464,11 +1477,16 @@ async function _coreGenerate(silent = false, workflowOverride = null, genOptions
|
||||
const baseWorkflow = workflowOverride || comfyUI.currentWorkflow;
|
||||
const workflowStyled = _applyStyleToWorkflow({ ...baseWorkflow });
|
||||
const workflowForGenerate = await _expandWildcardsInWorkflow(workflowStyled);
|
||||
// Video workflows (e.g. MiniMax H3) run far longer than a still image — use a longer
|
||||
// timeout so a multi-minute generation doesn't get force-rejected mid-run (see
|
||||
// comfyWorkflow.isVideoWorkflow and video-tab.js's own 30-minute timeout).
|
||||
const isVideo = comfyWorkflow.isVideoWorkflow(comfyUI.currentAnalysis);
|
||||
const { images, seed, svgOutputs } = await comfyUI.generate(
|
||||
workflowForGenerate,
|
||||
{
|
||||
seedMode,
|
||||
seedValue,
|
||||
timeoutMs: isVideo ? 30 * 60 * 1000 : undefined,
|
||||
onProgress: (pct) => {
|
||||
if (progressBar) progressBar.style.width = `${(pct * 100).toFixed(1)}%`;
|
||||
if (progressText) progressText.textContent = `${(pct * 100).toFixed(0)}%`;
|
||||
@@ -1514,23 +1532,36 @@ async function _coreGenerate(silent = false, workflowOverride = null, genOptions
|
||||
});
|
||||
}
|
||||
} else if (outputImages.length > 0) {
|
||||
// Video outputs (SaveVideo/PreviewVideo, e.g. MiniMax H3) come back through the
|
||||
// same {"images":[...]} shape as still images — dispatch to <video> vs <img>
|
||||
// per-item by extension rather than assuming the whole batch is one media type.
|
||||
const showMedia = (blob, filename) => {
|
||||
const url = URL.createObjectURL(blob);
|
||||
if (isVideoFilename(filename)) {
|
||||
if (resultVideo) { resultVideo.src = url; resultVideo.style.display = "block"; }
|
||||
if (resultImg) resultImg.style.display = "none";
|
||||
} else {
|
||||
if (resultImg) { resultImg.src = url; resultImg.style.display = "block"; }
|
||||
if (resultVideo) { resultVideo.pause(); resultVideo.style.display = "none"; }
|
||||
}
|
||||
};
|
||||
|
||||
const blob = await comfyUI.getImageBlob(outputImages[0]);
|
||||
const url = URL.createObjectURL(blob);
|
||||
if (resultImg) {
|
||||
resultImg.src = url;
|
||||
resultImg.style.display = "block";
|
||||
}
|
||||
showMedia(blob, outputImages[0].filename);
|
||||
|
||||
if (resultThumbs && outputImages.length > 1) {
|
||||
resultThumbs.innerHTML = "";
|
||||
for (let i = 0; i < outputImages.length; i++) {
|
||||
const b = i === 0 ? blob : await comfyUI.getImageBlob(outputImages[i]);
|
||||
const u = i === 0 ? url : URL.createObjectURL(b);
|
||||
const thumb = document.createElement("img");
|
||||
const filename = outputImages[i].filename;
|
||||
const u = URL.createObjectURL(b);
|
||||
const isVid = isVideoFilename(filename);
|
||||
const thumb = document.createElement(isVid ? "video" : "img");
|
||||
thumb.src = u;
|
||||
if (isVid) thumb.muted = true;
|
||||
thumb.className = `wfm-gen-thumb ${i === 0 ? "active" : ""}`;
|
||||
thumb.addEventListener("click", () => {
|
||||
resultImg.src = u;
|
||||
showMedia(b, filename);
|
||||
resultThumbs.querySelectorAll(".wfm-gen-thumb").forEach((t) => t.classList.remove("active"));
|
||||
thumb.classList.add("active");
|
||||
});
|
||||
|
||||
+258
-33
@@ -256,6 +256,7 @@ const LANGUAGES = {
|
||||
labNoWorkflowLoaded: "Load a workflow into GenerateUI first",
|
||||
labNoSourceImage: "Drop a source image first",
|
||||
labNoResultsYet: "No results yet",
|
||||
labLastFrameExtractFailed: (msg) => `Failed to extract last frame from generated video: ${msg}`,
|
||||
labResultPreview: "Preview",
|
||||
labEnterPlanName: "Plan name:",
|
||||
labPlanSaved: "Plan saved",
|
||||
@@ -287,6 +288,15 @@ const LANGUAGES = {
|
||||
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",
|
||||
labPromptGroupBtnTitle: "Apply a Prompt Group",
|
||||
labPromptGroupModalTitle: "Prompt Group",
|
||||
labPromptGroupEmpty: "No groups yet. Create groups in the Prompt tab's group panel.",
|
||||
labPromptGroupCount: (n) => `${n} preset(s)`,
|
||||
labPromptGroupSelectFirst: "Select a group first",
|
||||
labPromptGroupNoPresets: "This group has no presets",
|
||||
labPromptGroupApplied: (name, n) => `Applied "${name}" (${n} keyframes) to Prompt`,
|
||||
labPromptGroupBatchRaised: (n) => `Batch count raised to ${n} to fit the group`,
|
||||
labSelectKeyframeFirst: "Select a keyframe first",
|
||||
|
||||
// -- GenerateUI Input tab: Image sub-panel placeholder --
|
||||
i2iPlaceholderTitle: "Placeholder Image",
|
||||
@@ -567,6 +577,8 @@ const LANGUAGES = {
|
||||
gallerySelectImageFirst: "Please select an image first",
|
||||
galleryNoLoadImageNode: "No LoadImage node in current workflow",
|
||||
gallerySentGenUI: "Sent to GenerateUI Image tab",
|
||||
sendToLiNodeNoOpener: "Open Workflow Studio from ComfyUI's top menu to use this feature",
|
||||
sendToLiNodeSuccess: (filename) => `Sent "${filename}" to LI node`,
|
||||
galleryCCNotAvailable: "Open this Gallery from ComfyUI Comic Creator to use Send CC",
|
||||
gallerySentCC: "Sent to ComfyUI Comic Creator",
|
||||
galleryNoEmbeddedWorkflow: "No ComfyUI workflow embedded in this image.",
|
||||
@@ -835,6 +847,8 @@ const LANGUAGES = {
|
||||
helpLab15: "Checkpoint / LoRA / VAE each carry forward independently, the same effective-value rule as every other column (see above): a keyframe in one never resets the other two to the workflow default. A field left blank in the edit modal shows \"(inherits: ...)\" as its placeholder instead of \"(workflow default)\" when an earlier keyframe in that same list already set something, so it's clear what actually applies. \"Revert to #1's setting\" and Bypass — like +/- — only ever affect whichever ONE of the three is currently selected by the C/L/V toggle, never the other two",
|
||||
helpLab16: "Bypass LoRA node checkbox (LoRA keyframe's own edit modal only): forces that keyframe's strength_model/strength_clip to 0 at apply-time, standing in for ComfyUI's own node Bypass (mode:4) — the workflow used here is already converted to API format, which has no mode concept, so zeroing strength is the behavioral equivalent. Disables the strength fields while checked; independent of the row-level Bypass checkbox above (see helpLab13), which skips the whole row instead of touching the node",
|
||||
helpLab17: "Apply LoRA syntax + trigger words to Positive prompt checkbox (LoRA column only): when checked, appends <lora:name:strengthModel:strengthClip> plus that LoRA's cached CivitAI trigger words to the Positive prompt, comma-separated, at apply-time — the same format GenerateUI's own Model tab Apply button writes. Switching keyframes (a different LoRA, this checkbox turned off, or the row Bypassed) always strips exactly what the previous iteration injected before adding anything new, so a batch never accumulates every LoRA it has used. Disabled automatically while Bypass LoRA node is checked",
|
||||
helpLab18: "A single click on a keyframe cell selects it (blue outline) instead of opening it — double-click to open the edit modal as before. Each column's header (Model / Prompt / Ksampler) also has ▲ / ▼ buttons that swap the selected keyframe with its immediate neighbor to reorder them without retyping anything; keyframe #1 (the baseline) can never move, and nothing can be swapped into its slot",
|
||||
helpLab19: "Prompt column header's PG button: pick one of the Prompt tab's preset groups (Table view's Presets Group, the same groups used by the Batch tab's checklist) and replace the entire Prompt column with one keyframe per preset in that group's order, starting at #1 (#1 is overwritten, not appended after). If the group has more presets than the current Batch count, Batch count is raised automatically to fit (capped at 50, the Batch input's own limit); anything still beyond that shows the usual \"keyframes beyond Batch count\" warning instead of being silently dropped",
|
||||
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",
|
||||
@@ -878,6 +892,7 @@ const LANGUAGES = {
|
||||
helpPrompt23: "Wildcards table — same files as the Form tab's Wildcard file manager; editing the File path or the Ext dropdown renames the file (saves the content under the new name, then removes the old file)",
|
||||
helpPrompt24: "Style table — same styles as the Form tab's Style manager, editable inline the same way as Presets",
|
||||
helpPrompt25: "Presets table toolbar — the ★ and B sort buttons (next to the search box) bring favorited / batch-selected presets to the top of the list; both can be enabled together (★ takes priority, B breaks ties), and everything else keeps its original relative order",
|
||||
helpPrompt26: "Style table toolbar — select exactly one row whose File badge isn't custom.json to enable + Add to this file: it adds a blank row targeting that same file (shown as a badge in the File column even before saving) — the same capability as the Form tab's Style manager (see above); custom.json entries and multi-row selections leave the button disabled, use the regular + New Style button for those instead",
|
||||
helpSettings1: "UI language and summary language",
|
||||
helpSettings2: "Theme selection (13 presets) with customization: color overrides, background patterns (stripes, polka dot, checkerboard, SVG tiling), and font selection (16 Google Fonts including Japanese display fonts)",
|
||||
helpSettings3: "Workflow data folder path",
|
||||
@@ -885,7 +900,9 @@ const LANGUAGES = {
|
||||
helpSettings5: "AI Assistant (Prompt Tab): backend (Ollama / LM Studio / Lemonade), API URL, default model, and connection test",
|
||||
helpSettings6: "Default workflow setting",
|
||||
helpSettings7: "Eagle integration URL and auto-save toggle",
|
||||
helpSettings8: "Data Management: export all plugin data (settings, metadata, prompts, etc.) to a JSON file, or import to restore. After importing, restart ComfyUI.",
|
||||
helpSettings8: "Data Management: export core settings, metadata, and prompts to a JSON file, or import to restore. After importing, restart ComfyUI.",
|
||||
helpSettings15: "Full Backup (ZIP): unlike the JSON export above, also includes folder-based data (AI Skills, Lab Plans, Style presets) and the Tagger database — everything the JSON export can't represent. Restoring overwrites existing files; restart ComfyUI afterward.",
|
||||
helpSettings16: "Two opt-in checkboxes above the Full Backup buttons additionally include ComfyUI's default workflows folder and the Impact Pack's wildcard folder in the export — both export-only, never restored automatically; copy the ZIP's _external/ folder back by hand if you want them.",
|
||||
helpSettings9: "All sections are collapsible accordion panels",
|
||||
helpSettings10: "Wildcard Integration: link WFS wildcard dir to ComfyUI-Impact-Pack wildcards (directory junction on Windows / symlink on other OS); existing files migrated automatically",
|
||||
helpSettings11: "Text Size: one slider (10–28 px) adjusts font size for all prompt and chat textareas at once — Generate UI positive/negative prompts, AI Assistant chat input, Preset positive/negative, Wildcard prompt and file editor, and Metadata prompt full preview; takes effect immediately and saved with Save Settings",
|
||||
@@ -918,17 +935,18 @@ const LANGUAGES = {
|
||||
helpGallery4: "Toolbar filters: favorites (★), text search (filename / tag / prompt), tag filter, group filter, sort by date/name",
|
||||
helpGallery5: "Folder tree: click to load images, expand with ▶; '+ New' creates a subfolder inside the selected folder, 'Del' deletes it with all contents",
|
||||
helpGallery6: "Multi-select: Ctrl+click to toggle individual images; Shift+click to range-select from the last clicked item — bulk bar: select group → 'Add to Group' / 'Remove from Group'; 'Favorite All' / 'Unfavorite All'; 'Compare' (2–4 images); 'Move To...'; 'Delete File'",
|
||||
helpGallery7: "Detail panel — Info tab: filename, size, date, tags (add/remove), memo; 'Move To...' moves the image to another folder, 'Delete File' removes it permanently",
|
||||
helpGallery7: "Detail panel — Info tab: filename, size, dimensions (image width×height) or video duration, date, tags (add/remove), memo; 'Move To...' moves the image to another folder, 'Delete File' removes it permanently",
|
||||
helpGallery8: "Detail panel — JSON tab: displays workflow JSON from PNG embedded data (prompt / workflow keys) or from metadata saved by the Generate UI tab; 'Copy & Send Canvas' button copies to clipboard and sends the workflow directly to the ComfyUI canvas (requires Workflow Studio to be opened from the ComfyUI toolbar; UI-format only falls back to title drag if opened from a bookmark)",
|
||||
helpGallery9: "Detail panel — Groups tab: create, assign, remove, rename, and delete groups per image",
|
||||
helpGallery10: "Workflow auto-save: images generated in the Generate UI tab automatically have their workflow saved to gallery metadata and shown in the JSON tab",
|
||||
helpGallery11: "Supports PNG (tEXt/iTXt), JPEG, WebP, GIF; workflow extraction reads ComfyUI prompt and workflow keys embedded in PNG metadata",
|
||||
helpGallery11: "Supports PNG (tEXt/iTXt), JPEG, WebP, GIF, MP4; workflow extraction reads ComfyUI prompt/workflow keys embedded in PNG metadata or in MP4 container tags (as written by SaveVideo, e.g. MiniMax H3 output)",
|
||||
helpGallery12: "Metadata button (green, in the detail panel tab bar): opens the selected image in the Metadata tab for full embedded-data inspection; Alt+click on any image thumbnail has the same effect",
|
||||
helpGallery13: "Load GenUI button (blue, in the detail panel tab bar): loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab and switches to it; shows a warning toast if no workflow is embedded or the format is not supported",
|
||||
helpGallery14: "Tagger button (purple, in the detail panel action row): opens the selected image directly in the Tagger tab's Single mode for instant tagging",
|
||||
helpGallery15: "F button (cyan overlay, top-left of each thumbnail): toggle the image in/out of the __Feeder__ group with a single click; cyan and always visible when in group, visible on hover only when not; quickly queue images for the Feeder tab Gallery mode",
|
||||
helpGallery16: "Image Edit button (toolbar, next to Refresh): sends the currently selected image to the Image Edit tab; if layers already exist the image is added as a new layer scaled to fit the canvas, otherwise it becomes Layer 1",
|
||||
helpGallery17: "Send GenUI Image button (toolbar, next to Image Edit): uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded first",
|
||||
helpGallery27: "Send to LI node button (toolbar, next to Send GenUI Image): uploads the selected image and writes its filename into the image widget of the currently selected node on the ComfyUI canvas (falling back to the first LoadImage-type node found) — same destination as Image Edit tab's Send to LI node; requires Workflow Studio to have been opened from ComfyUI's top menu button",
|
||||
helpGallery18: "Second sub-tab next to Output (top of the Gallery tab) for browsing a visual prompt library — manages the ws_image_prompt folder inside the ComfyUI output directory (created automatically)",
|
||||
helpGallery19: "Same 3-column layout: folder tree (left) | thumbnails (center) | prompt builder (right). Click a thumbnail to preview it and its prompt text — this does not add it to the prompt yet",
|
||||
helpGallery20: "\"+ Add\" appends the previewed image's prompt as a chip under \"Selected Prompts\"; chips can be removed individually (×) or all at once (\"Clear All\"); \"Save\" edits and persists the prompt text for that image",
|
||||
@@ -964,7 +982,7 @@ const LANGUAGES = {
|
||||
helpSidepanel10: "Search within each sub-tab to quickly find items",
|
||||
helpSidepanel11: "Models tab: All / ★ Favorites / Groups / By Type sub-tabs; Prompts tab: All / ★ Favorites / Categories sub-tabs + Groups sub-tab (row 2); Models Groups — LoRA groups show an \"All N LoRAs\" item to drag all into a single Lora Loader (LoraManager) node",
|
||||
helpSidepanel12: "⚙ Theme button (header): customize panel background, sub-header background, text, border, and secondary text colors — changes are saved to localStorage and applied on next open",
|
||||
helpSidepanel13: "I tab (Information): drop a ComfyUI PNG/WebP/JSON to inspect model, LoRA, and prompt metadata in the side panel — sub-tabs: model / lora / Prompts; supports UnetLoaderGGUF, QuadrupleCLIPLoader, and Lora Loader (LoraManager) node types",
|
||||
helpSidepanel13: "I tab (Information): drop a ComfyUI PNG/WebP/MP4/JSON to inspect model, LoRA, and prompt metadata in the side panel — sub-tabs: model / lora / Prompts; supports UnetLoaderGGUF, QuadrupleCLIPLoader, and Lora Loader (LoraManager) node types; MP4 reads the workflow/prompt tags embedded by SaveVideo, including all-in-one video nodes like MiniMax H3 ImageToVideo",
|
||||
helpSidepanel14: "Information tab — drag items to canvas: model sub-tab places the loader node (Checkpoint → CheckpointLoaderSimple, VAE → VAELoader, Diffusion Model → UNETLoader, Text Encoder → CLIPLoader); double-click also places at canvas center",
|
||||
helpSidepanel15: "Information tab — LoRA sub-tab: detects LoRAs from LoraLoader, LoraLoaderModelOnly, and Lora Loader (LoraManager) nodes (API format supported); drag individual LoRA to place LoraLoader; \"Multiple LORA\" section places all LoRAs in a single Lora Loader (LoraManager) node with LoRA syntax pre-filled; Prompts sub-tab: drag a prompt to place CLIPTextEncode node with text pre-filled; click prompt to view full text and copy",
|
||||
helpSidepanel16: "A tab (AI Tools): Translation, Chat, TOOLS, and Settings sub-tabs powered by Ollama, LM Studio, Lemonade, or Unsloth; Chat supports multi-turn conversations; TOOLS includes VLM image analysis and wildcard generation; settings shared with the SPA AI TOOL tab via localStorage",
|
||||
@@ -1069,8 +1087,7 @@ const LANGUAGES = {
|
||||
helpImageEditExportTitle: "Export & Navigation",
|
||||
helpImageEdit17: "Save PNG: composites all visible layers and downloads the result as a PNG file",
|
||||
helpImageEdit18: "Save to Gallery: prompts for a filename (default: wfs-image-YYYYMMDDHHmmss) and saves the composite PNG directly to the Gallery root folder (configured in Settings > Gallery Output Folder); requires the Gallery tab to have been opened at least once to set the root",
|
||||
helpImageEdit19: "Save to Input: uploads the composite PNG to ComfyUI's input folder via /upload/image, making it selectable in Load Image nodes",
|
||||
helpImageEdit19b: "Send to Workflow: uploads the composite PNG (same as Save to Input) and additionally writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable",
|
||||
helpImageEdit19b: "Send to LI node: uploads the composite PNG to ComfyUI's input folder via /upload/image and writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable",
|
||||
helpImageEdit20: "Canvas navigation: scroll wheel to zoom, Space + drag to pan",
|
||||
helpImageEdit21: "Undo / Redo: Ctrl+Z / Ctrl+Y (or toolbar buttons ↩ ↪)",
|
||||
helpImageEditKbdTitle: "Image Edit Keyboard Shortcuts",
|
||||
@@ -1192,13 +1209,20 @@ const LANGUAGES = {
|
||||
eagleUrl: "Eagle URL",
|
||||
eagleAutoSave: "Auto-save generated images to Eagle",
|
||||
dataManagement: "Data Management",
|
||||
dataManagementHint: "Export all plugin data (settings, metadata, prompts, etc.) to a JSON file, or import a previously exported file to restore data. After importing, restart ComfyUI to apply changes.",
|
||||
dataManagementHint: "Export core settings, metadata, and prompts to a JSON file, or import a previously exported file to restore them. After importing, restart ComfyUI to apply changes.",
|
||||
exportData: "Export",
|
||||
importData: "Import",
|
||||
exportSuccess: "Export complete",
|
||||
exportError: "Export failed",
|
||||
importSuccess: "Import complete",
|
||||
importError: "Import failed",
|
||||
exportFullBackup: "Full Backup (ZIP)",
|
||||
importFullBackup: "Restore Full Backup (ZIP)",
|
||||
fullBackupHint: "Full Backup (ZIP) additionally includes folder-based data (AI Skills, Lab Plans, Style presets) and the Tagger database — everything the JSON export above can't represent. Restoring overwrites existing files; restart ComfyUI afterward.",
|
||||
fullBackupFilesUnit: "files",
|
||||
fullBackupIncludeWorkflows: "Include default workflows folder (user/default/workflows)",
|
||||
fullBackupIncludeWildcard: "Include Impact Pack wildcard folder (if present)",
|
||||
fullBackupExternalHint: "These are export-only — restoring a backup never touches them; copy the _external/ folder back manually if needed.",
|
||||
saveSettings: "Save Settings",
|
||||
settingsSaved: "Settings saved",
|
||||
ollamaSaved: "AI Assistant settings saved",
|
||||
@@ -1267,8 +1291,8 @@ const LANGUAGES = {
|
||||
metaSectionTe: "Text Encoder",
|
||||
metaSectionLora: "LoRA",
|
||||
metaSectionPrompt: "Prompt",
|
||||
metaDropMain: "Drop image / JSON",
|
||||
metaDropSub: "PNG · WebP · JSON",
|
||||
metaDropMain: "Drop image / video / JSON",
|
||||
metaDropSub: "PNG · WebP · MP4 · JSON",
|
||||
metaParsing: "Parsing...",
|
||||
metaFileTooLarge: "File too large (max 50 MB)",
|
||||
metaNoMetadata: "No metadata found",
|
||||
@@ -1278,7 +1302,7 @@ const LANGUAGES = {
|
||||
metaPromptText: "Text",
|
||||
metaSelectPrompt: "Select a prompt above to view full text...",
|
||||
metaFormatNoteTitle: "Supported formats",
|
||||
metaFmtComfyui: "ComfyUI — PNG / WebP / JSON",
|
||||
metaFmtComfyui: "ComfyUI — PNG / WebP / MP4 / JSON",
|
||||
metaFmtSdwebui: "SD WebUI / SD Forge — PNG (parameters)",
|
||||
metaFmtFooocus: "Fooocus — PNG (fooocus_scheme)",
|
||||
metaFormatTodo: "Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image subgraph workflows supported",
|
||||
@@ -1288,8 +1312,59 @@ const LANGUAGES = {
|
||||
helpMetadata2: "Center column: Checkpoint, VAE, Diffusion Model, and Text Encoder lists extracted from the workflow",
|
||||
helpMetadata3: "Right column: LoRA list (with strength values) and Prompt list (click to view full text below)",
|
||||
helpMetadata4: "Prompt actions — Copy: copy to clipboard; GenUI:P/N: set GenerateUI positive/negative prompt; Prompt:P/N: set Prompt tab preset positive/negative",
|
||||
helpMetadata5: "Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image subgraph workflows), SD WebUI, SD Forge, Fooocus.",
|
||||
helpMetadata5: "Supported: ComfyUI PNG/WebP/MP4/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image subgraph workflows; MP4 reads the workflow/prompt container tags written by SaveVideo, including all-in-one video nodes like MiniMax H3 ImageToVideo), SD WebUI, SD Forge, Fooocus.",
|
||||
helpMetadata6: "This is now a sub-tab inside the Gallery tab (to the right of Style_Catalog), rather than its own top-level tab — everything else about it works exactly the same",
|
||||
|
||||
// -- Video Tab (MiniMax H3, independent of GenerateUI) --
|
||||
tabVideo: "Video",
|
||||
loadInVideo: "Load in Video",
|
||||
videoTitle: "Video (MiniMax H3)",
|
||||
videoFirstFrame: "First Frame (optional)",
|
||||
videoLastFrame: "Last Frame (optional)",
|
||||
videoDropOrClick: "Drop image or click to select",
|
||||
videoPrompt: "Prompt",
|
||||
videoAspectRatio: "Aspect Ratio",
|
||||
videoMegapixels: "Megapixels",
|
||||
videoMultiple: "Multiple",
|
||||
videoDuration: "Duration (seconds)",
|
||||
videoNoiseSeed: "Noise Seed",
|
||||
videoRandomizeSeed: "Randomize",
|
||||
videoGenerate: "Generate",
|
||||
videoEditPlaceholder: "Editing tools coming soon",
|
||||
videoNoWorkflowLoaded: "No workflow loaded",
|
||||
videoUnsupportedWorkflow: "This workflow does not contain a MiniMax H3 Image-to-Video node",
|
||||
videoWorkflowLoaded: (name) => `Workflow loaded: ${name}`,
|
||||
videoGenerateSuccess: "Video generated",
|
||||
videoDoneCount: (n) => `Done (${n} file${n === 1 ? "" : "s"})`,
|
||||
videoSourceLabel: "Video Source",
|
||||
videoSourceHint: "Load any video here to use Frame/GIF tools without generating one.",
|
||||
videoSourceDropLabel: "Drop video or click to select",
|
||||
videoNoVideo: "No video",
|
||||
videoPropFrame: "Frame",
|
||||
videoPropGif: "GIF",
|
||||
videoFrameHint: "Play/seek the preview video to the position you want, then capture.",
|
||||
videoCaptureFrame: "Capture Frame",
|
||||
videoSaveToOutput: "Save to Output",
|
||||
videoFrameSaved: (name) => `Frame saved: ${name}`,
|
||||
videoFrameCaptureFailed: (msg) => `Failed to capture frame: ${msg}`,
|
||||
videoGifStart: "Start (s)",
|
||||
videoGifEnd: "End (s)",
|
||||
videoGifFps: "FPS",
|
||||
videoGifWidth: "Max Width",
|
||||
videoConvertToGif: "Convert to GIF",
|
||||
videoGifConverting: "Converting...",
|
||||
videoGifDoneCount: (n) => `Done (${n} frame${n === 1 ? "" : "s"})`,
|
||||
videoGifSaved: (name) => `GIF saved: ${name}`,
|
||||
videoNoSourceLoaded: "Load a video first (generate one, or drop a file into Video Source)",
|
||||
helpVideoTitle: "Video Tab",
|
||||
helpVideoDesc: "A dedicated video generation tab for the MiniMax H3 (Image to Video) workflow, independent of the GenerateUI tab.",
|
||||
helpVideo1: "Set first_frame (optional) / last_frame (optional) images, prompt, aspect_ratio / megapixels / multiple (resolution), duration (seconds), and noise_seed, then click Generate. Leaving first_frame empty runs the workflow text-only (bypassed), and workflows with no LoadImage node at all are also supported.",
|
||||
helpVideo2: "Model selection (UNet / CLIP / VAE / Audio VAE) is fixed to the loaded workflow's defaults and cannot be changed from this tab.",
|
||||
helpVideo3: "Use the \"Load in Video\" button in the Workflow tab's detail modal to load a workflow containing a MiniMax H3 Image-to-Video node. Unsupported workflows show an error instead.",
|
||||
helpVideo4: "Generated videos (mp4) can also be browsed and played back in the Gallery tab.",
|
||||
helpVideo5: "The Video Source panel next to the preview lets you drop or pick any local video (not just a generated one) to use the Frame/GIF tools below without running MiniMax H3 first; Clear resets it back to empty.",
|
||||
helpVideo6: "Frame tab (right panel): play/seek the preview video to the position you want, click Capture Frame to grab that frame client-side, then Save to Output to write it as a PNG into ComfyUI's output folder.",
|
||||
helpVideo7: "GIF tab (right panel): set Start/End (seconds), FPS, and an optional Max Width, then Convert to GIF — the server decodes the video and encodes an animated GIF into ComfyUI's output folder.",
|
||||
},
|
||||
|
||||
ja: {
|
||||
@@ -1542,6 +1617,7 @@ const LANGUAGES = {
|
||||
labNoWorkflowLoaded: "先にGenerateUIでワークフローを読み込んでください",
|
||||
labNoSourceImage: "先に元になる画像をドロップしてください",
|
||||
labNoResultsYet: "まだ結果がありません",
|
||||
labLastFrameExtractFailed: (msg) => `生成された動画から最終フレームの抽出に失敗しました: ${msg}`,
|
||||
labResultPreview: "プレビュー",
|
||||
labEnterPlanName: "プラン名:",
|
||||
labPlanSaved: "プランを保存しました",
|
||||
@@ -1573,6 +1649,15 @@ const LANGUAGES = {
|
||||
labT2IImageIgnored: "T2Iモードが有効なため、画像のアップロードは不要としてスキップしました",
|
||||
labIndexImageSaved: (filename) => `インデックス画像をOutputへ保存しました: ${filename}`,
|
||||
labIndexImageSaveFailed: "インデックス画像のOutputへの保存に失敗しました",
|
||||
labPromptGroupBtnTitle: "プロンプトグループを適用",
|
||||
labPromptGroupModalTitle: "プロンプトグループ",
|
||||
labPromptGroupEmpty: "グループがまだありません。Promptタブのグループパネルで作成してください。",
|
||||
labPromptGroupCount: (n) => `プリセット${n}件`,
|
||||
labPromptGroupSelectFirst: "先にグループを選択してください",
|
||||
labPromptGroupNoPresets: "このグループにはプリセットがありません",
|
||||
labPromptGroupApplied: (name, n) => `「${name}」(${n}件のキーフレーム)をPromptに適用しました`,
|
||||
labPromptGroupBatchRaised: (n) => `グループに合わせてBatch数を${n}に増やしました`,
|
||||
labSelectKeyframeFirst: "先にキーフレームを選択してください",
|
||||
|
||||
// -- GenerateUIタブ Inputサブタブ: Image内プレースホルダ --
|
||||
i2iPlaceholderTitle: "プレースホルダ画像",
|
||||
@@ -1853,6 +1938,8 @@ const LANGUAGES = {
|
||||
gallerySelectImageFirst: "先に画像を選択してください",
|
||||
galleryNoLoadImageNode: "現在のワークフローにLoadImageノードがありません",
|
||||
gallerySentGenUI: "GenerateUI Imageタブへ送信しました",
|
||||
sendToLiNodeNoOpener: "この機能を使うにはComfyUIのトップメニューからWorkflow Studioを起動してください",
|
||||
sendToLiNodeSuccess: (filename) => `"${filename}" をLIノードへ送信しました`,
|
||||
galleryCCNotAvailable: "Send CCはComfyUI Comic Creator内のギャラリーから開いた場合のみ使用できます",
|
||||
gallerySentCC: "ComfyUI Comic Creatorへ送信しました",
|
||||
galleryNoEmbeddedWorkflow: "この画像にはComfyUIワークフローが埋め込まれていません。",
|
||||
@@ -2121,6 +2208,8 @@ const LANGUAGES = {
|
||||
helpLab15: "Checkpoint/LoRA/VAEは、他の列と全く同じ実効値ルール(上記参照)でそれぞれ独立して引き継がれます:いずれか1つのキーフレームが、残り2つをワークフロー本来の設定に戻すことはありません。編集モーダルで未設定のままの項目は、同じリスト内の以前のキーフレームで何か設定済みの場合、プレースホルダが「(ワークフローの設定のまま)」ではなく「(引き継ぎ: ...)」と表示され、実際に適用される値が分かるようになっています。「1回目の設定に戻す」やBypassも+/-と同様、現在C/L/Vトグルで選択中の1項目だけに作用し、残り2つには影響しません",
|
||||
helpLab16: "LoRAノードをバイパスチェックボックス(LoRAキーフレーム自身の編集モーダルのみ):ComfyUI本来のノードBypass(mode:4)の代わりに、そのキーフレームのstrength_model/strength_clipを適用時に強制的に0にします — ここで使われるワークフローは既にAPI形式に変換済みでmodeの概念が無いため、強度をゼロにすることが実質的に同等の効果になります。チェック中は強度の入力欄が無効化されます。上記の行単位のBypassチェックボックス(helpLab13参照)とは独立しており、そちらは行全体をスキップするだけでノードには一切触れません",
|
||||
helpLab17: "LoRA構文とトリガーワードをポジティブプロンプトに適用チェックボックス(LoRA列のみ):チェックすると、適用時に <lora:name:strengthModel:strengthClip> とそのLoRAのキャッシュ済みCivitAIトリガーワードを、カンマ区切りでポジティブプロンプトへ追加します — GenerateUIのModelタブのApplyボタンが書き込むのと同じ書式です。キーフレームを切り替えた場合(別のLoRAへの変更、このチェックボックスをオフにした場合、または行自体をBypassした場合)は、新しい内容を追加する前に必ず直前のイテレーションが注入した分だけを正確に取り除くため、バッチ内で使われた全LoRAが蓄積されることはありません。「LoRAノードをバイパス」がチェックされている間は自動的に無効化されます",
|
||||
helpLab18: "キーフレームセルはシングルクリックで選択(青い枠線)に変わり、開くにはダブルクリックが必要になりました。各カラムのヘッダー(Model/Prompt/Ksampler)には▲/▼ボタンもあり、選択中のキーフレームを隣接するものと入れ替えて、入力し直すことなく並び順を変更できます。キーフレーム#1(ベースライン)は移動できず、他のキーフレームが#1の位置に入れ替わることもありません",
|
||||
helpLab19: "Promptカラムヘッダーの PG ボタン:Promptタブのプリセットグループ(Tableビューの Presets Group、Batchタブのチェックリストと同じグループ)を1つ選ぶと、Prompt列全体をそのグループの並び順で1プリセットにつき1キーフレームへ置き換えます(#1から開始、#1は上書きで追加ではありません)。グループのプリセット数が現在のBatch数を超える場合はBatch数を自動的に引き上げます(上限50、Batch入力欄自体の上限と同じ)。それでも収まらない分は静かに削除されず、通常の「Batch数を超えたキーフレーム」警告が表示されます",
|
||||
helpLabCardPlanTitle: "Settingサブタブ — 実行とプランファイル",
|
||||
helpLabPlan1: "右ペイン — Batch:実行する回数。Note:プランと一緒に保存される自由記述のメモ",
|
||||
helpLabPlan2: "Run/Pause/Cancel:Runでバッチループを開始、Pause/Resumeで回と回の間を一時停止・再開、Cancelで現在の生成を中断してループを止めます",
|
||||
@@ -2164,6 +2253,7 @@ const LANGUAGES = {
|
||||
helpPrompt23: "Wildcardsテーブル — Formタブのワイルドカードファイルマネージャーと同じファイル一覧です。File列のパスやExtドロップダウンを編集するとファイル名が変更されます(新しい名前で内容を保存してから、古いファイルを削除します)",
|
||||
helpPrompt24: "Styleテーブル — Formタブのスタイル管理と同じスタイル一覧で、Presetsと同様にインライン編集できます",
|
||||
helpPrompt25: "Presetsテーブルのツールバー — 検索ボックス横の★とBソートボタンで、お気に入り/Batch登録済みのプリセットを一覧の先頭に並べ替えます。両方同時にONにでき、その場合は★が優先、Bが次点の基準になり、それ以外は元の相対順序を維持します",
|
||||
helpPrompt26: "Styleテーブルのツールバー — Fileバッジがcustom.jsonではない行を1件だけ選択すると「+ Add to this file」が有効になります。同じファイルを追加先とする空の行を追加します(保存前からFile列にバッジで表示されます)— Formタブのスタイルマネージャーと同じ機能です(上記参照)。custom.jsonのスタイルや複数選択時はボタンが無効のままです。その場合は通常の「+ New Style」を使ってください",
|
||||
helpSettings1: "UI言語と要約言語の設定",
|
||||
helpSettings2: "テーマ選択(13種プリセット)+カスタマイズ:カラー調整、背景パターン(ストライプ、ポルカドット、チェック、SVGタイリング)、フォント選択(日本語デザインフォント含む16種のGoogle Fonts)",
|
||||
helpSettings3: "ワークフローデータフォルダのパス変更・リセット",
|
||||
@@ -2171,7 +2261,9 @@ const LANGUAGES = {
|
||||
helpSettings5: "AI Assistant(プロンプトタブ):バックエンド(Ollama / LM Studio / Lemonade)・API URL・デフォルトモデル・接続テスト",
|
||||
helpSettings6: "デフォルトワークフローの設定・解除",
|
||||
helpSettings7: "Eagle連携URL、自動保存の有効/無効",
|
||||
helpSettings8: "データ管理:設定・メタデータ・プロンプトなど全データをJSONにエクスポート、またはインポートして復元。インポート後はComfyUIを再起動してください。",
|
||||
helpSettings8: "データ管理:設定・メタデータ・プロンプトなど主要データをJSONにエクスポート、またはインポートして復元。インポート後はComfyUIを再起動してください。",
|
||||
helpSettings15: "フルバックアップ (ZIP):上記のJSONエクスポートと異なり、フォルダ形式のデータ(AI Skills、Lab Plan、Styleプリセット)とTaggerデータベースも含みます。復元すると既存ファイルは上書きされます。復元後はComfyUIを再起動してください。",
|
||||
helpSettings16: "フルバックアップのボタン上にある2つのチェックボックスで、デフォルトワークフローフォルダーとImpact Packのwildcardフォルダーもエクスポートに含められます。どちらもエクスポート専用で自動復元はされません。必要な場合はZIP内の_external/フォルダから手動でコピーしてください。",
|
||||
helpSettings9: "各セクションはアコーディオン式で折りたたみ可能",
|
||||
helpSettings10: "Wildcard Integration:WFSのワイルドカードディレクトリをComfyUI-Impact-Packのwildcardsディレクトリへリンク(Windowsはジャンクション、他OSはシンボリックリンク)。既存ファイルは自動で移行されます",
|
||||
helpSettings11: "テキストサイズ:スライダー1本(10〜28px)でプロンプト・チャット全テキストエリアのフォントサイズを一括調整 — GenerateUI ポジティブ/ネガティブプロンプト、AIアシスタントチャット入力、プリセット ポジティブ/ネガティブ、ワイルドカードプロンプト・ファイルエディタ、メタデータプロンプト全文プレビュー;即時反映・保存で確定",
|
||||
@@ -2204,17 +2296,18 @@ const LANGUAGES = {
|
||||
helpGallery4: "ツールバーフィルタ:お気に入り(★)、テキスト検索(ファイル名・タグ・プロンプト)、タグフィルタ、グループフィルタ、日付・名前ソート",
|
||||
helpGallery5: "フォルダツリー:クリックで画像を読み込み;▶で展開;「+ New」で選択フォルダ内にサブフォルダを作成;「Del」でそのフォルダとすべての内容を削除",
|
||||
helpGallery6: "複数選択:Ctrl+クリックで個別トグル;Shift+クリックで最後にクリックした位置から範囲選択 — 一括操作バー:グループを選択して「グループに追加」/「グループから削除」;「お気に入り追加(全件)」/「お気に入り解除(全件)」;「比較」(2〜4枚選択時);「移動先...」;「ファイル削除」",
|
||||
helpGallery7: "詳細パネル — Infoタブ:ファイル名、サイズ、日付、タグ(追加/削除)、メモ;「Move To...」で他フォルダへ移動;「ファイル削除」で完全削除",
|
||||
helpGallery7: "詳細パネル — Infoタブ:ファイル名、サイズ、寸法(画像は幅×高さ、動画は再生時間)、日付、タグ(追加/削除)、メモ;「Move To...」で他フォルダへ移動;「ファイル削除」で完全削除",
|
||||
helpGallery8: "詳細パネル — JSONタブ:PNGの埋め込みデータ(prompt / workflow キー)またはGenerateUIタブで保存したメタデータからワークフローJSONを表示;「Copy & Send Canvas」ボタンでクリップボードにコピーしてComfyUIキャンバスへ直接送信(UI形式・API形式どちらも対応);ComfyUIツールバーから開いていない場合はUI形式のみタイトルドラッグのフォールバック",
|
||||
helpGallery9: "詳細パネル — Groupsタブ:画像ごとのグループ作成、割り当て、解除、名前変更、削除",
|
||||
helpGallery10: "ワークフロー自動保存:GenerateUIタブで生成した画像はワークフローが自動でギャラリーメタデータに保存され、JSONタブで確認可能",
|
||||
helpGallery11: "PNG (tEXt/iTXt)、JPEG、WebP、GIF対応;PNG形式はComfyUIの埋め込みJSON(prompt / workflow キー)を読み込んでワークフロー抽出が可能",
|
||||
helpGallery11: "PNG (tEXt/iTXt)、JPEG、WebP、GIF、MP4対応;PNG形式はComfyUIの埋め込みJSON(prompt / workflow キー)、MP4形式はSaveVideoが書き込むコンテナタグ(同キー、MiniMax H3出力等)からワークフロー抽出が可能",
|
||||
helpGallery12: "Metadataボタン(緑、詳細パネルのタブバー内):選択画像をMetadataタブで開いて埋め込みデータを詳細確認。画像サムネイルのAlt+クリックでも同じ操作が可能",
|
||||
helpGallery13: "Load GenUIボタン(青、詳細パネルのタブバー内):選択画像に埋め込まれたComfyUIワークフローをGenerateUIタブへ直接読み込んで切り替え。ワークフローが埋め込まれていない場合や非対応形式の場合は警告トーストを表示",
|
||||
helpGallery14: "Taggerボタン(紫、詳細パネルのアクション行):選択画像をTaggerタブのSingleモードで直接開き、即座にタグ付けを開始できる",
|
||||
helpGallery15: "Fボタン(シアン色オーバーレイ、各サムネイル左上):クリック一つで画像を __Feeder__ グループに追加/削除;グループ内の場合は常にシアン色で表示、非グループ時はホバー時のみ表示;FeederタブのGalleryモードへ素早く画像を追加できる",
|
||||
helpGallery16: "Image Editボタン(ツールバー、Refreshボタン横):選択中の画像をImage Editタブに送信;既にレイヤーが存在する場合はキャンバスに合わせてスケールして新規レイヤーとして追加、存在しない場合はLayer 1になる",
|
||||
helpGallery17: "Send GenUI Imageボタン(ツールバー、Image Editボタン横):選択画像をComfyUIにアップロードし、GenerateUIタブの最初のLoadImageノードへ入力として設定;GenerateUI → Input → Imageへ自動切り替え;事前にLoadImageノードを含むワークフローの読み込みが必要",
|
||||
helpGallery27: "Send to LI nodeボタン(ツールバー、Send GenUI Imageボタン横):選択画像をアップロードし、そのファイル名をComfyUIキャンバス上で選択中のノード(無ければ最初に見つかったLoadImage系ノード)のimageウィジェットへ書き込む — Image EditタブのSend to LI nodeと同じ送信先;ComfyUIのトップメニューボタンからWorkflow Studioを起動している必要がある",
|
||||
helpGallery18: "GalleryタブのOutputと並ぶ2つ目のサブタブ。視覚的なプロンプトライブラリを閲覧できる — ComfyUI outputフォルダ内のws_image_promptフォルダを管理(未作成時は自動生成)",
|
||||
helpGallery19: "同じ3カラムレイアウト:フォルダツリー(左)|サムネイル一覧(中央)|プロンプトビルダー(右)。サムネイルクリックでプレビューとプロンプトテキストを表示 — この時点ではまだプロンプトに追加されない",
|
||||
helpGallery20: "「+ 追加」で、プレビュー中の画像のプロンプトを「選択済みプロンプト」にチップとして追加;チップは個別(×)または一括(「全クリア」)で削除可能;「Save」でその画像のプロンプトテキストを編集・保存",
|
||||
@@ -2249,7 +2342,7 @@ const LANGUAGES = {
|
||||
helpSidepanel10: "各サブタブ内で検索してアイテムをすばやく検索",
|
||||
helpSidepanel11: "Modelsタブ:All / ★ Favorites / Groups / By Type サブタブ;Promptsタブ:All / ★ Favorites / Categories サブタブ+Groupsサブタブ(下段);Models Groupsの LoRA グループには「All N LoRAs」アイテムがあり、ドラッグで全 LoRA を Lora Loader (LoraManager) ノードに一括配置できる",
|
||||
helpSidepanel12: "⚙ テーマボタン(ヘッダー):パネル背景・サブヘッダー背景・文字色・ボーダー・補助テキスト色をカスタマイズ可能、設定はlocalStorageに保存され次回起動時も反映",
|
||||
helpSidepanel13: "I タブ(Information):ComfyUI の PNG / WebP / JSON をドロップするとサイドパネル内でモデル・LoRA・プロンプトのメタデータを確認可能 — サブタブ: model / lora / Prompts;UnetLoaderGGUF・QuadrupleCLIPLoader・Lora Loader (LoraManager) ノードタイプに対応",
|
||||
helpSidepanel13: "I タブ(Information):ComfyUI の PNG / WebP / MP4 / JSON をドロップするとサイドパネル内でモデル・LoRA・プロンプトのメタデータを確認可能 — サブタブ: model / lora / Prompts;UnetLoaderGGUF・QuadrupleCLIPLoader・Lora Loader (LoraManager) ノードタイプに対応;MP4はSaveVideoが埋め込むworkflow/promptタグを読み取り、MiniMax H3 ImageToVideoのようなオールインワン動画ノードのプロンプトにも対応",
|
||||
helpSidepanel14: "Information タブ — キャンバスへドラッグ:model サブタブのアイテムをドラッグすると対応ローダーノードを配置(Checkpoint → CheckpointLoaderSimple、VAE → VAELoader、Diffusion Model → UNETLoader、Text Encoder → CLIPLoader);ダブルクリックでもキャンバス中央に配置可能",
|
||||
helpSidepanel15: "Information タブ — lora サブタブ:LoraLoader・LoraLoaderModelOnly・Lora Loader (LoraManager) ノード(APIフォーマット含む)から LoRA を検出;個別 LoRA をドラッグで LoraLoader を配置;「Multiple LORA」セクションで全 LoRA を Lora Loader (LoraManager) ノードに一括配置(LoRA構文自動入力);Prompts サブタブ:プロンプトをドラッグするとテキスト入力済みの CLIPTextEncode ノードを配置;クリックで全文表示・コピー可能",
|
||||
helpSidepanel16: "A タブ(AI ツール):翻訳・Chat・TOOLS・設定のサブタブ。Ollama、LM Studio、Lemonade、Unsloth に対応;Chat は LLM とのマルチターン会話;TOOLS は VLM 画像解析とワイルドカード生成に対応;設定は SPA の AI タブと localStorage で共有される",
|
||||
@@ -2354,8 +2447,7 @@ const LANGUAGES = {
|
||||
helpImageEditExportTitle: "エクスポートとナビゲーション",
|
||||
helpImageEdit17: "Save PNG:全可視レイヤーを合成してPNGファイルとしてダウンロード",
|
||||
helpImageEdit18: "Save to Gallery:ファイル名を入力(デフォルト: wfs-image-YYYYMMDDHHmmss)してギャラリーのルートフォルダに合成PNGを保存(設定 > Gallery Output Folderで設定);Galleryタブを一度開いてルートフォルダを設定する必要あり",
|
||||
helpImageEdit19: "Save to Input:合成PNGをComfyUIのinputフォルダに /upload/image でアップロードし、Load Imageノードで選択可能にする",
|
||||
helpImageEdit19b: "Send to Workflow:合成PNGをアップロードする点はSave to Inputと同じだが、さらにアップロード結果のファイル名をComfyUIグラフ内で選択中のノード(無ければ最初に見つかったLoadImage系ノード)のimageウィジェットへ書き込む;ComfyUIのトップメニューボタンからWorkflow Studioを起動している必要がある",
|
||||
helpImageEdit19b: "Send to LI node:合成PNGをComfyUIのinputフォルダに /upload/image でアップロードし、さらにそのファイル名をComfyUIグラフ内で選択中のノード(無ければ最初に見つかったLoadImage系ノード)のimageウィジェットへ書き込む;ComfyUIのトップメニューボタンからWorkflow Studioを起動している必要がある",
|
||||
helpImageEdit20: "キャンバスナビゲーション:スクロールホイールでズーム、Space + ドラッグでパン",
|
||||
helpImageEdit21: "Undo / Redo:Ctrl+Z / Ctrl+Y(またはツールバーの ↩ ↪ ボタン)",
|
||||
helpImageEditKbdTitle: "Image Edit キーボードショートカット",
|
||||
@@ -2476,13 +2568,20 @@ const LANGUAGES = {
|
||||
eagleUrl: "Eagle URL",
|
||||
eagleAutoSave: "生成画像をEagleに自動保存",
|
||||
dataManagement: "データ管理",
|
||||
dataManagementHint: "設定・メタデータ・プロンプトなど全データをJSONファイルにエクスポート、またはインポートして復元できます。インポート後はComfyUIを再起動してください。",
|
||||
dataManagementHint: "設定・メタデータ・プロンプトなど主要データをJSONファイルにエクスポート、またはインポートして復元できます。インポート後はComfyUIを再起動してください。",
|
||||
exportData: "エクスポート",
|
||||
importData: "インポート",
|
||||
exportSuccess: "エクスポート完了",
|
||||
exportError: "エクスポート失敗",
|
||||
importSuccess: "インポート完了",
|
||||
importError: "インポート失敗",
|
||||
exportFullBackup: "フルバックアップ (ZIP)",
|
||||
importFullBackup: "フルバックアップを復元 (ZIP)",
|
||||
fullBackupHint: "フルバックアップ(ZIP)は上記のJSONエクスポートでは表現できないフォルダ形式のデータ(AI Skills、Lab Plan、Styleプリセット)とTaggerデータベースも含みます。復元すると既存ファイルは上書きされます。復元後はComfyUIを再起動してください。",
|
||||
fullBackupFilesUnit: "件",
|
||||
fullBackupIncludeWorkflows: "デフォルトワークフローフォルダーを含める (user/default/workflows)",
|
||||
fullBackupIncludeWildcard: "Impact Packのwildcardフォルダーを含める(存在する場合)",
|
||||
fullBackupExternalHint: "これらはエクスポート専用です。復元時には一切触れません。必要な場合はZIP内の_external/フォルダから手動でコピーしてください。",
|
||||
saveSettings: "設定を保存",
|
||||
settingsSaved: "設定を保存しました",
|
||||
ollamaSaved: "AI Assistant設定を保存しました",
|
||||
@@ -2551,8 +2650,8 @@ const LANGUAGES = {
|
||||
metaSectionTe: "Text Encoder",
|
||||
metaSectionLora: "LoRA",
|
||||
metaSectionPrompt: "プロンプト",
|
||||
metaDropMain: "画像 / JSON をドロップ",
|
||||
metaDropSub: "PNG · WebP · JSON",
|
||||
metaDropMain: "画像 / 動画 / JSON をドロップ",
|
||||
metaDropSub: "PNG · WebP · MP4 · JSON",
|
||||
metaParsing: "解析中...",
|
||||
metaFileTooLarge: "ファイルが大きすぎます(最大 50 MB)",
|
||||
metaNoMetadata: "メタデータが見つかりません",
|
||||
@@ -2562,7 +2661,7 @@ const LANGUAGES = {
|
||||
metaPromptText: "テキスト",
|
||||
metaSelectPrompt: "上のプロンプトを選択すると全文を表示します...",
|
||||
metaFormatNoteTitle: "対応フォーマット",
|
||||
metaFmtComfyui: "ComfyUI — PNG / WebP / JSON",
|
||||
metaFmtComfyui: "ComfyUI — PNG / WebP / MP4 / JSON",
|
||||
metaFmtSdwebui: "SD WebUI / SD Forge — PNG(parameters チャンク)",
|
||||
metaFmtFooocus: "Fooocus — PNG(fooocus_scheme チャンク)",
|
||||
metaFormatTodo: "Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image サブグラフ形式に対応済み",
|
||||
@@ -2572,8 +2671,59 @@ const LANGUAGES = {
|
||||
helpMetadata2: "中列: ワークフローから抽出した Checkpoint・VAE・Diffusion Model・Text Encoder の一覧",
|
||||
helpMetadata3: "右列: LoRA 一覧(強度値付き)+プロンプト一覧(クリックで下部に全文表示)",
|
||||
helpMetadata4: "プロンプトアクション — Copy: クリップボードにコピー; GenUI:P/N: GenerateUI のポジティブ/ネガティブプロンプトにセット; Prompt:P/N: Prompt タブ Presets のポジティブ/ネガティブにセット",
|
||||
helpMetadata5: "対応フォーマット: ComfyUI PNG/WebP/JSON(標準形式 + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image サブグラフ形式)・SD WebUI・SD Forge・Fooocus。",
|
||||
helpMetadata5: "対応フォーマット: ComfyUI PNG/WebP/MP4/JSON(標準形式 + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image サブグラフ形式;MP4はSaveVideoが書き込むworkflow/promptコンテナタグを読み取り、MiniMax H3 ImageToVideoのようなオールインワン動画ノードにも対応)・SD WebUI・SD Forge・Fooocus。",
|
||||
helpMetadata6: "現在は Gallery タブ内のサブタブ(Style_Catalog の右隣)になっており、独立したトップレベルタブではありません — それ以外の動作は全く同じです",
|
||||
|
||||
// -- Video タブ(MiniMax H3専用、GenerateUIタブとは独立) --
|
||||
tabVideo: "Video",
|
||||
loadInVideo: "Videoに読み込み",
|
||||
videoTitle: "Video (MiniMax H3)",
|
||||
videoFirstFrame: "First Frame(任意)",
|
||||
videoLastFrame: "Last Frame(任意)",
|
||||
videoDropOrClick: "画像をドロップまたはクリックして選択",
|
||||
videoPrompt: "Prompt",
|
||||
videoAspectRatio: "Aspect Ratio",
|
||||
videoMegapixels: "Megapixels",
|
||||
videoMultiple: "Multiple",
|
||||
videoDuration: "Duration(秒)",
|
||||
videoNoiseSeed: "Noise Seed",
|
||||
videoRandomizeSeed: "ランダム化",
|
||||
videoGenerate: "Generate",
|
||||
videoEditPlaceholder: "編集機能は今後追加予定",
|
||||
videoNoWorkflowLoaded: "ワークフローが読み込まれていません",
|
||||
videoUnsupportedWorkflow: "このワークフローにはMiniMax H3のImage to Videoノードが含まれていません",
|
||||
videoWorkflowLoaded: (name) => `ワークフローを読み込みました: ${name}`,
|
||||
videoGenerateSuccess: "動画を生成しました",
|
||||
videoDoneCount: (n) => `完了(${n}件)`,
|
||||
videoSourceLabel: "動画ソース",
|
||||
videoSourceHint: "生成せずにFrame/GIF機能を使いたい場合はここに任意の動画を読み込めます。",
|
||||
videoSourceDropLabel: "動画をドロップまたはクリックして選択",
|
||||
videoNoVideo: "動画なし",
|
||||
videoPropFrame: "Frame",
|
||||
videoPropGif: "GIF",
|
||||
videoFrameHint: "プレビュー動画を再生・シークして止めたい位置で「Capture Frame」を押してください。",
|
||||
videoCaptureFrame: "Capture Frame",
|
||||
videoSaveToOutput: "Outputに保存",
|
||||
videoFrameSaved: (name) => `フレームを保存しました: ${name}`,
|
||||
videoFrameCaptureFailed: (msg) => `フレームのキャプチャに失敗しました: ${msg}`,
|
||||
videoGifStart: "開始(秒)",
|
||||
videoGifEnd: "終了(秒)",
|
||||
videoGifFps: "FPS",
|
||||
videoGifWidth: "最大幅",
|
||||
videoConvertToGif: "GIFに変換",
|
||||
videoGifConverting: "変換中...",
|
||||
videoGifDoneCount: (n) => `完了(${n}フレーム)`,
|
||||
videoGifSaved: (name) => `GIFを保存しました: ${name}`,
|
||||
videoNoSourceLoaded: "先に動画を用意してください(生成するか、動画ソースにファイルをドロップ)",
|
||||
helpVideoTitle: "Video タブ",
|
||||
helpVideoDesc: "MiniMax H3 (Image to Video) ワークフロー専用の動画生成タブ。GenerateUIタブとは独立して動作します。",
|
||||
helpVideo1: "first_frame(任意)/last_frame(任意)の画像、prompt、aspect_ratio/megapixels/multiple(解像度)、duration(秒)、noise_seedを指定してGenerateをクリックします。first_frameを未指定にするとテキストのみでバイパス実行され、LoadImageノード自体が無いワークフローにも対応しています。",
|
||||
helpVideo2: "モデル選択(UNet/CLIP/VAE/Audio VAE)は読み込んだワークフローの既定値に固定され、このタブでは変更できません。",
|
||||
helpVideo3: "Workflowタブの詳細モーダルにある「Videoに読み込み」ボタンから、MiniMax H3のImage to Videoノードを含むワークフローを読み込めます。対応していないワークフローはエラー表示になります。",
|
||||
helpVideo4: "生成した動画(mp4)はGalleryタブでも閲覧・再生できます。",
|
||||
helpVideo5: "プレビューの横にある「Video Source」パネルでは、生成した動画に限らず任意のローカル動画をドロップ/選択して、下のFrame/GIF機能をMiniMax H3を実行せずに使えます。Clearで選択をリセットできます。",
|
||||
helpVideo6: "Frameタブ(右パネル): プレビュー動画を再生・シークして止めたい位置で「Capture Frame」を押すとその場でフレームをキャプチャし、「Save to Output」でPNGとしてComfyUIのOutputフォルダに保存します。",
|
||||
helpVideo7: "GIFタブ(右パネル): Start/End(秒)・FPS・Max Width(任意)を指定して「Convert to GIF」を押すと、サーバー側で動画をデコードしアニメーションGIFとしてComfyUIのOutputフォルダに保存します。",
|
||||
},
|
||||
|
||||
zh: {
|
||||
@@ -2826,6 +2976,7 @@ const LANGUAGES = {
|
||||
labNoWorkflowLoaded: "请先在GenerateUI中加载工作流",
|
||||
labNoSourceImage: "请先拖入源图片",
|
||||
labNoResultsYet: "暂无结果",
|
||||
labLastFrameExtractFailed: (msg) => `从生成的视频提取最后一帧失败: ${msg}`,
|
||||
labResultPreview: "预览",
|
||||
labEnterPlanName: "方案名称:",
|
||||
labPlanSaved: "方案已保存",
|
||||
@@ -2857,6 +3008,15 @@ const LANGUAGES = {
|
||||
labT2IImageIgnored: "T2I模式已开启,无需上传图片,已跳过",
|
||||
labIndexImageSaved: (filename) => `索引图片已保存到Output:${filename}`,
|
||||
labIndexImageSaveFailed: "索引图片保存到Output失败",
|
||||
labPromptGroupBtnTitle: "应用提示词组",
|
||||
labPromptGroupModalTitle: "提示词组",
|
||||
labPromptGroupEmpty: "尚无分组。请在Prompt标签的分组面板中创建。",
|
||||
labPromptGroupCount: (n) => `${n} 个预设`,
|
||||
labPromptGroupSelectFirst: "请先选择一个分组",
|
||||
labPromptGroupNoPresets: "该分组没有预设",
|
||||
labPromptGroupApplied: (name, n) => `已将"${name}"(${n}个关键帧)应用到Prompt`,
|
||||
labPromptGroupBatchRaised: (n) => `已将Batch数量提高到${n}以适应该分组`,
|
||||
labSelectKeyframeFirst: "请先选择一个关键帧",
|
||||
|
||||
// -- GenerateUI标签页 Input子标签: Image内占位图 --
|
||||
i2iPlaceholderTitle: "占位图片",
|
||||
@@ -3137,6 +3297,8 @@ const LANGUAGES = {
|
||||
gallerySelectImageFirst: "请先选择图像",
|
||||
galleryNoLoadImageNode: "当前工作流中没有LoadImage节点",
|
||||
gallerySentGenUI: "已发送至GenerateUI图像标签",
|
||||
sendToLiNodeNoOpener: "请通过ComfyUI顶部菜单打开Workflow Studio以使用此功能",
|
||||
sendToLiNodeSuccess: (filename) => `已将"${filename}"发送到LI节点`,
|
||||
galleryCCNotAvailable: "仅当从ComfyUI Comic Creator内的图库打开时才能使用Send CC",
|
||||
gallerySentCC: "已发送至ComfyUI Comic Creator",
|
||||
galleryNoEmbeddedWorkflow: "此图像中未嵌入ComfyUI工作流。",
|
||||
@@ -3405,6 +3567,8 @@ const LANGUAGES = {
|
||||
helpLab15: "Checkpoint/LoRA/VAE与其他列采用完全相同的实际生效值规则(见上文),各自独立向后延续:其中一项的关键帧不会使另外两项恢复为工作流原始设置。在编辑弹窗中,若某字段留空,且同一列表中更早的关键帧已设置过值,其占位符会显示「(继承: ...)」而不是「(保持工作流原设置)」,方便确认实际会应用的值。「恢复第1次的设置」和Bypass与+/-一样,只会作用于当前C/L/V切换选中的那一项,不会影响另外两项",
|
||||
helpLab16: "绕过LoRA节点复选框(仅LoRA关键帧自己的编辑弹窗中):在应用时强制将该关键帧的strength_model/strength_clip设为0,替代ComfyUI原生的节点Bypass(mode:4)——这里使用的工作流已转换为API格式,不带mode概念,因此将强度归零在效果上是等价的。勾选后会禁用强度输入框;与上方行级别的Bypass复选框(见helpLab13)相互独立,后者只是跳过整行而不会改动节点本身",
|
||||
helpLab17: "将LoRA语法和触发词应用到正面提示词复选框(仅LoRA列):勾选后,会在应用时以逗号分隔的形式,将<lora:name:strengthModel:strengthClip>及该LoRA缓存的CivitAI触发词追加到正面提示词——格式与GenerateUI的Model标签页Apply按钮写入的完全一致。切换关键帧时(更换为另一个LoRA、取消勾选此复选框,或该行被Bypass)总会先精确移除上一次迭代注入的内容,再添加新内容,因此批次不会累积用过的所有LoRA。勾选「绕过LoRA节点」时会自动禁用",
|
||||
helpLab18: "单击关键帧单元格现在只是选中它(蓝色描边),不再直接打开编辑弹窗——需要双击才能打开编辑弹窗。每列的表头(Model/Prompt/Ksampler)新增了▲/▼按钮,可将选中的关键帧与相邻的关键帧互换位置,从而在不重新输入内容的情况下调整顺序;关键帧#1(基准行)无法移动,也不会有其他关键帧被换到#1的位置",
|
||||
helpLab19: "Prompt列表头的PG按钮:选择Prompt标签中的一个预设分组(Table视图中的Presets Group,与Batch标签复选列表使用的是同一批分组),即可将整个Prompt列替换为该分组内每个预设对应一个关键帧、按分组顺序排列(从#1开始,#1会被覆盖而不是在其后追加)。如果分组中的预设数量超过当前Batch数量,会自动提高Batch数量以容纳(上限为50,与Batch输入框本身的上限一致);仍然超出的部分不会被静默丢弃,而是照常显示「关键帧超出Batch数量」的提示",
|
||||
helpLabCardPlanTitle: "Setting子标签 — 运行与方案文件",
|
||||
helpLabPlan1: "右侧面板 — Batch:要运行的迭代次数;Note:与方案一起保存的自由备注",
|
||||
helpLabPlan2: "Run/Pause/Cancel:Run开始批量循环;Pause/Resume在各次迭代之间暂停/继续;Cancel会中断当前生成并停止循环",
|
||||
@@ -3448,6 +3612,7 @@ const LANGUAGES = {
|
||||
helpPrompt23: "Wildcards表格 — 与Form标签的通配符文件管理器使用相同的文件列表;编辑File列的路径或Ext下拉框会重命名文件(先以新名称保存内容,再删除旧文件)",
|
||||
helpPrompt24: "Style表格 — 与Form标签的Style管理器使用相同的Style列表,可像Presets一样进行内联编辑",
|
||||
helpPrompt25: "Presets表格工具栏 — 搜索框旁边的★和B排序按钮,可将收藏/已加入Batch的预设排到列表顶部;两者可同时启用(★优先,B为次要条件),其余项保持原有的相对顺序",
|
||||
helpPrompt26: "Style表格工具栏——只选中一行且其File徽标不是custom.json时,「+ Add to this file」按钮才会启用:会添加一个以该文件为目标的空白行(保存前File列就会显示该文件的徽标)——与Form标签中Style管理器的同一功能(见上文)。custom.json条目或多选时按钮保持禁用,此时请改用常规的「+ New Style」按钮",
|
||||
helpSettings1: "UI语言和摘要语言设置",
|
||||
helpSettings2: "主题选择(13种预设)+ 自定义:颜色调整、背景图案(条纹、波点、棋盘格、SVG平铺)、字体选择(含日文显示字体在内的16种Google Fonts)",
|
||||
helpSettings3: "工作流数据文件夹路径更改/重置",
|
||||
@@ -3455,7 +3620,9 @@ const LANGUAGES = {
|
||||
helpSettings5: "AI助手(提示词标签页):后端(Ollama / LM Studio / Lemonade)、API URL、默认模型、连接测试",
|
||||
helpSettings6: "默认工作流设置/取消",
|
||||
helpSettings7: "Eagle集成URL、自动保存开关",
|
||||
helpSettings8: "数据管理:将所有插件数据(设置、元数据、提示词等)导出为JSON文件,或导入以恢复。导入后请重启ComfyUI。",
|
||||
helpSettings8: "数据管理:将设置、元数据、提示词等主要数据导出为JSON文件,或导入以恢复。导入后请重启ComfyUI。",
|
||||
helpSettings15: "完整备份 (ZIP):与上方的JSON导出不同,还包含文件夹型数据(AI Skills、Lab Plan、Style预设)以及Tagger数据库。恢复会覆盖现有文件,恢复后请重启ComfyUI。",
|
||||
helpSettings16: "完整备份按钮上方的两个复选框可将ComfyUI默认工作流文件夹和Impact Pack的wildcard文件夹一并导出。两者均仅用于导出,不会自动恢复。如需要,请从ZIP中的_external/文件夹手动复制回去。",
|
||||
helpSettings9: "各部分可折叠展开",
|
||||
helpSettings10: "Wildcard Integration:将WFS通配符目录链接到ComfyUI-Impact-Pack的wildcards目录(Windows为目录联结,其他OS为符号链接);现有文件自动迁移",
|
||||
helpSettings11: "文字大小:单个滑块(10–28 px)可一次性调整所有提示词和聊天文本框的字体大小 — GenerateUI正/负向提示词、AI助手聊天输入、预设正/负向提示、通配符提示和文件编辑器、元数据提示词全文预览;即时生效并通过「保存设置」保存",
|
||||
@@ -3488,17 +3655,18 @@ const LANGUAGES = {
|
||||
helpGallery4: "工具栏过滤器:收藏 (★)、文本搜索(文件名・标签・提示词)、标签过滤、分组过滤、按日期/名称排序",
|
||||
helpGallery5: "文件夹树:点击加载图像,▶展开;'+ New'在选定文件夹内创建子文件夹;'Del'删除该文件夹及其所有内容",
|
||||
helpGallery6: "多选:Ctrl+点击切换单张图像;Shift+点击从上次点击位置进行范围选择 — 批量操作栏:选择分组 → 「添加到分组」/「从分组中删除」;全部收藏/取消收藏;「对比」(2–4张);移动到...;删除文件",
|
||||
helpGallery7: "详情面板 — 信息(Info)标签:文件名、大小、日期、标签(添加/移除)、备注;'移动到...'将图像移至另一文件夹;'删除文件'永久删除",
|
||||
helpGallery7: "详情面板 — 信息(Info)标签:文件名、大小、尺寸(图片为宽×高,视频为时长)、日期、标签(添加/移除)、备注;'移动到...'将图像移至另一文件夹;'删除文件'永久删除",
|
||||
helpGallery8: "详情面板 — JSON标签:显示来自PNG嵌入数据(prompt / workflow键)或Generate UI标签保存的工作流JSON;「Copy & Send Canvas」按钮将工作流复制到剪贴板并直接发送到ComfyUI画布(UI和API格式均支持);若Workflow Studio不是从ComfyUI工具栏打开,UI格式将回退到标题拖拽",
|
||||
helpGallery9: "详情面板 — 分组(Groups)标签:对每个图像进行组的创建、分配、移除、重命名和删除",
|
||||
helpGallery10: "工作流自动保存:在Generate UI标签生成的图像,其工作流会自动保存到图库元数据,并在JSON标签中显示",
|
||||
helpGallery11: "支持PNG(tEXt/iTXt)、JPEG、WebP、GIF;PNG格式读取ComfyUI嵌入的JSON(prompt / workflow键)提取工作流",
|
||||
helpGallery11: "支持PNG(tEXt/iTXt)、JPEG、WebP、GIF、MP4;PNG格式读取ComfyUI嵌入的JSON(prompt / workflow键)提取工作流,MP4格式读取SaveVideo写入的容器标签(同名键,如MiniMax H3输出)",
|
||||
helpGallery12: "Metadata按钮(绿色,位于详情面板标签栏):在Metadata标签中打开所选图像以全面查看嵌入数据;Alt+点击任意图像缩略图效果相同",
|
||||
helpGallery13: "Load GenUI按钮(蓝色,位于详情面板标签栏):将所选图像中嵌入的ComfyUI工作流直接加载到GenerateUI标签并切换过去;如果没有嵌入工作流或格式不受支持,则显示警告提示",
|
||||
helpGallery14: "Tagger按钮(紫色,位于详情面板操作行):将所选图像直接在Tagger标签的Single模式中打开,即可立即进行标注",
|
||||
helpGallery15: "F按钮(青色悬浮按钮,每个缩略图左上角):单击即可将图像添加到/从__Feeder__组中移除;图像在组中时始终显示青色,不在组中时仅悬停时可见;可快速为Feeder标签Gallery模式添加队列图像",
|
||||
helpGallery16: "Image Edit按钮(工具栏,Refresh按钮旁):将当前选中的图像发送到Image Edit标签;如果已有图层则按比例缩放添加为新图层,否则将成为Layer 1",
|
||||
helpGallery17: "Send GenUI Image按钮(工具栏,Image Edit按钮旁):将选中图像上传至ComfyUI并设置为GenerateUI标签中第一个LoadImage节点的输入;自动切换至GenerateUI → Input → Image;需要预先加载包含至少一个LoadImage节点的工作流",
|
||||
helpGallery27: "Send to LI node按钮(工具栏,Send GenUI Image按钮旁):上传选中图像并将其文件名写入ComfyUI画布上当前选中节点(若无选中节点则回退到找到的第一个LoadImage类节点)的image部件 — 与Image Edit标签的Send to LI node发送到同一目标;需要通过ComfyUI顶部菜单按钮打开Workflow Studio",
|
||||
helpGallery18: "Gallery标签页中与Output并列的第二个子标签,用于浏览可视化提示词库 — 管理ComfyUI output文件夹内的ws_image_prompt文件夹(未创建时自动生成)",
|
||||
helpGallery19: "相同的三栏布局:文件夹树(左)|缩略图(中)|提示词构建器(右)。点击缩略图可预览图像及其提示词文本 — 此时尚未添加到提示词中",
|
||||
helpGallery20: "「+ 添加」将预览中图像的提示词作为标签添加到「已选提示词」;标签可单独删除(×)或一次性清除(「全部清除」);「Save」用于编辑并保存该图像的提示词文本",
|
||||
@@ -3534,7 +3702,7 @@ const LANGUAGES = {
|
||||
helpSidepanel10: "在各子标签内搜索快速查找项目",
|
||||
helpSidepanel11: "Models标签:All / ★ Favorites / Groups / By Type子标签;Prompts标签:All / ★ Favorites / Categories子标签+Groups子标签(第二行);Models Groups的LoRA组显示「All N LoRAs」条目,可拖拽将全部LoRA放入单个Lora Loader (LoraManager)节点",
|
||||
helpSidepanel12: "⚙ 主题按钮(标题栏):可自定义面板背景、子标题背景、文字颜色、边框及辅助文字颜色,设置保存至localStorage并在下次打开时生效",
|
||||
helpSidepanel13: "I 标签(Information):拖放 ComfyUI PNG/WebP/JSON 即可在侧面板内查看模型、LoRA 和提示词元数据 — 子标签:model / lora / Prompts;支持 UnetLoaderGGUF、QuadrupleCLIPLoader 和 Lora Loader (LoraManager) 节点类型",
|
||||
helpSidepanel13: "I 标签(Information):拖放 ComfyUI PNG/WebP/MP4/JSON 即可在侧面板内查看模型、LoRA 和提示词元数据 — 子标签:model / lora / Prompts;支持 UnetLoaderGGUF、QuadrupleCLIPLoader 和 Lora Loader (LoraManager) 节点类型;MP4会读取SaveVideo写入的workflow/prompt标签,也支持MiniMax H3 ImageToVideo等一体化视频节点的提示词",
|
||||
helpSidepanel14: "Information 标签 — 拖拽到画布:model 子标签拖拽可放置对应加载节点(Checkpoint → CheckpointLoaderSimple、VAE → VAELoader、Diffusion Model → UNETLoader、Text Encoder → CLIPLoader);双击也可放置到画布中央",
|
||||
helpSidepanel15: "Information 标签 — lora 子标签:可检测 LoraLoader、LoraLoaderModelOnly 及 Lora Loader (LoraManager) 节点(含API格式)的 LoRA;拖拽单个 LoRA 放置 LoraLoader;「Multiple LORA」区域可将全部 LoRA 一次性放入 Lora Loader (LoraManager) 节点并自动填入LoRA语法;Prompts 子标签:拖拽提示词放置预填文本的 CLIPTextEncode 节点;点击可查看全文并复制",
|
||||
helpSidepanel16: "A 标签(AI 工具):翻译、Chat、TOOLS 和设置子标签,支持 Ollama、LM Studio、Lemonade 或 Unsloth;Chat 支持与 LLM 的多轮对话;TOOLS 包含 VLM 图像分析和通配符生成;设置通过 localStorage 与 SPA 的 AI 标签共享",
|
||||
@@ -3639,8 +3807,7 @@ const LANGUAGES = {
|
||||
helpImageEditExportTitle: "导出与导航",
|
||||
helpImageEdit17: "Save PNG:合并所有可见图层并下载为PNG文件",
|
||||
helpImageEdit18: "Save to Gallery:输入文件名(默认:wfs-image-YYYYMMDDHHmmss)将合成PNG保存到Gallery根文件夹(在设置 > Gallery Output Folder中配置);需要至少打开过一次Gallery标签以设置根目录",
|
||||
helpImageEdit19: "Save to Input:通过/upload/image将合成PNG上传到ComfyUI的输入文件夹,使其可在Load Image节点中选择",
|
||||
helpImageEdit19b: "Send to Workflow:与 Save to Input 一样会上传合成PNG,但还会将上传结果的文件名写入 ComfyUI 图中当前选中节点(若无选中节点则回退到找到的第一个 LoadImage 类节点)的 image 部件;需要通过 ComfyUI 顶部菜单按钮打开 Workflow Studio",
|
||||
helpImageEdit19b: "Send to LI node:通过 /upload/image 将合成PNG上传到ComfyUI的输入文件夹,并将上传结果的文件名写入 ComfyUI 图中当前选中节点(若无选中节点则回退到找到的第一个 LoadImage 类节点)的 image 部件;需要通过 ComfyUI 顶部菜单按钮打开 Workflow Studio",
|
||||
helpImageEdit20: "画布导航:滚轮缩放,Space+拖动平移",
|
||||
helpImageEdit21: "撤销/重做:Ctrl+Z / Ctrl+Y(或工具栏的 ↩ ↪ 按钮)",
|
||||
helpImageEditKbdTitle: "图像编辑键盘快捷键",
|
||||
@@ -3761,13 +3928,20 @@ const LANGUAGES = {
|
||||
eagleUrl: "Eagle URL",
|
||||
eagleAutoSave: "自动保存生成图片到Eagle",
|
||||
dataManagement: "数据管理",
|
||||
dataManagementHint: "将所有插件数据(设置、元数据、提示词等)导出为JSON文件,或导入之前导出的文件以恢复数据。导入后请重启ComfyUI以使更改生效。",
|
||||
dataManagementHint: "将设置、元数据、提示词等主要数据导出为JSON文件,或导入之前导出的文件以恢复数据。导入后请重启ComfyUI以使更改生效。",
|
||||
exportData: "导出",
|
||||
importData: "导入",
|
||||
exportSuccess: "导出完成",
|
||||
exportError: "导出失败",
|
||||
importSuccess: "导入完成",
|
||||
importError: "导入失败",
|
||||
exportFullBackup: "完整备份 (ZIP)",
|
||||
importFullBackup: "恢复完整备份 (ZIP)",
|
||||
fullBackupHint: "完整备份(ZIP)还包含上方JSON导出无法表示的文件夹型数据(AI Skills、Lab Plan、Style预设)以及Tagger数据库。恢复会覆盖现有文件,恢复后请重启ComfyUI。",
|
||||
fullBackupFilesUnit: "个文件",
|
||||
fullBackupIncludeWorkflows: "包含默认工作流文件夹 (user/default/workflows)",
|
||||
fullBackupIncludeWildcard: "包含Impact Pack的wildcard文件夹(如存在)",
|
||||
fullBackupExternalHint: "这些仅用于导出,恢复备份时不会处理它们。如需要,请从ZIP中的_external/文件夹手动复制回去。",
|
||||
saveSettings: "保存设置",
|
||||
settingsSaved: "设置已保存",
|
||||
ollamaSaved: "AI助手设置已保存",
|
||||
@@ -3836,8 +4010,8 @@ const LANGUAGES = {
|
||||
metaSectionTe: "文本编码器",
|
||||
metaSectionLora: "LoRA",
|
||||
metaSectionPrompt: "提示词",
|
||||
metaDropMain: "拖放图片 / JSON",
|
||||
metaDropSub: "PNG · WebP · JSON",
|
||||
metaDropMain: "拖放图片 / 视频 / JSON",
|
||||
metaDropSub: "PNG · WebP · MP4 · JSON",
|
||||
metaParsing: "解析中...",
|
||||
metaFileTooLarge: "文件过大(最大 50 MB)",
|
||||
metaNoMetadata: "未找到元数据",
|
||||
@@ -3847,7 +4021,7 @@ const LANGUAGES = {
|
||||
metaPromptText: "文本",
|
||||
metaSelectPrompt: "选择上方提示词以查看全文...",
|
||||
metaFormatNoteTitle: "支持格式",
|
||||
metaFmtComfyui: "ComfyUI — PNG / WebP / JSON",
|
||||
metaFmtComfyui: "ComfyUI — PNG / WebP / MP4 / JSON",
|
||||
metaFmtSdwebui: "SD WebUI / SD Forge — PNG(parameters)",
|
||||
metaFmtFooocus: "Fooocus — PNG(fooocus_scheme)",
|
||||
metaFormatTodo: "已支持 Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image 子图工作流",
|
||||
@@ -3857,8 +4031,59 @@ const LANGUAGES = {
|
||||
helpMetadata2: "中列:从工作流中提取的 Checkpoint、VAE、扩散模型、文本编码器列表",
|
||||
helpMetadata3: "右列:LoRA 列表(含强度值)和提示词列表(点击在下方显示全文)",
|
||||
helpMetadata4: "提示词操作 — Copy:复制到剪贴板;GenUI:P/N:设置 GenerateUI 正/负向提示;Prompt:P/N:设置 Prompt 标签页预设正/负向提示",
|
||||
helpMetadata5: "支持格式:ComfyUI PNG/WebP/JSON(标准格式 + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image 子图工作流)、SD WebUI、SD Forge、Fooocus。",
|
||||
helpMetadata5: "支持格式:ComfyUI PNG/WebP/MP4/JSON(标准格式 + Flux.2 / Qwen-Image / Z-Image / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed / Ernie Image 子图工作流;MP4读取SaveVideo写入的workflow/prompt容器标签,也支持MiniMax H3 ImageToVideo等一体化视频节点)、SD WebUI、SD Forge、Fooocus。",
|
||||
helpMetadata6: "现在它是 Gallery 标签页内的一个子标签(位于 Style_Catalog 右侧),不再是独立的顶层标签页 — 其余操作方式完全相同",
|
||||
|
||||
// -- Video 标签页(MiniMax H3 专用,独立于 GenerateUI) --
|
||||
tabVideo: "Video",
|
||||
loadInVideo: "加载到Video",
|
||||
videoTitle: "Video (MiniMax H3)",
|
||||
videoFirstFrame: "First Frame(可选)",
|
||||
videoLastFrame: "Last Frame(可选)",
|
||||
videoDropOrClick: "拖放图片或点击选择",
|
||||
videoPrompt: "Prompt",
|
||||
videoAspectRatio: "Aspect Ratio",
|
||||
videoMegapixels: "Megapixels",
|
||||
videoMultiple: "Multiple",
|
||||
videoDuration: "Duration(秒)",
|
||||
videoNoiseSeed: "Noise Seed",
|
||||
videoRandomizeSeed: "随机化",
|
||||
videoGenerate: "Generate",
|
||||
videoEditPlaceholder: "编辑功能即将推出",
|
||||
videoNoWorkflowLoaded: "尚未加载工作流",
|
||||
videoUnsupportedWorkflow: "该工作流不包含 MiniMax H3 的 Image to Video 节点",
|
||||
videoWorkflowLoaded: (name) => `已加载工作流: ${name}`,
|
||||
videoGenerateSuccess: "视频已生成",
|
||||
videoDoneCount: (n) => `完成(${n} 个文件)`,
|
||||
videoSourceLabel: "视频来源",
|
||||
videoSourceHint: "无需生成,也可在此加载任意视频以使用Frame/GIF工具。",
|
||||
videoSourceDropLabel: "拖放视频或点击选择",
|
||||
videoNoVideo: "暂无视频",
|
||||
videoPropFrame: "Frame",
|
||||
videoPropGif: "GIF",
|
||||
videoFrameHint: "播放/拖动预览视频到想要的位置,然后点击截取。",
|
||||
videoCaptureFrame: "截取当前帧",
|
||||
videoSaveToOutput: "保存到Output",
|
||||
videoFrameSaved: (name) => `已保存帧: ${name}`,
|
||||
videoFrameCaptureFailed: (msg) => `截取帧失败: ${msg}`,
|
||||
videoGifStart: "开始(秒)",
|
||||
videoGifEnd: "结束(秒)",
|
||||
videoGifFps: "FPS",
|
||||
videoGifWidth: "最大宽度",
|
||||
videoConvertToGif: "转换为GIF",
|
||||
videoGifConverting: "转换中...",
|
||||
videoGifDoneCount: (n) => `完成(${n} 帧)`,
|
||||
videoGifSaved: (name) => `已保存GIF: ${name}`,
|
||||
videoNoSourceLoaded: "请先准备视频(生成一个,或将文件拖入视频来源)",
|
||||
helpVideoTitle: "Video 标签页",
|
||||
helpVideoDesc: "MiniMax H3(Image to Video)工作流专用的视频生成标签页,独立于 GenerateUI 标签页运行。",
|
||||
helpVideo1: "设置 first_frame(可选)/last_frame(可选)图片、prompt、aspect_ratio/megapixels/multiple(分辨率)、duration(秒)和 noise_seed,然后点击 Generate。不指定 first_frame 时将以纯文本方式绕过执行,也支持完全没有 LoadImage 节点的工作流。",
|
||||
helpVideo2: "模型选择(UNet/CLIP/VAE/Audio VAE)固定为所加载工作流的默认值,无法在此标签页中修改。",
|
||||
helpVideo3: "可通过 Workflow 标签页详情弹窗中的「加载到Video」按钮,加载包含 MiniMax H3 Image to Video 节点的工作流。不支持的工作流会显示错误。",
|
||||
helpVideo4: "生成的视频(mp4)也可以在 Gallery 标签页中浏览和播放。",
|
||||
helpVideo5: "预览旁边的「Video Source」面板可以拖放或选择任意本地视频(不仅限于生成的视频),无需先运行MiniMax H3即可使用下方的Frame/GIF工具。点击Clear可重置选择。",
|
||||
helpVideo6: "Frame标签页(右侧面板):播放/拖动预览视频到想要的位置,点击「Capture Frame」在客户端截取该帧,再点击「Save to Output」将其保存为PNG到ComfyUI的输出文件夹。",
|
||||
helpVideo7: "GIF标签页(右侧面板):设置Start/End(秒)、FPS和可选的Max Width,点击「Convert to GIF」后,服务器会解码视频并将动画GIF保存到ComfyUI的输出文件夹。",
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -1112,7 +1112,6 @@ class ImageEditTab {
|
||||
document.getElementById("ie-redo-btn")?.addEventListener("click", () => this._redo());
|
||||
document.getElementById("ie-save-btn")?.addEventListener("click", () => this._fileExport.savePng());
|
||||
document.getElementById("ie-save-gallery-btn")?.addEventListener("click", () => this._fileExport.saveToGallery());
|
||||
document.getElementById("ie-upload-comfy-btn")?.addEventListener("click", () => this._fileExport.uploadToComfyUI());
|
||||
document.getElementById("ie-send-workflow-btn")?.addEventListener("click", () => this._fileExport.sendToWorkflow());
|
||||
document.getElementById("ie-zoom-fit")?.addEventListener("click", () => this._fitToView());
|
||||
document.getElementById("ie-zoom-100")?.addEventListener("click", () => {
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
* Image Edit Tab - File Export
|
||||
* Composites the visible layers (respecting mask-apply clipping) into a
|
||||
* flat canvas and offers three destinations: local PNG download, WFS
|
||||
* Gallery, and ComfyUI's own /upload/image endpoint.
|
||||
* Gallery, and the selected node's image widget on the ComfyUI canvas
|
||||
* (Send to LI node).
|
||||
*/
|
||||
|
||||
import { showToast } from "../app.js";
|
||||
@@ -104,24 +105,7 @@ export class FileExport {
|
||||
}
|
||||
}
|
||||
|
||||
async uploadToComfyUI() {
|
||||
if (!this._cb.getLayerManager()) { showToast("No image loaded", "error"); return; }
|
||||
const canvas = this._buildCompositeCanvas();
|
||||
const blob = await new Promise(resolve => canvas.toBlob(resolve, "image/png"));
|
||||
const file = new File([blob], (this._cb.getBaseName() || "wfs-edit") + "-output.png", { type: "image/png" });
|
||||
const form = new FormData();
|
||||
form.append("image", file);
|
||||
form.append("overwrite", "true");
|
||||
try {
|
||||
const r = await fetch("/upload/image", { method: "POST", body: form });
|
||||
const data = await r.json();
|
||||
showToast(`Uploaded: ${data.name}`, "success");
|
||||
} catch {
|
||||
showToast("Upload failed", "error");
|
||||
}
|
||||
}
|
||||
|
||||
// Uploads the composite like uploadToComfyUI(), then (via window.opener,
|
||||
// Uploads the composite via /upload/image, then (via window.opener,
|
||||
// since WFS runs in its own window — same cross-window pattern as
|
||||
// wfmReceiveWorkflow/wfmOpenMaskEditorForNode) writes the resulting
|
||||
// filename into the "image" widget of the currently selected ComfyUI
|
||||
@@ -144,9 +128,9 @@ export class FileExport {
|
||||
const data = await r.json();
|
||||
const filename = data.subfolder ? `${data.subfolder}/${data.name}` : data.name;
|
||||
window.opener.wfmSendImageToSelectedNode(filename);
|
||||
showToast(`Sent "${filename}" to workflow`, "success");
|
||||
showToast(`Sent "${filename}" to LI node`, "success");
|
||||
} catch (err) {
|
||||
showToast(`Send to workflow failed: ${err.message}`, "error");
|
||||
showToast(`Send to LI node failed: ${err.message}`, "error");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+224
-9
@@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
import { comfyUI } from "./comfyui-client.js";
|
||||
import { comfyWorkflow } from "./comfyui-workflow.js";
|
||||
import { comfyEditor } from "./comfyui-editor.js";
|
||||
import { showToast, openModal, closeModal } from "./app.js";
|
||||
import { t } from "./i18n.js";
|
||||
@@ -16,6 +17,8 @@ import { escapeHtml, embedPngTextChunk, getEagleSettings, saveToEagle, setupSear
|
||||
import { extractAllMetadata, readAllPNGTextChunks } from "./metadata-tab.js";
|
||||
import { syncJsonHighlight, syncScroll } from "./json-highlight.js";
|
||||
import { _expandWildcardsInWorkflow } from "./generate-tab.js";
|
||||
import { pmGroups, getPresetsInGroup } from "./prompt-presets.js";
|
||||
import { isVideoFilename, extractLastFrameBlob } from "./video-utils.js";
|
||||
|
||||
// Checkpoint/LoRA/VAE are three fully independent keyframe timelines — same as
|
||||
// Prompt/KSampler — each with its own +/-, its own atIteration sequence, its own
|
||||
@@ -128,6 +131,13 @@ let _lastGeneratedImageRef = null; // ComfyUI "name [type]" annotated ref of the
|
||||
// with the plan and simply resets to "checkpoint" on page load.
|
||||
let _modelViewMode = "checkpoint";
|
||||
|
||||
// Single-click-selected keyframe index per real column key (checkpoint/lora/vae/prompt/
|
||||
// ksampler) — used by that column's up/down reorder buttons. A single click selects
|
||||
// (this object); a double click still opens the edit modal directly, bypassing
|
||||
// selection. Not part of the Plan data — resets whenever columns are replaced wholesale
|
||||
// (plan load/clear, Prompt Group apply) so a stale index never points past the new array.
|
||||
let _selectedIdx = {};
|
||||
|
||||
// ============================================
|
||||
// Init
|
||||
// ============================================
|
||||
@@ -137,6 +147,8 @@ export function initLabTab() {
|
||||
_initPlanDropZone();
|
||||
_initSubtabToggle();
|
||||
_initColumnButtons();
|
||||
_initReorderButtons();
|
||||
_initPromptGroupButton();
|
||||
_initModelViewToggle();
|
||||
_initRunControls();
|
||||
_initPlanButtons();
|
||||
@@ -400,6 +412,133 @@ function _initColumnButtons() {
|
||||
});
|
||||
}
|
||||
|
||||
// Single click on a cell selects it (for the up/down reorder buttons below) instead of
|
||||
// opening the edit modal — opening now requires a double click (_renderColumn wires
|
||||
// both listeners on the same cell).
|
||||
function _selectCell(col, idx) {
|
||||
_selectedIdx[col] = idx;
|
||||
_renderColumnForKey(col);
|
||||
}
|
||||
|
||||
// Up/down buttons: swap the selected keyframe with its immediate array neighbor. Row 1
|
||||
// (idx 0, the baseline) can never move and nothing can be swapped into its slot — it has
|
||||
// no atIteration input of its own and drives the "live GenerateUI value" display, so
|
||||
// letting another keyframe take its place would silently change that keyframe's
|
||||
// behavior. Swapping the two keyframes' atIteration values (rather than reordering the
|
||||
// array directly) keeps each object's own value permanently paired with its own
|
||||
// atIteration field; re-deriving the array order from those swapped values below is
|
||||
// then just "swap array position to match", not a re-sort of the whole column.
|
||||
function _initReorderButtons() {
|
||||
document.querySelectorAll(".wfm-lab-col-up").forEach((btn) => {
|
||||
btn.addEventListener("click", () => _moveSelectedKeyframe(_resolveColumnKey(btn.dataset.col), -1));
|
||||
});
|
||||
document.querySelectorAll(".wfm-lab-col-down").forEach((btn) => {
|
||||
btn.addEventListener("click", () => _moveSelectedKeyframe(_resolveColumnKey(btn.dataset.col), 1));
|
||||
});
|
||||
}
|
||||
|
||||
function _moveSelectedKeyframe(col, direction) {
|
||||
const kfs = _lab.columns[col];
|
||||
const idx = _selectedIdx[col];
|
||||
if (idx == null || idx >= kfs.length) { // unselected, or stale after a bulk replace/remove
|
||||
showToast(t("labSelectKeyframeFirst"), "error");
|
||||
return;
|
||||
}
|
||||
const targetIdx = idx + direction;
|
||||
if (idx <= 0 || targetIdx <= 0 || targetIdx >= kfs.length) return; // baseline immovable; can't swap past either end
|
||||
|
||||
const tmpIter = kfs[idx].atIteration;
|
||||
kfs[idx].atIteration = kfs[targetIdx].atIteration;
|
||||
kfs[targetIdx].atIteration = tmpIter;
|
||||
[kfs[idx], kfs[targetIdx]] = [kfs[targetIdx], kfs[idx]];
|
||||
|
||||
_selectedIdx[col] = targetIdx;
|
||||
_renderColumnForKey(col);
|
||||
}
|
||||
|
||||
// "PG" button on the Prompt column header: lets the user pick one of the Prompt tab's
|
||||
// preset groups (pmGroups, defined in prompt-presets.js) and replace the ENTIRE Prompt
|
||||
// column with one keyframe per preset in the group, in group order, starting at
|
||||
// iteration #1 (which is overwritten, not appended to).
|
||||
function _initPromptGroupButton() {
|
||||
const btn = document.getElementById("wfm-lab-prompt-group-btn");
|
||||
if (btn) btn.title = t("labPromptGroupBtnTitle");
|
||||
btn?.addEventListener("click", () => _openPromptGroupModal());
|
||||
}
|
||||
|
||||
function _openPromptGroupModal() {
|
||||
const groupNames = Object.keys(pmGroups).sort();
|
||||
const listHtml = groupNames.length === 0
|
||||
? `<div class="wfm-pm-empty">${t("labPromptGroupEmpty")}</div>`
|
||||
: groupNames.map((g) => {
|
||||
const count = getPresetsInGroup(g).length;
|
||||
return `<div class="wfm-pm-item wfm-lab-pg-item" data-group="${escapeHtml(g)}">
|
||||
<div class="wfm-pm-item-body">
|
||||
<div class="wfm-pm-item-name">${escapeHtml(g)}</div>
|
||||
<div class="wfm-pm-item-sub">${t("labPromptGroupCount", count)}</div>
|
||||
</div>
|
||||
</div>`;
|
||||
}).join("");
|
||||
|
||||
const html = `
|
||||
<div id="wfm-lab-pg-list">${listHtml}</div>
|
||||
<div style="display:flex;gap:8px;margin-top:12px;justify-content:flex-end;">
|
||||
<button id="wfm-lab-pg-apply" class="wfm-btn wfm-btn-primary" disabled>${t("labApply")}</button>
|
||||
</div>`;
|
||||
openModal(t("labPromptGroupModalTitle"), html);
|
||||
|
||||
let selectedGroup = null;
|
||||
const applyBtn = document.getElementById("wfm-lab-pg-apply");
|
||||
document.querySelectorAll(".wfm-lab-pg-item").forEach((el) => {
|
||||
el.addEventListener("click", () => {
|
||||
document.querySelectorAll(".wfm-lab-pg-item").forEach((o) => o.classList.remove("active"));
|
||||
el.classList.add("active");
|
||||
selectedGroup = el.dataset.group;
|
||||
if (applyBtn) applyBtn.disabled = false;
|
||||
});
|
||||
});
|
||||
applyBtn?.addEventListener("click", () => {
|
||||
if (!selectedGroup) { showToast(t("labPromptGroupSelectFirst"), "error"); return; }
|
||||
_applyPromptGroupToLab(selectedGroup);
|
||||
});
|
||||
}
|
||||
|
||||
// Full replacement of _lab.columns.prompt: one keyframe per preset in the group, in
|
||||
// group order, atIteration 1..N — #1 is overwritten (never appended after), matching
|
||||
// how every other "bulk load" action on Lab (e.g. plan load) replaces rather than merges.
|
||||
function _applyPromptGroupToLab(groupName) {
|
||||
const presets = getPresetsInGroup(groupName);
|
||||
if (presets.length === 0) { showToast(t("labPromptGroupNoPresets"), "error"); return; }
|
||||
|
||||
// Batch input caps at 50 (see templates/index.html); raise batchCount to fit the
|
||||
// group up to that cap, same as the existing keyframe-beyond-batch warning handles
|
||||
// anything past it (see _warnIfKeyframesExceedBatch below) rather than silently
|
||||
// dropping presets past #50.
|
||||
if (presets.length > _lab.batchCount) {
|
||||
_lab.batchCount = Math.min(presets.length, 50);
|
||||
const batchEl = document.getElementById("wfm-lab-batch-count");
|
||||
if (batchEl) batchEl.value = _lab.batchCount;
|
||||
showToast(t("labPromptGroupBatchRaised", _lab.batchCount), "info");
|
||||
}
|
||||
|
||||
_lab.columns.prompt = presets.map((p, idx) => ({
|
||||
atIteration: idx + 1,
|
||||
value: {
|
||||
positive: p.text || p.posText || "",
|
||||
negative: p.negText || "",
|
||||
styleApplied: false,
|
||||
styleName: "",
|
||||
},
|
||||
revertToBase: false,
|
||||
bypassed: false,
|
||||
}));
|
||||
delete _selectedIdx.prompt; // stale selection would point past the freshly replaced array
|
||||
_renderColumnForKey("prompt");
|
||||
_warnIfKeyframesExceedBatch();
|
||||
closeModal();
|
||||
showToast(t("labPromptGroupApplied", groupName, presets.length), "success");
|
||||
}
|
||||
|
||||
// Wires the Model column header's C/L/V buttons — switches which independent field
|
||||
// (checkpoint/lora/vae) the shared cell list, +/-, and cell-click modal all operate on.
|
||||
// Purely a display/routing selector: none of the three keyframe arrays are touched by
|
||||
@@ -448,6 +587,17 @@ function _hasNodeForColumn(col) {
|
||||
if (col === "vae") {
|
||||
return (analysis?.vae_nodes?.length || 0) > 0 || (analysis?.checkpoint_nodes?.length || 0) > 0;
|
||||
}
|
||||
// Video all-in-one nodes (e.g. MiniMaxH3ImageToVideo) DO wire through a
|
||||
// SamplerCustomAdvanced internally, so sampler_nodes.length alone isn't enough to
|
||||
// detect "no user-adjustable sampler here" — that internal sampler is a fixed part
|
||||
// of the model's own preset, not something meant to be edited per keyframe (unlike a
|
||||
// real Advanced Sampling workflow's SamplerCustomAdvanced, e.g. Flux/SD3.5). Treat
|
||||
// any video workflow as having no editable Ksampler column, same as the Model
|
||||
// sub-columns above hide when their node is absent.
|
||||
if (col === "ksampler") {
|
||||
if (comfyWorkflow.isVideoWorkflow(analysis)) return false;
|
||||
return (analysis?.sampler_nodes?.length || 0) > 0;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -464,8 +614,12 @@ function _renderColumn(col, containerId = `wfm-lab-col-cells-${col}`) {
|
||||
}
|
||||
const keyframes = _lab.columns[col];
|
||||
container.innerHTML = keyframes.map((kf, idx) => _cellHtml(col, kf, idx)).join("");
|
||||
// Single click selects (for the up/down reorder buttons); double click still opens
|
||||
// the edit modal directly, independent of whatever is currently selected.
|
||||
container.querySelectorAll(".wfm-lab-cell").forEach((el) => {
|
||||
el.addEventListener("click", () => _openCellModal(col, parseInt(el.dataset.idx, 10)));
|
||||
const idx = parseInt(el.dataset.idx, 10);
|
||||
el.addEventListener("click", () => _selectCell(col, idx));
|
||||
el.addEventListener("dblclick", () => _openCellModal(col, idx));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -485,6 +639,7 @@ function _cellHtml(col, kf, idx) {
|
||||
const revertClass = kf.revertToBase ? " wfm-lab-cell-revert" : "";
|
||||
const bypassClass = kf.bypassed ? " wfm-lab-cell-bypassed" : "";
|
||||
const nodeBypassClass = (col === "lora" && kf.value?.nodeBypass) ? " wfm-lab-cell-node-bypassed" : "";
|
||||
const selectedClass = _selectedIdx[col] === idx ? " wfm-lab-cell-selected" : "";
|
||||
if (idx === 0) {
|
||||
// Bypassed takes priority over the live-reflect display — an explicit "skip this
|
||||
// row" toggle shouldn't be masked by Setting 1's usual "show the workflow's
|
||||
@@ -492,13 +647,13 @@ function _cellHtml(col, kf, idx) {
|
||||
const live = !kf.bypassed && _isLiveDisplay(col, idx);
|
||||
const liveClass = live ? " wfm-lab-cell-live" : "";
|
||||
const label = live ? _cellLabel(col, { value: _liveValueFor(col), revertToBase: false, bypassed: false }) : _cellLabel(col, kf);
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}${liveClass}" data-idx="${idx}">
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}${liveClass}${selectedClass}" data-idx="${idx}">
|
||||
<span class="wfm-lab-cell-index">${kf.atIteration}:</span>
|
||||
<span class="wfm-lab-cell-value">${label}</span>
|
||||
</div>`;
|
||||
}
|
||||
// Iteration #2 and beyond: value on its own line, applied-at iteration below it
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}" data-idx="${idx}">
|
||||
return `<div class="wfm-lab-cell${revertClass}${bypassClass}${nodeBypassClass}${selectedClass}" data-idx="${idx}">
|
||||
<div class="wfm-lab-cell-value">${_cellLabel(col, kf)}</div>
|
||||
<div class="wfm-lab-cell-applied">${t("labAppliedAt", kf.atIteration)}</div>
|
||||
</div>`;
|
||||
@@ -1218,6 +1373,20 @@ function _annotatedImageRef(img) {
|
||||
return `${rel} [${img.type || "output"}]`;
|
||||
}
|
||||
|
||||
// Extracts the last frame of a just-generated video output and uploads it as a plain
|
||||
// "input" image, returning the filename LoadImage's image widget expects (no [type]
|
||||
// suffix needed — uploadImage always lands in the input folder). Used only by the
|
||||
// chain-image path below; the Video tab will reuse extractLastFrameBlob() directly
|
||||
// once it grows its own batch/chaining feature.
|
||||
async function _extractAndUploadLastFrame(img) {
|
||||
const url = _resultImageUrl(img);
|
||||
const blob = await extractLastFrameBlob(url);
|
||||
const file = new File([blob], `lab_lastframe_${Date.now()}.png`, { type: "image/png" });
|
||||
const result = await comfyUI.uploadImage(file, file.name);
|
||||
if (!result.name) throw new Error("Upload returned no filename");
|
||||
return result.name;
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Batch execution
|
||||
// ============================================
|
||||
@@ -1261,6 +1430,10 @@ async function _runLabBatch() {
|
||||
const progressBar = document.getElementById("wfm-lab-progress-bar");
|
||||
const progressText = document.getElementById("wfm-lab-progress-text");
|
||||
const eagleAutoSave = getEagleSettings().autoSave;
|
||||
// Video workflows (e.g. MiniMax H3) run far longer than a still image — use a longer
|
||||
// timeout for every iteration so a multi-minute generation doesn't get force-rejected
|
||||
// mid-batch (see comfyWorkflow.isVideoWorkflow and generate-tab.js's own use of this).
|
||||
const isVideoWf = comfyWorkflow.isVideoWorkflow(comfyUI.currentAnalysis);
|
||||
|
||||
let completed = 0, failed = 0;
|
||||
let prevLoraInjection = null;
|
||||
@@ -1280,6 +1453,7 @@ async function _runLabBatch() {
|
||||
const { images } = await comfyUI.generate(workflowExpanded, {
|
||||
seedMode: seed != null ? "fixed" : "random",
|
||||
seedValue: seed ?? -1,
|
||||
timeoutMs: isVideoWf ? 30 * 60 * 1000 : undefined,
|
||||
onProgress: (pct) => {
|
||||
if (progressBar) progressBar.style.width = `${(pct * 100).toFixed(1)}%`;
|
||||
if (progressText) progressText.textContent = `[${i}/${_lab.batchCount}] ${(pct * 100).toFixed(0)}%`;
|
||||
@@ -1287,7 +1461,20 @@ async function _runLabBatch() {
|
||||
});
|
||||
const outputImages = images.filter((img) => img.type !== "temp");
|
||||
if (outputImages.length > 0) {
|
||||
_lastGeneratedImageRef = _annotatedImageRef(outputImages[0]);
|
||||
const first = outputImages[0];
|
||||
if (isVideoFilename(first.filename)) {
|
||||
// LoadImage can't take an mp4 directly — extract its last frame
|
||||
// client-side and upload that as an "input" image, so the chain
|
||||
// (Use generated image for next) can feed it back in as first_frame.
|
||||
try {
|
||||
_lastGeneratedImageRef = await _extractAndUploadLastFrame(first);
|
||||
} catch (err) {
|
||||
showToast(t("labLastFrameExtractFailed", err.message), "error");
|
||||
_lastGeneratedImageRef = null;
|
||||
}
|
||||
} else {
|
||||
_lastGeneratedImageRef = _annotatedImageRef(first);
|
||||
}
|
||||
}
|
||||
for (const img of outputImages) {
|
||||
if (_lab.results.images.length < MAX_RESULTS) {
|
||||
@@ -1337,14 +1524,23 @@ function _renderResultsGrid() {
|
||||
grid.innerHTML = `<p class="wfm-placeholder">${t("labNoResultsYet")}</p>`;
|
||||
return;
|
||||
}
|
||||
grid.innerHTML = _lab.results.images.map((img, i) => `
|
||||
grid.innerHTML = _lab.results.images.map((img, i) => {
|
||||
const url = _resultImageUrl(img);
|
||||
const media = isVideoFilename(img.filename)
|
||||
? `<video class="wfm-lab-result-thumb" data-idx="${i}" src="${url}" muted></video>`
|
||||
: `<img class="wfm-lab-result-thumb" data-idx="${i}" src="${url}">`;
|
||||
return `
|
||||
<div class="wfm-lab-result-item">
|
||||
<span class="wfm-lab-result-index">${img.iteration}</span>
|
||||
<img class="wfm-lab-result-thumb" data-idx="${i}" src="${_resultImageUrl(img)}">
|
||||
</div>`).join("");
|
||||
${media}
|
||||
</div>`;
|
||||
}).join("");
|
||||
grid.querySelectorAll(".wfm-lab-result-thumb").forEach((el) => {
|
||||
el.addEventListener("click", () => {
|
||||
openModal(t("labResultPreview"), `<img src="${el.src}" style="max-width:100%;max-height:80vh;display:block;margin:0 auto;">`);
|
||||
const content = el.tagName === "VIDEO"
|
||||
? `<video src="${el.src}" controls style="max-width:100%;max-height:80vh;display:block;margin:0 auto;"></video>`
|
||||
: `<img src="${el.src}" style="max-width:100%;max-height:80vh;display:block;margin:0 auto;">`;
|
||||
openModal(t("labResultPreview"), content);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -1391,6 +1587,23 @@ function _loadImageEl(src) {
|
||||
});
|
||||
}
|
||||
|
||||
// A result item's own URL (e.g. .mp4) can't be loaded into an <img> — extract its
|
||||
// last frame first so the index/contact-sheet gets a real thumbnail instead of
|
||||
// silently failing onto the canvas's black background (see _buildIndexImageDataUrl).
|
||||
async function _loadIndexCellImage(img) {
|
||||
const url = _resultImageUrl(img);
|
||||
if (!isVideoFilename(img.filename)) return _loadImageEl(url);
|
||||
try {
|
||||
const blob = await extractLastFrameBlob(url);
|
||||
const blobUrl = URL.createObjectURL(blob);
|
||||
const im = await _loadImageEl(blobUrl);
|
||||
URL.revokeObjectURL(blobUrl);
|
||||
return im;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// planData, when given, is embedded into the resulting PNG as an iTXt chunk
|
||||
// (LAB_PLAN_PNG_KEY) so the image alone — dropped onto the Plan drop zone, from
|
||||
// anywhere, not just lab_plan/ — can be loaded back without needing a same-named
|
||||
@@ -1410,7 +1623,7 @@ async function _buildIndexImageDataUrl(planData) {
|
||||
ctx.fillRect(0, 0, canvas.width, canvas.height);
|
||||
|
||||
for (let i = 0; i < imgs.length; i++) {
|
||||
const im = await _loadImageEl(_resultImageUrl(imgs[i]));
|
||||
const im = await _loadIndexCellImage(imgs[i]);
|
||||
if (!im) continue;
|
||||
const col = i % cols, row = Math.floor(i / cols);
|
||||
const scale = Math.max(cellSize / im.width, cellSize / im.height);
|
||||
@@ -1517,6 +1730,7 @@ function _applyPlanData(filename, data) {
|
||||
_lab.workflowFilename = data.workflow_filename || null;
|
||||
_lab.columns = _migrateLabColumns(data.columns);
|
||||
_lab.results = { images: (data.results?.images || []).slice(0, MAX_RESULTS) };
|
||||
_selectedIdx = {}; // every column's array was just replaced wholesale
|
||||
_updatePlanWorkflowUI();
|
||||
_updateT2IModeUI();
|
||||
|
||||
@@ -1596,6 +1810,7 @@ async function _loadPlanFromServer(filename) {
|
||||
function _clearPlan() {
|
||||
if (!window.confirm(t("labConfirmClear"))) return;
|
||||
_lab = _emptyLabState();
|
||||
_selectedIdx = {};
|
||||
|
||||
const noteEl = document.getElementById("wfm-lab-note");
|
||||
const batchEl = document.getElementById("wfm-lab-batch-count");
|
||||
|
||||
@@ -97,6 +97,81 @@ export async function readAllPNGTextChunks(file) {
|
||||
return chunks;
|
||||
}
|
||||
|
||||
// ── MP4 container metadata (moov/udta/meta の mdta keys/ilst) ──
|
||||
// ComfyUIのSaveVideoはPNGのtEXtチャンクと同じキー名(workflow=UI形式, prompt=API形式)で
|
||||
// JSON文字列をisobmff(mp4)のudta/meta(mdta)にコンテナレベルタグとして書き込む(FFmpegの
|
||||
// movflags=+use_metadata_tags)。ここではPyAV等に頼らずブラウザ側でボックスを直接辿って読む。
|
||||
function findMP4Box(view, bytes, start, end, targetType) {
|
||||
let offset = start;
|
||||
while (offset + 8 <= end) {
|
||||
const size = view.getUint32(offset);
|
||||
const type = String.fromCharCode(bytes[offset + 4], bytes[offset + 5], bytes[offset + 6], bytes[offset + 7]);
|
||||
let boxSize = size;
|
||||
let bodyStart = offset + 8;
|
||||
if (size === 1) {
|
||||
if (offset + 16 > end) break;
|
||||
const hi = view.getUint32(offset + 8);
|
||||
const lo = view.getUint32(offset + 12);
|
||||
boxSize = hi * 4294967296 + lo;
|
||||
bodyStart = offset + 16;
|
||||
} else if (size === 0) {
|
||||
boxSize = end - offset;
|
||||
}
|
||||
if (boxSize < 8) break;
|
||||
if (type === targetType) return { bodyStart, end: offset + boxSize };
|
||||
offset += boxSize;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export async function readMP4MetaTags(file) {
|
||||
const buffer = await file.arrayBuffer();
|
||||
const bytes = new Uint8Array(buffer);
|
||||
const view = new DataView(buffer);
|
||||
if (bytes.length < 12) return null;
|
||||
const ftyp = String.fromCharCode(bytes[4], bytes[5], bytes[6], bytes[7]);
|
||||
if (ftyp !== "ftyp") return null;
|
||||
|
||||
const moov = findMP4Box(view, bytes, 0, bytes.length, "moov");
|
||||
if (!moov) return null;
|
||||
const udta = findMP4Box(view, bytes, moov.bodyStart, moov.end, "udta");
|
||||
let meta = udta ? findMP4Box(view, bytes, udta.bodyStart, udta.end, "meta") : null;
|
||||
if (!meta) meta = findMP4Box(view, bytes, moov.bodyStart, moov.end, "meta");
|
||||
if (!meta) return null;
|
||||
const metaBody = meta.bodyStart + 4; // meta は FullBox (version+flags 4バイト)
|
||||
const keysBox = findMP4Box(view, bytes, metaBody, meta.end, "keys");
|
||||
const ilstBox = findMP4Box(view, bytes, metaBody, meta.end, "ilst");
|
||||
if (!keysBox || !ilstBox) return null;
|
||||
|
||||
const utf8 = new TextDecoder("utf-8", { fatal: false });
|
||||
let off = keysBox.bodyStart + 4; // version+flags をスキップ
|
||||
const count = view.getUint32(off); off += 4;
|
||||
const keyNames = [];
|
||||
for (let i = 0; i < count && off + 8 <= keysBox.end; i++) {
|
||||
const ksize = view.getUint32(off);
|
||||
if (ksize < 8) break;
|
||||
keyNames.push(utf8.decode(bytes.slice(off + 8, off + ksize)));
|
||||
off += ksize;
|
||||
}
|
||||
|
||||
const result = {};
|
||||
let ioff = ilstBox.bodyStart;
|
||||
while (ioff + 8 <= ilstBox.end) {
|
||||
const itemSize = view.getUint32(ioff);
|
||||
const keyIndex = view.getUint32(ioff + 4);
|
||||
if (itemSize < 8) break;
|
||||
const itemEnd = Math.min(ioff + itemSize, ilstBox.end);
|
||||
const data = findMP4Box(view, bytes, ioff + 8, itemEnd, "data");
|
||||
if (data) {
|
||||
const payload = bytes.slice(data.bodyStart + 8, data.end); // type(4)+locale(4)をスキップ
|
||||
const name = keyNames[keyIndex - 1];
|
||||
if (name) { try { result[name] = utf8.decode(payload); } catch { /* skip */ } }
|
||||
}
|
||||
ioff = itemEnd;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// ── Workflow extraction helpers ───────────────────────────────
|
||||
function collectUnique(arr) {
|
||||
const seen = new Set(), out = [];
|
||||
@@ -459,6 +534,13 @@ function extractPromptsAPI(wf) {
|
||||
if (combined) textMap.set(id, combined);
|
||||
continue;
|
||||
}
|
||||
// MiniMaxH3ImageToVideo等の動画生成オールインワンノード。CLIPTextEncode等を経由せず
|
||||
// 自ノードの"prompt"入力に直接テキストを持つ(positive/negativeの区別も無い)ため、
|
||||
// isTextEncoderNode判定を通さずtextMapへ直接投入する(fallbackのtextsに載る)。
|
||||
if (typeof n.inputs?.prompt === "string" && /ImageToVideo|TextToVideo/i.test(ct)) {
|
||||
textMap.set(id, n.inputs.prompt);
|
||||
continue;
|
||||
}
|
||||
if (!isTextEncoderNode(ct)) continue;
|
||||
// "prompt" — TextEncodeQwenImageEdit(Plus)/TextEncodeBooguEdit and similar Image Edit
|
||||
// model text encoders use this key instead of "text"/"text_g".
|
||||
@@ -607,6 +689,7 @@ 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");
|
||||
const isMP4 = file.type === "video/mp4" || name.endsWith(".mp4");
|
||||
|
||||
async function fromWorkflow(originalWf, source) {
|
||||
let wf = originalWf;
|
||||
@@ -644,6 +727,17 @@ export async function extractAllMetadata(file) {
|
||||
const wf = extractWorkflowFromEXIF(exif);
|
||||
return wf ? await fromWorkflow(wf, "comfyui") : null;
|
||||
}
|
||||
if (isMP4) {
|
||||
let tags; try { tags = await readMP4MetaTags(file); } catch { return null; }
|
||||
if (!tags) return null;
|
||||
for (const key of ["prompt", "workflow"]) {
|
||||
const raw = tags[key];
|
||||
if (!raw) continue;
|
||||
let wf; try { wf = JSON.parse(sanitizeJSON(raw)); } catch { continue; }
|
||||
if (wf) return await fromWorkflow(wf, "comfyui");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
// PNG
|
||||
const chunks = await readAllPNGTextChunks(file);
|
||||
if (!chunks) return null;
|
||||
|
||||
@@ -208,6 +208,13 @@ function matchesSearch(p) {
|
||||
(p.tags || []).some(t => t.toLowerCase().includes(s));
|
||||
}
|
||||
|
||||
// Ordered list of actual preset objects for a group (stale ids already filtered out by
|
||||
// loadAllPresets, but this is defensive for callers that read pmGroups directly too).
|
||||
export function getPresetsInGroup(groupName) {
|
||||
const ids = pmGroups[groupName] || [];
|
||||
return ids.map(id => promptPresets.find(p => p.id === id)).filter(Boolean);
|
||||
}
|
||||
|
||||
export function isInBatchPreset(id) {
|
||||
return (pmGroups["Batch"] || []).includes(id);
|
||||
}
|
||||
|
||||
@@ -768,6 +768,7 @@ function openWildcardPromptModal(file) {
|
||||
let tableStyles = [];
|
||||
let stylesSearch = "";
|
||||
let pendingNewStyle = false;
|
||||
let pendingNewStyleFile = null; // null = default custom.json; set by "+ Add to this file"
|
||||
const selectedStyleNames = new Set();
|
||||
|
||||
function styleMatchesSearch(s) {
|
||||
@@ -781,9 +782,18 @@ function styleMatchesSearch(s) {
|
||||
function updateStylesDeleteBtn() {
|
||||
const btn = document.getElementById("wfm-ptable-style-delete-btn");
|
||||
const deselectBtn = document.getElementById("wfm-ptable-style-deselect-btn");
|
||||
const addFileBtn = document.getElementById("wfm-ptable-style-addfile-btn");
|
||||
const n = selectedStyleNames.size;
|
||||
if (btn) { btn.disabled = n === 0; btn.textContent = n > 0 ? `Delete (${n})` : "Delete"; }
|
||||
if (deselectBtn) deselectBtn.disabled = n === 0;
|
||||
// 「このファイルへ追加」は選択が1件かつcustom.json以外のファイル由来のときだけ有効
|
||||
// (prompt-styles.js の Form 版と同じ制約 — custom.jsonは既に「+ New Style」で追加可能)
|
||||
if (addFileBtn) {
|
||||
const single = n === 1 ? tableStyles.find(s => selectedStyleNames.has(s.name)) : null;
|
||||
const targetFile = (single?.file && single.file !== "custom.json") ? single.file : "";
|
||||
addFileBtn.disabled = !targetFile;
|
||||
addFileBtn.dataset.targetFile = targetFile;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadStylesTable() {
|
||||
@@ -841,11 +851,14 @@ function buildStyleRow(style, index) {
|
||||
tr.appendChild(tdName);
|
||||
|
||||
const tdFile = document.createElement("td");
|
||||
if (style?.file) {
|
||||
// 新規行は保存先未定(=custom.json)なら空欄のまま、「このファイルへ追加」経由なら
|
||||
// pendingNewStyleFile を保存前からバッジ表示して、どこに追加されるか分かるようにする
|
||||
const fileForBadge = style?.file || (isNew ? pendingNewStyleFile : null);
|
||||
if (fileForBadge) {
|
||||
const badge = document.createElement("span");
|
||||
badge.className = "wfm-prompt-edit-file-badge";
|
||||
badge.title = style.file;
|
||||
badge.textContent = style.file;
|
||||
badge.title = fileForBadge;
|
||||
badge.textContent = fileForBadge;
|
||||
tdFile.appendChild(badge);
|
||||
}
|
||||
tr.appendChild(tdFile);
|
||||
@@ -872,9 +885,10 @@ function buildStyleRow(style, index) {
|
||||
addBtn.addEventListener("click", async () => {
|
||||
const name = nameInput.value.trim();
|
||||
if (!name) { showToast(t("pleaseEnterStyleName"), "error"); nameInput.focus(); return; }
|
||||
const result = await styleApiCreate(name, posTA.value, negTA.value, null);
|
||||
const result = await styleApiCreate(name, posTA.value, negTA.value, pendingNewStyleFile);
|
||||
if (result.ok) {
|
||||
pendingNewStyle = false;
|
||||
pendingNewStyleFile = null;
|
||||
await loadStylesTable();
|
||||
await styleRefreshList();
|
||||
await refreshStylesList();
|
||||
@@ -883,7 +897,7 @@ function buildStyleRow(style, index) {
|
||||
showToast(t("errorWithMsg", result.error), "error");
|
||||
}
|
||||
});
|
||||
cancelBtn.addEventListener("click", () => { pendingNewStyle = false; renderStylesTable(); });
|
||||
cancelBtn.addEventListener("click", () => { pendingNewStyle = false; pendingNewStyleFile = null; renderStylesTable(); });
|
||||
} else {
|
||||
const saveStyleRow = async (changedEl) => {
|
||||
const nameNow = nameInput.value.trim();
|
||||
@@ -1073,6 +1087,16 @@ export function initPromptTableTab() {
|
||||
document.getElementById("wfm-ptable-style-add-btn")?.addEventListener("click", () => {
|
||||
if (pendingNewStyle) return;
|
||||
pendingNewStyle = true;
|
||||
pendingNewStyleFile = null;
|
||||
renderStylesTable();
|
||||
document.querySelector("#wfm-ptable-style-tbody input")?.focus();
|
||||
});
|
||||
document.getElementById("wfm-ptable-style-addfile-btn")?.addEventListener("click", (e) => {
|
||||
if (pendingNewStyle) return;
|
||||
const targetFile = e.currentTarget.dataset.targetFile;
|
||||
if (!targetFile) return;
|
||||
pendingNewStyle = true;
|
||||
pendingNewStyleFile = targetFile;
|
||||
renderStylesTable();
|
||||
document.querySelector("#wfm-ptable-style-tbody input")?.focus();
|
||||
});
|
||||
|
||||
@@ -824,6 +824,25 @@ export async function initSettingsTab() {
|
||||
<input type="file" id="wfm-settings-import-file" accept=".json" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<p style="font-size:12px;color:var(--wfm-text-secondary);margin:12px 0 8px 0;">${t("fullBackupHint")}</p>
|
||||
<div style="display:flex;flex-direction:column;gap:4px;margin-bottom:8px;">
|
||||
<label class="wfm-lab-checkbox-label" style="font-size:12px;">
|
||||
<input type="checkbox" id="wfm-settings-backup-include-workflows">
|
||||
${t("fullBackupIncludeWorkflows")}
|
||||
</label>
|
||||
<label class="wfm-lab-checkbox-label" style="font-size:12px;">
|
||||
<input type="checkbox" id="wfm-settings-backup-include-wildcard">
|
||||
${t("fullBackupIncludeWildcard")}
|
||||
</label>
|
||||
<span style="font-size:11px;color:var(--wfm-text-secondary);">${t("fullBackupExternalHint")}</span>
|
||||
</div>
|
||||
<div style="display:flex;gap:8px;flex-wrap:wrap;">
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-settings-export-full">${t("exportFullBackup")}</button>
|
||||
<label class="wfm-btn wfm-btn-sm" style="cursor:pointer;margin:0;">
|
||||
${t("importFullBackup")}
|
||||
<input type="file" id="wfm-settings-import-full-file" accept=".zip" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<div id="wfm-settings-data-status" style="font-size:12px;margin-top:8px;"></div>
|
||||
</details>
|
||||
|
||||
@@ -1532,8 +1551,53 @@ export async function initSettingsTab() {
|
||||
statusEl.textContent = t("importError") + ": " + e.message;
|
||||
statusEl.style.color = "var(--wfm-error, #f44336)";
|
||||
}
|
||||
// Reset file input so same file can be re-selected
|
||||
e.target.value = "";
|
||||
});
|
||||
|
||||
// --- Full Backup Export (ZIP) ---
|
||||
document.getElementById("wfm-settings-export-full")?.addEventListener("click", async () => {
|
||||
const statusEl = document.getElementById("wfm-settings-data-status");
|
||||
try {
|
||||
const includeWorkflows = document.getElementById("wfm-settings-backup-include-workflows")?.checked ? "1" : "0";
|
||||
const includeWildcard = document.getElementById("wfm-settings-backup-include-wildcard")?.checked ? "1" : "0";
|
||||
const res = await fetch(`/api/wfm/settings/export-full?include_workflows=${includeWorkflows}&include_wildcard=${includeWildcard}`);
|
||||
if (!res.ok) throw new Error(await res.text());
|
||||
const blob = await res.blob();
|
||||
const url = URL.createObjectURL(blob);
|
||||
const a = document.createElement("a");
|
||||
a.href = url;
|
||||
a.download = "wfm-full-backup.zip";
|
||||
a.click();
|
||||
URL.revokeObjectURL(url);
|
||||
statusEl.textContent = t("exportSuccess");
|
||||
statusEl.style.color = "var(--wfm-success, #4caf50)";
|
||||
} catch (e) {
|
||||
statusEl.textContent = t("exportError") + ": " + e.message;
|
||||
statusEl.style.color = "var(--wfm-error, #f44336)";
|
||||
}
|
||||
});
|
||||
|
||||
// --- Full Backup Import (ZIP) ---
|
||||
document.getElementById("wfm-settings-import-full-file")?.addEventListener("change", async (e) => {
|
||||
const statusEl = document.getElementById("wfm-settings-data-status");
|
||||
const file = e.target.files?.[0];
|
||||
if (!file) return;
|
||||
try {
|
||||
const fd = new FormData();
|
||||
fd.append("file", file, file.name);
|
||||
const res = await fetch("/api/wfm/settings/import-full", {
|
||||
method: "POST",
|
||||
body: fd,
|
||||
});
|
||||
const result = await res.json();
|
||||
if (!res.ok) throw new Error(result.error || res.statusText);
|
||||
statusEl.textContent = `${t("importSuccess")}: ${result.extracted?.length ?? 0} ${t("fullBackupFilesUnit")}`;
|
||||
statusEl.style.color = "var(--wfm-success, #4caf50)";
|
||||
} catch (e) {
|
||||
statusEl.textContent = t("importError") + ": " + e.message;
|
||||
statusEl.style.color = "var(--wfm-error, #f44336)";
|
||||
} finally {
|
||||
e.target.value = "";
|
||||
}
|
||||
});
|
||||
|
||||
// Save G'MIC path setting
|
||||
|
||||
@@ -0,0 +1,725 @@
|
||||
/**
|
||||
* Video Tab - MiniMax H3 (Image to Video) 専用の動画生成UI
|
||||
* GenerateUIタブとは完全に独立。UI形式ワークフローJSONを直接編集し、
|
||||
* comfyWorkflow.convertUiToApi() でAPI形式に変換して実行する。
|
||||
* 状態は「テンプレートJSON+フォーム値」のみ保持し、生成の都度
|
||||
* structuredClone() したコピーに書き込む(複数回生成をまたいだID不整合を防ぐ)。
|
||||
*/
|
||||
|
||||
import { showToast } from "./app.js";
|
||||
import { t } from "./i18n.js";
|
||||
import { comfyUI } from "./comfyui-client.js";
|
||||
import { comfyWorkflow } from "./comfyui-workflow.js";
|
||||
import { escapeHtml } from "./util.js";
|
||||
|
||||
const DEFAULT_WORKFLOW_FILENAME = "minimax_test.json";
|
||||
|
||||
const state = {
|
||||
templateWorkflow: null,
|
||||
templateFilename: null,
|
||||
firstFrameFilename: null,
|
||||
lastFrameFilename: null,
|
||||
generating: false,
|
||||
// Whatever's currently shown in the center preview frame — a just-generated
|
||||
// result, or a video dropped/picked in the Video Source panel. Used by the
|
||||
// Frame/GIF property tabs so they work on any video, not just generated ones.
|
||||
// { kind: "output"|"input", filename, subfolder, type } for anything already on
|
||||
// the server, or { kind: "local", file } for a picked file not yet uploaded.
|
||||
previewSource: null,
|
||||
};
|
||||
|
||||
// ============================================
|
||||
// ワークフロー取得
|
||||
// ============================================
|
||||
|
||||
async function getRawWorkflow(filename) {
|
||||
const res = await fetch(`/api/wfm/workflows/raw?filename=${encodeURIComponent(filename)}`);
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
return await res.json();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// MiniMax H3ノードの動的特定(ノードIDをハードコードしない)
|
||||
// ============================================
|
||||
|
||||
// ノードのinputs[]のうちwidgetキーを持つものだけを抽出した並び順で、名前からインデックスを引く。
|
||||
// widgets_values配列はこの並び順と1:1対応する(link接続されていてもwidgetキーを持つ入力は
|
||||
// widgets_valuesにスロットを持つ「legacy full」形式のため)。
|
||||
function _widgetIndex(node, name) {
|
||||
const widgetInputs = (node?.inputs || []).filter((inp) => inp.widget);
|
||||
return widgetInputs.findIndex((inp) => inp.name === name);
|
||||
}
|
||||
|
||||
function locateMiniMaxNodes(workflow) {
|
||||
if (!Array.isArray(workflow?.nodes) || !Array.isArray(workflow?.links)) return null;
|
||||
|
||||
const sgDef = (workflow.definitions?.subgraphs || [])
|
||||
.find((sg) => (sg.nodes || []).some((n) => n.type === "MiniMaxH3ImageToVideo"));
|
||||
if (!sgDef) return null;
|
||||
|
||||
const instanceNode = workflow.nodes.find((n) => n.type === sgDef.id);
|
||||
if (!instanceNode || !Array.isArray(instanceNode.widgets_values)) return null;
|
||||
|
||||
const firstFrameSlot = instanceNode.inputs.findIndex((inp) => inp.name === "first_frame");
|
||||
const lastFrameSlot = instanceNode.inputs.findIndex((inp) => inp.name === "last_frame");
|
||||
const widthSlot = instanceNode.inputs.findIndex((inp) => inp.name === "width");
|
||||
if (firstFrameSlot === -1 || lastFrameSlot === -1 || widthSlot === -1) return null;
|
||||
|
||||
const findLinkedNode = (targetSlot) => {
|
||||
const link = workflow.links.find((l) => l[3] === instanceNode.id && l[4] === targetSlot);
|
||||
if (!link) return null;
|
||||
return workflow.nodes.find((n) => n.id === link[1]) || null;
|
||||
};
|
||||
|
||||
// first_frameはoptional入力のため、LoadImageノードが接続されていないワークフロー
|
||||
// (テキストのみで動作するT2V構成など)もサポート対象とする。未接続の場合は
|
||||
// loadImageNode: null のまま返し、必要ならrunGeneration側で動的にノードを注入する。
|
||||
const rawLoadImageNode = findLinkedNode(firstFrameSlot);
|
||||
const loadImageNode = (rawLoadImageNode && rawLoadImageNode.type === "LoadImage") ? rawLoadImageNode : null;
|
||||
const resolutionNode = findLinkedNode(widthSlot);
|
||||
if (!resolutionNode || resolutionNode.type !== "ResolutionSelector") return null;
|
||||
|
||||
const promptIdx = _widgetIndex(instanceNode, "prompt");
|
||||
const durationIdx = _widgetIndex(instanceNode, "value_1");
|
||||
if (promptIdx === -1 || durationIdx === -1) return null;
|
||||
|
||||
return {
|
||||
sgDef, instanceNode, loadImageNode, resolutionNode,
|
||||
firstFrameSlot, lastFrameSlot, promptIdx, durationIdx,
|
||||
};
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// ワークフロー読み込み
|
||||
// ============================================
|
||||
|
||||
function _showFramePreview(which, filename) {
|
||||
const previewImg = document.getElementById(`wfm-video-${which}-frame-preview`);
|
||||
const wrap = document.getElementById(`wfm-video-${which}-frame-wrap`);
|
||||
if (!previewImg || !wrap || !filename) return;
|
||||
previewImg.src = `${comfyUI.baseUrl}/view?filename=${encodeURIComponent(filename)}&type=input`;
|
||||
wrap.style.display = "";
|
||||
}
|
||||
|
||||
export async function loadWorkflowIntoVideoEditor(workflow, filename) {
|
||||
const nodes = locateMiniMaxNodes(workflow);
|
||||
if (!nodes) {
|
||||
showToast(t("videoUnsupportedWorkflow"), "error");
|
||||
return false;
|
||||
}
|
||||
|
||||
state.templateWorkflow = workflow;
|
||||
state.templateFilename = filename || "";
|
||||
state.firstFrameFilename = null;
|
||||
state.lastFrameFilename = null;
|
||||
|
||||
const nameEl = document.getElementById("wfm-video-wf-name");
|
||||
if (nameEl) nameEl.textContent = filename || "Loaded Workflow";
|
||||
|
||||
const { instanceNode, resolutionNode, loadImageNode, promptIdx, durationIdx } = nodes;
|
||||
|
||||
const promptEl = document.getElementById("wfm-video-prompt");
|
||||
if (promptEl) promptEl.value = instanceNode.widgets_values[promptIdx] ?? "";
|
||||
|
||||
const durationEl = document.getElementById("wfm-video-duration");
|
||||
if (durationEl) durationEl.value = instanceNode.widgets_values[durationIdx] ?? 2;
|
||||
|
||||
const arIdx = _widgetIndex(resolutionNode, "aspect_ratio");
|
||||
const mpIdx = _widgetIndex(resolutionNode, "megapixels");
|
||||
const multIdx = _widgetIndex(resolutionNode, "multiple");
|
||||
const aspectEl = document.getElementById("wfm-video-aspect-ratio");
|
||||
if (aspectEl && arIdx !== -1 && resolutionNode.widgets_values[arIdx] != null) {
|
||||
aspectEl.value = resolutionNode.widgets_values[arIdx];
|
||||
}
|
||||
const mpEl = document.getElementById("wfm-video-megapixels");
|
||||
if (mpEl && mpIdx !== -1) mpEl.value = resolutionNode.widgets_values[mpIdx] ?? mpEl.value;
|
||||
const multEl = document.getElementById("wfm-video-multiple");
|
||||
if (multEl && multIdx !== -1) multEl.value = resolutionNode.widgets_values[multIdx] ?? multEl.value;
|
||||
|
||||
const fnIdx = _widgetIndex(loadImageNode, "image");
|
||||
if (fnIdx !== -1 && loadImageNode.widgets_values[fnIdx]) {
|
||||
state.firstFrameFilename = loadImageNode.widgets_values[fnIdx];
|
||||
_showFramePreview("first", state.firstFrameFilename);
|
||||
}
|
||||
|
||||
showToast(t("videoWorkflowLoaded", filename || ""), "success");
|
||||
return true;
|
||||
}
|
||||
|
||||
async function loadDefaultWorkflow() {
|
||||
try {
|
||||
const wf = await getRawWorkflow(DEFAULT_WORKFLOW_FILENAME);
|
||||
await loadWorkflowIntoVideoEditor(wf, DEFAULT_WORKFLOW_FILENAME);
|
||||
} catch {
|
||||
// 初回自動ロード失敗は静かに無視する(環境によってファイルが存在しないこともある)。
|
||||
// Workflowタブの「Load in Video」ボタンから明示的に読み込める。
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Aspect Ratio 選択肢(object_infoから動的取得、ハードコードしない)
|
||||
// ============================================
|
||||
|
||||
async function _populateAspectRatioOptions() {
|
||||
const select = document.getElementById("wfm-video-aspect-ratio");
|
||||
if (!select) return;
|
||||
try {
|
||||
const info = await comfyUI.fetchObjectInfo("ResolutionSelector");
|
||||
const inputDef = info?.ResolutionSelector?.input?.required?.aspect_ratio;
|
||||
if (!inputDef) return;
|
||||
const first = inputDef[0];
|
||||
let values = null;
|
||||
if (Array.isArray(first)) values = first;
|
||||
else if (typeof first === "string" && Array.isArray(inputDef[1]?.values)) values = inputDef[1].values;
|
||||
else if (typeof first === "string" && Array.isArray(inputDef[1]?.options)) values = inputDef[1].options;
|
||||
if (!values?.length) return;
|
||||
select.innerHTML = values.map((v) => `<option value="${escapeHtml(v)}">${escapeHtml(v)}</option>`).join("");
|
||||
} catch {
|
||||
// ResolutionSelectorが未導入の環境などは選択肢が空のまま(手入力不可のselectなので実質何もできないが、
|
||||
// Videoタブ自体の初期化は継続させる)。
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// first_frame / last_frame アップロード
|
||||
// ============================================
|
||||
|
||||
function _wireDropZone(dropZoneId, fileInputId, onFile) {
|
||||
const dropZone = document.getElementById(dropZoneId);
|
||||
const fileInput = document.getElementById(fileInputId);
|
||||
if (!dropZone || !fileInput) return;
|
||||
fileInput.addEventListener("change", () => {
|
||||
if (fileInput.files.length > 0) onFile(fileInput.files[0]);
|
||||
});
|
||||
dropZone.addEventListener("dragover", (e) => { e.preventDefault(); dropZone.classList.add("drag-over"); });
|
||||
dropZone.addEventListener("dragleave", () => dropZone.classList.remove("drag-over"));
|
||||
dropZone.addEventListener("drop", (e) => {
|
||||
e.preventDefault();
|
||||
dropZone.classList.remove("drag-over");
|
||||
if (e.dataTransfer.files.length > 0) onFile(e.dataTransfer.files[0]);
|
||||
});
|
||||
}
|
||||
|
||||
async function _handleFrameUpload(which, file) {
|
||||
if (!file || !file.type.startsWith("image/")) return;
|
||||
const statusEl = document.getElementById(`wfm-video-${which}-frame-status`);
|
||||
const previewImg = document.getElementById(`wfm-video-${which}-frame-preview`);
|
||||
const wrap = document.getElementById(`wfm-video-${which}-frame-wrap`);
|
||||
if (previewImg) previewImg.src = URL.createObjectURL(file);
|
||||
if (wrap) wrap.style.display = "";
|
||||
if (statusEl) statusEl.textContent = "Uploading...";
|
||||
try {
|
||||
const result = await comfyUI.uploadImage(file, file.name);
|
||||
if (which === "first") state.firstFrameFilename = result.name;
|
||||
else state.lastFrameFilename = result.name;
|
||||
if (statusEl) {
|
||||
statusEl.textContent = `✓ ${result.name}`;
|
||||
statusEl.style.color = "var(--wfm-success)";
|
||||
}
|
||||
} catch (err) {
|
||||
if (statusEl) {
|
||||
statusEl.textContent = `✗ ${err.message}`;
|
||||
statusEl.style.color = "var(--wfm-danger)";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function _clearFrame(which) {
|
||||
if (which === "first") state.firstFrameFilename = null;
|
||||
else state.lastFrameFilename = null;
|
||||
const wrap = document.getElementById(`wfm-video-${which}-frame-wrap`);
|
||||
const previewImg = document.getElementById(`wfm-video-${which}-frame-preview`);
|
||||
const statusEl = document.getElementById(`wfm-video-${which}-frame-status`);
|
||||
const fileInput = document.getElementById(`wfm-video-${which}-frame-file`);
|
||||
if (wrap) wrap.style.display = "none";
|
||||
if (previewImg) previewImg.src = "";
|
||||
if (statusEl) statusEl.textContent = "";
|
||||
if (fileInput) fileInput.value = "";
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// フォーム値の読み取り・ワークフローへの反映
|
||||
// ============================================
|
||||
|
||||
function _readFormValues() {
|
||||
return {
|
||||
prompt: document.getElementById("wfm-video-prompt")?.value || "",
|
||||
aspectRatio: document.getElementById("wfm-video-aspect-ratio")?.value || "",
|
||||
megapixels: Number(document.getElementById("wfm-video-megapixels")?.value) || 0.2,
|
||||
multiple: Number(document.getElementById("wfm-video-multiple")?.value) || 32,
|
||||
duration: Number(document.getElementById("wfm-video-duration")?.value) || 2,
|
||||
};
|
||||
}
|
||||
|
||||
function _applyFormToWorkflow(nodes, form) {
|
||||
const { instanceNode, resolutionNode, loadImageNode, promptIdx, durationIdx } = nodes;
|
||||
|
||||
instanceNode.widgets_values[promptIdx] = form.prompt;
|
||||
instanceNode.widgets_values[durationIdx] = form.duration;
|
||||
|
||||
const arIdx = _widgetIndex(resolutionNode, "aspect_ratio");
|
||||
const mpIdx = _widgetIndex(resolutionNode, "megapixels");
|
||||
const multIdx = _widgetIndex(resolutionNode, "multiple");
|
||||
if (arIdx !== -1) resolutionNode.widgets_values[arIdx] = form.aspectRatio;
|
||||
if (mpIdx !== -1) resolutionNode.widgets_values[mpIdx] = form.megapixels;
|
||||
if (multIdx !== -1) resolutionNode.widgets_values[multIdx] = form.multiple;
|
||||
|
||||
// first_frameは既存のLoadImageノードが接続されている場合のみここで書き換える。
|
||||
// 接続が無い場合(loadImageNode: null)は、first_frameが新規指定された時だけ
|
||||
// _injectFrameNode()でノードごと注入する(未指定ならバイパス=未接続のまま実行)。
|
||||
if (loadImageNode) {
|
||||
const fnIdx = _widgetIndex(loadImageNode, "image");
|
||||
if (fnIdx !== -1) loadImageNode.widgets_values[fnIdx] = state.firstFrameFilename;
|
||||
}
|
||||
}
|
||||
|
||||
// first_frame/last_frameが未接続のワークフローに対して、画像が指定された時だけ
|
||||
// LoadImageノードを新規注入する共通ヘルパー。ノードID/リンクIDはclone内の実際の
|
||||
// 最大値+1で採番するため、重複ID/リンクID不整合は起きない
|
||||
// (CLAUDE.md記載の既知の落とし穴への対策)。未指定時は何もしない
|
||||
// (テンプレート由来のlink:nullのまま=クリーンな状態を毎回cloneするので残留の心配がない=バイパス扱い)。
|
||||
function _injectFrameNode(clone, instanceNode, targetSlot, filename) {
|
||||
const maxNodeId = Math.max(clone.last_node_id || 0, ...clone.nodes.map((n) => n.id));
|
||||
const maxLinkId = Math.max(clone.last_link_id || 0, ...clone.links.map((l) => l[0]));
|
||||
const newNodeId = maxNodeId + 1;
|
||||
const newLinkId = maxLinkId + 1;
|
||||
|
||||
clone.nodes.push({
|
||||
id: newNodeId,
|
||||
type: "LoadImage",
|
||||
pos: [(instanceNode.pos?.[0] || 0) - 260, (instanceNode.pos?.[1] || 0) + 40],
|
||||
size: [280, 314],
|
||||
flags: {},
|
||||
order: clone.nodes.length,
|
||||
mode: 0,
|
||||
inputs: [
|
||||
{ localized_name: "image", name: "image", type: "COMBO", widget: { name: "image" }, link: null },
|
||||
{ localized_name: "choose file to upload", name: "upload", type: "IMAGEUPLOAD", widget: { name: "upload" }, link: null },
|
||||
],
|
||||
outputs: [
|
||||
{ localized_name: "IMAGE", name: "IMAGE", type: "IMAGE", links: [newLinkId] },
|
||||
{ localized_name: "MASK", name: "MASK", type: "MASK", links: null },
|
||||
],
|
||||
properties: { "Node name for S&R": "LoadImage" },
|
||||
widgets_values: [filename, "image"],
|
||||
});
|
||||
|
||||
clone.links.push([newLinkId, newNodeId, 0, instanceNode.id, targetSlot, "IMAGE"]);
|
||||
const targetInput = instanceNode.inputs[targetSlot];
|
||||
if (targetInput) targetInput.link = newLinkId;
|
||||
|
||||
clone.last_node_id = newNodeId;
|
||||
clone.last_link_id = newLinkId;
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// 実行
|
||||
// ============================================
|
||||
|
||||
async function runGeneration() {
|
||||
if (state.generating) return;
|
||||
if (!state.templateWorkflow) {
|
||||
showToast(t("videoNoWorkflowLoaded"), "error");
|
||||
return;
|
||||
}
|
||||
|
||||
const clone = structuredClone(state.templateWorkflow);
|
||||
const nodes = locateMiniMaxNodes(clone);
|
||||
if (!nodes) {
|
||||
showToast(t("videoUnsupportedWorkflow"), "error");
|
||||
return;
|
||||
}
|
||||
|
||||
_applyFormToWorkflow(nodes, _readFormValues());
|
||||
// first_frame: 既存のLoadImageノードが無いワークフロー(T2V構成等)で、
|
||||
// ユーザーが新たに画像を指定した場合のみノードを注入する。未指定ならバイパス(未接続のまま実行)。
|
||||
if (!nodes.loadImageNode && state.firstFrameFilename) {
|
||||
_injectFrameNode(clone, nodes.instanceNode, nodes.firstFrameSlot, state.firstFrameFilename);
|
||||
}
|
||||
if (state.lastFrameFilename) {
|
||||
_injectFrameNode(clone, nodes.instanceNode, nodes.lastFrameSlot, state.lastFrameFilename);
|
||||
}
|
||||
|
||||
const genBtn = document.getElementById("wfm-video-generate-btn");
|
||||
const progressBar = document.getElementById("wfm-video-progress-bar");
|
||||
const progressText = document.getElementById("wfm-video-progress-text");
|
||||
|
||||
state.generating = true;
|
||||
if (genBtn) genBtn.disabled = true;
|
||||
if (progressBar) progressBar.style.width = "0%";
|
||||
if (progressText) progressText.textContent = "Converting workflow...";
|
||||
|
||||
try {
|
||||
const apiWorkflow = await comfyWorkflow.convertUiToApi(clone);
|
||||
|
||||
const seedValue = Number(document.getElementById("wfm-video-noise-seed")?.value) || 0;
|
||||
const seedMode = document.getElementById("wfm-video-seed-randomize")?.checked ? "random" : "fixed";
|
||||
|
||||
const { images, seed } = await comfyUI.generate(apiWorkflow, {
|
||||
seedMode,
|
||||
seedValue,
|
||||
timeoutMs: 30 * 60 * 1000, // 動画生成は静止画より長時間になりうる
|
||||
onProgress: (pct) => {
|
||||
if (progressBar) progressBar.style.width = `${(pct * 100).toFixed(1)}%`;
|
||||
if (progressText) progressText.textContent = `${(pct * 100).toFixed(0)}%`;
|
||||
},
|
||||
});
|
||||
|
||||
const seedEl = document.getElementById("wfm-video-noise-seed");
|
||||
if (seedEl) seedEl.value = seed;
|
||||
|
||||
const outputMedia = images.filter((img) => img.type !== "temp");
|
||||
if (progressText) progressText.textContent = t("videoDoneCount", outputMedia.length);
|
||||
if (progressBar) progressBar.style.width = "100%";
|
||||
|
||||
_renderResult(outputMedia);
|
||||
await _saveGeneratedVideoMeta(outputMedia, apiWorkflow);
|
||||
showToast(t("videoGenerateSuccess"), "success");
|
||||
} catch (err) {
|
||||
showToast(t("errorWithMsg", err.message), "error");
|
||||
if (progressText) progressText.textContent = "Error";
|
||||
} finally {
|
||||
state.generating = false;
|
||||
if (genBtn) genBtn.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// 結果表示
|
||||
// ============================================
|
||||
|
||||
// Sets (or clears) the center preview frame's video and records where it came from —
|
||||
// `source` is what the Frame/GIF property tabs act on (see state.previewSource above).
|
||||
// Revokes the previous blob: URL (if any) so picking a series of local files doesn't
|
||||
// leak memory.
|
||||
let _previewObjectUrl = null;
|
||||
|
||||
function _setPreviewMedia(url, source) {
|
||||
state.previewSource = source;
|
||||
const video = document.getElementById("wfm-video-preview-video");
|
||||
const placeholder = document.getElementById("wfm-video-preview-placeholder");
|
||||
if (!video || !placeholder) return;
|
||||
|
||||
if (_previewObjectUrl) {
|
||||
URL.revokeObjectURL(_previewObjectUrl);
|
||||
_previewObjectUrl = null;
|
||||
}
|
||||
if (url && url.startsWith("blob:")) _previewObjectUrl = url;
|
||||
|
||||
if (url) {
|
||||
video.src = url;
|
||||
video.style.display = "block";
|
||||
placeholder.style.display = "none";
|
||||
} else {
|
||||
video.pause();
|
||||
video.removeAttribute("src");
|
||||
video.load();
|
||||
video.style.display = "none";
|
||||
placeholder.style.display = "";
|
||||
}
|
||||
}
|
||||
|
||||
function _renderResult(images) {
|
||||
// MiniMax H3 always emits a single VIDEO output — but guard generically (prefer
|
||||
// an mp4 if present) in case a future video workflow's SaveVideo/PreviewVideo
|
||||
// ordering differs.
|
||||
const media = (images || []).find((img) => img.filename.toLowerCase().endsWith(".mp4")) || images?.[0];
|
||||
if (!media) {
|
||||
_setPreviewMedia(null, null);
|
||||
return;
|
||||
}
|
||||
const params = new URLSearchParams({ filename: media.filename, subfolder: media.subfolder || "", type: media.type || "output" });
|
||||
const src = `${comfyUI.baseUrl}/view?${params}`;
|
||||
_setPreviewMedia(src, {
|
||||
kind: media.type === "input" ? "input" : "output",
|
||||
filename: media.filename,
|
||||
subfolder: media.subfolder || "",
|
||||
type: media.type || "output",
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Gallery連携(生成結果のワークフローをサイドカーメタとして保存)
|
||||
// ============================================
|
||||
|
||||
let _outputDir = "";
|
||||
|
||||
async function _fetchOutputDir() {
|
||||
try {
|
||||
const res = await fetch("/api/wfm/settings/output-dir");
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
_outputDir = (data.current || "").replace(/\\/g, "/").replace(/\/$/, "");
|
||||
}
|
||||
} catch { /* non-critical */ }
|
||||
}
|
||||
|
||||
async function _saveGeneratedVideoMeta(images, workflow) {
|
||||
if (!_outputDir) await _fetchOutputDir();
|
||||
if (!_outputDir) return;
|
||||
for (const img of images) {
|
||||
if (img.type !== "output") continue;
|
||||
const parts = [_outputDir];
|
||||
if (img.subfolder) parts.push(img.subfolder);
|
||||
parts.push(img.filename);
|
||||
const path = parts.join("/");
|
||||
try {
|
||||
await fetch("/wfm/gallery/image/meta", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ path, workflow }),
|
||||
});
|
||||
} catch { /* non-critical */ }
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// i18nの適用(app.jsのapplyI18nToHtml()と同じ「個別要素にt()を適用」方式)
|
||||
// ============================================
|
||||
|
||||
function _applyVideoI18n() {
|
||||
const setText = (id, key) => {
|
||||
const el = document.getElementById(id);
|
||||
if (el) el.textContent = t(key);
|
||||
};
|
||||
setText("wfm-video-title-label", "videoTitle");
|
||||
setText("wfm-video-first-frame-label", "videoFirstFrame");
|
||||
setText("wfm-video-last-frame-label", "videoLastFrame");
|
||||
setText("wfm-video-first-frame-drop-label", "videoDropOrClick");
|
||||
setText("wfm-video-last-frame-drop-label", "videoDropOrClick");
|
||||
setText("wfm-video-first-frame-clear", "clear");
|
||||
setText("wfm-video-last-frame-clear", "clear");
|
||||
setText("wfm-video-prompt-label", "videoPrompt");
|
||||
setText("wfm-video-aspect-ratio-label", "videoAspectRatio");
|
||||
setText("wfm-video-megapixels-label", "videoMegapixels");
|
||||
setText("wfm-video-multiple-label", "videoMultiple");
|
||||
setText("wfm-video-duration-label", "videoDuration");
|
||||
setText("wfm-video-noise-seed-label", "videoNoiseSeed");
|
||||
setText("wfm-video-randomize-label", "videoRandomizeSeed");
|
||||
setText("wfm-video-generate-btn", "videoGenerate");
|
||||
setText("wfm-video-edit-placeholder-label", "videoEditPlaceholder");
|
||||
setText("wfm-video-source-label", "videoSourceLabel");
|
||||
setText("wfm-video-source-hint", "videoSourceHint");
|
||||
setText("wfm-video-source-drop-label", "videoSourceDropLabel");
|
||||
setText("wfm-video-source-clear", "clear");
|
||||
setText("wfm-video-preview-placeholder", "videoNoVideo");
|
||||
setText("wfm-video-prop-tab-frame", "videoPropFrame");
|
||||
setText("wfm-video-prop-tab-gif", "videoPropGif");
|
||||
setText("wfm-video-frame-hint", "videoFrameHint");
|
||||
setText("wfm-video-frame-capture-btn", "videoCaptureFrame");
|
||||
setText("wfm-video-frame-save-btn", "videoSaveToOutput");
|
||||
setText("wfm-video-gif-start-label", "videoGifStart");
|
||||
setText("wfm-video-gif-end-label", "videoGifEnd");
|
||||
setText("wfm-video-gif-fps-label", "videoGifFps");
|
||||
setText("wfm-video-gif-width-label", "videoGifWidth");
|
||||
setText("wfm-video-gif-convert-btn", "videoConvertToGif");
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Video Source panel — loads any local video into the preview frame, independent of
|
||||
// generation, so Frame/GIF tools work without running MiniMax H3 first.
|
||||
// ============================================
|
||||
|
||||
function _wireVideoSourcePanel() {
|
||||
_wireDropZone("wfm-video-source-drop", "wfm-video-source-file", (file) => {
|
||||
if (!file.type.startsWith("video/")) return;
|
||||
const statusEl = document.getElementById("wfm-video-source-status");
|
||||
_setPreviewMedia(URL.createObjectURL(file), { kind: "local", file });
|
||||
if (statusEl) { statusEl.textContent = file.name; statusEl.style.color = ""; }
|
||||
});
|
||||
|
||||
document.getElementById("wfm-video-source-clear")?.addEventListener("click", () => {
|
||||
_setPreviewMedia(null, null);
|
||||
const statusEl = document.getElementById("wfm-video-source-status");
|
||||
if (statusEl) statusEl.textContent = "";
|
||||
const fileInput = document.getElementById("wfm-video-source-file");
|
||||
if (fileInput) fileInput.value = "";
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Properties panel tabs (Frame / GIF)
|
||||
// ============================================
|
||||
|
||||
function _initPropTabs() {
|
||||
const tabs = document.querySelectorAll(".wfm-video-prop-tab");
|
||||
tabs.forEach((btn) => {
|
||||
btn.addEventListener("click", () => {
|
||||
tabs.forEach((b) => b.classList.remove("active"));
|
||||
btn.classList.add("active");
|
||||
const target = btn.dataset.propTab;
|
||||
document.querySelectorAll(".wfm-video-prop-content").forEach((c) => {
|
||||
c.style.display = c.id === `wfm-video-prop-${target}` ? "" : "none";
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Frame tab — captures the preview video's current playback position as a PNG,
|
||||
// client-side (canvas), and saves it into ComfyUI's own output folder.
|
||||
// ============================================
|
||||
|
||||
let _capturedFrameBlob = null;
|
||||
|
||||
function _blobToDataUrl(blob) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => resolve(reader.result);
|
||||
reader.onerror = () => reject(new Error("Failed to read blob"));
|
||||
reader.readAsDataURL(blob);
|
||||
});
|
||||
}
|
||||
|
||||
function _initFrameTab() {
|
||||
const captureBtn = document.getElementById("wfm-video-frame-capture-btn");
|
||||
const saveBtn = document.getElementById("wfm-video-frame-save-btn");
|
||||
const previewWrap = document.getElementById("wfm-video-frame-preview-wrap");
|
||||
const previewImg = document.getElementById("wfm-video-frame-preview-img");
|
||||
const statusEl = document.getElementById("wfm-video-frame-status");
|
||||
|
||||
captureBtn?.addEventListener("click", () => {
|
||||
const video = document.getElementById("wfm-video-preview-video");
|
||||
if (!video || video.style.display === "none" || !video.videoWidth) {
|
||||
showToast(t("videoNoSourceLoaded"), "error");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const canvas = document.createElement("canvas");
|
||||
canvas.width = video.videoWidth;
|
||||
canvas.height = video.videoHeight;
|
||||
canvas.getContext("2d").drawImage(video, 0, 0);
|
||||
canvas.toBlob((blob) => {
|
||||
if (!blob) return;
|
||||
_capturedFrameBlob = blob;
|
||||
if (previewImg) previewImg.src = URL.createObjectURL(blob);
|
||||
if (previewWrap) previewWrap.style.display = "";
|
||||
if (saveBtn) saveBtn.disabled = false;
|
||||
if (statusEl) statusEl.textContent = "";
|
||||
}, "image/png");
|
||||
} catch (err) {
|
||||
showToast(t("videoFrameCaptureFailed", err.message), "error");
|
||||
}
|
||||
});
|
||||
|
||||
saveBtn?.addEventListener("click", async () => {
|
||||
if (!_capturedFrameBlob) return;
|
||||
saveBtn.disabled = true;
|
||||
if (statusEl) statusEl.textContent = "Saving...";
|
||||
try {
|
||||
const dataUrl = await _blobToDataUrl(_capturedFrameBlob);
|
||||
const res = await fetch("/api/wfm/video/frame/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}`);
|
||||
if (statusEl) { statusEl.textContent = `✓ ${json.filename}`; statusEl.style.color = "var(--wfm-success)"; }
|
||||
showToast(t("videoFrameSaved", json.filename), "success");
|
||||
} catch (err) {
|
||||
if (statusEl) { statusEl.textContent = `✗ ${err.message}`; statusEl.style.color = "var(--wfm-danger)"; }
|
||||
showToast(t("errorWithMsg", err.message), "error");
|
||||
} finally {
|
||||
saveBtn.disabled = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// GIF tab — sends the preview video (uploading it first if it's a local file not yet
|
||||
// on the server) to the server, which decodes it with PyAV and encodes an animated
|
||||
// GIF with Pillow (both already required by ComfyUI itself — no ffmpeg dependency).
|
||||
// ============================================
|
||||
|
||||
function _initGifTab() {
|
||||
const convertBtn = document.getElementById("wfm-video-gif-convert-btn");
|
||||
const progressBar = document.getElementById("wfm-video-gif-progress-bar");
|
||||
const progressText = document.getElementById("wfm-video-gif-progress-text");
|
||||
const previewWrap = document.getElementById("wfm-video-gif-preview-wrap");
|
||||
const previewImg = document.getElementById("wfm-video-gif-preview-img");
|
||||
const statusEl = document.getElementById("wfm-video-gif-status");
|
||||
|
||||
convertBtn?.addEventListener("click", async () => {
|
||||
if (!state.previewSource) {
|
||||
showToast(t("videoNoSourceLoaded"), "error");
|
||||
return;
|
||||
}
|
||||
convertBtn.disabled = true;
|
||||
if (statusEl) statusEl.textContent = "";
|
||||
if (progressBar) progressBar.style.width = "20%";
|
||||
if (progressText) progressText.textContent = "Uploading...";
|
||||
|
||||
try {
|
||||
let ref = state.previewSource;
|
||||
if (ref.kind === "local") {
|
||||
const result = await comfyUI.uploadImage(ref.file, ref.file.name);
|
||||
ref = { kind: "input", filename: result.name, subfolder: result.subfolder || "", type: "input" };
|
||||
// Cache the uploaded reference so a repeat conversion doesn't re-upload.
|
||||
state.previewSource = ref;
|
||||
}
|
||||
|
||||
const start = Number(document.getElementById("wfm-video-gif-start")?.value) || 0;
|
||||
const endRaw = document.getElementById("wfm-video-gif-end")?.value;
|
||||
const fps = Number(document.getElementById("wfm-video-gif-fps")?.value) || 10;
|
||||
const widthRaw = document.getElementById("wfm-video-gif-width")?.value;
|
||||
|
||||
if (progressBar) progressBar.style.width = "60%";
|
||||
if (progressText) progressText.textContent = t("videoGifConverting");
|
||||
|
||||
const res = await fetch("/api/wfm/video/to-gif", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
filename: ref.filename,
|
||||
subfolder: ref.subfolder || "",
|
||||
type: ref.type,
|
||||
start_time: start,
|
||||
end_time: endRaw ? Number(endRaw) : null,
|
||||
fps,
|
||||
max_width: widthRaw ? Number(widthRaw) : null,
|
||||
}),
|
||||
});
|
||||
const json = await res.json();
|
||||
if (!res.ok) throw new Error(json.error || `HTTP ${res.status}`);
|
||||
|
||||
if (progressBar) progressBar.style.width = "100%";
|
||||
if (progressText) progressText.textContent = t("videoGifDoneCount", json.frame_count ?? 0);
|
||||
|
||||
const params = new URLSearchParams({ filename: json.filename, subfolder: json.subfolder || "", type: "output" });
|
||||
if (previewImg) previewImg.src = `${comfyUI.baseUrl}/view?${params}`;
|
||||
if (previewWrap) previewWrap.style.display = "";
|
||||
if (statusEl) { statusEl.textContent = `✓ ${json.filename}`; statusEl.style.color = "var(--wfm-success)"; }
|
||||
showToast(t("videoGifSaved", json.filename), "success");
|
||||
} catch (err) {
|
||||
if (statusEl) { statusEl.textContent = `✗ ${err.message}`; statusEl.style.color = "var(--wfm-danger)"; }
|
||||
if (progressText) progressText.textContent = "Error";
|
||||
showToast(t("errorWithMsg", err.message), "error");
|
||||
} finally {
|
||||
convertBtn.disabled = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// 初期化
|
||||
// ============================================
|
||||
|
||||
export function initVideoTab() {
|
||||
_applyVideoI18n();
|
||||
_populateAspectRatioOptions();
|
||||
|
||||
_wireDropZone("wfm-video-first-frame-drop", "wfm-video-first-frame-file", (file) => _handleFrameUpload("first", file));
|
||||
_wireDropZone("wfm-video-last-frame-drop", "wfm-video-last-frame-file", (file) => _handleFrameUpload("last", file));
|
||||
|
||||
document.getElementById("wfm-video-first-frame-clear")?.addEventListener("click", () => _clearFrame("first"));
|
||||
document.getElementById("wfm-video-last-frame-clear")?.addEventListener("click", () => _clearFrame("last"));
|
||||
document.getElementById("wfm-video-generate-btn")?.addEventListener("click", runGeneration);
|
||||
|
||||
_wireVideoSourcePanel();
|
||||
_initPropTabs();
|
||||
_initFrameTab();
|
||||
_initGifTab();
|
||||
|
||||
loadDefaultWorkflow();
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
/**
|
||||
* Video helper utilities shared across tabs that deal with generated mp4 output
|
||||
* (Lab tab's "use generated image for next" chaining, and the Video tab's future
|
||||
* batch features). Kept dependency-free (no comfyUI/comfyEditor imports) so it can
|
||||
* be reused from either tab without pulling in unrelated state.
|
||||
*/
|
||||
|
||||
export function isVideoFilename(filename) {
|
||||
return /\.(mp4|webm|mov)$/i.test(filename || "");
|
||||
}
|
||||
|
||||
// Extracts the last frame of a video at `videoUrl` as a PNG Blob, by seeking a
|
||||
// detached <video> element to just before its end and drawing that frame onto a
|
||||
// canvas. Runs entirely client-side (no server round-trip / PyAV dependency).
|
||||
//
|
||||
// Seeks to (duration - 0.05s) rather than duration itself: seeking exactly to the
|
||||
// end is unreliable across browsers (some clamp it back to the last keyframe's
|
||||
// timestamp, which can fire a "seeked" event before the frame is actually decoded).
|
||||
// The "seeked" listener also ignores events that don't land near that target time,
|
||||
// since loading a video can fire an initial seeked-to-0 before the real seek lands.
|
||||
export function extractLastFrameBlob(videoUrl) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const video = document.createElement("video");
|
||||
video.muted = true;
|
||||
video.playsInline = true;
|
||||
video.preload = "auto";
|
||||
|
||||
let target = null;
|
||||
let settled = false;
|
||||
|
||||
const cleanup = () => {
|
||||
video.removeAttribute("src");
|
||||
video.load();
|
||||
};
|
||||
const finish = (fn, arg) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
cleanup();
|
||||
fn(arg);
|
||||
};
|
||||
|
||||
video.addEventListener("error", () => {
|
||||
finish(reject, new Error("Failed to load video for last-frame extraction"));
|
||||
});
|
||||
|
||||
video.addEventListener("loadedmetadata", () => {
|
||||
if (!Number.isFinite(video.duration) || video.duration <= 0) {
|
||||
finish(reject, new Error("Video has no readable duration"));
|
||||
return;
|
||||
}
|
||||
target = Math.max(0, video.duration - 0.05);
|
||||
video.currentTime = target;
|
||||
});
|
||||
|
||||
video.addEventListener("seeked", () => {
|
||||
if (target == null || Math.abs(video.currentTime - target) > 0.5) return;
|
||||
try {
|
||||
const canvas = document.createElement("canvas");
|
||||
canvas.width = video.videoWidth;
|
||||
canvas.height = video.videoHeight;
|
||||
canvas.getContext("2d").drawImage(video, 0, 0);
|
||||
canvas.toBlob((blob) => {
|
||||
if (blob) finish(resolve, blob);
|
||||
else finish(reject, new Error("Failed to encode last frame"));
|
||||
}, "image/png");
|
||||
} catch (err) {
|
||||
finish(reject, err);
|
||||
}
|
||||
});
|
||||
|
||||
video.src = videoUrl;
|
||||
});
|
||||
}
|
||||
+18
-25
@@ -7,6 +7,7 @@
|
||||
import { showToast, openModal, closeModal } from "./app.js";
|
||||
import { comfyWorkflow } from "./comfyui-workflow.js";
|
||||
import { loadWorkflowIntoEditor } from "./generate-tab.js";
|
||||
import { loadWorkflowIntoVideoEditor } from "./video-tab.js";
|
||||
import { t, getSummaryPrompt } from "./i18n.js";
|
||||
import { highlightJSON } from "./json-highlight.js";
|
||||
import { openBadgeEditModal } from "./models-tab.js";
|
||||
@@ -615,6 +616,8 @@ async function showSidePanel(wf, cardEl) {
|
||||
// Enable toolbar load buttons
|
||||
const listLoadBtn = document.getElementById("wfm-list-load-btn");
|
||||
if (listLoadBtn) { listLoadBtn.disabled = false; listLoadBtn.title = ""; }
|
||||
const listLoadVideoBtn = document.getElementById("wfm-list-load-video-btn");
|
||||
if (listLoadVideoBtn) { listLoadVideoBtn.disabled = false; listLoadVideoBtn.title = ""; }
|
||||
const listOpenComfyBtn = document.getElementById("wfm-list-open-comfyui-btn");
|
||||
if (listOpenComfyBtn) { listOpenComfyBtn.disabled = false; listOpenComfyBtn.title = ""; }
|
||||
|
||||
@@ -660,6 +663,8 @@ function closeSidePanel() {
|
||||
if (titleEl) titleEl.textContent = "";
|
||||
const listLoadBtn = document.getElementById("wfm-list-load-btn");
|
||||
if (listLoadBtn) { listLoadBtn.disabled = true; listLoadBtn.title = t("selectCardFirst"); }
|
||||
const listLoadVideoBtn = document.getElementById("wfm-list-load-video-btn");
|
||||
if (listLoadVideoBtn) { listLoadVideoBtn.disabled = true; listLoadVideoBtn.title = t("selectCardFirst"); }
|
||||
const listOpenComfyBtn = document.getElementById("wfm-list-open-comfyui-btn");
|
||||
if (listOpenComfyBtn) { listOpenComfyBtn.disabled = true; listOpenComfyBtn.title = t("selectCardFirst"); }
|
||||
renderSideGroup(null);
|
||||
@@ -956,8 +961,6 @@ function openDetailModal(wf) {
|
||||
<textarea class="wfm-textarea" id="wfm-detail-memo" rows="4" placeholder="${t("memoPlaceholder")}">${meta.memo || ""}</textarea>
|
||||
</section>
|
||||
<div class="wfm-modal-actions">
|
||||
<button class="wfm-btn wfm-btn-primary" id="wfm-detail-load">${t("loadInGenerate")}</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-detail-open-comfyui">${t("sendToCanvas")}</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-detail-set-default">${t("setAsDefault")}</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="wfm-detail-change-thumb">${t("changeThumbnail")}</button>
|
||||
<input type="file" id="wfm-detail-thumb-file" accept="image/png,image/webp,image/jpeg" style="display:none">
|
||||
@@ -1094,29 +1097,6 @@ function openDetailModal(wf) {
|
||||
}
|
||||
});
|
||||
|
||||
// Load in GenerateUI
|
||||
document.getElementById("wfm-detail-load").addEventListener("click", async () => {
|
||||
try {
|
||||
const wfData = await getRawWorkflow(wf.filename);
|
||||
const loaded = await loadWorkflowIntoEditor(wfData, wf.filename);
|
||||
if (loaded === false) return;
|
||||
document.querySelector('.wfm-tab[data-tab="generate"]')?.click();
|
||||
closeModal();
|
||||
} catch (err) {
|
||||
showToast(t("loadError") + ": " + err.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
// Send to Canvas
|
||||
document.getElementById("wfm-detail-open-comfyui")?.addEventListener("click", async () => {
|
||||
try {
|
||||
const wfData = await getRawWorkflow(wf.filename);
|
||||
sendToCanvas(wfData, wf.filename);
|
||||
} catch (err) {
|
||||
showToast(t("loadError") + ": " + err.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
// Set as default workflow
|
||||
document.getElementById("wfm-detail-set-default")?.addEventListener("click", async () => {
|
||||
try {
|
||||
@@ -1398,6 +1378,19 @@ export function initWorkflowTab() {
|
||||
}
|
||||
});
|
||||
|
||||
// Toolbar: Load in Video button (MiniMax H3専用。非対応ワークフローはloadWorkflowIntoVideoEditor内でエラートースト表示済み)
|
||||
document.getElementById("wfm-list-load-video-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedWf) return;
|
||||
try {
|
||||
const wfData = await getRawWorkflow(state.selectedWf.filename);
|
||||
const loaded = await loadWorkflowIntoVideoEditor(wfData, state.selectedWf.filename);
|
||||
if (loaded === false) return;
|
||||
document.querySelector('.wfm-tab[data-tab="video"]')?.click();
|
||||
} catch (err) {
|
||||
showToast(t("loadError") + ": " + err.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
// Toolbar: Send to Canvas button
|
||||
document.getElementById("wfm-list-open-comfyui-btn")?.addEventListener("click", async () => {
|
||||
if (!state.selectedWf) return;
|
||||
|
||||
+214
-15
@@ -10,6 +10,7 @@
|
||||
<link rel="stylesheet" href="/wfm_static/css/tagger-tab.css">
|
||||
<link rel="stylesheet" href="/wfm_static/css/image-edit-tab.css">
|
||||
<link rel="stylesheet" href="/wfm_static/css/lab-tab.css">
|
||||
<link rel="stylesheet" href="/wfm_static/css/video-tab.css">
|
||||
</head>
|
||||
<body>
|
||||
<!-- Header -->
|
||||
@@ -25,6 +26,7 @@
|
||||
<button class="wfm-tab" data-tab="prompt">Prompt</button>
|
||||
<button class="wfm-tab" data-tab="gallery">Gallery</button>
|
||||
<button class="wfm-tab" data-tab="image-edit">Image Edit</button>
|
||||
<button class="wfm-tab" data-tab="video">Video</button>
|
||||
<button class="wfm-tab" data-tab="tagger">Tagger</button>
|
||||
<button class="wfm-tab" data-tab="settings">Settings</button>
|
||||
<button class="wfm-tab" data-tab="help">Help</button>
|
||||
@@ -54,6 +56,7 @@
|
||||
<option value="">All Groups</option>
|
||||
</select>
|
||||
<button id="wfm-list-load-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary" disabled title="Select a card first">Load in GenerateUI</button>
|
||||
<button id="wfm-list-load-video-btn" class="wfm-btn wfm-btn-sm" disabled title="Select a card first">Load in Video</button>
|
||||
<button id="wfm-list-open-comfyui-btn" class="wfm-btn wfm-btn-sm" disabled title="Select a card first">Send to Canvas</button>
|
||||
<div class="wfm-view-btns">
|
||||
<button class="wfm-view-btn active" data-view="thumb" title="Thumbnail">⊞</button>
|
||||
@@ -567,6 +570,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="wfm-lab-col-btns">
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-up" data-col="model" title="Move selected keyframe up">▲</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-down" data-col="model" title="Move selected keyframe down">▼</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="model" title="Add keyframe">+</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="model" title="Remove last keyframe">-</button>
|
||||
</div>
|
||||
@@ -577,6 +582,9 @@
|
||||
<div class="wfm-lab-col-header">
|
||||
<span>プロンプト</span>
|
||||
<div class="wfm-lab-col-btns">
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-up" data-col="prompt" title="Move selected keyframe up">▲</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-down" data-col="prompt" title="Move selected keyframe down">▼</button>
|
||||
<button type="button" id="wfm-lab-prompt-group-btn" class="wfm-btn wfm-btn-xs" title="Apply Prompt Group">PG</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="prompt" title="Add keyframe">+</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="prompt" title="Remove last keyframe">-</button>
|
||||
</div>
|
||||
@@ -587,6 +595,8 @@
|
||||
<div class="wfm-lab-col-header">
|
||||
<span>Ksampler</span>
|
||||
<div class="wfm-lab-col-btns">
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-up" data-col="ksampler" title="Move selected keyframe up">▲</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-down" data-col="ksampler" title="Move selected keyframe down">▼</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="ksampler" title="Add keyframe">+</button>
|
||||
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="ksampler" title="Remove last keyframe">-</button>
|
||||
</div>
|
||||
@@ -898,6 +908,7 @@
|
||||
<!-- Result Display -->
|
||||
<div class="wfm-gen-result">
|
||||
<img id="wfm-gen-result-img" style="display:none;max-width:100%;border-radius:6px;">
|
||||
<video id="wfm-gen-result-video" controls style="display:none;max-width:100%;border-radius:6px;"></video>
|
||||
<div id="wfm-gen-result-thumbs" class="wfm-gen-thumbs"></div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1277,6 +1288,7 @@
|
||||
<span style="flex:1;"></span>
|
||||
<button id="wfm-ptable-style-deselect-btn" class="wfm-btn wfm-btn-sm" disabled title="Clear row selection">Deselect</button>
|
||||
<button id="wfm-ptable-style-delete-btn" class="wfm-btn wfm-btn-sm wfm-btn-danger" disabled>Delete</button>
|
||||
<button id="wfm-ptable-style-addfile-btn" class="wfm-btn wfm-btn-sm" disabled title="Select a style whose file is not custom.json to add a new style to that same file">+ Add to this file</button>
|
||||
<button id="wfm-ptable-style-add-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary">+ New Style</button>
|
||||
</div>
|
||||
<div class="wfm-prompt-table-scroll">
|
||||
@@ -1328,6 +1340,7 @@
|
||||
<button class="wfm-help-nav-item" data-help-page="aitool">AI TOOL Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="tagger">Tagger Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="imageedit">Image Edit Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="video">Video Tab</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="shortcuts">Keyboard Shortcuts</button>
|
||||
<button class="wfm-help-nav-item" data-help-page="trouble">Troubleshooting</button>
|
||||
</div>
|
||||
@@ -1512,6 +1525,8 @@
|
||||
<li id="wfm-help-lab-15">Checkpoint / LoRA / VAE each carry forward independently, the same effective-value rule as every other column (see above): a keyframe in one never resets the other two to the workflow default. A field left blank in the edit modal shows "(inherits: ...)" as its placeholder instead of "(workflow default)" when an earlier keyframe in that same list already set something, so it's clear what actually applies. "Revert to #1's setting" and Bypass — like +/- — only ever affect whichever ONE of the three is currently selected by the C/L/V toggle, never the other two</li>
|
||||
<li id="wfm-help-lab-16">Bypass LoRA node checkbox (LoRA keyframe's own edit modal only): forces that keyframe's strength_model/strength_clip to 0 at apply-time, standing in for ComfyUI's own node Bypass (mode:4) — the workflow used here is already converted to API format, which has no mode concept, so zeroing strength is the behavioral equivalent. Disables the strength fields while checked; independent of the row-level Bypass checkbox above, which skips the whole row instead of touching the node</li>
|
||||
<li id="wfm-help-lab-17">Apply LoRA syntax + trigger words to Positive prompt checkbox (LoRA column only): when checked, appends <lora:name:strengthModel:strengthClip> plus that LoRA's cached CivitAI trigger words to the Positive prompt, comma-separated, at apply-time — the same format GenerateUI's own Model tab Apply button writes. Switching keyframes (a different LoRA, this checkbox turned off, or the row Bypassed) always strips exactly what the previous iteration injected before adding anything new, so a batch never accumulates every LoRA it has used. Disabled automatically while Bypass LoRA node is checked</li>
|
||||
<li id="wfm-help-lab-18">A single click on a keyframe cell selects it (blue outline) instead of opening it — double-click to open the edit modal as before. Each column's header (Model / Prompt / Ksampler) also has <b>▲ / ▼</b> buttons that swap the selected keyframe with its immediate neighbor to reorder them without retyping anything; keyframe #1 (the baseline) can never move, and nothing can be swapped into its slot</li>
|
||||
<li id="wfm-help-lab-19">Prompt column header's <b>PG</b> button: pick one of the Prompt tab's preset groups (Table view's Presets Group, the same groups used by the Batch tab's checklist) and replace the entire Prompt column with one keyframe per preset in that group's order, starting at #1 (#1 is overwritten, not appended after). If the group has more presets than the current Batch count, Batch count is raised automatically to fit (capped at 50, the Batch input's own limit); anything still beyond that shows the usual "keyframes beyond Batch count" warning instead of being silently dropped</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -1600,6 +1615,7 @@
|
||||
<li id="wfm-help-prompt-23">Wildcards table — same files as the Form tab's Wildcard file manager; editing the <b>File</b> path or the <b>Ext</b> dropdown renames the file (saves the content under the new name, then removes the old file)</li>
|
||||
<li id="wfm-help-prompt-24">Style table — same styles as the Form tab's Style manager, editable inline the same way as Presets</li>
|
||||
<li id="wfm-help-prompt-25">Presets table toolbar — the ★ and B sort buttons (next to the search box) bring favorited / batch-selected presets to the top of the list; both can be enabled together (★ takes priority, B breaks ties), and everything else keeps its original relative order</li>
|
||||
<li id="wfm-help-prompt-26">Style table toolbar — select exactly one row whose <b>File</b> badge isn't <code>custom.json</code> to enable <b>+ Add to this file</b>: it adds a blank row targeting that same file (shown as a badge in the File column even before saving) — the same capability as the Form tab's Style manager (see above); custom.json entries and multi-row selections leave the button disabled, use the regular <b>+ New Style</b> button for those instead</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1628,7 +1644,7 @@
|
||||
<div class="wfm-help-card">
|
||||
<h3 id="wfm-help-metadata-card-formats-title">Supported Formats</h3>
|
||||
<ul>
|
||||
<li id="wfm-help-metadata-5">Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Mage-Flow subgraph workflows), SD WebUI, SD Forge, Fooocus. Model extraction covers UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, and QuadrupleCLIPLoader (e.g. HiDream 4-CLIP).</li>
|
||||
<li id="wfm-help-metadata-5">Supported: ComfyUI PNG/WebP/MP4/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Mage-Flow subgraph workflows; MP4 reads the workflow/prompt container tags written by SaveVideo, including all-in-one video nodes like MiniMax H3 ImageToVideo), SD WebUI, SD Forge, Fooocus. Model extraction covers UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, and QuadrupleCLIPLoader (e.g. HiDream 4-CLIP).</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1673,7 +1689,9 @@
|
||||
<div class="wfm-help-card">
|
||||
<h3 id="wfm-help-settings-card-misc-title">Data & Misc</h3>
|
||||
<ul>
|
||||
<li id="wfm-help-settings-8">Data Management: export all plugin data to JSON / import to restore</li>
|
||||
<li id="wfm-help-settings-8">Data Management: export core settings/metadata/prompts to JSON / import to restore</li>
|
||||
<li id="wfm-help-settings-15">Full Backup (ZIP): unlike the JSON export above, also includes folder-based data (AI Skills, Lab Plans, Style presets) and the Tagger database; Restore overwrites existing files — restart ComfyUI afterward</li>
|
||||
<li id="wfm-help-settings-16">Two opt-in checkboxes above the Full Backup buttons additionally include ComfyUI's default workflows folder and the Impact Pack's wildcard folder in the export — both export-only, never restored automatically; copy the ZIP's _external/ folder back by hand if you want them</li>
|
||||
<li id="wfm-help-settings-13">CivitAI Host: choose between civitai.com (SFW only) and civitai.red (unrestricted) — determines which site opens when clicking a model link in the Models tab CivitAI panel</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -1752,7 +1770,7 @@
|
||||
<div class="wfm-help-card">
|
||||
<h3 id="wfm-help-gallery-card-detail-title">Detail Panel</h3>
|
||||
<ul>
|
||||
<li id="wfm-help-gallery-7">Detail panel — Info tab: filename, size, date, tags (add/remove), memo; <b>download icon</b> (on image hover) to download the single image; "Move To..." moves the image to another folder, "Delete File" removes it permanently</li>
|
||||
<li id="wfm-help-gallery-7">Detail panel — Info tab: filename, size, dimensions (image width×height) or video duration, date, tags (add/remove), memo; <b>download icon</b> (on image hover) to download the single image; "Move To..." moves the image to another folder, "Delete File" removes it permanently</li>
|
||||
<li id="wfm-help-gallery-8">Detail panel — JSON tab: displays workflow JSON from PNG embedded data (prompt / workflow keys) or from metadata saved by the Generate UI tab; 'Copy & Send Canvas' button copies to clipboard and stores the workflow for title-drag to canvas</li>
|
||||
<li id="wfm-help-gallery-9">Detail panel — Groups tab: create, assign, remove, rename, and delete groups per image; the <b>__Feeder__</b> group is reserved (shown with 🔒) and cannot be renamed or deleted — rename and delete buttons are disabled when it is selected</li>
|
||||
</ul>
|
||||
@@ -1765,13 +1783,14 @@
|
||||
<li id="wfm-help-gallery-14"><b>Tagger</b> button (purple, in the detail panel action row): opens the selected image directly in the Tagger tab's Single mode for instant tagging</li>
|
||||
<li id="wfm-help-gallery-16"><b>Image Edit</b> button (toolbar, next to Refresh): sends the currently selected image to the Image Edit tab; if layers already exist the image is added as a new layer scaled to fit the canvas, otherwise it becomes Layer 1</li>
|
||||
<li id="wfm-help-gallery-17"><b>Send GenUI Image</b> button (toolbar, next to Image Edit): uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded first</li>
|
||||
<li id="wfm-help-gallery-27"><b>Send to LI node</b> button (toolbar, next to Send GenUI Image): uploads the selected image and writes its filename into the image widget of the currently selected node on the ComfyUI canvas (falling back to the first LoadImage-type node found) — same destination as Image Edit tab's Send to LI node; requires Workflow Studio to have been opened from ComfyUI's top menu button</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wfm-help-card">
|
||||
<h3 id="wfm-help-gallery-card-formats-title">Formats & Auto-save</h3>
|
||||
<ul>
|
||||
<li id="wfm-help-gallery-10">Workflow auto-save: images generated in the Generate UI tab automatically have their workflow saved to gallery metadata and shown in the JSON tab</li>
|
||||
<li id="wfm-help-gallery-11">Supports PNG (tEXt/iTXt), JPEG, WebP, GIF; workflow extraction reads ComfyUI prompt and workflow keys embedded in PNG metadata</li>
|
||||
<li id="wfm-help-gallery-11">Supports PNG (tEXt/iTXt), JPEG, WebP, GIF, MP4; workflow extraction reads ComfyUI prompt/workflow keys embedded in PNG metadata or in MP4 container tags (as written by SaveVideo, e.g. MiniMax H3 output)</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1848,7 +1867,7 @@
|
||||
<div class="wfm-help-card">
|
||||
<h3 id="wfm-help-sidepanel-card-info-title">Information (I) tab</h3>
|
||||
<ul>
|
||||
<li id="wfm-help-sidepanel-13">I tab (Information): drop a ComfyUI PNG/WebP/JSON to inspect model, LoRA, and prompt metadata in the side panel — sub-tabs: model / lora / Prompts; supports UnetLoaderGGUF and QuadrupleCLIPLoader node types</li>
|
||||
<li id="wfm-help-sidepanel-13">I tab (Information): drop a ComfyUI PNG/WebP/MP4/JSON to inspect model, LoRA, and prompt metadata in the side panel — sub-tabs: model / lora / Prompts; supports UnetLoaderGGUF and QuadrupleCLIPLoader node types; MP4 reads the workflow/prompt tags embedded by SaveVideo, including all-in-one video nodes like MiniMax H3 ImageToVideo</li>
|
||||
<li id="wfm-help-sidepanel-14">Information tab — drag items to canvas: model sub-tab places the loader node (Checkpoint → CheckpointLoaderSimple, VAE → VAELoader, Diffusion Model → UNETLoader, Text Encoder → CLIPLoader); double-click also places at canvas center</li>
|
||||
<li id="wfm-help-sidepanel-15">Information tab — LoRA sub-tab: drag individual LoRA to place LoraLoader; "Multiple LORA" section at bottom places all LoRAs in a single Lora Loader (LoraManager) node; Prompts sub-tab: drag a prompt to place CLIPTextEncode node with text pre-filled; click prompt to view full text and copy</li>
|
||||
</ul>
|
||||
@@ -2051,8 +2070,7 @@
|
||||
<ul>
|
||||
<li id="wfm-help-imageedit-17">Save PNG: composites all visible layers and downloads the result as a PNG file</li>
|
||||
<li id="wfm-help-imageedit-18">Save to Gallery: prompts for a filename (default: wfs-image-YYYYMMDDHHmmss) and saves the composite PNG directly to the Gallery root folder (configured in Settings > Gallery Output Folder); requires the Gallery tab to have been opened at least once to set the root</li>
|
||||
<li id="wfm-help-imageedit-19">Save to Input: uploads the composite PNG to ComfyUI's input folder via /upload/image, making it selectable in Load Image nodes</li>
|
||||
<li id="wfm-help-imageedit-19b">Send to Workflow: uploads the composite PNG (same as Save to Input) and additionally writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable</li>
|
||||
<li id="wfm-help-imageedit-19b">Send to Workflow: uploads the composite PNG to ComfyUI's input folder via /upload/image and writes the resulting filename into the image widget of the currently selected node in the ComfyUI graph, falling back to the first LoadImage-type node found; requires Workflow Studio to have been opened from ComfyUI's top menu button so the ComfyUI tab is reachable</li>
|
||||
<li id="wfm-help-imageedit-20">Canvas navigation: scroll wheel to zoom, Space + drag to pan</li>
|
||||
<li id="wfm-help-imageedit-21">Undo / Redo: Ctrl+Z / Ctrl+Y (or toolbar buttons ↩ ↪)</li>
|
||||
</ul>
|
||||
@@ -2073,6 +2091,23 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wfm-help-page" id="wfm-help-page-video">
|
||||
<h2 id="wfm-help-video-title">Video Tab</h2>
|
||||
<p id="wfm-help-video-desc">A dedicated video generation tab for the MiniMax H3 (Image to Video) workflow, independent of the GenerateUI tab.</p>
|
||||
<div class="wfm-help-card">
|
||||
<ul>
|
||||
<li id="wfm-help-video-1">Set first_frame (optional) / last_frame (optional) images, prompt, aspect_ratio / megapixels / multiple (resolution), duration (seconds), and noise_seed, then click Generate. Leaving first_frame empty runs the workflow text-only (bypassed), and workflows with no LoadImage node at all are also supported.</li>
|
||||
<li id="wfm-help-video-2">Model selection (UNet / CLIP / VAE / Audio VAE) is fixed to the loaded workflow's defaults and cannot be changed from this tab.</li>
|
||||
<li id="wfm-help-video-3">Use the "Load in Video" button in the Workflow tab's detail modal to load a workflow containing a MiniMax H3 Image-to-Video node. Unsupported workflows show an error instead.</li>
|
||||
<li id="wfm-help-video-4">Generated videos (mp4) can also be browsed and played back in the Gallery tab.</li>
|
||||
<li id="wfm-help-video-5">The Video Source panel next to the preview lets you drop or pick any local video (not just a generated one) to use the Frame/GIF tools below without running MiniMax H3 first; Clear resets it back to empty.</li>
|
||||
<li id="wfm-help-video-6">Frame tab (right panel): play/seek the preview video to the position you want, click Capture Frame to grab that frame client-side, then Save to Output to write it as a PNG into ComfyUI's output folder.</li>
|
||||
<li id="wfm-help-video-7">GIF tab (right panel): set Start/End (seconds), FPS, and an optional Max Width, then Convert to GIF — the server decodes the video and encodes an animated GIF into ComfyUI's output folder.</li>
|
||||
</ul>
|
||||
</div>
|
||||
<button class="wfm-help-jump-btn wfm-btn wfm-btn-sm" data-jump-tab="video">Go to Video Tab</button>
|
||||
</div>
|
||||
|
||||
<div class="wfm-help-page" id="wfm-help-page-shortcuts">
|
||||
<div class="wfm-help-article-header">
|
||||
<h2 id="wfm-help-shortcuts-title">Keyboard Shortcuts</h2>
|
||||
@@ -2205,6 +2240,7 @@
|
||||
<option value="name_asc">Name A-Z</option>
|
||||
<option value="name_desc">Name Z-A</option>
|
||||
</select>
|
||||
<button id="wfm-gallery-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
|
||||
<div class="wfm-view-btns">
|
||||
<button class="wfm-view-btn active" data-gallery-view="thumb" title="Thumbnail">⊞</button>
|
||||
<button class="wfm-view-btn" data-gallery-view="table" title="Table">≡</button>
|
||||
@@ -2213,8 +2249,8 @@
|
||||
<button id="wfm-gallery-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh</button>
|
||||
<button id="wfm-gallery-send-image-edit-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to Image Edit tab">Image Edit</button>
|
||||
<button id="wfm-gallery-send-genui-image-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to GenerateUI Image input">Send GenUI Image</button>
|
||||
<button id="wfm-gallery-send-li-node-btn" class="wfm-btn wfm-btn-sm" title="Upload and write selected image's filename into the selected node's image widget (e.g. LoadImage)">Send to LI node</button>
|
||||
<button id="wfm-gallery-send-cc-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to ComfyUI Comic Creator's selected panel" style="display:none;">Send CC</button>
|
||||
<button id="wfm-gallery-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
|
||||
</div>
|
||||
<!-- 複数選択時の一括操作バー -->
|
||||
<div id="wfm-gallery-bulk-bar" class="wfm-gallery-bulk-bar" style="display:none;">
|
||||
@@ -2276,14 +2312,16 @@
|
||||
</div>
|
||||
<div class="wfm-gallery-detail-action-row">
|
||||
<button id="wfm-gallery-open-metadata-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-green" title="Open in Metadata tab (or Alt+click image)">Metadata</button>
|
||||
<button id="wfm-gallery-load-genui-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-primary" title="Load workflow into GenerateUI">Load GenUI</button>
|
||||
<button id="wfm-gallery-load-genui-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-primary" title="Load workflow into GenerateUI">GenUI</button>
|
||||
<button id="wfm-gallery-open-tagger-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-tagger" title="Open in Tagger"></button>
|
||||
<button id="wfm-gallery-download-btn" class="wfm-gallery-action-btn wfm-gallery-action-btn-orange" title="Download">Download</button>
|
||||
</div>
|
||||
<!-- Info タブ -->
|
||||
<div id="wfm-gallery-detail-info" class="wfm-gallery-detail-tab-content" style="display:none;">
|
||||
<div class="wfm-gallery-info-section">
|
||||
<div class="wfm-gallery-info-row" id="wfm-gallery-info-name"></div>
|
||||
<div class="wfm-gallery-info-row" id="wfm-gallery-info-size"></div>
|
||||
<div class="wfm-gallery-info-row" id="wfm-gallery-info-dim"></div>
|
||||
<div class="wfm-gallery-info-row" id="wfm-gallery-info-date"></div>
|
||||
</div>
|
||||
<!-- ImagePromptサイドカー ( .txt / ponyxlWildcardsVault 由来のプロンプトがある画像のみ表示) -->
|
||||
@@ -2497,8 +2535,8 @@
|
||||
<div class="wfm-metadata-col1">
|
||||
<div class="wfm-metadata-drop-zone" id="wfm-meta-drop">
|
||||
<div class="wfm-meta-drop-label" id="wfm-meta-drop-label">
|
||||
<div class="wfm-meta-drop-main">Drop image / JSON</div>
|
||||
<div class="wfm-meta-drop-sub">PNG · WebP · JSON</div>
|
||||
<div class="wfm-meta-drop-main">Drop image / video / JSON</div>
|
||||
<div class="wfm-meta-drop-sub">PNG · WebP · MP4 · JSON</div>
|
||||
</div>
|
||||
<img id="wfm-meta-preview-img" class="wfm-meta-preview-img" style="display:none;" alt="preview">
|
||||
</div>
|
||||
@@ -2506,13 +2544,13 @@
|
||||
<div class="wfm-meta-format-note" id="wfm-meta-format-note">
|
||||
<div class="wfm-meta-format-note-title" id="wfm-meta-format-note-title">Supported formats</div>
|
||||
<ul class="wfm-meta-format-list">
|
||||
<li id="wfm-meta-fmt-comfyui">ComfyUI — PNG / WebP / JSON</li>
|
||||
<li id="wfm-meta-fmt-comfyui">ComfyUI — PNG / WebP / MP4 / JSON</li>
|
||||
<li id="wfm-meta-fmt-sdwebui">SD WebUI / SD Forge — PNG (parameters)</li>
|
||||
<li id="wfm-meta-fmt-fooocus">Fooocus — PNG (fooocus_scheme)</li>
|
||||
</ul>
|
||||
<div class="wfm-meta-format-todo" id="wfm-meta-format-todo">Flux.2 / Qwen-Image / Z-Image subgraph workflows supported</div>
|
||||
</div>
|
||||
<input type="file" id="wfm-meta-file-input" accept="image/png,image/webp,.json,application/json" style="display:none;">
|
||||
<input type="file" id="wfm-meta-file-input" accept="image/png,image/webp,video/mp4,.mp4,.json,application/json" style="display:none;">
|
||||
</div>
|
||||
|
||||
<!-- Col2: Model info -->
|
||||
@@ -2592,8 +2630,7 @@
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-redo-btn" title="Redo (Ctrl+Y)">↪</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-save-btn">Save PNG</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-save-gallery-btn" title="Save to Gallery root folder">Save to Gallery</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-upload-comfy-btn">Save to Input</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-send-workflow-btn" title="Upload and write this image's filename into the selected node's image widget (e.g. LoadImage)">Send to Workflow</button>
|
||||
<button class="wfm-btn wfm-btn-sm" id="ie-send-workflow-btn" title="Upload and write this image's filename into the selected node's image widget (e.g. LoadImage)">Send to LI node</button>
|
||||
</div>
|
||||
|
||||
<!-- Tool options -->
|
||||
@@ -2650,6 +2687,168 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Video Tab (MiniMax H3専用・GenerateUIタブとは独立) -->
|
||||
<section id="wfm-tab-video" class="wfm-tab-content">
|
||||
<div class="wfm-video-layout">
|
||||
<div class="wfm-video-form-panel">
|
||||
<div class="wfm-video-header">
|
||||
<h3 id="wfm-video-title-label">Video (MiniMax H3)</h3>
|
||||
<span id="wfm-video-wf-name" class="wfm-video-wf-name">No workflow loaded</span>
|
||||
</div>
|
||||
|
||||
<div class="wfm-video-frame-slots">
|
||||
<div class="wfm-video-frame-slot">
|
||||
<label id="wfm-video-first-frame-label">First Frame (optional)</label>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-video-first-frame-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-video-first-frame-preview">
|
||||
</div>
|
||||
<div class="wfm-i2i-drop-zone" id="wfm-video-first-frame-drop">
|
||||
<label class="wfm-i2i-drop-label">
|
||||
<span id="wfm-video-first-frame-drop-label">Drop image or click to select</span>
|
||||
<input type="file" accept="image/*" id="wfm-video-first-frame-file" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;align-items:center;">
|
||||
<span class="wfm-i2i-status" id="wfm-video-first-frame-status" style="flex:1;"></span>
|
||||
<button type="button" class="wfm-btn wfm-btn-sm" id="wfm-video-first-frame-clear">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wfm-video-frame-slot">
|
||||
<label id="wfm-video-last-frame-label">Last Frame (optional)</label>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-video-last-frame-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-video-last-frame-preview">
|
||||
</div>
|
||||
<div class="wfm-i2i-drop-zone" id="wfm-video-last-frame-drop">
|
||||
<label class="wfm-i2i-drop-label">
|
||||
<span id="wfm-video-last-frame-drop-label">Drop image or click to select</span>
|
||||
<input type="file" accept="image/*" id="wfm-video-last-frame-file" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;align-items:center;">
|
||||
<span class="wfm-i2i-status" id="wfm-video-last-frame-status" style="flex:1;"></span>
|
||||
<button type="button" class="wfm-btn wfm-btn-sm" id="wfm-video-last-frame-clear">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label for="wfm-video-prompt" id="wfm-video-prompt-label">Prompt</label>
|
||||
<textarea id="wfm-video-prompt" class="wfm-textarea" rows="6"></textarea>
|
||||
|
||||
<div class="wfm-video-resolution-row">
|
||||
<div>
|
||||
<label for="wfm-video-aspect-ratio" id="wfm-video-aspect-ratio-label">Aspect Ratio</label>
|
||||
<select id="wfm-video-aspect-ratio" class="wfm-input"></select>
|
||||
</div>
|
||||
<div>
|
||||
<label for="wfm-video-megapixels" id="wfm-video-megapixels-label">Megapixels</label>
|
||||
<input type="number" id="wfm-video-megapixels" class="wfm-input" step="0.01" min="0.01" value="0.2">
|
||||
</div>
|
||||
<div>
|
||||
<label for="wfm-video-multiple" id="wfm-video-multiple-label">Multiple</label>
|
||||
<input type="number" id="wfm-video-multiple" class="wfm-input" step="8" min="8" value="32">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wfm-video-resolution-row">
|
||||
<div>
|
||||
<label for="wfm-video-duration" id="wfm-video-duration-label">Duration (seconds)</label>
|
||||
<input type="number" id="wfm-video-duration" class="wfm-input" step="0.5" min="0.5" value="2">
|
||||
</div>
|
||||
<div>
|
||||
<label for="wfm-video-noise-seed" id="wfm-video-noise-seed-label">Noise Seed</label>
|
||||
<input type="number" id="wfm-video-noise-seed" class="wfm-input" value="0">
|
||||
</div>
|
||||
<div class="wfm-video-seed-randomize-wrap">
|
||||
<label><input type="checkbox" id="wfm-video-seed-randomize" checked> <span id="wfm-video-randomize-label">Randomize</span></label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;align-items:center;gap:10px;margin-top:10px;">
|
||||
<button id="wfm-video-generate-btn" class="wfm-btn wfm-btn-primary" style="flex:1;">Generate</button>
|
||||
</div>
|
||||
<div class="wfm-gen-progress-container">
|
||||
<div class="wfm-gen-progress-track">
|
||||
<div id="wfm-video-progress-bar" class="wfm-gen-progress-bar"></div>
|
||||
</div>
|
||||
<span id="wfm-video-progress-text" class="wfm-gen-progress-text">Ready</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 中央ペイン: プレビュー(生成結果 or ドロップされた任意の動画) + 編集(将来機能用プレースホルダー) -->
|
||||
<div class="wfm-video-center-panel">
|
||||
<div class="wfm-video-preview-row">
|
||||
<div class="wfm-video-preview-frame" id="wfm-video-preview-frame">
|
||||
<span class="wfm-placeholder" id="wfm-video-preview-placeholder">No video</span>
|
||||
<video id="wfm-video-preview-video" class="wfm-video-preview-el" controls style="display:none;"></video>
|
||||
</div>
|
||||
<div class="wfm-video-source-panel">
|
||||
<div class="wfm-video-pane-header" id="wfm-video-source-label">Video Source</div>
|
||||
<p class="wfm-video-prop-hint" id="wfm-video-source-hint">Load any video here to use Frame/GIF tools without generating one.</p>
|
||||
<div class="wfm-i2i-drop-zone" id="wfm-video-source-drop">
|
||||
<label class="wfm-i2i-drop-label">
|
||||
<span id="wfm-video-source-drop-label">Drop video or click to select</span>
|
||||
<input type="file" accept="video/*" id="wfm-video-source-file" style="display:none;">
|
||||
</label>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;align-items:center;margin-top:6px;">
|
||||
<span class="wfm-i2i-status" id="wfm-video-source-status" style="flex:1;"></span>
|
||||
<button type="button" class="wfm-btn wfm-btn-sm" id="wfm-video-source-clear">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wfm-video-edit-panel">
|
||||
<span id="wfm-video-edit-placeholder-label" class="wfm-placeholder">Editing tools coming soon</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 右ペイン: プロパティ(Frame抽出 / GIF変換の2タブ) -->
|
||||
<div class="wfm-video-properties-panel">
|
||||
<div class="wfm-video-prop-tabnav">
|
||||
<button type="button" class="wfm-video-prop-tab active" data-prop-tab="frame" id="wfm-video-prop-tab-frame">Frame</button>
|
||||
<button type="button" class="wfm-video-prop-tab" data-prop-tab="gif" id="wfm-video-prop-tab-gif">GIF</button>
|
||||
</div>
|
||||
|
||||
<div id="wfm-video-prop-frame" class="wfm-video-prop-content active">
|
||||
<p class="wfm-video-prop-hint" id="wfm-video-frame-hint">Play/seek the preview video to the position you want, then capture.</p>
|
||||
<button type="button" id="wfm-video-frame-capture-btn" class="wfm-btn wfm-btn-sm" style="width:100%;">Capture Frame</button>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-video-frame-preview-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-video-frame-preview-img">
|
||||
</div>
|
||||
<button type="button" id="wfm-video-frame-save-btn" class="wfm-btn wfm-btn-primary wfm-btn-sm" style="width:100%;margin-top:6px;" disabled>Save to Output</button>
|
||||
<span class="wfm-i2i-status" id="wfm-video-frame-status"></span>
|
||||
</div>
|
||||
|
||||
<div id="wfm-video-prop-gif" class="wfm-video-prop-content" style="display:none;">
|
||||
<div class="wfm-lab-field-row">
|
||||
<label id="wfm-video-gif-start-label">Start (s)</label>
|
||||
<input type="number" id="wfm-video-gif-start" class="wfm-input" value="0" min="0" step="0.1">
|
||||
</div>
|
||||
<div class="wfm-lab-field-row">
|
||||
<label id="wfm-video-gif-end-label">End (s)</label>
|
||||
<input type="number" id="wfm-video-gif-end" class="wfm-input" placeholder="end" min="0" step="0.1">
|
||||
</div>
|
||||
<div class="wfm-lab-field-row">
|
||||
<label id="wfm-video-gif-fps-label">FPS</label>
|
||||
<input type="number" id="wfm-video-gif-fps" class="wfm-input" value="10" min="1" max="30">
|
||||
</div>
|
||||
<div class="wfm-lab-field-row">
|
||||
<label id="wfm-video-gif-width-label">Max Width</label>
|
||||
<input type="number" id="wfm-video-gif-width" class="wfm-input" placeholder="original" min="16">
|
||||
</div>
|
||||
<button type="button" id="wfm-video-gif-convert-btn" class="wfm-btn wfm-btn-primary wfm-btn-sm" style="width:100%;margin-top:8px;">Convert to GIF</button>
|
||||
<div class="wfm-gen-progress-container" style="margin-top:8px;">
|
||||
<div class="wfm-gen-progress-track">
|
||||
<div id="wfm-video-gif-progress-bar" class="wfm-gen-progress-bar"></div>
|
||||
</div>
|
||||
<span id="wfm-video-gif-progress-text" class="wfm-gen-progress-text"></span>
|
||||
</div>
|
||||
<div class="wfm-i2i-preview-wrap" id="wfm-video-gif-preview-wrap" style="display:none;">
|
||||
<img class="wfm-i2i-preview-img" id="wfm-video-gif-preview-img">
|
||||
</div>
|
||||
<span class="wfm-i2i-status" id="wfm-video-gif-status"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Tagger Tab -->
|
||||
<section id="wfm-tab-tagger" class="wfm-tab-content">
|
||||
<div class="wfm-tagger-subtab-nav">
|
||||
|
||||
@@ -673,9 +673,9 @@ window.wfmOpenMaskEditorForNode = async (imageDataUrl, maskDataUrl) => {
|
||||
};
|
||||
|
||||
// ============================================
|
||||
// Cross-window bridge for SPA "Send to Workflow"
|
||||
// Cross-window bridge for SPA "Send to LI node"
|
||||
// ============================================
|
||||
// WFS Image Edit タブから呼ばれる。アップロード済みの画像ファイル名を、現在ComfyUIキャンバス上で
|
||||
// WFS Image Edit / Galleryタブから呼ばれる。アップロード済みの画像ファイル名を、現在ComfyUIキャンバス上で
|
||||
// 選択中のノードの "image" ウィジェット(LoadImage / LoadImage 互換ノード)へ書き込む。
|
||||
// 選択ノードに該当ウィジェットが無ければグラフ内の最初の該当ノードにフォールバックする。
|
||||
// chat_TE カスタムノードの "Send to workflow" ボタンと同じロジック。
|
||||
@@ -2553,6 +2553,81 @@ async function _readAllPNGTextChunks(file) {
|
||||
return chunks;
|
||||
}
|
||||
|
||||
// ── MP4 container metadata (moov/udta/meta の mdta keys/ilst) ──
|
||||
// ComfyUIのSaveVideoはPNGのtEXtチャンクと同じキー名(workflow=UI形式, prompt=API形式)で
|
||||
// JSON文字列をisobmff(mp4)のudta/meta(mdta)にコンテナレベルタグとして書き込む(FFmpegの
|
||||
// movflags=+use_metadata_tags)。static/js/metadata-tab.js の readMP4MetaTags() と同一ロジック。
|
||||
function _findMP4Box(view, bytes, start, end, targetType) {
|
||||
let offset = start;
|
||||
while (offset + 8 <= end) {
|
||||
const size = view.getUint32(offset);
|
||||
const type = String.fromCharCode(bytes[offset + 4], bytes[offset + 5], bytes[offset + 6], bytes[offset + 7]);
|
||||
let boxSize = size;
|
||||
let bodyStart = offset + 8;
|
||||
if (size === 1) {
|
||||
if (offset + 16 > end) break;
|
||||
const hi = view.getUint32(offset + 8);
|
||||
const lo = view.getUint32(offset + 12);
|
||||
boxSize = hi * 4294967296 + lo;
|
||||
bodyStart = offset + 16;
|
||||
} else if (size === 0) {
|
||||
boxSize = end - offset;
|
||||
}
|
||||
if (boxSize < 8) break;
|
||||
if (type === targetType) return { bodyStart, end: offset + boxSize };
|
||||
offset += boxSize;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async function _readMP4MetaTags(file) {
|
||||
const buffer = await file.arrayBuffer();
|
||||
const bytes = new Uint8Array(buffer);
|
||||
const view = new DataView(buffer);
|
||||
if (bytes.length < 12) return null;
|
||||
const ftyp = String.fromCharCode(bytes[4], bytes[5], bytes[6], bytes[7]);
|
||||
if (ftyp !== "ftyp") return null;
|
||||
|
||||
const moov = _findMP4Box(view, bytes, 0, bytes.length, "moov");
|
||||
if (!moov) return null;
|
||||
const udta = _findMP4Box(view, bytes, moov.bodyStart, moov.end, "udta");
|
||||
let meta = udta ? _findMP4Box(view, bytes, udta.bodyStart, udta.end, "meta") : null;
|
||||
if (!meta) meta = _findMP4Box(view, bytes, moov.bodyStart, moov.end, "meta");
|
||||
if (!meta) return null;
|
||||
const metaBody = meta.bodyStart + 4; // meta は FullBox (version+flags 4バイト)
|
||||
const keysBox = _findMP4Box(view, bytes, metaBody, meta.end, "keys");
|
||||
const ilstBox = _findMP4Box(view, bytes, metaBody, meta.end, "ilst");
|
||||
if (!keysBox || !ilstBox) return null;
|
||||
|
||||
const utf8 = new TextDecoder("utf-8", { fatal: false });
|
||||
let off = keysBox.bodyStart + 4; // version+flags をスキップ
|
||||
const count = view.getUint32(off); off += 4;
|
||||
const keyNames = [];
|
||||
for (let i = 0; i < count && off + 8 <= keysBox.end; i++) {
|
||||
const ksize = view.getUint32(off);
|
||||
if (ksize < 8) break;
|
||||
keyNames.push(utf8.decode(bytes.slice(off + 8, off + ksize)));
|
||||
off += ksize;
|
||||
}
|
||||
|
||||
const result = {};
|
||||
let ioff = ilstBox.bodyStart;
|
||||
while (ioff + 8 <= ilstBox.end) {
|
||||
const itemSize = view.getUint32(ioff);
|
||||
const keyIndex = view.getUint32(ioff + 4);
|
||||
if (itemSize < 8) break;
|
||||
const itemEnd = Math.min(ioff + itemSize, ilstBox.end);
|
||||
const data = _findMP4Box(view, bytes, ioff + 8, itemEnd, "data");
|
||||
if (data) {
|
||||
const payload = bytes.slice(data.bodyStart + 8, data.end); // type(4)+locale(4)をスキップ
|
||||
const name = keyNames[keyIndex - 1];
|
||||
if (name) { try { result[name] = utf8.decode(payload); } catch { /* skip */ } }
|
||||
}
|
||||
ioff = itemEnd;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// UI→API変換(static/js/comfyui-workflow.js の convertUiToApi() 相当ロジックの複製)
|
||||
// web/comfyui/ は static/js/ と配信URLが異なりESモジュールをimportできないため、
|
||||
@@ -3330,6 +3405,13 @@ function _extractPromptsAPI(wf) {
|
||||
if (combined) textMap.set(id, combined);
|
||||
continue;
|
||||
}
|
||||
// MiniMaxH3ImageToVideo等の動画生成オールインワンノード。CLIPTextEncode等を経由せず
|
||||
// 自ノードの"prompt"入力に直接テキストを持つ(positive/negativeの区別も無い)ため、
|
||||
// _isTextEncoderNode判定を通さずtextMapへ直接投入する(fallbackのtextsに載る)。
|
||||
if (typeof n.inputs?.prompt === "string" && /ImageToVideo|TextToVideo/i.test(ct)) {
|
||||
textMap.set(id, n.inputs.prompt);
|
||||
continue;
|
||||
}
|
||||
if (!_isTextEncoderNode(ct)) continue;
|
||||
// "prompt" — TextEncodeQwenImageEdit(Plus)/TextEncodeBooguEdit and similar Image Edit
|
||||
// model text encoders use this key instead of "text"/"text_g".
|
||||
@@ -3457,6 +3539,7 @@ 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");
|
||||
const isMP4 = file.type === "video/mp4" || name.endsWith(".mp4");
|
||||
|
||||
async function fromWorkflow(originalWf, source) {
|
||||
let wf = originalWf;
|
||||
@@ -3492,6 +3575,17 @@ async function _extractAllMetadata(file) {
|
||||
const wf = _extractWorkflowFromEXIF(exif);
|
||||
return wf ? await fromWorkflow(wf, "comfyui") : null;
|
||||
}
|
||||
if (isMP4) {
|
||||
let tags; try { tags = await _readMP4MetaTags(file); } catch { return null; }
|
||||
if (!tags) return null;
|
||||
for (const key of ["prompt", "workflow"]) {
|
||||
const raw = tags[key];
|
||||
if (!raw) continue;
|
||||
let wf; try { wf = JSON.parse(_sanitizeJSON(raw)); } catch { continue; }
|
||||
if (wf) return await fromWorkflow(wf, "comfyui");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
// PNG
|
||||
const chunks = await _readAllPNGTextChunks(file);
|
||||
if (!chunks) return null;
|
||||
@@ -3601,7 +3695,7 @@ const setupInfoDropHandlers = (container) => {
|
||||
const renderInfoModels = (container, meta) => {
|
||||
container.innerHTML = "";
|
||||
if (!meta) {
|
||||
container.innerHTML = `<div class="wfm-nlp-info-empty">Drop a PNG/WebP/JSON file to view model info</div>`;
|
||||
container.innerHTML = `<div class="wfm-nlp-info-empty">Drop a PNG/WebP/MP4/JSON file to view model info</div>`;
|
||||
return;
|
||||
}
|
||||
const sections = [
|
||||
@@ -3640,7 +3734,7 @@ const renderInfoModels = (container, meta) => {
|
||||
const renderInfoLoras = (container, meta) => {
|
||||
container.innerHTML = "";
|
||||
if (!meta || !meta.loras || meta.loras.length === 0) {
|
||||
container.innerHTML = `<div class="wfm-nlp-info-empty">${meta ? "No LoRA found" : "Drop a PNG/WebP/JSON file to view LoRA info"}</div>`;
|
||||
container.innerHTML = `<div class="wfm-nlp-info-empty">${meta ? "No LoRA found" : "Drop a PNG/WebP/MP4/JSON file to view LoRA info"}</div>`;
|
||||
return;
|
||||
}
|
||||
for (const lora of meta.loras) {
|
||||
@@ -3689,7 +3783,7 @@ const renderInfoPrompts = (container, meta) => {
|
||||
const promptFull = panelEl?.querySelector("#wfm-nlp-info-prompt-full");
|
||||
const promptFullLabel = panelEl?.querySelector("#wfm-nlp-info-prompt-full-label");
|
||||
if (!meta) {
|
||||
container.innerHTML = `<div class="wfm-nlp-info-empty">Drop a PNG/WebP/JSON file to view prompts</div>`;
|
||||
container.innerHTML = `<div class="wfm-nlp-info-empty">Drop a PNG/WebP/MP4/JSON file to view prompts</div>`;
|
||||
return;
|
||||
}
|
||||
const allPrompts = [
|
||||
@@ -3754,8 +3848,8 @@ const renderInfoTab = (container) => {
|
||||
<div class="wfm-nlp-info-layout">
|
||||
<div class="wfm-nlp-info-drop" id="wfm-nlp-info-drop">
|
||||
<img id="wfm-nlp-info-preview-img" style="display:none;max-width:100%;max-height:100%;object-fit:contain;pointer-events:none;">
|
||||
<span id="wfm-nlp-info-drop-label" style="font-size:11px;color:var(--descrip-text,#999);pointer-events:none;">Drop PNG / WebP / JSON</span>
|
||||
<input type="file" id="wfm-nlp-info-file-input" accept=".png,.webp,.json,image/png,image/webp,application/json" style="display:none;">
|
||||
<span id="wfm-nlp-info-drop-label" style="font-size:11px;color:var(--descrip-text,#999);pointer-events:none;">Drop PNG / WebP / MP4 / JSON</span>
|
||||
<input type="file" id="wfm-nlp-info-file-input" accept=".png,.webp,.mp4,.json,image/png,image/webp,video/mp4,application/json" style="display:none;">
|
||||
</div>
|
||||
<div id="wfm-nlp-info-fileinfo" class="wfm-nlp-info-fileinfo">—</div>
|
||||
<div id="wfm-nlp-info-subcontent" class="wfm-nlp-info-subcontent"></div>
|
||||
|
||||
Reference in New Issue
Block a user