Compare commits

...
2 Commits
Author SHA1 Message Date
ketle-manandClaude Sonnet 4.6 d54234b18d v0.3.12: Raw JSON search, workflow analyzer extended model detection, README screenshots refresh
- GenerateUI: always-visible search bar in Raw JSON panel (match count, ↑/↓ nav, Escape/✕ clear, orange/yellow highlights, scroll sync)
- workflow_analyzer: CLIPLoader type-field detection (_CLIP_TYPE_TO_MODEL), subgraph node scanning, UnetLoaderGGUF support, NewBie/Ovis/HiDream/Wan/Cosmos/Lumina added
- README: screenshots replaced with 8 feature-focused images; v0.3.12 changelog

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-18 13:46:59 +09:00
ketle-manandClaude Sonnet 4.6 4298fd9ea2 v0.3.11: Metadata tab extended loader support + Settings text size slider
- metadata-tab.js: add UnetLoaderGGUF/UNETLoaderGGUF as Diffusion Model
  and QuadrupleCLIPLoader as Text Encoder (was already in node_sets_menu.js
  for the I tab; now consistent across both Metadata tab and side panel)
- settings-tab.js: add applyTextareaFontSize() + Text Size section (10-28px
  slider that applies to all 8 prompt/chat textareas at once)
- app.js: apply saved textareaFontSize on page load alongside theme
- templates/index.html: update help text for Metadata and Settings tabs
- README/DEVLOG: v0.3.11 documentation

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-17 16:03:10 +09:00
28 changed files with 550 additions and 48 deletions
+162
View File
@@ -1,5 +1,167 @@
# DEVLOG - ComfyUI-Workflow-Studio
## 2026-05-18: v0.3.12 リリース — README スクリーンショット刷新 / workflow_analyzer 拡張
### 概要
- README Screenshots を旧タブ別画像(12枚)から機能特徴別の新画像(8枚)に刷新
- `workflow_analyzer.py` に CLIPLoader type フィールド対応・新モデル種別検出を追加(NewBie / Ovis / HiDream / Wan / Cosmos / Lumina 等)
### 変更内容
#### `README.md`
- バージョンバッジを `0.3.12` に更新
- Screenshots セクションを全面刷新
- 旧: `docs/screenshot_*.png` 参照の 6 テーブル(タブ別 12 枚)
- 新: `docs/1_workflowtab.png`〜`docs/8_Customize.png` の機能特徴別 8 枚を 2 カラムグリッドで表示
- キャプションはファイル名のプレフィックスを除いて整形(例: `1_workflowtab` → **Workflow Tab**)
- `v0.3.12` changelog エントリを新規追加(RAW JSON 検索 + workflow_analyzer 拡張)
#### `docs/`
- 旧スクリーンショット 11 枚(`screenshot_*.png`)を削除
- 新スクリーンショット 8 枚(`1_workflowtab.png`〜`8_Customize.png`)を追加
#### `py/services/workflow_analyzer.py`
**`_CLIP_TYPE_TO_MODEL` 追加**
- CLIPLoader の type 文字列(`"flux"`, `"hidream_i"`, `"wan"`, `"cosmos"` 等)→ モデル種別名のマッピング辞書
**`_clip_type_from_ui_node(node)` 追加**
- UI フォーマットノードの `widgets_values` から CLIPLoader / DualCLIPLoader / TripleCLIPLoader の type 文字列を取得
**`_collect_all_ui_nodes(workflow_data)` 追加**
- `nodes[]` だけでなく `definitions.subgraphs[].nodes[]` も走査するジェネレータ
- サブグラフ内のローダーノードも model_type 検出の対象になった
**`_detect_model_type_from_name(mn_base, model_types)` 追加**
- モデルファイル名から種別を判定するヘルパー関数に切り出し(従来はインライン記述)
- 追加対応: NewBie / Ovis / HiDream / Wan(`wan-N` / `wan-video` パターン)
**`analyze_workflow()` 改修**
- ファイル名検出に NewBie / Ovis / HiDream / Wan を追加
- `UnetLoaderGGUF` 等を含む `UnetLoader` 系を一括マッチ (`"UnetLoader" in ntype`)
- CLIPLoader 系ノードで `clip_type` → `_CLIP_TYPE_TO_MODEL` → モデル種別を検出
- `_model_name_from_api_node` に `clip_name1` / `clip_name` を追加(CLIPLoader の API フォーマット対応)
- node_iter のタプルに `clip_type` を追加(`(ntype, title, mn, clip_type)`)
- タイトル検出に HiDream / Ovis / NewBie を追加
---
## 2026-05-17: RAW JSON パネルに検索機能を追加
### 概要
生成 UI タブの RAW JSON パネルに VSCode 風の検索バーを追加。常時表示で、マッチ間ナビゲーションとクリアボタンを備える。
### 変更内容
#### `templates/index.html`
- `#wfm-gen-rawjson-widget` 内にヘッダーとエディターの間で `.wfm-rawjson-search` バーを追加
- 検索入力 (`#wfm-gen-raw-search`)
- マッチ数表示 (`#wfm-gen-raw-search-count`、例: `3/12`)
- 前へ ↑ / 次へ ↓ ボタン
- ✕ クリアボタン
- JSON コンテナ内に検索ハイライト専用オーバーレイ `<pre id="wfm-gen-raw-json-search-overlay">` を追加(シンタックスハイライト層と textarea 層の間)
#### `static/css/main.css`
- `.wfm-rawjson-search` — 検索バー全体のレイアウト
- `.wfm-rawjson-search-input` — 検索入力フィールド(フォーカス時 accent カラーのボーダー)
- `.wfm-rawjson-search-count` — マッチ数表示(min-width: 56px、中央揃え)
- `.wfm-rawjson-search-btn` / `.wfm-rawjson-search-clear` — ナビ・クリアボタン
- `.wfm-json-search-overlay` — 文字色を透明にし `<mark>` の背景のみを表示するオーバーレイ
- `.wfm-search-match` — 通常マッチ: 黄色半透明
- `.wfm-search-current` — 現在マッチ: オレンジ強調 + アウトライン
- `.wfm-json-editor` の z-index を 2 → 3 に更新(オーバーレイが z-index: 2 を占有するため)
#### `static/js/generate-tab.js`
既存の「Raw JSON highlight sync on input/scroll」ブロックを拡張:
- `updateSearchOverlay()` — 検索語でテキストを走査し `matchPositions[]` を構築、オーバーレイ HTML を生成
- マッチなし時: カウント欄を赤字で "No results" 表示
- 現在マッチへ自動スクロール + テキストエリアのカーソルをマッチ位置に移動
- スクロール同期: エディター scroll イベントでオーバーレイの scrollTop/Left を追従
- エディター入力時: シンタックスハイライト更新と並行して検索オーバーレイも更新
- キーボード: Enter(次へ)/ Shift+Enter(前へ)/ Escape(クリア)対応
---
## 2026-05-17: v0.3.11 Metadata タブ対応ノードタイプ拡張 / Settings テキストサイズ UI 追加
### 概要
- `metadata-tab.js`(Metadata タブ本体)に `UnetLoaderGGUF` / `UNETLoaderGGUF` / `QuadrupleCLIPLoader` 対応を追加
- `node_sets_menu.js` の I タブには v0.3.10 で追加済みだったが、Metadata タブには未反映だった
- Settings タブに「Text Size」セクションを追加 — プロンプト・チャット系の全テキストエリアのフォントサイズを一括変更するスライダー
### 変更内容
#### `static/js/metadata-tab.js`
**`extractDiffusionModels` 拡張**
- `UNETLoader` のみ → `UNETLoader` / `UnetLoaderGGUF` / `UNETLoaderGGUF` に拡張(Set を使った判定に変更)
- HiDream i1 Full GGUF など GGUF 形式の Diffusion Model が Metadata タブでも正しく読み取れるようになった
**`extractTextEncoders` 拡張**
- `QuadrupleCLIPLoader`(`clip_name1`〜`clip_name4`)を追加、LiteGraph 形式・API 形式の両方に対応
- HiDream の 4-CLIP(clip_l / clip_g / t5xxl / llama_3.1)が全件表示されるようになった
#### `static/js/settings-tab.js`
**`applyTextareaFontSize(size)` 追加(export)**
- `<style id="wfm-ta-font-size-style">` を `<head>` に注入
- 対象セレクタ(対象を 8 箇所に一括適用):
| 対象 | ID |
|---|---|
| Generate UI — Positive Prompt | `#wfm-prompt-pos-text` |
| Generate UI — Negative Prompt | `#wfm-prompt-neg-text` |
| Prompt タブ — AI Assistant チャット | `#wfm-ollama-input` |
| Prompt タブ — Preset Positive | `#wfm-preset-pos` |
| Prompt タブ — Preset Negative | `#wfm-preset-neg` |
| Prompt タブ — Wildcard プロンプト | `#wfm-wc-prompt` |
| Prompt タブ — Wildcard ファイルエディタ | `#wfm-wc-editor-content` |
| Metadata タブ — PROMPT 全文プレビュー | `#wfm-meta-prompt-full` |
- 範囲: 10〜28px(clamp)、デフォルト 13px
**Settings タブ HTML「Text Size」セクション追加**
- Language Settings の下、Workflow Data Folder の上に新規 `<details>` セクション
- `<input type="range">` スライダー (min=10, max=28, step=1) + px 値表示
- スライダー操作でリアルタイム適用
- 「Save Settings」ボタンで `textareaFontSize` を localStorage に保存
#### `static/js/app.js`
- `applyTextareaFontSize` をインポート
- ページ読み込み直後(テーマ適用と同タイミング)に localStorage の保存値を読み込んで適用
#### `templates/index.html`
- `wfm-help-metadata-5`: 対応ローダーを明記(UNETLoader / UnetLoaderGGUF / UNETLoaderGGUF / CLIPLoader / DualCLIPLoader / TripleCLIPLoader / QuadrupleCLIPLoader)
- `wfm-help-settings-11` 新規追加: Text Size スライダーの説明
### 検証済みファイル
| ファイル | Metadata タブでの検出内容 |
|---|---|
| `n-hidream_i1_full.png` | Diffusion Model: `hidream-i1-full-Q5_0.gguf`(UnetLoaderGGUF)、Text Encoder: 4 件(QuadrupleCLIPLoader)、VAE: 1 件 |
---
## 2026-05-17: v0.3.10 Information タブ キャンバスドラッグ対応 / ノードタイプ拡張 / バグ修正
### 概要
+21 -19
View File
@@ -5,33 +5,25 @@ A comprehensive workflow management and generation UI plugin for [ComfyUI](https
Browse, organize, and execute workflows directly from a dedicated studio interface — without switching between windows or manually editing JSON.
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.3.10-green)
![Version](https://img.shields.io/badge/version-0.3.12-green)
## Screenshots
| Workflow Tab | GenerateUI Tab |
| Workflow Tab | Models Tab |
|:---:|:---:|
| ![Workflow](docs/screenshot_workflow.png) | ![GenerateUI](docs/screenshot_generate.png) |
| ![Workflow Tab](docs/1_workflowtab.png) | ![Models Tab](docs/2_modelstab.png) |
| Prompt Tab | Metadata Tab |
| Prompt Input Assistance | Gen UI Feeder |
|:---:|:---:|
| ![Prompt](docs/screenshot_prompt.png) | ![Metadata](docs/screenshot_metadata.png) |
| ![Prompt Input Assistance](docs/3_PromptInputAssistance.png) | ![Gen UI Feeder](docs/4_GenUI_feeder.png) |
| Settings Tab | Help & Support Tab |
| Top Bar | WS Library |
|:---:|:---:|
| ![Settings](docs/screenshot_settings.png) | ![Help](docs/screenshot_help.png) |
| ![Top Bar](docs/5_topbar.png) | ![WS Library](docs/6_ws_library.png) |
| Nodes Tab | Models Tab |
| Library Information | Customize |
|:---:|:---:|
| ![Nodes](docs/screenshot_nodes.png) | ![Models](docs/screenshot_models.png) |
| Gallery Tab | Nodes Tab |
|:---:|:---:|
| ![Gallery](docs/screenshot_gallery.png) | ![Nodes](docs/screenshot_nodes.png) |
| Workflow Studio Library (ComfyUI) | ComfyUI Integration |
|:---:|:---:|
| ![Workflow Studio Library](docs/screenshot_wf_node_library.png) | ![ComfyUI Top Bar](docs/screenshot_comfyui_topbar.png) |
| ![Library Information](docs/7_library_Infomation.png) | ![Customize](docs/8_Customize.png) |
---
@@ -59,7 +51,7 @@ Browse, organize, and execute workflows directly from a dedicated studio interfa
- **Input tab** — Prompt (top) and Image drag-and-drop (bottom) in the left column; Raw JSON (540px) in the right column
- **Model tab** — Checkpoint, VAE, LoRA, ControlNet, UNET, TextEncoder selectors with filter; Raw JSON on the right
- **Settings tab** — KSampler and Latent Image side by side at 50% width each; Raw JSON on the right
- **Always-visible Raw JSON** — edit the API-format JSON directly from any tab with syntax highlighting; Apply button reloads the workflow
- **Always-visible Raw JSON** — edit the API-format JSON directly from any tab with syntax highlighting; Apply button reloads the workflow; built-in **search bar** (always shown) finds all matches as you type with count display (`3/12`); navigate with ↑/↓ buttons or Enter / Shift+Enter; Escape or ✕ clears; current match highlighted in orange, other matches in yellow
- **One-click generation** — queue prompts to ComfyUI without leaving the studio
- **Seed control** — randomize, lock, or manually set seeds; seed input and mode selector stacked vertically for readability
- **Checkpoint Batch** — enable via checkbox in the right panel to sequentially generate with every checkpoint model; select checkpoints by folder from the dropdown (check a folder to select all its files, expand with ▶ for individual file selection, supports any subfolder depth); Filter input to search; All / None buttons for quick selection; **Pause/Resume** suspends processing between models; Stop aborts after the current generation; amber progress bar tracks per-model progress
@@ -95,7 +87,7 @@ Requires the **[comfyui-image-feeder](https://github.com/ketle-man/comfyui-image
### Metadata Tab (v0.3.8)
- **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
- **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)
- **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); 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
- **Prompt actions** — Copy to clipboard, **GenUI:P/N** (set GenerateUI positive/negative prompt), **Prompt:P/N** (set Prompt tab preset positive/negative)
@@ -113,6 +105,7 @@ Requires the **[comfyui-image-feeder](https://github.com/ketle-man/comfyui-image
- **Ollama connection** — configure Ollama server URL
- **Default workflow** — set a workflow to auto-load on startup
- **Data Management** — export all plugin data (settings, metadata, prompts, etc.) to a single JSON file; import to restore data (useful when migrating or reinstalling)
- **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
- **Wildcard Integration** — link the WFS wildcard directory to ComfyUI-Impact-Pack's `wildcards/` directory (directory junction on Windows, symlink on other OS); existing WFS wildcard files are automatically migrated; requires [ComfyUI-Impact-Pack](https://github.com/ltdrdata/ComfyUI-Impact-Pack)
- **Language** — English / Japanese / Chinese
@@ -250,6 +243,15 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
## Changelog
### v0.3.12
- **GenerateUI — Raw JSON search** — always-visible search bar above the Raw JSON editor; finds all matches as you type with match count (`3/12`); navigate forward/back with ↑/↓ buttons, Enter / Shift+Enter, or Escape / ✕ to clear; current match highlighted in orange, other matches in yellow; search overlay syncs with editor scroll and stays updated while editing
- **Workflow analyzer — extended model type detection** — added CLIPLoader `type` field mapping to model family (`flux`, `hidream_i`, `wan`, `cosmos`, `lumina`, `ovis`, etc.) via `_CLIP_TYPE_TO_MODEL`; subgraph nodes (`definitions.subgraphs`) now scanned for model detection; `UnetLoaderGGUF` and similar loaders matched via `"UnetLoader" in ntype`; new families added: NewBie, Ovis, HiDream, Wan, Cosmos, Lumina; model-name detection refactored into reusable `_detect_model_type_from_name()`
- **Screenshots refreshed** — replaced tab-by-tab screenshots with 8 feature-focused images
### v0.3.11
- **Metadata Tab — extended loader support** — `metadata-tab.js` now recognizes `UnetLoaderGGUF` and `UNETLoaderGGUF` as Diffusion Model (e.g. HiDream GGUF workflows), and `QuadrupleCLIPLoader` as Text Encoder (e.g. HiDream 4-CLIP); previously these were detected only in the side panel I tab, not in the Metadata tab itself
- **Settings Tab — Text Size** — new slider (10–28 px) in the Settings tab adjusts font size for all prompt and chat text areas at once: Generate UI positive/negative prompts, AI Assistant chat input, Preset prompts, Wildcard text area and file editor, and Metadata prompt full preview; applied immediately on drag and persisted with Save Settings
### v0.3.10
- **Information tab — drag to canvas** — model, lora, and Prompts sub-tabs in the side panel I tab now support drag & drop onto the ComfyUI canvas; double-click also places nodes at canvas center
- model sub-tab: each item places the corresponding loader node (Checkpoint → `CheckpointLoaderSimple`, VAE → `VAELoader`, Diffusion Model → `UNETLoader`, Text Encoder → `CLIPLoader`)
Binary file not shown.

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 975 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

+101 -20
View File
@@ -3,6 +3,23 @@
import os
import re
# CLIPLoader / DualCLIPLoader の type フィールド → モデル種別マッピング
_CLIP_TYPE_TO_MODEL = {
"flux": "Flux",
"flux2": "Flux2",
"newbie": "NewBie",
"ovis": "Ovis",
"qwen_image": "Qwen",
"sd3": "SD3",
"sd3.5": "SD3",
"hidream_i": "HiDream",
"hidream_e": "HiDream",
"hidream": "HiDream",
"wan": "Wan",
"cosmos": "Cosmos",
"lumina": "Lumina",
}
def _model_name_from_ui_node(node):
"""Extract model filename from UI format node (lowercase)."""
@@ -11,16 +28,65 @@ def _model_name_from_ui_node(node):
return val.lower() if isinstance(val, str) else ""
def _clip_type_from_ui_node(node):
"""Extract CLIPLoader type string from widgets_values (lowercase)."""
ntype = node.get("type", "")
vals = node.get("widgets_values", [])
if ntype == "CLIPLoader" and len(vals) > 1:
return str(vals[1]).lower() if isinstance(vals[1], str) else ""
if ntype in ("DualCLIPLoader", "TripleCLIPLoader") and len(vals) > 2:
return str(vals[2]).lower() if isinstance(vals[2], str) else ""
return ""
def _model_name_from_api_node(node):
"""Extract model filename from API format node (lowercase)."""
inputs = node.get("inputs", {})
for key in ("ckpt_name", "unet_name", "model_name"):
for key in ("ckpt_name", "unet_name", "model_name", "clip_name1", "clip_name"):
val = inputs.get(key, "")
if isinstance(val, str) and val:
return val.lower()
return ""
def _collect_all_ui_nodes(workflow_data):
"""Yield all UI-format nodes including those inside definitions.subgraphs."""
for node in workflow_data.get("nodes", []):
yield node
defs = workflow_data.get("definitions", {})
if isinstance(defs, dict):
for sg in defs.get("subgraphs", []):
if isinstance(sg, dict):
for node in sg.get("nodes", []):
yield node
def _detect_model_type_from_name(mn_base, model_types):
"""Detect model type from a model filename (already lowercased basename)."""
if re.search(r"sd1[._-]?5|v1[._-]5", mn_base):
model_types.add("SD1.5")
elif re.search(r"sdxl|[._-]xl[._-]|[._-]xl$|xl[._-]", mn_base):
model_types.add("SDXL")
elif re.search(r"flux[-_.]?2", mn_base):
model_types.add("Flux2")
elif "flux" in mn_base:
model_types.add("Flux")
elif re.search(r"sd[._-]?3", mn_base):
model_types.add("SD3")
elif "qwen" in mn_base:
model_types.add("Qwen")
elif "zimage" in mn_base or "z-image" in mn_base or "zit" in mn_base:
model_types.add("Z-IMAGE")
elif "newbie" in mn_base:
model_types.add("NewBie")
elif "ovis" in mn_base:
model_types.add("Ovis")
elif "hidream" in mn_base:
model_types.add("HiDream")
elif "wan" in mn_base and re.search(r"wan[-_.]?\d|wan[-_]video", mn_base):
model_types.add("Wan")
def analyze_workflow(workflow_data, filename=""):
"""Analyze workflow JSON and return model types, input/output node counts."""
model_types = set()
@@ -36,23 +102,33 @@ def analyze_workflow(workflow_data, filename=""):
model_types.add("Qwen")
if "zimage" in fn or "z-image" in fn or "zit" in fn:
model_types.add("Z-IMAGE")
if "flux2" in fn:
if re.search(r"flux[-_.]?2", fn):
model_types.add("Flux2")
elif "flux" in fn:
model_types.add("Flux")
if "sd3" in fn:
model_types.add("SD3")
if "newbie" in fn:
model_types.add("NewBie")
if "ovis" in fn:
model_types.add("Ovis")
if "hidream" in fn:
model_types.add("HiDream")
if "wan" in fn and re.search(r"wan[-_.]?\d|wan[-_]video", fn):
model_types.add("Wan")
# Support both UI format (nodes array) and API format (node ID object)
raw_nodes = workflow_data.get("nodes", None)
if raw_nodes is not None:
# UI / app format: collect all nodes including subgraph definitions
node_iter = [
(
node.get("type", ""),
node.get("title", "").lower(),
_model_name_from_ui_node(node),
_clip_type_from_ui_node(node),
)
for node in raw_nodes
for node in _collect_all_ui_nodes(workflow_data)
]
else:
node_iter = []
@@ -62,33 +138,32 @@ def analyze_workflow(workflow_data, filename=""):
ntype = node.get("class_type", "")
title = node.get("_meta", {}).get("title", "").lower()
mn = _model_name_from_api_node(node)
node_iter.append((ntype, title, mn))
node_iter.append((ntype, title, mn, ""))
for ntype, title, mn in node_iter:
for ntype, title, mn, clip_type in node_iter:
if (
"CheckpointLoader" in ntype
or "UNETLoader" in ntype
or "UnetLoader" in ntype # UnetLoaderGGUF 等を含む
or "unet_name" in ntype
):
mn_base = os.path.basename(mn.replace("\\", "/"))
if re.search(r"sd1[._-]?5|v1[._-]5", mn_base):
model_types.add("SD1.5")
elif re.search(r"sdxl|[._-]xl[._-]|[._-]xl$|xl[._-]", mn_base):
model_types.add("SDXL")
elif "flux2" in mn_base:
model_types.add("Flux2")
elif "flux" in mn_base:
model_types.add("Flux")
elif re.search(r"sd[._-]?3", mn_base):
model_types.add("SD3")
elif "qwen" in mn_base:
model_types.add("Qwen")
elif "zimage" in mn_base or "z-image" in mn_base or "zit" in mn_base:
model_types.add("Z-IMAGE")
_detect_model_type_from_name(mn_base, model_types)
# CLIPLoader 系: type フィールドまたはファイル名からモデル種別を検出
# QuadrupleCLIPLoader 等、type フィールドを持たない新型ローダーにも対応
if "CLIPLoader" in ntype:
if clip_type:
detected = _CLIP_TYPE_TO_MODEL.get(clip_type)
if detected:
model_types.add(detected)
mn_base = os.path.basename(mn.replace("\\", "/"))
if mn_base:
_detect_model_type_from_name(mn_base, model_types)
if "sdxl" in title:
model_types.add("SDXL")
if "flux2" in title:
if re.search(r"flux[-_.]?2", title):
model_types.add("Flux2")
elif "flux" in title:
model_types.add("Flux")
@@ -98,6 +173,12 @@ def analyze_workflow(workflow_data, filename=""):
model_types.add("Qwen")
if "zimage" in title or "z-image" in title or "zit" in title:
model_types.add("Z-IMAGE")
if "newbie" in title:
model_types.add("NewBie")
if "ovis" in title:
model_types.add("Ovis")
if "hidream" in title:
model_types.add("HiDream")
if ntype == "CLIPTextEncode" or "prompt" in title:
inputs["prompts"] += 1
+83 -1
View File
@@ -677,6 +677,69 @@ body {
height: auto !important;
}
/* RAW JSON search bar */
.wfm-rawjson-search {
display: flex;
align-items: center;
gap: 4px;
padding: 4px 8px;
background: var(--wfm-bg-secondary);
border-bottom: 1px solid var(--wfm-border);
flex-shrink: 0;
}
.wfm-rawjson-search-input {
flex: 1;
height: 22px;
padding: 0 6px;
background: var(--wfm-bg);
border: 1px solid var(--wfm-border);
border-radius: 3px;
color: var(--wfm-text);
font-size: 12px;
outline: none;
min-width: 0;
}
.wfm-rawjson-search-input:focus {
border-color: var(--wfm-accent);
}
.wfm-rawjson-search-count {
font-size: 11px;
color: var(--wfm-text-secondary);
white-space: nowrap;
min-width: 56px;
text-align: center;
}
.wfm-rawjson-search-btn {
width: 22px;
height: 22px;
padding: 0;
background: transparent;
border: 1px solid transparent;
border-radius: 3px;
color: var(--wfm-text-secondary);
font-size: 13px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
line-height: 1;
}
.wfm-rawjson-search-btn:hover {
background: rgba(255, 255, 255, 0.08);
border-color: var(--wfm-border);
color: var(--wfm-text);
}
.wfm-rawjson-search-clear {
font-size: 14px;
}
.wfm-gen-col-title {
font-size: 12px;
font-weight: 600;
@@ -1334,8 +1397,27 @@ body {
pointer-events: none;
}
.wfm-json-editor {
/* Search match overlay: transparent text, mark backgrounds only */
.wfm-json-search-overlay {
z-index: 2;
color: transparent !important;
}
.wfm-json-search-overlay mark.wfm-search-match {
background: rgba(234, 201, 70, 0.35);
color: transparent;
border-radius: 2px;
}
.wfm-json-search-overlay mark.wfm-search-current {
background: rgba(255, 150, 0, 0.65);
color: transparent;
border-radius: 2px;
outline: 1px solid rgba(255, 150, 0, 0.9);
}
.wfm-json-editor {
z-index: 3;
color: transparent;
caret-color: #ffffff;
outline: none;
+7 -1
View File
@@ -361,7 +361,7 @@ import { initWorkflowTab } from "./workflow-tab.js";
import { initNodesTab } from "./nodes-tab.js";
import { initGenerateTab } from "./generate-tab.js";
import { initPromptTab } from "./prompt-tab.js";
import { initSettingsTab, applyTheme, getSavedTheme } from "./settings-tab.js";
import { initSettingsTab, applyTheme, getSavedTheme, applyTextareaFontSize } from "./settings-tab.js";
import { initModelsTab } from "./models-tab.js";
import { initGalleryTab } from "./gallery-tab.js";
import { initMetadataTab } from "./metadata-tab.js";
@@ -369,6 +369,12 @@ import { initMetadataTab } from "./metadata-tab.js";
// Apply saved theme immediately to prevent flash of default theme
applyTheme(getSavedTheme());
// Apply saved textarea font size
try {
const _s = JSON.parse(localStorage.getItem("wfm_settings") || "{}");
if (_s.textareaFontSize) applyTextareaFontSize(_s.textareaFontSize);
} catch {}
document.addEventListener("DOMContentLoaded", () => {
applyI18nToHtml();
initTabs();
+109 -4
View File
@@ -731,14 +731,119 @@ export async function initGenerateTab() {
}
});
// Raw JSON highlight sync on input/scroll
// Raw JSON highlight sync + search
{
const editor = document.getElementById("wfm-gen-raw-json");
const highlight = document.getElementById("wfm-gen-raw-json-highlight");
if (editor && highlight) {
editor.addEventListener("input", () => syncJsonHighlight(highlight, editor.value));
editor.addEventListener("scroll", () => syncScroll(editor, highlight));
const searchOverlay = document.getElementById("wfm-gen-raw-json-search-overlay");
const searchInput = document.getElementById("wfm-gen-raw-search");
const searchCount = document.getElementById("wfm-gen-raw-search-count");
const searchPrev = document.getElementById("wfm-gen-raw-search-prev");
const searchNext = document.getElementById("wfm-gen-raw-search-next");
const searchClear = document.getElementById("wfm-gen-raw-search-clear");
let currentMatchIndex = 0;
let matchPositions = [];
function updateSearchOverlay() {
if (!editor || !searchOverlay || !searchInput) return;
const term = searchInput.value;
if (!term) {
searchOverlay.innerHTML = "";
if (searchCount) { searchCount.textContent = ""; searchCount.style.color = ""; }
matchPositions = [];
return;
}
const text = editor.value;
const escapedTerm = term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
const regex = new RegExp(escapedTerm, "gi");
matchPositions = [];
let m;
while ((m = regex.exec(text)) !== null) matchPositions.push(m.index);
if (matchPositions.length === 0) {
searchOverlay.innerHTML = "";
if (searchCount) { searchCount.textContent = "No results"; searchCount.style.color = "#e06c75"; }
return;
}
if (searchCount) searchCount.style.color = "";
if (currentMatchIndex >= matchPositions.length) currentMatchIndex = 0;
if (searchCount) searchCount.textContent = `${currentMatchIndex + 1}/${matchPositions.length}`;
const escapedHtml = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
let matchIdx = 0;
const html = escapedHtml.replace(new RegExp(escapedTerm, "gi"), (match) => {
const cls = matchIdx === currentMatchIndex ? "wfm-search-current" : "wfm-search-match";
matchIdx++;
return `<mark class="${cls}">${match}</mark>`;
});
searchOverlay.innerHTML = html + "\n";
// Scroll editor to current match
const pos = matchPositions[currentMatchIndex];
editor.focus();
editor.setSelectionRange(pos, pos + term.length);
const lineNum = (text.slice(0, pos).match(/\n/g) || []).length;
const lineH = parseFloat(getComputedStyle(editor).lineHeight) || 18;
editor.scrollTop = Math.max(0, lineH * lineNum - editor.clientHeight / 2);
searchOverlay.scrollTop = editor.scrollTop;
searchOverlay.scrollLeft = editor.scrollLeft;
if (highlight) highlight.scrollTop = editor.scrollTop;
}
if (editor && highlight) {
editor.addEventListener("input", () => {
syncJsonHighlight(highlight, editor.value);
if (searchInput?.value) updateSearchOverlay();
});
editor.addEventListener("scroll", () => {
syncScroll(editor, highlight);
if (searchOverlay) {
searchOverlay.scrollTop = editor.scrollTop;
searchOverlay.scrollLeft = editor.scrollLeft;
}
});
}
searchInput?.addEventListener("input", () => { currentMatchIndex = 0; updateSearchOverlay(); });
searchNext?.addEventListener("click", () => {
if (!matchPositions.length) return;
currentMatchIndex = (currentMatchIndex + 1) % matchPositions.length;
updateSearchOverlay();
});
searchPrev?.addEventListener("click", () => {
if (!matchPositions.length) return;
currentMatchIndex = (currentMatchIndex - 1 + matchPositions.length) % matchPositions.length;
updateSearchOverlay();
});
function clearSearch() {
if (searchInput) searchInput.value = "";
currentMatchIndex = 0;
matchPositions = [];
if (searchOverlay) searchOverlay.innerHTML = "";
if (searchCount) { searchCount.textContent = ""; searchCount.style.color = ""; }
}
searchClear?.addEventListener("click", clearSearch);
searchInput?.addEventListener("keydown", (e) => {
if (e.key === "Enter") {
if (!matchPositions.length) return;
currentMatchIndex = e.shiftKey
? (currentMatchIndex - 1 + matchPositions.length) % matchPositions.length
: (currentMatchIndex + 1) % matchPositions.length;
updateSearchOverlay();
e.preventDefault();
} else if (e.key === "Escape") {
clearSearch();
}
});
}
// Check for workflow loaded from Workflow tab (via sessionStorage)
+5 -2
View File
@@ -122,8 +122,9 @@ function extractVAEs(wf) {
}
function extractDiffusionModels(wf) {
if (!wf || typeof wf !== "object") return [];
if (Array.isArray(wf.nodes)) return collectUnique(collectAllNodes(wf).filter(n => n.type === "UNETLoader").map(n => n.widgets_values?.[0]));
return collectUnique(Object.values(wf).filter(n => n?.class_type === "UNETLoader").map(n => n.inputs?.unet_name));
const UNET_TYPES = new Set(["UNETLoader", "UnetLoaderGGUF", "UNETLoaderGGUF"]);
if (Array.isArray(wf.nodes)) return collectUnique(collectAllNodes(wf).filter(n => UNET_TYPES.has(n.type)).map(n => n.widgets_values?.[0]));
return collectUnique(Object.values(wf).filter(n => UNET_TYPES.has(n?.class_type)).map(n => n.inputs?.unet_name));
}
function extractTextEncoders(wf) {
if (!wf || typeof wf !== "object") return [];
@@ -133,6 +134,7 @@ function extractTextEncoders(wf) {
if (n.type === "CLIPLoader") { if (n.widgets_values?.[0]) names.push(n.widgets_values[0]); }
else if (n.type === "DualCLIPLoader") { [0,1].forEach(i => { if (n.widgets_values?.[i]) names.push(n.widgets_values[i]); }); }
else if (n.type === "TripleCLIPLoader") { [0,1,2].forEach(i => { if (n.widgets_values?.[i]) names.push(n.widgets_values[i]); }); }
else if (n.type === "QuadrupleCLIPLoader") { [0,1,2,3].forEach(i => { if (n.widgets_values?.[i]) names.push(n.widgets_values[i]); }); }
}
} else {
for (const n of Object.values(wf)) {
@@ -141,6 +143,7 @@ function extractTextEncoders(wf) {
if (ct === "CLIPLoader") { if (n.inputs?.clip_name) names.push(n.inputs.clip_name); }
else if (ct === "DualCLIPLoader") { if (n.inputs?.clip_name1) names.push(n.inputs.clip_name1); if (n.inputs?.clip_name2) names.push(n.inputs.clip_name2); }
else if (ct === "TripleCLIPLoader") { ["clip_name1","clip_name2","clip_name3"].forEach(k => { if (n.inputs?.[k]) names.push(n.inputs[k]); }); }
else if (ct === "QuadrupleCLIPLoader") { ["clip_name1","clip_name2","clip_name3","clip_name4"].forEach(k => { if (n.inputs?.[k]) names.push(n.inputs[k]); }); }
}
}
return collectUnique(names);
+52
View File
@@ -314,6 +314,30 @@ function clearCustomOverrides() {
if (fontEl) fontEl.remove();
}
const TEXTAREA_FONT_SIZE_DEFAULT = 13;
const TEXTAREA_FONT_SIZE_STYLE_ID = "wfm-ta-font-size-style";
const TEXTAREA_FONT_SIZE_TARGETS = [
"#wfm-prompt-pos-text",
"#wfm-prompt-neg-text",
"#wfm-ollama-input",
"#wfm-preset-pos",
"#wfm-preset-neg",
"#wfm-wc-prompt",
"#wfm-wc-editor-content",
"#wfm-meta-prompt-full",
].join(",\n ");
export function applyTextareaFontSize(size) {
const px = Math.max(10, Math.min(28, parseInt(size) || TEXTAREA_FONT_SIZE_DEFAULT));
let el = document.getElementById(TEXTAREA_FONT_SIZE_STYLE_ID);
if (!el) {
el = document.createElement("style");
el.id = TEXTAREA_FONT_SIZE_STYLE_ID;
document.head.appendChild(el);
}
el.textContent = `${TEXTAREA_FONT_SIZE_TARGETS} { font-size: ${px}px !important; }`;
}
export function applyTheme(themeId) {
if (themeId) {
document.documentElement.setAttribute("data-theme", themeId);
@@ -485,6 +509,24 @@ export async function initSettingsTab() {
</div>
</details>
<!-- Text Size -->
<details class="wfm-settings-section" open>
<summary class="wfm-settings-summary">${t("textSizeLabel") || "Text Size"}</summary>
<div class="wfm-form-group">
<label style="display:flex;align-items:center;justify-content:space-between;">
<span>${t("textSizeTextarea") || "Prompt / Chat Textarea"}</span>
<span id="wfm-ta-font-size-val" style="font-size:12px;color:var(--wfm-text-secondary);">${settings.textareaFontSize || TEXTAREA_FONT_SIZE_DEFAULT}px</span>
</label>
<input type="range" class="wfm-range" id="wfm-ta-font-size"
min="10" max="28" step="1"
value="${settings.textareaFontSize || TEXTAREA_FONT_SIZE_DEFAULT}"
style="width:100%;margin-top:4px;">
<small style="color:var(--wfm-text-secondary);font-size:11px;display:block;margin-top:4px;">
${t("textSizeHint") || "Applies to: Generate UI prompts, AI Assistant chat, Preset prompts, Wildcard textarea, Metadata prompt preview"}
</small>
</div>
</details>
<!-- Workflow Data Folder -->
<details class="wfm-settings-section">
<summary class="wfm-settings-summary">${t("workflowsDir")}</summary>
@@ -1032,8 +1074,17 @@ export async function initSettingsTab() {
showToast(t("defaultWorkflowCleared"), "success");
});
// --- Textarea font size slider ---
document.getElementById("wfm-ta-font-size")?.addEventListener("input", (e) => {
const px = parseInt(e.target.value);
const valEl = document.getElementById("wfm-ta-font-size-val");
if (valEl) valEl.textContent = `${px}px`;
applyTextareaFontSize(px);
});
// Save (local settings)
document.getElementById("wfm-settings-save")?.addEventListener("click", () => {
const taFontSize = parseInt(document.getElementById("wfm-ta-font-size")?.value) || TEXTAREA_FONT_SIZE_DEFAULT;
const patch = {
comfyuiUrl: document.getElementById("wfm-settings-comfyui-url")?.value.trim() || "",
eagleUrl: document.getElementById("wfm-settings-eagle-url")?.value.trim() || "http://localhost:41595",
@@ -1041,6 +1092,7 @@ export async function initSettingsTab() {
uiLang: getLang(),
summaryLang: getSummaryLang(),
theme: document.documentElement.getAttribute("data-theme") || "",
textareaFontSize: taFontSize,
};
saveLocalSettings(patch);
+10 -1
View File
@@ -517,8 +517,16 @@
<span class="wfm-gen-rawjson-label">Raw JSON</span>
<button id="wfm-gen-apply-raw-btn" class="wfm-btn wfm-btn-sm">Apply</button>
</div>
<div class="wfm-rawjson-search">
<input type="text" id="wfm-gen-raw-search" class="wfm-rawjson-search-input" placeholder="Search...">
<span id="wfm-gen-raw-search-count" class="wfm-rawjson-search-count"></span>
<button id="wfm-gen-raw-search-prev" class="wfm-rawjson-search-btn" title="Previous match">↑</button>
<button id="wfm-gen-raw-search-next" class="wfm-rawjson-search-btn" title="Next match">↓</button>
<button id="wfm-gen-raw-search-clear" class="wfm-rawjson-search-btn wfm-rawjson-search-clear" title="Clear search">✕</button>
</div>
<div class="wfm-json-container wfm-gen-rawjson-editor">
<pre id="wfm-gen-raw-json-highlight" class="wfm-json-highlight"></pre>
<pre id="wfm-gen-raw-json-search-overlay" class="wfm-json-highlight wfm-json-search-overlay"></pre>
<textarea id="wfm-gen-raw-json" class="wfm-json-editor" spellcheck="false" placeholder="Paste workflow JSON here..."></textarea>
</div>
</div>
@@ -864,7 +872,7 @@
<li id="wfm-help-metadata-2">Center column: Checkpoint, VAE, Diffusion Model, and Text Encoder lists extracted from the workflow</li>
<li id="wfm-help-metadata-3">Right column: LoRA list (with strength values) and Prompt list (click to view full text below)</li>
<li id="wfm-help-metadata-4">Prompt actions — Copy: copy to clipboard; GenUI:P/N: set GenerateUI positive/negative prompt; Prompt:P/N: set Prompt tab preset positive/negative</li>
<li id="wfm-help-metadata-5">Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image subgraph workflows), SD WebUI, SD Forge, Fooocus.</li>
<li id="wfm-help-metadata-5">Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image 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>
</ul>
</div>
@@ -881,6 +889,7 @@
<li id="wfm-help-settings-8">Data Management: export all plugin data to JSON / import to restore</li>
<li id="wfm-help-settings-9">All sections are collapsible accordion panels</li>
<li id="wfm-help-settings-10">Wildcard Integration: link WFS wildcard dir to ComfyUI-Impact-Pack wildcards (junction/symlink); existing files migrated automatically</li>
<li id="wfm-help-settings-11">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</li>
</ul>
</div>