Compare commits

...
1 Commits
Author SHA1 Message Date
ketle-manandClaude Sonnet 4.6 465871b9f8 feat: GenerateUI A1111-style wildcard expansion + Gallery bug fixes (v0.3.49)
- GenerateUI: SPA-side __name__ wildcard expansion for non-ImpactWildcard nodes
  (CLIPTextEncode etc.); nested expansion up to 5 passes; ImpactWildcard* skipped
  (server-side); works in single and batch generation
- Gallery: fix Export button missing text label in bulk action bar
- Gallery: fix prompt search missing images with no cached prompt index —
  on-demand metadata read + cache build when search is active
- Help text updated (EN/JA/ZH): helpGen16 added
- Version bumped to 0.3.49

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-22 11:43:17 +09:00
8 changed files with 143 additions and 5 deletions
+31
View File
@@ -1,5 +1,36 @@
# DEVLOG - ComfyUI-Workflow-Studio
## 2026-06-22: v0.3.49 — 生成UIタブ A1111風ワイルドカード展開・ギャラリータブ バグ修正2件
**変更ファイル**: `static/js/generate-tab.js`, `static/js/app.js`, `py/services/gallery_service.py`, `static/js/i18n.js`, `templates/index.html`
### 生成UIタブ — A1111風SPAサイドワイルドカード展開
ImpactWildcardEncode/Processor以外のノード(CLIPTextEncodeなど)のテキスト入力に`__name__`構文が含まれる場合、ComfyUIへの送信前にSPA側でワイルドカードを展開する機能を追加。
- `generate-tab.js` に `_fetchWildcardLines()`, `_expandWildcardText()`, `_expandWildcardsInWorkflow()` を追加
- `_coreGenerate()` 内の `comfyUI.generate()` 呼び出し前にワイルドカード展開を実行
- ワイルドカードファイルは既存の `/api/wfm/wildcards/content` API経由で取得(WFS wildcard フォルダ参照)
- ファイル内容はセッション中キャッシュ(`_wcLineCache`);ランダム選択は毎回独立して実行
- ネスト展開対応(最大5パス);見つからないワイルドカードはそのまま通過
- ImpactWildcardEncode/ProcessorノードはスキップしてComfyUIサーバー側(Impact Pack)に委ねる
- 単体生成・バッチ生成どちらも `_coreGenerate()` を経由するため両方で機能する
- ヘルプ更新(EN/JA/ZH): `helpGen16` を追加(`index.html`, `app.js`, `i18n.js` 3言語)
### ギャラリータブ — エクスポートボタンのラベル欠落を修正
`app.js` の `updateUITexts()` に `wfm-gallery-bulk-export` ボタンへの `textContent` 設定が抜けていた。`galleryBulkMove` と `galleryBulkDelete` の間に `galleryBulkExport` の設定を追加。
### ギャラリータブ — プロンプト検索で未キャッシュ画像にヒットしない問題を修正
`prompt_cache` は詳細パネルで一度開いた画像にのみ構築されていた。A1111など外部ツールで生成した画像をWFS外から追加した場合、一度も開かれていない画像はプロンプト検索にヒットしなかった。
- `gallery_service.py` の `list_images()` で検索実行時、`prompt_cache` が空の画像をその場でメタデータ読み込み(`_read_png_metadata` / `_read_jpeg_metadata`)してキャッシュに保存してから検索対象に含める
- A1111形式PNG(tEXtチャンク `parameters` キー)も正しく検索対象になる
- 初回検索時のみ読み込みが発生;以降はキャッシュから即時検索
---
## 2026-06-22: v0.3.48 — ギャラリータブ 画像ダウンロード・一括エクスポート機能追加
**変更ファイル**: `templates/index.html`, `static/js/gallery-tab.js`, `static/css/gallery-tab.css`, `py/routes/gallery_routes.py`, `static/js/i18n.js`
+10 -1
View File
@@ -18,7 +18,7 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- Built-in AI tools (translation and more)
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.3.47-green)
![Version](https://img.shields.io/badge/version-0.3.49-green)
## Screenshots
@@ -334,6 +334,15 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
## Changelog
### v0.3.49
- **GenerateUI tab — A1111-style SPA-side wildcard expansion** — when prompt text in non-ImpactWildcard nodes (e.g. CLIPTextEncode) contains `__name__` syntax, the SPA expands it at generation time by randomly picking a line from the matching file in the WFS wildcard folder; nested wildcards are re-expanded up to 5 passes; unresolved wildcards are passed through unchanged; ImpactWildcardEncode/Processor nodes are skipped (handled server-side by Impact Pack); works in both single and batch generation
- **Gallery tab — fix Export button missing label** — the bulk action bar's Export button had no text label because the `textContent` assignment was missing from `updateUITexts()`; fixed by adding the `galleryBulkExport` i18n key assignment alongside the existing Move/Delete entries
- **Gallery tab — fix prompt search not matching images with no cached index** — `prompt_cache` was only built when an image was opened in the detail panel; A1111 images (or any images never opened) were invisible to prompt search; now when search is active and `prompt_cache` is empty, the image file is read on-demand and the cache is populated and persisted for future searches
### v0.3.48
- **Gallery tab — single image download** — hover over a detail-panel preview image to reveal a download overlay (⬇ icon); click to download the original file with its original filename preserved
- **Gallery tab — bulk export to ZIP** — multiple selected images can be exported as a ZIP archive via the "Export" button in the bulk action bar; filename: `gallery_export_<timestamp>.zip`; backend: `POST /wfm/gallery/images/export-zip` with path-traversal protection
### v0.3.47
- **Models tab — fix stale group state after file move** — when models were moved to a subdirectory via "Move To...", `state.modelGroups` in the JS client was not updated to reflect the new model paths; the group filter view would lose the moved models immediately after the operation. Now the client-side group membership is updated in sync with the server-side rename (mirrors the existing Python `move_models` logic). Generate tab Batch groups are unaffected as they always fetch fresh from the server.
+16 -1
View File
@@ -225,11 +225,26 @@ class GalleryService:
# 検索フィルタ(ファイル名・メモ・タグ・キャッシュ済みプロンプト)
if search:
s = search.lower()
prompt_cache = meta.get("prompt_cache", "")
# prompt_cache未構築の場合は画像から直接読み込んでキャッシュする
if not prompt_cache and ext in (".png", ".jpg", ".jpeg"):
embedded = {}
if ext == ".png":
embedded = self._read_png_metadata(Path(abs_path))
else:
embedded = self._read_jpeg_metadata(Path(abs_path))
if embedded:
prompt_cache = " ".join(
str(v) for k, v in embedded.items()
if k != "workflow" and isinstance(v, str) and len(v) < 50_000
).strip()
if prompt_cache:
self.metadata_store.save(abs_path, {"prompt_cache": prompt_cache})
if not (
s in name.lower()
or s in item["memo"].lower()
or any(s in t.lower() for t in tags)
or s in meta.get("prompt_cache", "").lower()
or s in prompt_cache.lower()
):
continue
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "comfyui-workflow-studio"
description = "A comprehensive workflow, asset management, and generation UI plugin for ComfyUI. Manage workflows, models, images, and prompts; batch generation and Image Feeder in the GenerateUI tab; library side panel with canvas drag & drop and AI tools."
version = "0.3.47"
version = "0.3.49"
license = "MIT"
requires-python = ">= 3.10"
dependencies = ["jinja2"]
+3 -1
View File
@@ -215,6 +215,8 @@ function applyI18nToHtml() {
if (galleryBulkUnfav) galleryBulkUnfav.textContent = t("galleryBulkUnfavAll");
const galleryBulkMove = document.getElementById("wfm-gallery-bulk-move");
if (galleryBulkMove) galleryBulkMove.textContent = t("galleryBulkMoveTo");
const galleryBulkExport = document.getElementById("wfm-gallery-bulk-export");
if (galleryBulkExport) galleryBulkExport.textContent = t("galleryBulkExport");
const galleryBulkDelete = document.getElementById("wfm-gallery-bulk-delete");
if (galleryBulkDelete) galleryBulkDelete.textContent = t("galleryBulkDelete");
const galleryOpenTaggerBtn = document.getElementById("wfm-gallery-open-tagger-btn");
@@ -352,7 +354,7 @@ function applyI18nToHtml() {
"wfm-help-gen-8": "helpGen8", "wfm-help-gen-9": "helpGen9", "wfm-help-gen-10": "helpGen10",
"wfm-help-gen-11": "helpGen11", "wfm-help-gen-12": "helpGen12",
"wfm-help-gen-13": "helpGen13", "wfm-help-gen-14": "helpGen14",
"wfm-help-gen-15": "helpGen15",
"wfm-help-gen-15": "helpGen15", "wfm-help-gen-16": "helpGen16",
"wfm-help-feeder-title": "helpFeederTitle",
"wfm-help-feeder-desc": "helpFeederDesc",
"wfm-help-feeder-imgloop-title": "helpFeederImgloopTitle",
+78 -1
View File
@@ -1193,6 +1193,82 @@ function initCheckpointBatch() {
});
}
// ============================================
// SPA-side wildcard expansion (A1111-style __name__ syntax)
// Applies to non-ImpactWildcard nodes only; ImpactWildcard* nodes expand server-side.
// ============================================
const _wcLineCache = new Map(); // filename → string[] | null
async function _fetchWildcardLines(name) {
if (_wcLineCache.has(name)) return _wcLineCache.get(name);
try {
const res = await fetch(`/api/wfm/wildcards/content?filename=${encodeURIComponent(name + ".txt")}`);
if (!res.ok) { _wcLineCache.set(name, null); return null; }
const data = await res.json();
const lines = (data.content || "")
.split("\n")
.map(l => l.trim())
.filter(l => l && !l.startsWith("#"));
const result = lines.length > 0 ? lines : null;
_wcLineCache.set(name, result);
return result;
} catch {
_wcLineCache.set(name, null);
return null;
}
}
async function _expandWildcardText(text) {
for (let pass = 0; pass < 5; pass++) {
const matches = [...text.matchAll(/__([^_\s][^_]*)__/g)];
if (matches.length === 0) break;
let changed = false;
let offset = 0;
let result = text;
for (const match of matches) {
const lines = await _fetchWildcardLines(match[1]);
if (lines) {
const replacement = lines[Math.floor(Math.random() * lines.length)];
const pos = match.index + offset;
result = result.slice(0, pos) + replacement + result.slice(pos + match[0].length);
offset += replacement.length - match[0].length;
changed = true;
}
}
if (!changed) break;
text = result;
}
return text;
}
const _IMPACT_WC_TYPES = new Set(["ImpactWildcardEncode", "ImpactWildcardProcessor"]);
async function _expandWildcardsInWorkflow(workflow) {
let hasWildcard = false;
outer: for (const node of Object.values(workflow)) {
if (_IMPACT_WC_TYPES.has(node.class_type)) continue;
for (const val of Object.values(node.inputs || {})) {
if (typeof val === "string" && /__[^_\s][^_]*__/.test(val)) {
hasWildcard = true;
break outer;
}
}
}
if (!hasWildcard) return workflow;
const expanded = JSON.parse(JSON.stringify(workflow));
for (const node of Object.values(expanded)) {
if (_IMPACT_WC_TYPES.has(node.class_type)) continue;
for (const [key, val] of Object.entries(node.inputs || {})) {
if (typeof val === "string" && /__[^_\s][^_]*__/.test(val)) {
node.inputs[key] = await _expandWildcardText(val);
}
}
}
return expanded;
}
// ============================================
// Generation (core — throws on error)
// ============================================
@@ -1209,8 +1285,9 @@ async function _coreGenerate(silent = false) {
if (progressBar) progressBar.style.width = "0%";
if (progressText) progressText.textContent = "Starting...";
const workflowForGenerate = await _expandWildcardsInWorkflow({ ...comfyUI.currentWorkflow });
const { images, seed } = await comfyUI.generate(
{ ...comfyUI.currentWorkflow },
workflowForGenerate,
{
seedMode,
seedValue,
+3
View File
@@ -613,6 +613,7 @@ const LANGUAGES = {
helpGen13: "Batch tab — Center pane: group-based selection with inner tabs (Checkpoint | Lora | Prompt | Workflow); Checkpoint/Lora groups come from the Models tab, Prompt groups from the Prompt tab, Workflow groups from the Workflow tab — check a group header to select all its members, or expand ▶ to select individually",
helpGen14: "Batch tab — Right pane (Batch Queue): 6 columns — Checkpoint, Lora, Prompt, Workflow, Sampler, Scheduler; each column has an enable checkbox (radio behavior: only one at a time); count shown per column",
helpGen15: "Sampler/Scheduler batch: select samplers or schedulers in the left pane, enable the column in Batch Queue, then Generate to iterate through each value on the KSampler node; lists are fetched from ComfyUI (connection required)",
helpGen16: "SPA-side wildcard expansion (A1111-style): when prompt text in non-ImpactWildcard nodes (e.g. CLIPTextEncode) contains __name__ syntax, the SPA expands it at generation time by randomly picking a line from the matching file in the WFS wildcard folder; nested wildcards are re-expanded up to 5 passes; unresolved wildcards are passed through unchanged; ImpactWildcardEncode/Processor nodes are skipped (handled server-side by Impact Pack); works in both single and batch generation",
helpFeederTitle: "GenerateUI Tab — Feeder subtab",
helpFeederDesc: "Two modes switchable via the [Image Loop] / [Gallery] toggle at the top of the left pane.",
helpFeederImgloopTitle: "Image Loop mode",
@@ -1491,6 +1492,7 @@ const LANGUAGES = {
helpGen13: "Batchタブ — 中央ペイン:グループ選択(Checkpoint | Lora | Prompt | Workflowの内部タブ);Checkpoint/LoraグループはModelsタブ、PromptグループはPromptタブ、WorkflowグループはWorkflowタブの定義を反映 — グループヘッダーにチェックで全メンバーを選択、▶で展開して個別選択も可能",
helpGen14: "Batchタブ — 右ペイン(バッチキュー):6列構成 — Checkpoint / Lora / Prompt / Workflow / Sampler / Scheduler;各列にチェックボックスがあり1種類のみ有効化可能(ラジオ動作);各列に件数を表示",
helpGen15: "Sampler/Schedulerバッチ:左ペインでサンプラーまたはスケジューラーを選択し、バッチキューの対応列を有効化してGenerateを実行;選択した値を順番にKSamplerノードに適用して生成;リストはComfyUIから取得(要接続)",
helpGen16: "SPAサイドのワイルドカード展開(A1111スタイル):ImpactWildcard系以外のノード(CLIPTextEncodeなど)のプロンプトに__name__構文が含まれる場合、生成時にSPA側がWFSワイルドカードフォルダの対応ファイルからランダムに1行選んで展開;ネストしたワイルドカードは最大5パスまで再展開;見つからないワイルドカードはそのまま送信;ImpactWildcardEncode/ProcessorノードはスキップしてComfyUIサーバー側(Impact Pack)が処理;単体生成・バッチ生成どちらでも機能",
helpFeederTitle: "GenerateUI Tab — Feeder サブタブ",
helpFeederDesc: "左ペイン上部の [Image Loop] / [Gallery] トグルで2つのモードを切り替えられます。",
helpFeederImgloopTitle: "Image Loop モード",
@@ -2369,6 +2371,7 @@ const LANGUAGES = {
helpGen13: "Batch标签 — 中央窗格:基于组的选择(含Checkpoint | Lora | Prompt | Workflow内部标签);Checkpoint/Lora组来自Models标签,Prompt组来自Prompt标签,Workflow组来自Workflow标签 — 勾选组标题选中所有成员,▶展开后也可单独选择",
helpGen14: "Batch标签 — 右窗格(批量队列):6列 — Checkpoint / Lora / Prompt / Workflow / Sampler / Scheduler;每列有启用复选框(单选行为,每次仅一种);每列显示数量",
helpGen15: "Sampler/Scheduler批次:在左窗格选择采样器或调度器,启用批次队列对应列后点击Generate;依次将每个值应用到KSampler节点逐一生成;列表从ComfyUI获取(需已连接)",
helpGen16: "SPA端通配符展开(A1111风格):当非ImpactWildcard系节点(如CLIPTextEncode)的提示词中含有__name__语法时,SPA在生成时从WFS通配符文件夹的对应文件中随机选取一行展开;嵌套通配符最多重复展开5次;未找到的通配符原样传递;ImpactWildcardEncode/Processor节点跳过(由ComfyUI服务端Impact Pack处理);单次生成和批量生成均有效",
helpFeederTitle: "GenerateUI Tab — Feeder 子标签",
helpFeederDesc: "通过左侧面板顶部的 [图片循环] / [图库] 切换按钮可在两种模式间切换。",
helpFeederImgloopTitle: "图片循环模式",
+1
View File
@@ -1046,6 +1046,7 @@
<li id="wfm-help-gen-13">Batch tab — Center pane: group-based selection with inner tabs (Checkpoint | Lora | Prompt | Workflow); Checkpoint tab shows groups defined in the Models tab — check a group header to select all its members, or expand ▶ to check individual models; group membership always reflects the current Models tab state</li>
<li id="wfm-help-gen-14">Batch tab — Right pane (Batch Queue): 6 columns — Checkpoint, Lora, Prompt, Workflow, Sampler, Scheduler; each column has an enable checkbox; only one type active at a time; count shown per column</li>
<li id="wfm-help-gen-15">Sampler/Scheduler batch: select one or more samplers or schedulers from the left pane, enable the column in Batch Queue, then Generate to run each value through the KSampler node sequentially; sampler/scheduler lists are fetched from ComfyUI (requires connection)</li>
<li id="wfm-help-gen-16">SPA-side wildcard expansion (A1111-style): when prompt text in non-ImpactWildcard nodes (e.g. CLIPTextEncode) contains __name__ syntax, the SPA expands it at generation time by randomly picking a line from the matching file in the WFS wildcard folder; nested wildcards are re-expanded up to 5 passes; unresolved wildcards are passed through unchanged; ImpactWildcardEncode/Processor nodes are skipped (handled server-side by Impact Pack); works in both single and batch generation</li>
</ul>
</div>
</div>