Compare commits

...
Author SHA1 Message Date
总工andmultica-agent 949cd2ecad HEL-654: D 批——记录流状态语义、金框结果切换、撤销删除与任务页重皮
- 点选金框滑动 + 检视区 150ms 交叉淡变;↑↓/J/K 即时切换、空格播放、
  Delete 删除、] 检视区、浮层让位;新记录入场/完成金光/失败抖动,减动效只余短淡变
- 单条删除 5 秒撤销(Toast 金色动作钮),窗口过后才提交 DELETE,离页 flush;
  任务页同队列同步;工作流删除保留旧记录并标识「工作流已删除」
- 红/琥珀界线:失败红 + 中文结论展开;done 但文件取不到 → 琥珀「文件缺失」
  + 用相同参数重做/移除记录
- 参数页提交自动切结果页;工作流选择器 ↑↓ 真高亮 + Enter 使用(ShellPop arrowRoving 开关)
- 记录流 80 条分页(220 条专项:50 次轮询 490ms);任务页 §3.5 芯片+搜索+
  行内进度条+ghost 重试;i18n 七语种 +17 键

Co-authored-by: multica-agent <github@multica.ai>
2026-09-30 13:02:51 +08:00
总工 0c620e61fe HEL-661: merge C-batch generate desk (feat/hel-653-c-generate) 2026-09-30 11:39:13 +08:00
6f4d50f4f0 HEL-653: C 批生成台——拆分输入台/工作流选择/输入槽/记录流/检视区
- StudioGenerate 拆为 generate/ 下的 Composer、WorkflowPicker、SlotTray、ParamChip、
  TakeFeed/TakeCard、Inspector、ParamsPanel、ContextBar,逻辑收进 schema/takes/context
- 输入槽只按工作流 JSON 实际接线渲染;常用参数芯片 + 高级参数折叠,显示原值与已改标记
- 工作台素材/镜头卡新增「在生成台调参」,带项目上下文进入;结果不回填(后端无目标)
- 共享样式(a-chip/a-seg/a-slot/a-tile 等)进 app.css;ShellPop 支持向上弹出
- /image、/video 仍是同一生成台,按用途预选默认工作流与筛选

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: multica-agent <github@multica.ai>
2026-09-30 10:59:46 +08:00
8b03291327 HEL-652: B 批导航壳层——60px 图标轨、顶栏与手机底栏
- 216px 文字侧栏改为 60px 图标轨:金色渐变 Logo、当前页金色指示条滑动、350ms 延迟悬停提示,底部连接/模型/设置/语言
- 顶栏:标题+副标题、项目范围胶囊(全部项目列表/最近项目)、Ctrl/⌘K 搜索、减少动态开关、任务托盘胶囊、本次连接胶囊(名称+延迟)
- ≤760px:隐藏图标轨,底部 项目/创作/生成/更多 四个标签,更多为底部抽屉(其余页面、搜索、减少动态、语言);删除「手机端暂不适配」拦截
- 新增 ShellPop(Esc/↑↓/Tab 循环/外部点击关闭、焦点归还)与 CommandPalette(复用 Modal)
- 减少动态:跟随系统设置,另可手动开启并持久化(data-reduce)
- .a-darkroom 背景接入 --page-glow;新增壳层尺寸 token 与 .a-kbd/.a-menu-* 公共类
- 生图/生视频顶栏去掉与全局胶囊重复的连接状态(参数栏仍显示所选连接与队列)
- 路由 URL 不变(/projects 仍重定向到项目总览 /)

Co-authored-by: multica-agent <github@multica.ai>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-30 09:26:36 +08:00
总工andmultica-agent 225fcb49ea fix(ui): edited-draft marker uses amber warn per HEL-658 ruling (HEL-657)
Co-authored-by: multica-agent <github@multica.ai>
2026-09-30 08:49:53 +08:00
施工员andmultica-agent 70a860ce2a fix(ui): split running/awaiting-confirm colors and neutral kind tags (HEL-651 A batch)
- project card stage segments: running -> --run, awaiting confirm -> --warn
- running counters/dots and 'testing' states -> --run; warn-named notes -> --warn
- image/video/usage kind tags and plain entry/card icons -> neutral tokens

Co-authored-by: multica-agent <github@multica.ai>
2026-09-30 08:38:11 +08:00
施工员andmultica-agent e42212a16f feat(ui): fusion design tokens and shared component reskin (HEL-651 A batch)
- app.css: HEL-649 §一 tokens (bg/line/accent/status/text/type/space/radius/shadow/motion), legacy names aliased, reduced-motion via prefers-reduced-motion and data-reduce
- shared .a-btn/.status-chip/.a-panel/inputs reskinned; new .a-tag/.a-progress/.a-sprocket/.a-stage/.a-float
- tailwind colors/radii reference the same CSS variables
- ui primitives (StatusChip/ProgressBar/Modal/Button/ConfirmDialog/Skeleton/Switch/Card/Toast) on tokens
- running state -> --run, awaiting confirm -> --warn, --cloud purple removed, old palette literals -> tokens

Co-authored-by: multica-agent <github@multica.ai>
2026-09-30 08:29:37 +08:00
总工 f5f19f0366 merge: HEL-643 import preflight, real test runs and media groups 2026-09-29 19:12:18 +08:00
总工 bfe7b20b73 merge: HEL-641 image deletion and video history click-to-play 2026-09-29 19:12:08 +08:00
总工andmultica-agent 2ed9d25c24 feat(workflows): import preflight, real test runs and media groups (HEL-643)
- L2 连接核查: /object_info preflight (node existence + combo values) with
  5-min cache + manual refresh; analyze accepts endpoint_id, saved workflows
  get POST /{id}/check; unreachable degrades to 无法核查, never blocks saving
- 测试工作流: jobs.origin='workflow_test' rides the real queue → ComfyUI →
  outputs pipeline; only a downloadable, correctly-typed output counts as a
  pass; dry-run refused; repeat clicks reuse the in-flight job; artifacts
  isolated under assets/_workflow_test/{id}; retention keeps newest 5;
  clear-tests + delete-workflow cascade cleanup; tasks page shows a 测试 badge
- Media groups: Autogrow detection generalized to video/audio lists
  (ref_videos/ref_audios etc.), patcher clones/rewires per media family,
  validation per list kind; entries appear only for actually-wired slots;
  MiniMax H3 Ref2VA official-limit hints keyed off the node class
- 25 new backend tests (preflight / workflow-test / media-groups) against the
  fake ComfyUI; fake server gains /object_info + drop_outputs knobs

Co-authored-by: multica-agent <github@multica.ai>
2026-09-29 19:07:20 +08:00
总工andmultica-agent 48e16ae443 feat(studio): image result deletion and video history click-to-play (HEL-641)
Co-authored-by: multica-agent <github@multica.ai>
2026-09-29 17:48:00 +08:00
施工员andmultica-agent 319c7b049b fix: nine review follow-ups for connections & workflow foundation (HEL-619)
1. .form-col border-box — 384px is the outer width (a6 spec)
2. import preview counts all analyzed inputs, matching inline/studio counts
3. SSRF guard also runs on endpoint save (create + patch)
4. schemeless/garbled URL is a 400 format error, not a DNS-classified probe failure
5. ComfyUI health probe timeout 120s → 5s (matches the test probe)
6. workflow delete refuses (409) while pending/running jobs use it; delete errors surfaced in the UI
7. agent_llm_assignments: per-role incremental merge server-side + single-role delta payloads
8. test_shell_tool now portable (interpreter on PATH; PYTHON+approval instead of ffprobe)
9. test_video_continue pauses the queue singleton via monkeypatch (no leak into test_workbench)

Co-authored-by: multica-agent <github@multica.ai>
2026-09-29 16:13:00 +08:00
总工andmultica-agent e3bfe771af feat(workflows): manual output-node mapping for unknown custom outputs (HEL-638)
Unknown custom output nodes are never auto-typed by class-name semantics;
they stay pending until the user designates the real output node(s) and
media type. Picking a usage alone no longer enables a workflow, reanalyze/
migration/field edits never overwrite a user mapping, generation harvests
only the mapped nodes from ComfyUI history, and media-type mismatches or
missing node results fail for real instead of faking completion.

Co-authored-by: multica-agent <github@multica.ai>
2026-09-29 14:44:37 +08:00
总工andmultica-agent e6f761f8c8 feat(workflows): 五类用途识别与导入确认闭环 (HEL-636)
- 判型器 classify_usage:按输出节点(sink 检测)与被消费图片槽判定
  文生图/图生图/文生视频/图生视频/参考图生视频,不依赖文件名/模型名/
  固定节点 ID;歧义(单散装图+视频、同图双输出)与无输出给中文说明
- 参考图组泛化:任意 <group>.<prefix>N 连续编号且均接图源的输入成组
  (MiniMaxH3 特判仅剩标签美化);patcher 支持通用组回填
- workflows 表新增 usage/usage_source,幂等迁移回填;判不出的存量行
  停用待确认;kind 语义收窄为输出媒体,历史无损
- 导入改两步向导:分析→预览(判定依据/输出节点/媒体槽角色可改/
  参数预览/警告)→确认保存;usage_source=user 的纠正不被重分析覆盖
- 生成页按 usage 过滤;待确认工作流不进生成页且提交被拒
- 新增 test_usage_classifier / test_workflow_import_confirm;
  两个旧测试夹具补输出节点以匹配新守卫

Co-authored-by: multica-agent <github@multica.ai>
2026-09-29 12:13:33 +08:00
30e8e85766 feat(studio): 三种图片输入工作流与最多九张参考图 (HEL-633)
- 解析:H3 参考生视频 ref_images 自增输入收拢为 1–9 张有序参考图组;
  图生视频首/尾帧、Qwen 编辑输入图按真实连线识别,未连线不出槽位;
  Qwen 编辑模式暴露 resolution
- 打补丁:按张数克隆/复用/删除 LoadImage 并按序接线 ref_image_0..N-1
- 校验:参考图上限 9、至少 1 张、格式/存在性;必填图片槽位
- 工作流体检:缺 class_type / 断链 / 采样器无模型 → 导入时中文告警,
  生成接口与 worker 拒绝执行并提示重新导出
- 前端:RefImageGrid(逐张添加/预览/替换/删除/序号/超限整批拒绝)、
  MediaSlot 横排已选态、分辨率字段、损坏工作流提示、连接页告警标签
- 测试:三份真实 JSON + 1/4/9 张参考图全链路

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: multica-agent <github@multica.ai>
2026-09-29 09:16:17 +08:00
110 changed files with 17329 additions and 3645 deletions
@@ -2,6 +2,7 @@
from __future__ import annotations
import logging
import time
import uuid
from pathlib import Path
from typing import Any
@@ -13,6 +14,22 @@ from calliope.comfyui.registry import IMAGE_CLASSES, AUDIO_CLASSES, VIDEO_CLASSE
logger = logging.getLogger("calliope.comfyui")
# Reachability probe budget (HEL-619): matches the connections-page test
# probe (5s). Without it health() inherits the 120s client default, so a
# bad endpoint hangs every queued job for two minutes before failing.
HEALTH_TIMEOUT_SEC = 5.0
# /object_info fetch is a few MB on big instances; the preflight check
# (HEL-642/643) caches it per endpoint for this long. Manual refresh
# (`force_refresh=True`) bypasses the TTL.
OBJECT_INFO_TTL_SEC = 300.0
_object_info_cache: dict[str, tuple[float, dict[str, Any]]] = {}
def clear_object_info_cache() -> None:
"""Drop cached /object_info payloads (tests swap fake endpoints in)."""
_object_info_cache.clear()
def _surface_error(prefix: str, resp: httpx.Response) -> RuntimeError:
"""Raise with ComfyUI's own error body instead of an opaque status line.
@@ -76,11 +93,40 @@ class ComfyUIClient:
async def health(self) -> bool:
try:
resp = await self._http.get(f"{self.base_url}/system_stats")
resp = await self._http.get(
f"{self.base_url}/system_stats", timeout=HEALTH_TIMEOUT_SEC
)
return resp.status_code == 200
except Exception:
return False
def _cache_key(self) -> str:
auth = self._headers.get("Authorization") or next(
(v for k, v in self._headers.items() if k.lower() not in ("authorization",)), ""
)
return f"{self.base_url}|{auth}"
async def object_info(self, force_refresh: bool = False) -> dict[str, Any]:
"""The server's full ``/object_info`` node catalogue, cached per endpoint.
Cached for OBJECT_INFO_TTL_SEC; ``force_refresh`` re-fetches (the
connections page "重新检查" button after the user installs nodes).
Raises on transport/HTTP errors so callers can report honestly.
"""
key = self._cache_key()
now = time.monotonic()
if not force_refresh:
hit = _object_info_cache.get(key)
if hit and now - hit[0] < OBJECT_INFO_TTL_SEC:
return hit[1]
resp = await self._http.get(f"{self.base_url}/object_info", timeout=30.0)
resp.raise_for_status()
data = resp.json()
if not isinstance(data, dict):
raise RuntimeError("ComfyUI 返回的 /object_info 不是对象")
_object_info_cache[key] = (now, data)
return data
async def upload_image(self, path: Path, subfolder: str = "calliope") -> str:
data = path.read_bytes()
files = {"image": (path.name, data, "application/octet-stream")}
@@ -285,16 +331,46 @@ class ComfyUIClient:
except Exception as exc:
logger.warning("ComfyUI interrupt failed: %s", exc)
def extract_outputs(self, history: dict[str, Any]) -> list[dict[str, str]]:
# History items carry no explicit media type — infer from the file
# extension first, then the history key the node reported under.
_VIDEO_EXTS = frozenset({".mp4", ".webm", ".mkv", ".mov", ".gif", ".m4v", ".avi", ".flv"})
_IMAGE_EXTS = frozenset({".png", ".jpg", ".jpeg", ".webp", ".bmp", ".tif", ".tiff"})
@classmethod
def _infer_media_kind(cls, filename: str, history_key: str) -> str | None:
ext = Path(str(filename)).suffix.lower()
if ext in cls._VIDEO_EXTS:
return "video"
if ext in cls._IMAGE_EXTS:
return "image"
if history_key in ("gifs", "videos"):
return "video"
return None
def extract_outputs(
self, history: dict[str, Any], node_kinds: dict[str, str] | None = None
) -> list[dict[str, str]]:
"""Media items in a finished prompt's history.
``node_kinds`` (HEL-638) scopes the harvest to the workflow's
confirmed output nodes — {nodeId: image|video} — so results from
nodes the user never designated are ignored, and each item carries
the node id plus its inferred media kind for mismatch checks.
"""
outputs: list[dict[str, str]] = []
for _node_id, node_out in (history.get("outputs") or {}).items():
for node_id, node_out in (history.get("outputs") or {}).items():
if node_kinds is not None and str(node_id) not in node_kinds:
continue
for key in ("images", "gifs", "videos"):
for item in node_out.get(key) or []:
filename = item.get("filename", "")
outputs.append(
{
"filename": item.get("filename", ""),
"filename": filename,
"subfolder": item.get("subfolder", ""),
"type": item.get("type", "output"),
"node_id": str(node_id),
"media_kind": self._infer_media_kind(filename, key) or "",
}
)
return outputs
@@ -0,0 +1,126 @@
"""Structural checks on an imported ComfyUI API workflow.
``error`` findings mean ComfyUI will reject the prompt as exported, so the
studio blocks generation; ``warning`` findings only explain odd parameters.
Nothing here repairs a workflow — a broken export has to be re-exported from
a ComfyUI that has the missing custom nodes installed.
"""
from __future__ import annotations
from typing import Any
REEXPORT_HINT = "请在已安装对应自定义节点的 ComfyUI 中打开该工作流,重新导出 API 格式 JSON 后再导入"
# Nodes that cannot run without a model link.
_NEEDS_MODEL = frozenset(
{"KSampler", "KSamplerAdvanced", "BasicGuider", "CFGGuider", "BasicScheduler"}
)
def _title(node_id: str, node: dict[str, Any]) -> str:
title = str((node.get("_meta") or {}).get("title") or "").strip()
return f"节点 {node_id}「{title}」" if title else f"节点 {node_id}"
def workflow_warnings(workflow: dict[str, Any]) -> list[dict[str, str]]:
if not isinstance(workflow, dict):
return []
found: list[dict[str, str]] = []
nodes = {str(k): v for k, v in workflow.items() if isinstance(v, dict)}
untyped = [nid for nid, node in nodes.items() if not str(node.get("class_type") or "").strip()]
for nid in untyped:
found.append(
{
"level": "error",
"code": "missing_class_type",
"node_id": nid,
"message": f"{_title(nid, nodes[nid])}缺少节点类型(class_type),"
"导出时 ComfyUI 未加载该自定义节点",
}
)
consumed: set[str] = set()
for nid, node in nodes.items():
inputs = node.get("inputs") or {}
for name, val in inputs.items():
if isinstance(val, list) and len(val) == 2 and isinstance(val[0], (str, int)):
src = str(val[0])
consumed.add(src)
if src not in nodes:
found.append(
{
"level": "error",
"code": "dangling_link",
"node_id": nid,
"message": f"{_title(nid, node)}的输入「{name}」"
f"连到了不存在的节点 {src}",
}
)
ct = str(node.get("class_type") or "")
if ct in _NEEDS_MODEL and not isinstance(inputs.get("model"), list):
found.append(
{
"level": "error",
"code": "missing_model_link",
"node_id": nid,
"message": f"{_title(nid, node)}({ct})没有连接模型(model),"
"模型加载链路在导出时丢失",
}
)
for nid, node in nodes.items():
ct = str(node.get("class_type") or "")
if ct.startswith("Empty") and "Latent" in ct and nid not in consumed:
found.append(
{
"level": "warning",
"code": "orphan_latent",
"node_id": nid,
"message": f"{_title(nid, nodes[nid])}没有接到任何节点,"
"它的宽高不会生效,已不在表单中显示",
}
)
# HEL-636/638: a workflow without any recognizable output node can never
# return a result — block it with a readable reason instead of letting
# ComfyUI run blind. Unknown candidates (needs_mapping) don't trigger
# this: the user designates them on the import/connections page, and
# until then the row stays disabled.
from calliope.comfyui.parser import detect_output_nodes
outputs = detect_output_nodes(workflow)
if not any(o.get("kind") in ("image", "video") for o in outputs):
unknown = [o for o in outputs if o.get("evidence") == "unknown_node"]
if not unknown:
found.append(
{
"level": "error",
"code": "no_output",
"node_id": "",
"message": "未在图中找到输出节点(SaveImage / 视频合成等),"
"请确认导出的是 API 格式且包含保存节点",
}
)
else:
names = "、".join(f"节点 {o['nodeId']}" for o in unknown[:4])
found.append(
{
"level": "warning",
"code": "unknown_output_node",
"node_id": names,
"message": f"存在无法识别的输出节点({names}),"
"需人工指定实际输出节点及其媒体类型(图片/视频)后才能生成",
}
)
return found
def blocking_problem(workflow: dict[str, Any]) -> str | None:
"""One Chinese sentence explaining why this workflow cannot be submitted."""
errors = [w["message"] for w in workflow_warnings(workflow) if w["level"] == "error"]
if not errors:
return None
shown = ";".join(errors[:4]) + (f";等 {len(errors)} 处" if len(errors) > 4 else "")
return f"该工作流文件不完整,ComfyUI 无法执行:{shown}。{REEXPORT_HINT}。"
@@ -0,0 +1,148 @@
"""Stored output-node mapping for imported workflows (HEL-638).
Unknown custom output nodes are never auto-typed. The import confirm page
(or the connections table) stores the user's explicit designation — which
node ids are the real outputs and each one's media type — in
``workflows.output_map`` with ``output_map_source='user'``. Everything that
re-derives schemas (reanalyze, migration, plain field edits) must keep that
decision; only a fresh explicit payload replaces it.
Rows without unknown candidates carry an ``auto`` map derived from the
trusted registry/tagged outputs so the generation path always knows which
history nodes to harvest.
"""
from __future__ import annotations
import json
from typing import Any
from calliope.comfyui.parser import parse_dynamic_outputs
from calliope.comfyui.registry import (
IMAGE_OUTPUT_CLASSES,
NUMBER_CLASSES,
TEXT_AREA_CLASSES,
VIDEO_OUTPUT_CLASSES,
)
VALID_OUTPUT_KINDS = ("image", "video")
def _wiring_class(class_type: str) -> bool:
"""Parameter / wiring classes can never be designated as outputs."""
return (
not class_type
or class_type in TEXT_AREA_CLASSES
or class_type in NUMBER_CLASSES
or class_type.startswith("Empty")
or class_type.startswith("Primitive")
)
def _entry_public(entry: dict[str, Any]) -> dict[str, Any]:
out = {
"nodeId": str(entry.get("nodeId") or ""),
"kind": entry.get("kind"),
}
if entry.get("label"):
out["label"] = entry["label"]
if entry.get("class_type"):
out["class_type"] = entry["class_type"]
return out
def auto_output_map(workflow: dict[str, Any]) -> list[dict[str, Any]]:
"""Trusted outputs only (tagged titles / registry classes)."""
if not isinstance(workflow, dict):
return []
return [
_entry_public(o)
for o in parse_dynamic_outputs(workflow)
if o.get("kind") in VALID_OUTPUT_KINDS
]
def needs_user_output_map(workflow: dict[str, Any]) -> bool:
"""True when the graph has unknown output candidates (HEL-638)."""
if not isinstance(workflow, dict):
return False
return any(
o.get("evidence") == "unknown_node" for o in parse_dynamic_outputs(workflow)
)
def validate_output_map(
workflow: dict[str, Any], entries: Any
) -> list[str]:
"""Chinese problems with a user-supplied output map; empty = valid."""
if not isinstance(entries, list) or not entries:
return ["输出节点映射不能为空:请至少指定一个输出节点及其媒体类型"]
seen: set[str] = set()
problems: list[str] = []
for entry in entries:
if not isinstance(entry, dict):
problems.append("输出节点映射格式有误(应为对象数组)")
continue
nid = str(entry.get("nodeId") or "")
node = workflow.get(nid) if isinstance(workflow, dict) else None
if not nid or not isinstance(node, dict):
problems.append(f"输出节点 {nid or '?'} 不存在于该工作流中")
continue
ct = str(node.get("class_type") or "").strip()
if not ct:
problems.append(f"节点 {nid} 缺少节点类型,不能作为输出节点")
elif _wiring_class(ct) and ct not in (IMAGE_OUTPUT_CLASSES | VIDEO_OUTPUT_CLASSES):
problems.append(f"节点 {nid}({ct})是参数/连线节点,不能作为输出节点")
if entry.get("kind") not in VALID_OUTPUT_KINDS:
problems.append(f"输出节点 {nid} 的媒体类型必须是图片或视频")
if nid in seen:
problems.append(f"输出节点 {nid} 重复指定")
seen.add(nid)
return problems
def load_output_map(raw: str | None) -> list[dict[str, Any]]:
if not raw:
return []
try:
data = json.loads(raw)
except (json.JSONDecodeError, TypeError):
return []
return data if isinstance(data, list) else []
def resolve_output_map(
output_map_raw: str | None, source: str | None, workflow: dict[str, Any]
) -> tuple[list[dict[str, Any]], str | None]:
"""The map generation harvests, plus whose decision it is.
A user map wins as long as its node ids still exist in the stored JSON
(defensive pruning — PATCH cannot edit the JSON, but keep it safe);
otherwise the trusted auto map applies. Empty list back means "not
confirmed yet".
"""
if source == "user":
entries = [
e for e in load_output_map(output_map_raw) if str(e.get("nodeId") or "") in
(workflow if isinstance(workflow, dict) else {})
]
if entries:
return entries, "user"
return [], None
auto = auto_output_map(workflow)
return (auto, "auto") if auto else ([], None)
def mapping_problem(
workflow: dict[str, Any], output_map_raw: str | None, source: str | None
) -> str | None:
"""Chinese reason this workflow's outputs are not confirmed, else None."""
if not needs_user_output_map(workflow):
return None
entries, resolved = resolve_output_map(output_map_raw, source, workflow)
if resolved == "user" and entries:
return None
return (
"该工作流含无法识别的自定义输出节点,需在「ComfyUI 连接」页指定"
"实际输出节点及其媒体类型(图片/视频)后才能启用或生成"
)
+612 -8
View File
@@ -3,18 +3,25 @@
from __future__ import annotations
import math
import re
from typing import Any
from calliope.comfyui.patcher import FIELD_KEY_SEP, resolve_patch_field
from calliope.comfyui.registry import (
AUDIO_CLASSES,
IMAGE_CLASSES,
IMAGE_OUTPUT_CLASSES,
IMAGE_URL_CLASSES,
NUMBER_CLASSES,
TEXT_AREA_CLASSES,
VIDEO_CLASSES,
VIDEO_OUTPUT_CLASSES,
ComfyOutputKind,
class_to_input_kind,
class_to_output_kind,
)
from calliope.comfyui.roles import (
USAGE_VALUES,
normalize_input_role,
normalize_output_role,
parse_title_tag,
@@ -76,9 +83,17 @@ def effective_input_schema(
Auto-detected (and empty) schemas are re-derived from the workflow JSON
on every read, so parser upgrades reach workflows imported earlier
without a re-import. Tagged ``(Input:…)`` schemas are kept as stored.
Entries the user corrected on the import confirm page carry
``manual: true`` — their role/label survive re-derivation.
"""
if not stored or any(isinstance(e, dict) and e.get("auto") for e in stored):
if not stored:
return parse_dynamic_inputs(workflow)
manual_by_id = {
str(e.get("nodeId")): e for e in stored if isinstance(e, dict) and e.get("manual")
}
if any(isinstance(e, dict) and e.get("auto") for e in stored):
fresh = parse_dynamic_inputs(workflow)
return [manual_by_id.get(str(e.get("nodeId")), e) for e in fresh]
return stored
@@ -236,6 +251,12 @@ _NUMBER_LIMITS: dict[str, dict[str, Any]] = {
"megapixels": {"min": 0.1, "max": 16.0, "step": 0.1},
}
# Text encoders whose ``resolution`` widget sizes the generated image when an
# input image is wired (edit mode); in text-to-image it only sizes references.
_RESOLUTION_ENCODERS: dict[str, dict[str, Any]] = {
"TextEncodeQwenImage21": {"min": 0, "max": 4096, "step": 32, "integer": True},
}
# comfy_extras/nodes_resolution.py — option strings must match exactly.
RESOLUTION_ASPECT_RATIOS: dict[str, tuple[int, int]] = {
"1:1 (Square)": (1, 1),
@@ -260,6 +281,213 @@ def resolution_selector_size(aspect_ratio: str, megapixels: float, multiple: int
)
# ComfyUI Autogrow media inputs a studio form fills as one 1…max list
# (HEL-643 generalizes the original image-only registry to three media
# kinds). The workflow wires ``<group>.<prefix>N``; extra items are cloned
# loader nodes added at patch time (patcher.py). This registry only
# beautifies known classes (label + real max + hint key); detection itself
# is generic — any ``<group>.<prefix>N`` run of same-family media-loader
# links folds into a group, image / video / audio alike.
MEDIA_GROUPS: dict[str, dict[str, dict[str, Any]]] = {
"MiniMaxH3ReferenceToVideo": {
"ref_images": {
"prefix": "ref_image_",
"max": 9,
"label": "参考图",
"kind": "image",
},
"ref_videos": {
"prefix": "ref_video_",
"max": 3,
"label": "参考视频",
"kind": "video",
},
"ref_audios": {
"prefix": "ref_audio_",
"max": 3,
"label": "参考音频",
"kind": "audio",
},
},
}
# Backwards-compatible alias for the original image-only view.
IMAGE_GROUPS = MEDIA_GROUPS
# Consuming-node classes whose groups carry official usage limits worth a
# hint in the UI. Purely cosmetic — detection never depends on it.
_MEDIA_HINTS: dict[str, str] = {
"MiniMaxH3ReferenceToVideo": "minimax_h3_ref2va",
}
# ``ref_images.ref_image_0`` / ``images.image_1`` style Autogrow input names.
_GROUP_INPUT_RE = re.compile(
r"^(?P<group>[A-Za-z0-9_+-]+)\.(?P<rest>[A-Za-z0-9_+-]+?)(?P<n>\d+)$"
)
# Consumer input name → (role, label) of the LoadImage wired into it.
_FRAME_SLOT_ROLES: dict[str, tuple[str, str]] = {
"first_frame": ("first_frame", "首帧"),
"start_image": ("first_frame", "首帧"),
"last_frame": ("last_frame", "尾帧"),
"end_image": ("last_frame", "尾帧"),
}
# Group media kind → (schema kind, role, default label, default max).
_GROUP_KIND_META: dict[str, tuple[str, str, str, int]] = {
"image": ("image_list", "reference_image", "参考图", 9),
"video": ("video_list", "reference_video", "参考视频", 9),
"audio": ("audio_list", "reference_audio", "参考音频", 9),
}
# Loader class family for each media kind (registry.py sets).
_GROUP_SOURCE_CLASSES: dict[str, frozenset[str]] = {
"image": IMAGE_CLASSES,
"video": VIDEO_CLASSES,
"audio": AUDIO_CLASSES,
}
def media_group_spec(class_type: str, group: str) -> dict[str, Any] | None:
return MEDIA_GROUPS.get(class_type, {}).get(group)
def image_group_spec(class_type: str, group: str) -> dict[str, Any] | None:
return media_group_spec(class_type, group)
def image_group_prefix(node: dict[str, Any], group: str) -> str | None:
"""The ``<prefix>`` this node numbers its ``<group>.<prefix>N`` inputs with.
Known classes read it from the registry; anything else derives it from
the node's own wired input names (generic Autogrow detection).
"""
spec = image_group_spec(str(node.get("class_type") or ""), group)
if spec:
return str(spec["prefix"])
head = f"{group}."
prefixes = set()
for name in (node.get("inputs") or {}):
if not name.startswith(head):
continue
m = _GROUP_INPUT_RE.match(name)
if m and m.group("group") == group:
prefixes.add(m.group("rest"))
if len(prefixes) == 1:
return prefixes.pop()
return None
def image_group_slots(
node: dict[str, Any], group: str, prefix: str
) -> list[tuple[int, str, Any]]:
"""``[(N, input name, link), …]`` wired into ``<group>.<prefix>N``, by N."""
head = f"{group}.{prefix}"
out: list[tuple[int, str, Any]] = []
for name, val in (node.get("inputs") or {}).items():
if name.startswith(head) and name[len(head):].isdigit():
out.append((int(name[len(head):]), name, val))
return sorted(out)
def _detected_group_runs(
workflow: dict[str, Any], node: dict[str, Any]
) -> list[tuple[str, str, list[str], str]]:
"""``[(group, prefix, source loader ids, media kind)]`` for Autogrow inputs.
A run qualifies when the numbers are consecutive, every slot links to a
loader of the SAME media family (image / video / audio), and the run
either starts at 0 (single-slot Autogrow exports like H3's
``ref_image_0``) or has ≥2 slots. Single runs numbered from 1 (e.g.
TextEncodeQwenImage21's ``images.image_1``) stay ordinary image slots.
"""
runs: dict[tuple[str, str], dict[int, Any]] = {}
for name, val in (node.get("inputs") or {}).items():
m = _GROUP_INPUT_RE.match(name)
if not m or not (isinstance(val, list) and len(val) == 2):
continue
runs.setdefault((m.group("group"), m.group("rest")), {})[int(m.group("n"))] = val
out: list[tuple[str, str, list[str], str]] = []
for (group, prefix), slots in sorted(runs.items()):
ns = sorted(slots)
if any(b - a != 1 for a, b in zip(ns, ns[1:])):
continue
if not (ns[0] == 0 or len(ns) >= 2):
continue
sources: list[str] = []
family: str | None = None
for n in ns:
link = slots[n]
src = workflow.get(str(link[0]))
if not isinstance(src, dict):
family = None
break
ct = str(src.get("class_type") or "")
kinds = [
kind
for kind, classes in _GROUP_SOURCE_CLASSES.items()
if ct in classes
]
if len(kinds) != 1 or (family is not None and kinds[0] != family):
family = None
break
family = kinds[0]
sources.append(str(link[0]))
if family and sources:
out.append((group, prefix, sources, family))
return out
def _media_groups(
workflow: dict[str, Any],
) -> tuple[list[dict[str, Any]], set[str]]:
"""Group entries for Autogrow reference inputs (image/video/audio) plus
the loader node ids they absorb."""
entries: list[dict[str, Any]] = []
absorbed: set[str] = set()
for nid, node in sorted(
((str(k), v) for k, v in workflow.items() if isinstance(v, dict)),
key=lambda kv: _node_sort_key(kv[0]),
):
class_type = str(node.get("class_type") or "")
for group, _prefix, sources, media_kind in _detected_group_runs(workflow, node):
spec = media_group_spec(class_type, group) or {}
kind, role, default_label, default_max = _GROUP_KIND_META[media_kind]
absorbed.update(sources)
hint = _MEDIA_HINTS.get(class_type)
entries.append(
_entry(
f"{nid}{FIELD_KEY_SEP}{group}",
str(spec.get("label") or default_label),
role,
kind,
None,
True,
min=1,
max=spec.get("max", default_max),
media_hint=hint,
)
)
return entries, absorbed
def _image_slot(
nid: str, workflow: dict[str, Any], consumers: dict[str, list[tuple[str, str]]]
) -> tuple[str, str] | None:
"""(role, label) of a LoadImage from what consumes it; None when unwired."""
uses = consumers.get(nid, [])
if not uses:
return None
for _cid, name in uses:
if name in _FRAME_SLOT_ROLES:
return _FRAME_SLOT_ROLES[name]
for cid, name in uses:
ct = str((workflow.get(cid) or {}).get("class_type") or "")
if "TextEncode" in ct and name.startswith("image"):
return "image", "输入图"
return "image", ""
def _key(node_id: str, node: dict[str, Any], field: str) -> str:
"""Plain nodeId when that already patches ``field``; else ``nodeId@field``."""
return (
@@ -283,6 +511,7 @@ def detect_untagged_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
)
texts: list[tuple[str, dict[str, Any], str, bool]] = [] # (id, node, field, negative)
groups, grouped_loaders = _media_groups(workflow)
media: list[dict[str, Any]] = []
numbers: list[dict[str, Any]] = []
taken_roles: set[str] = set()
@@ -308,23 +537,39 @@ def detect_untagged_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
lowered = title.lower()
if ct in IMAGE_CLASSES or ct in _MASK_IMAGE_CLASSES:
if nid in grouped_loaders:
continue
is_mask = ct in _MASK_IMAGE_CLASSES or "mask" in lowered or "遮罩" in lowered
label = title if title and title != ct else ("遮罩" if is_mask else "参考图")
if is_mask and "mask" not in label.lower() and "遮罩" not in label:
label = f"遮罩 · {label}"
has_default = isinstance(inputs.get("image"), str) and bool(inputs.get("image"))
slot = _image_slot(nid, workflow, consumers)
if is_mask:
label = title if title and title != ct else "遮罩"
if "mask" not in label.lower() and "遮罩" not in label:
label = f"遮罩 · {label}"
has_default = isinstance(inputs.get("image"), str) and bool(inputs.get("image"))
media.append(
_entry(_key(nid, node, "image"), label, "mask", "image", None, not has_default)
)
continue
if slot is None:
# Nothing consumes it — ComfyUI never runs it, so no upload slot.
continue
role, label = slot
media.append(
_entry(
_key(nid, node, "image"),
label,
"mask" if is_mask else "image",
label or (title if title and title != ct else "参考图"),
role,
"image",
None,
not has_default,
True,
)
)
continue
if ct in VIDEO_CLASSES or ct in AUDIO_CLASSES:
if nid in grouped_loaders:
# Absorbed into an Autogrow media group (HEL-643) — the
# group entry owns its upload slots.
continue
kind = "video" if ct in VIDEO_CLASSES else "audio"
field = resolve_patch_field(node)
has_default = isinstance(inputs.get(field), str) and bool(inputs.get(field))
@@ -346,6 +591,24 @@ def detect_untagged_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
texts.append((nid, node, neg_field, True))
elif field:
texts.append((nid, node, field, _is_negative(nid, lowered, consumers)))
edits_image = any(
k.startswith("images.") and isinstance(v, list) for k, v in inputs.items()
)
if ct in _RESOLUTION_ENCODERS and edits_image and "resolution" not in taken_roles:
value = inputs.get("resolution")
if _is_scalar(value) and not isinstance(value, str):
taken_roles.add("resolution")
numbers.append(
_entry(
_key(nid, node, "resolution"),
"输出分辨率",
"resolution",
"number",
value,
False,
**_RESOLUTION_ENCODERS[ct],
)
)
continue
if ct in _SAMPLER_CLASSES:
@@ -391,6 +654,9 @@ def detect_untagged_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
add_number(nid, node, "cfg", "cfg", "CFG")
continue
if ct.startswith("Empty") and "Latent" in ct:
if nid not in consumers:
# Orphan latent (Qwen edit sizes from its encoder): editing it changes nothing.
continue
add_number(nid, node, "width", "width", "宽度")
add_number(nid, node, "height", "height", "高度")
add_number(nid, node, "batch_size", "batch", "批次数量")
@@ -462,6 +728,7 @@ def detect_untagged_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
)
results.extend(numbers)
results.extend(media)
results.extend(groups)
return results
@@ -496,4 +763,341 @@ def parse_dynamic_outputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
"kind": out_kind,
}
)
if not results:
results = detect_output_nodes(workflow)
return results
# ---------------------------------------------------------------------------
# Output (sink) detection + five-usage classification (HEL-636)
# ---------------------------------------------------------------------------
# Nodes whose output another node consumes are wiring, not results. A node
# nothing consumes is a sink; media sinks are the workflow's outputs.
_INPUT_ONLY_CLASSES = IMAGE_CLASSES | IMAGE_URL_CLASSES | AUDIO_CLASSES | VIDEO_CLASSES
# Latent/source shapers (EmptyLatentImage…) are wiring even when nothing
# consumes them — they never carry results out of the graph.
_SOURCE_ONLY_CLASSES = _INPUT_ONLY_CLASSES | TEXT_AREA_CLASSES | NUMBER_CLASSES
# Classes that are known-internal tails: standard decode steps and cache
# cleaners consume media but never emit history outputs, so they can never
# be output candidates (HEL-638: a graph ending in these has no output).
_NON_OUTPUT_CLASSES = frozenset(
{"VAEDecode", "VAEDecodeTiled", "VAEDecodeAudio", "easy cleanGpuUsed"}
)
# Widget names save-style custom nodes carry, and link input names that mark
# "consumes rendered media" — used to flag unknown sinks that need mapping.
_SAVE_WIDGET_NAMES = frozenset(
{"filename_prefix", "filename", "prefix", "path", "output_path", "save_output"}
)
_MEDIA_LINK_NAMES = frozenset(
{"images", "image", "video", "frames", "latent", "latents", "audio", "audios"}
)
def _sinks(
workflow: dict[str, Any], consumers: dict[str, list[tuple[str, str]]]
) -> list[tuple[str, dict[str, Any]]]:
out: list[tuple[str, dict[str, Any]]] = []
for nid, node in sorted(
((str(k), v) for k, v in workflow.items() if isinstance(v, dict)),
key=lambda kv: _node_sort_key(kv[0]),
):
if not consumers.get(nid):
out.append((nid, node))
return out
def _unknown_sink_looks_like_save(node: dict[str, Any], workflow: dict[str, Any]) -> bool:
inputs = node.get("inputs") or {}
for name, val in inputs.items():
if name in _SAVE_WIDGET_NAMES and isinstance(val, (str, int, float, bool)):
return True
if name in _MEDIA_LINK_NAMES and isinstance(val, list) and len(val) == 2:
src = workflow.get(str(val[0]))
if isinstance(src, dict) and "decode" in str(src.get("class_type") or "").lower():
return True
return False
def _node_has_save_widget(node: dict[str, Any]) -> bool:
"""A concrete save widget (filename/prefix/path) — the only signal that
counts for unknown nodes that something else consumes; media links from
decode steps are meaningless there (every transform has them)."""
inputs = node.get("inputs") or {}
return any(
name in _SAVE_WIDGET_NAMES and isinstance(val, (str, int, float, bool))
for name, val in inputs.items()
)
def _video_semantics(workflow: dict[str, Any]) -> bool:
"""Auxiliary evidence the graph renders video (frame counts, video nodes)."""
for node in workflow.values():
if not isinstance(node, dict):
continue
ct = str(node.get("class_type") or "").lower()
if "video" in ct or "animatediff" in ct:
return True
for name in (node.get("inputs") or {}):
if name in _FRAME_INPUTS:
return True
return False
def _suggest_output_kind(class_type: str, videoish: bool) -> str | None:
"""Best-guess media type for an unknown candidate — UI default only."""
lower = class_type.lower()
if "video" in lower or "animatediff" in lower:
return "video"
if "image" in lower or "save" in lower:
return "image"
return "video" if videoish else None
def _unknown_output_entry(
nid: str, node: dict[str, Any], workflow: dict[str, Any], videoish: bool
) -> dict[str, Any]:
ct = str(node.get("class_type") or "")
return {
"nodeId": nid,
"label": _title_of(node) or ct,
"role": None,
# HEL-638: unknown custom nodes are never auto-typed — the user
# picks the media type; `suggested_kind` is only a form default.
"kind": None,
"class_type": ct,
"evidence": "unknown_node",
"suggested_kind": _suggest_output_kind(ct, videoish),
}
def detect_output_nodes(workflow: dict[str, Any]) -> list[dict[str, Any]]:
"""Infer output nodes of an untagged workflow from its sinks.
Exact registry classes (SaveImage, VHS_VideoCombine…) count whether or
not something downstream consumes them (a SaveVideo feeding a
cache-cleanup tail is still the output). Every OTHER class at an output
position is an *unknown candidate*: kind stays null, the import page
asks the user to designate the real output node(s) and their media
type, and the workflow stays pending until then (HEL-638). Sinks with
no save features only become candidates when the graph has no trusted
output at all — next to a real saver they are utility tails.
"""
if not isinstance(workflow, dict):
return []
consumers = _consumers(workflow)
videoish = _video_semantics(workflow)
registry_outputs: list[dict[str, Any]] = []
candidates: list[dict[str, Any]] = []
seen: set[str] = set()
def _is_wiring(ct: str) -> bool:
return (
not ct
or ct in _SOURCE_ONLY_CLASSES
or ct in _NON_OUTPUT_CLASSES
or ct.startswith("Empty")
)
# 1) Trusted registry outputs at sink positions.
for nid, node in _sinks(workflow, consumers):
ct = str(node.get("class_type") or "")
if ct in IMAGE_OUTPUT_CLASSES or ct in VIDEO_OUTPUT_CLASSES:
registry_outputs.append(
{
"nodeId": nid,
"label": _title_of(node) or ct,
"role": None,
"kind": "video" if ct in VIDEO_OUTPUT_CLASSES else "image",
"class_type": ct,
"evidence": "registry",
}
)
seen.add(nid)
# 2) Registry output classes consumed by other nodes are outputs too.
for nid, node in sorted(
((str(k), v) for k, v in workflow.items() if isinstance(v, dict)),
key=lambda kv: _node_sort_key(kv[0]),
):
ct = str(node.get("class_type") or "")
if nid in seen or ct not in (IMAGE_OUTPUT_CLASSES | VIDEO_OUTPUT_CLASSES):
continue
registry_outputs.append(
{
"nodeId": nid,
"label": _title_of(node) or ct,
"role": None,
"kind": "video" if ct in VIDEO_OUTPUT_CLASSES else "image",
"class_type": ct,
"evidence": "registry",
}
)
seen.add(nid)
# 3) Unknown sink candidates. Save-looking sinks always need mapping;
# feature-less sinks only when nothing trusted exists (utility tails
# next to a real saver stay invisible).
has_trusted = bool(registry_outputs)
for nid, node in _sinks(workflow, consumers):
ct = str(node.get("class_type") or "")
if nid in seen or _is_wiring(ct) or ct in (IMAGE_OUTPUT_CLASSES | VIDEO_OUTPUT_CLASSES):
continue
if _unknown_sink_looks_like_save(node, workflow) or not has_trusted:
candidates.append(_unknown_output_entry(nid, node, workflow, videoish))
seen.add(nid)
# 4) Unknown save-looking nodes that something consumes (a custom saver
# feeding a cleanup tail is still an output candidate). Only concrete
# save widgets count here — decode-fed media links are ubiquitous among
# mid-graph transforms (CreateVideo & co.) and never mark an output.
for nid, node in sorted(
((str(k), v) for k, v in workflow.items() if isinstance(v, dict)),
key=lambda kv: _node_sort_key(kv[0]),
):
ct = str(node.get("class_type") or "")
if nid in seen or _is_wiring(ct) or ct in (IMAGE_OUTPUT_CLASSES | VIDEO_OUTPUT_CLASSES):
continue
if _node_has_save_widget(node):
candidates.append(_unknown_output_entry(nid, node, workflow, videoish))
seen.add(nid)
results = registry_outputs + candidates
results.sort(key=lambda r: _node_sort_key(r["nodeId"]))
return results
# Title heuristics the studio form applies to tagged (Input:…) slots; the
# classifier must judge a workflow the same way the form renders it.
_TAGGED_FIRST_RE = re.compile(r"first|start|首帧", re.IGNORECASE)
_TAGGED_LAST_RE = re.compile(r"last|end|尾帧", re.IGNORECASE)
_TAGGED_MASK_RE = re.compile(r"mask|遮罩", re.IGNORECASE)
def _slot_effective_role(entry: dict[str, Any]) -> str | None:
"""The role the generate form will act on for this schema entry."""
kind = str(entry.get("kind") or "")
if kind == "image_list":
return "reference_image"
role = normalize_input_role(entry.get("role"))
if entry.get("auto") or kind not in ("image", "image_url"):
return role
label = str(entry.get("label") or "")
if _TAGGED_MASK_RE.search(label):
return "mask"
if _TAGGED_FIRST_RE.search(label):
return "first_frame"
if _TAGGED_LAST_RE.search(label):
return "last_frame"
return role
def classify_usage(workflow: dict[str, Any]) -> dict[str, Any]:
"""Judge a workflow's usage from graph evidence (HEL-636 §2).
Returns ``usage`` plus everything the import confirm page shows:
``ambiguous`` (needs a human decision), ``needs_mapping`` (unknown
output nodes), ``problem`` (Chinese reason when usage is None) and
``evidence`` (output nodes, image/video slots, summary lines). Never
looks at file names, model names or fixed node ids.
"""
inputs = parse_dynamic_inputs(workflow) if isinstance(workflow, dict) else []
outputs = parse_dynamic_outputs(workflow)
media_outputs = [o for o in outputs if o.get("kind") in ("image", "video")]
unknown_outputs = [o for o in outputs if o.get("evidence") == "unknown_node"]
out_kinds = sorted({o["kind"] for o in media_outputs})
image_slots: list[dict[str, Any]] = []
video_slots: list[dict[str, Any]] = []
for entry in inputs:
kind = str(entry.get("kind") or "")
if kind in ("image", "image_list", "image_url"):
image_slots.append(
{
"nodeId": entry.get("nodeId"),
"label": entry.get("label"),
"kind": kind,
"role": _slot_effective_role(entry),
}
)
elif kind == "video":
video_slots.append(
{
"nodeId": entry.get("nodeId"),
"label": entry.get("label"),
"kind": kind,
"role": normalize_input_role(entry.get("role")),
}
)
effective = [s["role"] or "image" for s in image_slots if s["role"] != "mask"]
bulk = [r for r in effective if r in (None, "image")]
has_frame = any(r in ("first_frame", "last_frame") for r in effective)
has_ref_group = any(s["kind"] == "image_list" for s in image_slots)
summary: list[str] = []
for o in media_outputs:
zh = "图片" if o["kind"] == "image" else "视频"
summary.append(f"输出:节点 {o['nodeId']}({o.get('class_type') or o['label']})→ {zh}")
if unknown_outputs:
names = "、".join(
f"节点 {o['nodeId']}({o.get('class_type') or '?'})" for o in unknown_outputs[:4]
)
summary.append(f"存在无法识别的输出节点:{names},需人工指定输出节点及媒体类型")
for s in image_slots:
if s["role"] != "mask":
summary.append(f"图片输入:节点 {s['nodeId']}({s['label']})")
if video_slots:
summary.append("含视频输入槽(本版本不支持参考视频上传)")
usage: str | None = None
ambiguous = False
problem: str | None = None
if not out_kinds and not unknown_outputs:
problem = (
"未在图中找到输出节点(SaveImage / 视频合成等),"
"请确认导出的是 API 格式且包含保存节点"
)
elif unknown_outputs:
# HEL-638: any unknown custom output node keeps the workflow
# pending — no name-based guessing, and picking a usage alone must
# not bypass the output-node designation.
names = "、".join(
f"节点 {o['nodeId']}({o.get('class_type') or '?'})" for o in unknown_outputs[:4]
)
ambiguous = True
problem = (
f"存在无法识别的输出节点({names}),"
"需人工指定实际输出节点及其媒体类型(图片/视频)后才能保存启用"
)
elif len(out_kinds) > 1:
ambiguous = True
problem = "同一工作流同时输出图片和视频,需人工选择主用途"
elif len(out_kinds) == 1:
if out_kinds[0] == "image":
usage = "image2image" if bulk else "text2image"
elif has_ref_group or len(bulk) >= 2:
usage = "ref2video"
elif has_frame and not bulk:
usage = "image2video"
elif not effective:
usage = "text2video"
else:
ambiguous = True
problem = "视频工作流中的单张图片输入无法判定是首帧还是参考图,需人工确认"
return {
"usage": usage,
"ambiguous": ambiguous,
"needs_mapping": bool(unknown_outputs),
"problem": problem,
"evidence": {
"outputs": outputs,
"image_slots": image_slots,
"video_slots": video_slots,
"summary": summary,
},
"usable_usage": list(USAGE_VALUES),
}
@@ -5,12 +5,44 @@ from __future__ import annotations
import copy
from typing import Any
from calliope.comfyui.registry import class_to_patch_field
from calliope.comfyui.registry import (
AUDIO_CLASSES,
IMAGE_CLASSES,
VIDEO_CLASSES,
VIDEO_FILE_CLASSES,
class_to_patch_field,
)
# Input keys of the form "<nodeId>@<widget>" target one named widget on a
# node (auto-detected inputs: KSampler seed/steps/cfg, latent width/height…).
FIELD_KEY_SEP = "@"
# Media-loader families and the Chinese slot label used on cloned nodes.
_GROUP_LABELS: tuple[tuple[frozenset[str], str], ...] = (
(IMAGE_CLASSES, "参考图"),
(VIDEO_CLASSES, "参考视频"),
(AUDIO_CLASSES, "参考音频"),
)
def _loader_label(class_type: str) -> str:
for classes, label in _GROUP_LABELS:
if class_type in classes:
return label
return "参考素材"
def _loader_field(class_type: str, inputs: dict[str, Any]) -> str:
"""The widget a loader node of this class stores its file value in."""
if class_type in IMAGE_CLASSES:
return "image"
if class_type in VIDEO_CLASSES:
return "file" if class_type in VIDEO_FILE_CLASSES else "video"
if class_type in AUDIO_CLASSES:
# VHS_LoadAudio names its widget "audio:" (with the colon).
return "audio" if "audio" in inputs else "audio:"
return "image"
def _resolve_field(field: str, inputs: dict[str, Any]) -> str:
"""Map the computed patch field onto a key that exists on this node.
@@ -38,6 +70,78 @@ def resolve_patch_field(node: dict[str, Any]) -> str:
)
def _next_node_id(workflow: dict[str, Any]) -> str:
numeric = [int(k) for k in workflow if str(k).isdigit()]
return str(max(numeric, default=0) + 1)
def apply_media_group(
workflow: dict[str, Any], node_id: str, group: str, paths: list[str]
) -> None:
"""Rewire an Autogrow media group (image/video/audio) to exactly ``paths``.
``<group>.<prefix>0 … N-1`` each get their own loader node: the
workflow's existing ones are reused in slot order, extra ones are clones
of the first, and slots/loaders left over from the export are removed so
no stale media reaches ComfyUI. File values are local paths —
``prepare_media_inputs`` uploads them right before queueing.
"""
from calliope.comfyui.parser import image_group_prefix, image_group_slots
node = workflow.get(node_id)
if not isinstance(node, dict):
return
prefix = image_group_prefix(node, group)
if prefix is None:
return
inputs = dict(node.get("inputs") or {})
slots = image_group_slots(node, group, prefix)
loaders: list[str] = []
for _n, name, link in slots:
inputs.pop(name, None)
if isinstance(link, list) and len(link) == 2:
src = workflow.get(str(link[0]))
if isinstance(src, dict) and str(src.get("class_type") or "") in (
IMAGE_CLASSES | VIDEO_CLASSES | AUDIO_CLASSES
):
loaders.append(str(link[0]))
if not loaders:
return
template = copy.deepcopy(workflow[loaders[0]])
label = _loader_label(str(template.get("class_type") or ""))
still_used: set[str] = set()
for nid, other in workflow.items():
if nid == node_id or not isinstance(other, dict):
continue
for val in (other.get("inputs") or {}).values():
if isinstance(val, list) and len(val) == 2:
still_used.add(str(val[0]))
for nid in loaders[len(paths):]:
if nid not in still_used and nid not in loaders[: len(paths)]:
workflow.pop(nid, None)
for i, path in enumerate(paths):
if i < len(loaders):
nid = loaders[i]
loader = workflow[nid]
else:
nid = _next_node_id(workflow)
loader = copy.deepcopy(template)
loader_inputs = dict(loader.get("inputs") or {})
field = _loader_field(str(loader.get("class_type") or ""), loader_inputs)
loader_inputs[field] = path
loader["inputs"] = loader_inputs
loader["_meta"] = {**(loader.get("_meta") or {}), "title": f"{label} {i + 1}"}
workflow[nid] = loader
inputs[f"{group}.{prefix}{i}"] = [nid, 0]
node["inputs"] = inputs
# Original name kept: image groups were the first (and most common) family.
apply_image_group = apply_media_group
def patch_workflow(
base: dict[str, Any],
values_by_node_id: dict[str, Any],
@@ -54,6 +158,15 @@ def patch_workflow(
if not isinstance(node, dict):
continue
inputs = dict(node.get("inputs") or {})
if field is not None and field not in inputs and any(
k.startswith(f"{field}.") for k in inputs
):
paths = [value] if isinstance(value, str) else value
if isinstance(paths, list):
clean = [p for p in paths if isinstance(p, str) and p.strip()]
if clean:
apply_media_group(patched, key, field, clean)
continue
if field is None:
field = resolve_patch_field(node)
elif isinstance(inputs.get(field), list):
@@ -0,0 +1,137 @@
"""L2 connection preflight: check a workflow against a live /object_info (HEL-642/643).
Layer 1 (lint.py) judges the JSON on its own; this module judges the JSON
against what the target ComfyUI actually has installed. Two generic rules,
zero hard-coding for any specific workflow or model name:
1. Node existence — every ``class_type`` in the JSON must exist as a key of
the server's /object_info catalogue; missing ones are custom nodes the
user has not installed.
2. Combo value legality — for every combo input the server declares (an
input whose spec carries a candidate list — unet_name/clip_name/
sampler/scheduler/…), the JSON's current widget value must be one of the
candidates; a miss usually means a model file or component is missing.
File-upload widgets (LoadImage.image and friends) are skipped: their combo
lists are the server's input directory at export time and the value is
replaced by an upload before every submit, so a miss there says nothing.
"""
from __future__ import annotations
from typing import Any
from calliope.comfyui.registry import AUDIO_CLASSES, IMAGE_CLASSES, VIDEO_CLASSES
# Media-loader classes and the widget names that hold their file values —
# upload-backed combos that cannot be judged before an upload happens.
_MEDIA_LOADER_FIELDS: tuple[frozenset[str], frozenset[str]] = (
(IMAGE_CLASSES, frozenset({"image"})),
(AUDIO_CLASSES, frozenset({"audio", "audio:"})),
(VIDEO_CLASSES, frozenset({"file", "video"})),
)
# object_info widget-config keys that mark an input as file-upload backed.
_UPLOAD_CONFIG_KEYS = ("image_upload", "audio_upload", "video_upload", "upload")
_MAX_CANDIDATES_SHOWN = 6
def _node_title(node: dict[str, Any]) -> str:
title = (node.get("_meta") or {}).get("title")
return str(title).strip() if title else ""
def _is_upload_backed(class_type: str, input_name: str, config: Any) -> bool:
if isinstance(config, dict) and any(config.get(k) for k in _UPLOAD_CONFIG_KEYS):
return True
for classes, fields in _MEDIA_LOADER_FIELDS:
if class_type in classes and input_name in fields:
return True
return False
def _combo_candidates(spec: Any) -> list[str] | None:
"""The candidate list when ``spec`` is a combo input, else None.
A combo spec is ``[["a", "b"], {config}]`` — first element a list of
plain strings. Typed inputs (``["FLOAT", {…}]``) return None.
"""
if not (isinstance(spec, list) and len(spec) >= 1):
return None
values = spec[0]
if not isinstance(values, list) or not values:
return None
if not all(isinstance(v, str) for v in values):
return None
return values
def check_workflow_against(
object_info: dict[str, Any], workflow: dict[str, Any]
) -> list[dict[str, Any]]:
"""Findings for every problem the target server's catalogue reveals.
Each finding is ``{level, code, node_id, node_title, message, hint}``
(``level`` is always ``"error"`` for now — both rules are hard misses).
"""
findings: list[dict[str, Any]] = []
if not isinstance(object_info, dict) or not isinstance(workflow, dict):
return findings
for node_id, node in workflow.items():
if not isinstance(node, dict):
continue
class_type = str(node.get("class_type") or "")
title = _node_title(node)
label = f"节点 {node_id}「{title}」" if title else f"节点 {node_id}"
spec = object_info.get(class_type)
if not isinstance(spec, dict):
findings.append(
{
"level": "error",
"code": "missing_node",
"node_id": str(node_id),
"node_title": title,
"message": (
f"缺少自定义节点 {class_type or '(未知类名)'}({label})——"
"该 ComfyUI 未安装此节点,需先安装对应的节点包"
),
"hint": "安装节点包后回到本页点「重新检查」即可复查,无需重新导入。",
}
)
continue
declared = (spec.get("input") or {}) if isinstance(spec.get("input"), dict) else {}
inputs = node.get("inputs") or {}
for section in ("required", "optional"):
entries = declared.get(section)
if not isinstance(entries, dict):
continue
for input_name, in_spec in entries.items():
value = inputs.get(input_name)
# Wired inputs (links) and absent widgets are not combos to judge.
if isinstance(value, (list, dict)) or value is None:
continue
config = in_spec[1] if isinstance(in_spec, list) and len(in_spec) > 1 else None
if _is_upload_backed(class_type, str(input_name), config):
continue
candidates = _combo_candidates(in_spec)
if candidates is None:
continue
if value in candidates:
continue
shown = "、".join(candidates[:_MAX_CANDIDATES_SHOWN])
if len(candidates) > _MAX_CANDIDATES_SHOWN:
shown += f" 等 {len(candidates)} 项"
findings.append(
{
"level": "error",
"code": "value_not_in_list",
"node_id": str(node_id),
"node_title": title,
"message": (
f"{label}:值「{value}」不在 ComfyUI 的可选列表"
f"(参数 {input_name})——多为对应的模型文件或组件未安装"
),
"hint": f"该 ComfyUI 上可选:{shown}" if shown else None,
}
)
return findings
@@ -30,7 +30,8 @@ VIDEO_OUTPUT_CLASSES = frozenset(
{"VHS_VideoCombine", "SaveVideo", "VideoOutput", "AnimateDiffCombine"}
)
IMAGE_OUTPUT_CLASSES = frozenset(
{"SaveImage", "PreviewImage", "SaveImageWebsocket", "ETN_SendImageWebSocket"}
{"SaveImage", "PreviewImage", "SaveImageWebsocket", "ETN_SendImageWebSocket",
"SaveImageAdvanced"}
)
@@ -30,6 +30,27 @@ OUTPUT_ROLE_ALIASES: dict[str, frozenset[str]] = {
"video": frozenset({"video", "vid"}),
}
# The five workflow usages the studio distinguishes (HEL-636). Derived from
# graph evidence only (output media + consumed image inputs) — never from
# file names, model names or fixed node ids.
WorkflowUsage = str
USAGE_VALUES: tuple[str, ...] = (
"text2image",
"image2image",
"text2video",
"image2video",
"ref2video",
)
def usage_to_kind(usage: str | None) -> str | None:
"""Output media kind of a usage (image / video); None when unknown."""
if usage in ("text2image", "image2image"):
return "image"
if usage in ("text2video", "image2video", "ref2video"):
return "video"
return None
def parse_title_tag(title: str) -> tuple[str | None, str | None, str]:
"""Return (kind, role, label) from a Comfy node title.
@@ -158,8 +158,12 @@ def smart_fill_inputs(
break
if ref_images:
for inp, path in zip(ref_image_slots(inputs), ref_images):
values[str(inp["nodeId"])] = path
group = next((inp for inp in inputs if inp.get("kind") == "image_list"), None)
if group is not None:
values[str(group["nodeId"])] = list(ref_images[: group.get("max") or len(ref_images)])
else:
for inp, path in zip(ref_image_slots(inputs), ref_images):
values[str(inp["nodeId"])] = path
if ref_videos:
for inp, path in zip(ref_video_slots(inputs), ref_videos):
@@ -3,6 +3,7 @@
from __future__ import annotations
import math
from pathlib import Path
from typing import Any
@@ -19,8 +20,9 @@ def validate_input_values(
``min``/``max``); select values must be one of ``options``. Blank values
are dropped so the workflow keeps its own value. Keys not in the schema
pass through untouched (other callers patch extra keys, e.g. uploads).
Only an auto-detected positive prompt must be present — tagged workflows
mark every input required, and blank ones fall back to the workflow's value.
Auto-detected required entries (positive prompt, wired image slots,
reference-image lists) must be present — tagged workflows mark every
input required, and blank ones fall back to the workflow's value.
"""
by_key = {str(e.get("nodeId")): e for e in schema if isinstance(e, dict)}
clean: dict[str, Any] = {}
@@ -61,6 +63,30 @@ def validate_input_values(
errors.append(f"「{label}」不能大于 {_fmt(hi)}")
continue
clean[key] = value
elif kind in ("image_list", "video_list", "audio_list"):
paths = [raw] if isinstance(raw, str) else raw
if not isinstance(paths, list) or not all(isinstance(p, str) for p in paths):
errors.append(f"「{label}」的取值格式不对,请重新上传")
continue
paths = [p for p in paths if p.strip()]
unit = _LIST_UNITS[kind]
noun = _LIST_NOUNS[kind]
hi = entry.get("max")
if hi is not None and len(paths) > hi:
errors.append(
f"{label}最多 {hi} {unit}(当前 {len(paths)} {unit}),请删除多余的{noun}"
)
continue
bad = [
f"{label} {i}:{msg}"
for i, p in enumerate(paths, 1)
if (msg := _media_file_problem(p, kind))
]
if bad:
errors.extend(bad)
continue
if paths:
clean[key] = paths
elif kind == "select":
options = entry.get("options") or []
if options and raw not in options:
@@ -70,8 +96,51 @@ def validate_input_values(
else:
clean[key] = raw
for key, entry in by_key.items():
required_prompt = entry.get("auto") and entry.get("required") and entry.get("role") == "prompt"
has_fallback = str(entry.get("defaultValue") or "").strip() != ""
if required_prompt and key not in clean and not has_fallback:
errors.append(f"请填写「{entry.get('label') or key}」")
required = entry.get("auto") and entry.get("required")
label = entry.get("label") or key
if required and entry.get("role") == "prompt":
has_fallback = str(entry.get("defaultValue") or "").strip() != ""
if key not in clean and not has_fallback:
errors.append(f"请填写「{label}」")
elif required and entry.get("kind") in ("image_list", "video_list", "audio_list"):
lo = entry.get("min") or 1
unit = _LIST_UNITS[entry.get("kind")]
if len(clean.get(key) or []) < lo and not any(label in e for e in errors):
errors.append(f"需要至少 {lo} {unit}{label}")
elif required and entry.get("kind") == "image" and entry.get("role") != "mask":
if key not in clean:
errors.append(f"请上传{label}")
return clean, errors
_IMAGE_EXTS = frozenset({".png", ".jpg", ".jpeg", ".webp"})
_VIDEO_EXTS = frozenset({".mp4", ".webm", ".mov"})
_AUDIO_EXTS = frozenset({".mp3", ".wav", ".m4a"})
_LIST_UNITS = {"image_list": "张", "video_list": "段", "audio_list": "段"}
_LIST_NOUNS = {"image_list": "图片", "video_list": "视频", "audio_list": "音频"}
_LIST_EXTS = {"image_list": _IMAGE_EXTS, "video_list": _VIDEO_EXTS, "audio_list": _AUDIO_EXTS}
_LIST_FORMAT_HINT = {
"image_list": "格式不支持,请使用 PNG / JPG / WebP",
"video_list": "格式不支持,请使用 MP4 / WebM / MOV",
"audio_list": "格式不支持,请使用 MP3 / WAV / M4A",
}
def _media_file_problem(path: str, kind: str) -> str | None:
"""Why ``path`` cannot fill a media-list slot of this kind (None = fine)."""
from calliope import config
target = Path(path)
if target.suffix.lower() not in _LIST_EXTS[kind]:
return _LIST_FORMAT_HINT[kind]
try:
target.resolve().relative_to(config.settings.assets_dir.resolve())
except (ValueError, OSError):
return f"只能使用在本页上传或从生成结果选入的{_LIST_NOUNS[kind]}"
if not target.is_file():
return "文件已不存在,请重新上传"
return None
def _image_file_problem(path: str) -> str | None:
return _media_file_problem(path, "image_list")
+95 -1
View File
@@ -121,7 +121,11 @@ CREATE TABLE IF NOT EXISTS workflows (
description TEXT,
prompt_profile TEXT NOT NULL DEFAULT 'prose',
is_enabled INTEGER NOT NULL DEFAULT 1,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
usage TEXT,
usage_source TEXT,
output_map TEXT,
output_map_source TEXT
);
CREATE TABLE IF NOT EXISTS jobs (
@@ -338,6 +342,74 @@ def _sqlite_connect(path: Path) -> sqlite3.Connection:
return sqlite3.connect(path)
def _backfill_workflow_usage(conn: sqlite3.Connection) -> None:
"""HEL-636: settle `workflows.usage` for rows that still have none.
Determinate graphs get ``usage='auto'``; indeterminate ones keep NULL
and are disabled (they must be confirmed on the connections page before
they can generate). Rows the user already confirmed (usage_source='user')
never pass through here again — their usage is set, so the WHERE clause
skips them. Old jobs / history / `kind` semantics are untouched.
"""
from calliope.comfyui.parser import classify_usage
rows = conn.execute(
"SELECT id, workflow_json FROM workflows WHERE usage IS NULL OR usage = ''"
).fetchall()
for row in rows: # plain connect — positional access
try:
workflow = json.loads(row[1])
except (json.JSONDecodeError, TypeError):
workflow = None
judgment = classify_usage(workflow) if isinstance(workflow, dict) else {}
if judgment.get("usage"):
conn.execute(
"UPDATE workflows SET usage = ?, usage_source = 'auto' WHERE id = ?",
(judgment["usage"], row[0]),
)
else:
conn.execute(
"UPDATE workflows SET is_enabled = 0 WHERE id = ? AND usage IS NULL",
(row[0],),
)
def _backfill_workflow_output_map(conn: sqlite3.Connection) -> None:
"""HEL-638: settle the output-node mapping for existing rows.
Rows the user already mapped (output_map_source='user') are never
touched. Determinate graphs get the trusted ``auto`` map. Rows whose
graph now contains unknown custom output candidates get no auto map and
are parked disabled — the usage decision survives, but until the user
designates the output nodes the workflow must not generate.
"""
from calliope.comfyui.output_map import auto_output_map, needs_user_output_map
rows = conn.execute(
"SELECT id, workflow_json FROM workflows"
" WHERE output_map_source IS NULL OR output_map_source != 'user'"
).fetchall()
for row in rows:
try:
workflow = json.loads(row[1])
except (json.JSONDecodeError, TypeError):
workflow = None
if not isinstance(workflow, dict):
continue
if needs_user_output_map(workflow):
conn.execute(
"UPDATE workflows SET output_map = NULL, output_map_source = NULL,"
" is_enabled = 0 WHERE id = ?",
(row[0],),
)
else:
conn.execute(
"UPDATE workflows SET output_map = ?, output_map_source = 'auto'"
" WHERE id = ?",
(json.dumps(auto_output_map(workflow)), row[0]),
)
async def migrate_db(db_path: Path) -> None:
db_path.parent.mkdir(parents=True, exist_ok=True)
conn = sqlite3.connect(db_path)
@@ -383,6 +455,23 @@ async def migrate_db(db_path: Path) -> None:
# comfyui_endpoints id). Dangling ids are tolerated — enqueue falls
# back to the active connection.
conn.execute("ALTER TABLE workflows ADD COLUMN endpoint_id TEXT")
# HEL-636: five-way usage (text2image…ref2video). NULL = pending human
# confirmation; `kind` keeps meaning output media for history/paths.
if "usage" not in cols:
conn.execute("ALTER TABLE workflows ADD COLUMN usage TEXT")
if "usage_source" not in cols:
conn.execute("ALTER TABLE workflows ADD COLUMN usage_source TEXT")
# HEL-638: explicit output-node designation for unknown custom output
# nodes ({nodeId, kind} JSON + 'user'|'auto'). Idempotent backfill
# below parks unmapped unknown-output rows (disabled) like usage does.
if "output_map" not in cols:
conn.execute("ALTER TABLE workflows ADD COLUMN output_map TEXT")
if "output_map_source" not in cols:
conn.execute("ALTER TABLE workflows ADD COLUMN output_map_source TEXT")
# Idempotent backfill: pending rows are re-judged on every boot (parser
# upgrades can settle them); confirmed rows are never touched.
_backfill_workflow_usage(conn)
_backfill_workflow_output_map(conn)
scene_cols = {r[1] for r in conn.execute("PRAGMA table_info(scenes)").fetchall()}
if "location_id" not in scene_cols:
conn.execute("ALTER TABLE scenes ADD COLUMN location_id INTEGER")
@@ -429,6 +518,11 @@ async def migrate_db(db_path: Path) -> None:
conn.execute("ALTER TABLE jobs ADD COLUMN comfy_prompt_id TEXT")
if "phase" not in job_cols:
conn.execute("ALTER TABLE jobs ADD COLUMN phase TEXT")
# HEL-643: where a job came from — 'user' (every normal generation) or
# 'workflow_test' (L3 试运行). Existing rows default to 'user', semantics
# unchanged; test jobs get isolated artifacts and no entity write-back.
if "origin" not in job_cols:
conn.execute("ALTER TABLE jobs ADD COLUMN origin TEXT NOT NULL DEFAULT 'user'")
# Build Scene's per-scene sessions: origin stamps WHERE a blind session was
# born ('chat' = user-created in AI Canvas, 'scene' = auto-created by the
# Build Scene rail). The session list excludes origin='scene' so scene
@@ -198,14 +198,35 @@ class ExpandClipsRequest(BaseModel):
clip_cap: int | None = None
WorkflowUsageKind = Literal[
"text2image",
"image2image",
"text2video",
"image2video",
"ref2video",
]
class WorkflowCreate(BaseModel):
name: str = Field(..., min_length=1)
kind: Literal["image", "video"] = "image"
kind: Literal["image", "video"] | None = None
workflow_json: dict[str, Any]
description: str | None = None
prompt_profile: Literal["prose", "minimax_h3_ref"] | None = None
# Optional binding to a ComfyUI connection id (settings.comfyui_endpoints).
endpoint_id: str | None = None
# HEL-636: five-way usage. Given by the import confirm page (possibly a
# user correction of the auto judgment); when absent it is classified
# from the graph, and indeterminate workflows stay pending (disabled).
usage: WorkflowUsageKind | None = None
usage_source: Literal["auto", "user"] | None = None
# Schema corrected on the confirm page (manual role overrides included).
input_schema: list[dict[str, Any]] | None = None
# HEL-638: explicit output-node designation for unknown custom output
# nodes — [{nodeId, kind: image|video}]. Required before a workflow
# with unknown outputs can be enabled or generated.
output_map: list[dict[str, Any]] | None = None
output_map_source: Literal["auto", "user"] | None = None
class WorkflowUpdate(BaseModel):
@@ -215,10 +236,34 @@ class WorkflowUpdate(BaseModel):
prompt_profile: Literal["prose", "minimax_h3_ref"] | None = None
is_enabled: bool | None = None
endpoint_id: str | None = None
usage: WorkflowUsageKind | None = None
usage_source: Literal["auto", "user"] | None = None
input_schema: list[dict[str, Any]] | None = None
# HEL-638: set/replace the user output mapping; an explicit empty list
# resets the workflow to pending confirmation.
output_map: list[dict[str, Any]] | None = None
output_map_source: Literal["auto", "user"] | None = None
class WorkflowAnalyze(BaseModel):
workflow_json: dict[str, Any]
# HEL-643: optional target connection — given, the analyze response also
# carries an L2 connection check (node/model availability via /object_info).
endpoint_id: str | None = None
# Bypass the /object_info cache (user re-checks after installing nodes).
refresh: bool = False
class WorkflowCheckRequest(BaseModel):
"""L2 re-check of a saved workflow against a live ComfyUI (HEL-643)."""
endpoint_id: str | None = None
refresh: bool = False
class WorkflowTestRequest(BaseModel):
"""Launch one real test run of a workflow (HEL-643 L3)."""
endpoint_id: str | None = None
input_values: dict[str, Any] = Field(default_factory=dict)
class JobCreate(BaseModel):
@@ -36,16 +36,18 @@ class QueueManager:
scene_id: int | None = None,
clip_id: int | None = None,
payload: dict[str, Any] | None = None,
origin: str = "user",
) -> dict[str, Any]:
conn = get_db(config.settings.db_path)
try:
payload = self._stamp_endpoint(conn, workflow_id, dict(payload or {}))
cur = conn.execute(
"""
INSERT INTO jobs (project_id, scene_id, clip_id, kind, workflow_id, status, payload_json)
VALUES (?, ?, ?, ?, ?, 'pending', ?)
INSERT INTO jobs (project_id, scene_id, clip_id, kind, workflow_id,
status, payload_json, origin)
VALUES (?, ?, ?, ?, ?, 'pending', ?, ?)
""",
(project_id, scene_id, clip_id, kind, workflow_id, json.dumps(payload)),
(project_id, scene_id, clip_id, kind, workflow_id, json.dumps(payload), origin),
)
conn.commit()
row = conn.execute("SELECT * FROM jobs WHERE id = ?", (cur.lastrowid,)).fetchone()
+95 -9
View File
@@ -13,6 +13,7 @@ import httpx
from calliope import config
from calliope.comfyui.client import ComfyUIClient
from calliope.comfyui.dry_run import write_placeholder_mp4, write_placeholder_png
from calliope.comfyui.lint import blocking_problem
from calliope.comfyui.parser import parse_dynamic_inputs
from calliope.comfyui.patcher import patch_workflow
from calliope.comfyui.roles import input_has_role
@@ -20,6 +21,11 @@ from calliope.db import get_db
from calliope.events.bus import event_bus
from calliope.export.runner import run_export
from calliope.queue.manager import queue_manager
from calliope.queue.workflow_test import (
TEST_ORIGIN,
prune_workflow_tests,
workflow_test_dir,
)
logger = logging.getLogger("calliope.worker")
@@ -163,6 +169,16 @@ class QueueWorker:
"message": f"{self._job_label(job)} failed",
},
)
if str(job.get("origin") or "") == TEST_ORIGIN and job.get("workflow_id"):
# Retention: keep only the newest records (and their
# artifacts) per workflow (HEL-643).
try:
prune_workflow_tests(int(job["workflow_id"]))
except Exception:
logger.exception(
"Pruning workflow-test records for workflow %s failed",
job["workflow_id"],
)
except Exception:
logger.exception("Worker loop error")
await asyncio.sleep(config.settings.queue_poll_interval_sec)
@@ -172,6 +188,7 @@ class QueueWorker:
payload = json.loads(job["payload_json"] or "{}")
project_id = job["project_id"]
kind = job["kind"]
is_test = str(job.get("origin") or "") == TEST_ORIGIN
use_dry = bool(config.settings.dry_run)
if kind == "export":
@@ -182,6 +199,13 @@ class QueueWorker:
base_url, headers, endpoint_label = self._resolve_endpoint(payload)
client = ComfyUIClient(base_url, headers=headers)
try:
# A workflow test must be a REAL run — a dry-run placeholder that
# passes as "测试通过" is exactly the false positive HEL-643 bans.
if use_dry and is_test:
raise RuntimeError(
"测试工作流必须真实运行:当前设置开启了 Dry-run(占位模式),"
"请到「设置」关闭 Dry-run 后重新测试"
)
if use_dry:
queue_manager.set_phase(job["id"], "dry_run")
return await self._dry_run(job, payload)
@@ -195,11 +219,24 @@ class QueueWorker:
)
workflow_id = job.get("workflow_id") or payload.get("workflow_id")
workflow = self._load_workflow(workflow_id)
if not workflow:
workflow_row = self._load_workflow_row(workflow_id)
if not workflow_row:
raise RuntimeError(
"找不到该任务使用的工作流(可能已被删除),请重新选择工作流后再生成"
)
workflow = workflow_row["workflow_json"]
broken = blocking_problem(workflow)
if broken:
raise RuntimeError(broken)
# HEL-638: harvest only the confirmed output nodes. A workflow
# with unknown custom outputs and no user mapping must not run.
node_kinds = self._output_node_kinds(workflow_row)
if node_kinds is None:
raise RuntimeError(
"该工作流含无法识别的自定义输出节点,尚未指定输出节点及媒体类型,"
"请到「ComfyUI 连接」页确认后再生成"
)
input_values = payload.get("input_values") or {}
if payload.get("continue_source") and kind == "video":
@@ -236,16 +273,39 @@ class QueueWorker:
f"ComfyUI 执行出错(任务 ID {prompt_id}):{_comfy_messages(messages)}"
)
outputs_meta = client.extract_outputs(history)
outputs_meta = client.extract_outputs(history, node_kinds=node_kinds)
saved = [m for m in outputs_meta if m.get("type") == "output"]
outputs_meta = saved or outputs_meta
if not outputs_meta:
checked = "、".join(sorted(node_kinds))
raise RuntimeError(
f"ComfyUI 显示任务已结束(任务 ID {prompt_id}),但没有返回任何图片或视频,"
"不算生成完成。请确认工作流带有保存/预览节点,并到 ComfyUI 历史中核对该任务。"
"不算生成完成。已按输出映射检查节点:" f"{checked};"
"请到 ComfyUI 历史中核对该任务,并确认所指定的输出节点正确。"
)
mismatch = next(
(
m
for m in outputs_meta
if m.get("media_kind") and m["media_kind"] != node_kinds.get(m["node_id"])
),
None,
)
if mismatch:
want = node_kinds.get(mismatch["node_id"])
raise RuntimeError(
f"输出节点 {mismatch['node_id']} 的媒体类型与映射不符"
f"(映射为{'视频' if want == 'video' else '图片'},"
f"实际返回 {mismatch['filename']}),任务不算生成完成。"
"请到「ComfyUI 连接」页修正该节点的媒体类型。"
)
queue_manager.set_phase(job["id"], "saving")
dest_dir = config.settings.assets_dir / str(project_id) / kind
if is_test:
# Test artifacts live in a scratch dir, isolated from project
# media and never written back to entities (HEL-643).
dest_dir = workflow_test_dir(int(workflow_id))
else:
dest_dir = config.settings.assets_dir / str(project_id) / kind
dest_dir.mkdir(parents=True, exist_ok=True)
paths: list[str] = []
for meta in outputs_meta:
@@ -259,7 +319,8 @@ class QueueWorker:
)
paths.append(str(dest))
self._apply_outputs_to_entities(job, payload, paths)
if not is_test:
self._apply_outputs_to_entities(job, payload, paths)
queue_manager.set_phase(job["id"], "finished")
return paths
finally:
@@ -472,20 +533,45 @@ class QueueWorker:
finally:
conn.close()
def _load_workflow(self, workflow_id: int | None) -> dict[str, Any] | None:
def _load_workflow_row(self, workflow_id: int | None) -> dict[str, Any] | None:
if not workflow_id:
return None
conn = get_db(config.settings.db_path)
try:
row = conn.execute(
"SELECT workflow_json FROM workflows WHERE id = ?", (workflow_id,)
"SELECT workflow_json, output_map, output_map_source FROM workflows"
" WHERE id = ?",
(workflow_id,),
).fetchone()
if not row:
return None
return json.loads(row["workflow_json"])
return {
"workflow_json": json.loads(row["workflow_json"]),
"output_map": row["output_map"],
"output_map_source": row["output_map_source"],
}
finally:
conn.close()
@staticmethod
def _output_node_kinds(workflow_row: dict[str, Any]) -> dict[str, str] | None:
"""Confirmed {nodeId: image|video} for this workflow, or None when
the outputs are not confirmed (unknown nodes, no user mapping)."""
from calliope.comfyui.output_map import mapping_problem, resolve_output_map
workflow = workflow_row["workflow_json"]
problem = mapping_problem(
workflow, workflow_row.get("output_map"), workflow_row.get("output_map_source")
)
if problem:
return None
entries, _source = resolve_output_map(
workflow_row.get("output_map"),
workflow_row.get("output_map_source"),
workflow,
)
return {str(e["nodeId"]): str(e["kind"]) for e in entries} or None
def _job_label(self, job: dict[str, Any]) -> str:
payload = json.loads(job.get("payload_json") or "{}")
kind = job.get("kind") or "job"
@@ -0,0 +1,180 @@
"""Workflow-test job helpers (HEL-643).
A test job (jobs.origin = 'workflow_test') runs the FULL real pipeline —
queue → ComfyUI → outputs — but its artifacts are isolated from project
entities: files land under ``assets/_workflow_test/{workflow_id}/`` and are
never written back to characters/locations/scenes/clips.
This module owns the artifact directory, the retention policy (keep the
newest N records per workflow) and the purge paths used by "清除测试记录"
and workflow deletion.
"""
from __future__ import annotations
import json
import logging
import shutil
from pathlib import Path
from typing import Any
from calliope import config
from calliope.db import get_db
logger = logging.getLogger("calliope.queue")
TEST_ORIGIN = "workflow_test"
TEST_SOURCE = "workflow_test"
# Records (and artifacts) kept per workflow before older ones are pruned.
TEST_KEEP = 5
def workflow_test_dir(workflow_id: int) -> Path:
return config.settings.assets_dir / "_workflow_test" / str(workflow_id)
def _safe_unlink(path_str: str) -> bool:
"""Delete a file if it resolves under assets_dir (missing = already gone)."""
try:
target = Path(path_str).resolve()
target.relative_to(config.settings.assets_dir.resolve())
except (ValueError, OSError):
return False
if not target.is_file():
return False
try:
target.unlink()
return True
except OSError:
return False
def _unlink_job_outputs(job: dict[str, Any]) -> None:
try:
paths = json.loads(job.get("output_paths_json") or "[]")
except (json.JSONDecodeError, TypeError):
return
if not isinstance(paths, list):
return
for p in paths:
if isinstance(p, str) and p.strip():
_safe_unlink(p)
def _remove_test_dir_if_empty(workflow_id: int) -> None:
d = workflow_test_dir(workflow_id)
try:
if d.is_dir() and not any(d.iterdir()):
d.rmdir()
except OSError:
pass
def _test_job_public(job: dict[str, Any]) -> dict[str, Any]:
out = dict(job)
out["payload"] = json.loads(job.get("payload_json") or "{}")
out["output_paths"] = json.loads(job.get("output_paths_json") or "[]")
out.pop("payload_json", None)
out.pop("output_paths_json", None)
return out
def list_test_jobs(workflow_id: int, limit: int = 20) -> list[dict[str, Any]]:
conn = get_db(config.settings.db_path)
try:
rows = conn.execute(
"SELECT * FROM jobs WHERE workflow_id = ? AND origin = ?"
" ORDER BY id DESC LIMIT ?",
(workflow_id, TEST_ORIGIN, limit),
).fetchall()
return [_test_job_public(dict(r)) for r in rows]
finally:
conn.close()
def find_active_test_job(workflow_id: int, endpoint_id: str | None) -> dict[str, Any] | None:
"""The unfinished test job for (workflow, endpoint), if one exists.
Idempotency guard for the "测试工作流" button: a second click re-uses the
in-flight job instead of enqueuing a duplicate.
"""
conn = get_db(config.settings.db_path)
try:
rows = conn.execute(
"SELECT * FROM jobs WHERE workflow_id = ? AND origin = ?"
" AND status IN ('pending', 'running') ORDER BY id DESC",
(workflow_id, TEST_ORIGIN),
).fetchall()
finally:
conn.close()
for r in rows:
job = dict(r)
try:
payload = json.loads(job.get("payload_json") or "{}")
except (json.JSONDecodeError, TypeError):
payload = {}
snap = payload.get("endpoint") or {}
if not isinstance(snap, dict):
snap = {}
if (snap.get("id") or None) == (endpoint_id or None):
return _test_job_public(job)
return None
def prune_workflow_tests(workflow_id: int, keep: int = TEST_KEEP) -> int:
"""Keep only the newest ``keep`` test records (older rows + files go)."""
conn = get_db(config.settings.db_path)
try:
rows = conn.execute(
"SELECT * FROM jobs WHERE workflow_id = ? AND origin = ?"
" ORDER BY id DESC LIMIT -1 OFFSET ?",
(workflow_id, TEST_ORIGIN, max(keep, 0)),
).fetchall()
removed = 0
for r in rows:
job = dict(r)
if job.get("status") in ("pending", "running"):
continue
_unlink_job_outputs(job)
conn.execute("DELETE FROM jobs WHERE id = ?", (job["id"],))
removed += 1
conn.commit()
finally:
conn.close()
_remove_test_dir_if_empty(workflow_id)
if removed:
logger.info("Pruned %s old workflow-test records for workflow %s", removed, workflow_id)
return removed
def purge_workflow_tests(workflow_id: int, *, allow_active: bool = False) -> int:
"""Delete EVERY test record and artifact for a workflow.
Returns the removed row count; raises RuntimeError when an unfinished
test job is still in flight (unless ``allow_active``).
"""
conn = get_db(config.settings.db_path)
try:
if not allow_active:
active = conn.execute(
"SELECT COUNT(*) AS n FROM jobs WHERE workflow_id = ? AND origin = ?"
" AND status IN ('pending', 'running')",
(workflow_id, TEST_ORIGIN),
).fetchone()["n"]
if active:
raise RuntimeError(
f"该工作流还有 {active} 个进行中的测试任务,请先等待完成或取消,再清除测试记录"
)
rows = conn.execute(
"SELECT * FROM jobs WHERE workflow_id = ? AND origin = ?",
(workflow_id, TEST_ORIGIN),
).fetchall()
removed = 0
for r in rows:
_unlink_job_outputs(dict(r))
conn.execute("DELETE FROM jobs WHERE id = ?", (r["id"],))
removed += 1
conn.commit()
finally:
conn.close()
shutil.rmtree(workflow_test_dir(workflow_id), ignore_errors=True)
return removed
@@ -77,8 +77,11 @@ def _parsed_url(base_url: str) -> tuple[str, str]:
url = (base_url or "").strip()
if not url:
raise HTTPException(status_code=400, detail="API 地址不能为空")
if "://" not in url:
url = f"http://{url}"
# HEL-619: the server validates format as strictly as the UI already
# does. A schemeless garbled string used to be silently prefixed with
# http:// and then reported as a DNS failure; it is a 400 format error.
if "://" not in url or any(ch.isspace() for ch in url):
raise HTTPException(status_code=400, detail="地址必须是 http:// 或 https:// 开头的有效 URL")
parsed = urlparse(url)
if parsed.scheme not in ("http", "https") or not parsed.hostname:
raise HTTPException(status_code=400, detail="地址必须是 http:// 或 https:// 开头的有效 URL")
@@ -135,7 +138,12 @@ async def list_endpoints() -> dict[str, Any]:
@router.post("/endpoints")
async def create_endpoint(payload: EndpointIn) -> dict[str, Any]:
base_url, _host = _parsed_url(payload.base_url)
base_url, host = _parsed_url(payload.base_url)
# HEL-619: the same SSRF guard as the connectivity test applies on
# save — otherwise a blocked address can be stored and later probed by
# the worker path. Unresolvable hosts still pass (resolution happens
# again at probe time).
_assert_not_ssrf(host)
incoming = [ep for ep in settings.comfyui_endpoints or []]
incoming.append(payload.model_dump() | {"base_url": base_url})
try:
@@ -151,7 +159,8 @@ async def update_endpoint(endpoint_id: str, payload: EndpointPatch) -> dict[str,
_stored_endpoint(endpoint_id)
base_url = payload.base_url
if base_url is not None:
base_url, _host = _parsed_url(base_url)
base_url, host = _parsed_url(base_url)
_assert_not_ssrf(host) # same save-time guard as create (HEL-619)
patch = payload.model_dump(exclude_unset=True)
if base_url is not None:
patch["base_url"] = base_url
@@ -13,6 +13,8 @@ from pydantic import BaseModel, Field
from calliope import config
from calliope.agent.prompts import item_reference_prompt
from calliope.comfyui.lint import blocking_problem
from calliope.comfyui.output_map import mapping_problem
from calliope.comfyui.parser import effective_input_schema
from calliope.comfyui.validate import validate_input_values
from calliope.db import get_db, row_to_dict
@@ -195,7 +197,14 @@ async def list_playground_jobs(limit: int = 50) -> list[dict[str, Any]]:
pid = ensure_playground_project(conn)
finally:
conn.close()
return [_job_public(j) for j in queue_manager.list_jobs(pid, None, limit)]
# Workflow-test jobs (HEL-643) ride the same scratch project but must not
# surface in the studio windows' history — they carry their own dialog.
jobs = [
j
for j in queue_manager.list_jobs(pid, None, limit)
if str(j.get("origin") or "user") != "workflow_test"
]
return [_job_public(j) for j in jobs]
@router.delete("/jobs/{job_id}")
@@ -334,7 +343,8 @@ async def generate(payload: PlaygroundGenerate) -> dict[str, Any]:
try:
pid = ensure_playground_project(conn)
wf = conn.execute(
"SELECT id, kind, is_enabled, workflow_json, input_schema FROM workflows WHERE id = ?",
"SELECT id, kind, is_enabled, workflow_json, input_schema, output_map,"
" output_map_source FROM workflows WHERE id = ?",
(payload.workflow_id,),
).fetchone()
if not wf:
@@ -346,13 +356,22 @@ async def generate(payload: PlaygroundGenerate) -> dict[str, Any]:
status_code=400, detail="该工作流已停用,请到「ComfyUI 连接」页启用后再生成"
)
kind = wf["kind"]
workflow_json = json.loads(wf["workflow_json"])
# HEL-638: a workflow with unknown custom output nodes must have a
# confirmed output mapping before anything is queued.
map_problem = mapping_problem(workflow_json, wf["output_map"], wf["output_map_source"])
if map_problem:
raise HTTPException(status_code=400, detail=map_problem)
schema = effective_input_schema(
json.loads(wf["input_schema"]) if wf["input_schema"] else [],
json.loads(wf["workflow_json"]),
json.loads(wf["input_schema"]) if wf["input_schema"] else [], workflow_json
)
finally:
conn.close()
broken = blocking_problem(workflow_json)
if broken:
raise HTTPException(status_code=400, detail=broken)
input_values, problems = validate_input_values(schema, payload.input_values)
if problems:
raise HTTPException(status_code=400, detail="参数有误:" + ";".join(problems))
@@ -107,7 +107,11 @@ async def update_settings(payload: SettingsUpdate) -> dict[str, Any]:
if assignments_in is not None:
settings.ensure_llm_profiles()
ids = {p["id"] for p in settings.llm_profiles}
cleaned: dict[str, str | None] = {}
# HEL-619: per-role INCREMENTAL update. Rapid dropdown switches used
# to send whole cached snapshots that fully overwrote the map, so a
# stale snapshot could wipe a newer choice. Roles absent from the
# payload keep their stored value; a role sent as null is cleared.
cleaned: dict[str, str | None] = dict(settings.agent_llm_assignments or {})
for role, pid in assignments_in.items():
if role not in AGENT_LLM_ROLES:
continue
@@ -5,15 +5,42 @@ from typing import Any
from fastapi import APIRouter, HTTPException
from calliope.comfyui.endpoints import client_for, endpoint_snapshot
from calliope.comfyui.lint import blocking_problem, workflow_warnings
from calliope.comfyui.output_map import (
auto_output_map,
load_output_map,
mapping_problem,
needs_user_output_map,
validate_output_map,
)
from calliope.comfyui.parser import (
classify_usage,
effective_input_schema,
parse_dynamic_inputs,
parse_dynamic_outputs,
)
from calliope.comfyui.preflight import check_workflow_against
from calliope.comfyui.profiles import detect_prompt_profile
from calliope.comfyui.roles import usage_to_kind
from calliope.comfyui.validate import validate_input_values
from calliope.config import settings
from calliope.db import get_db, row_to_dict
from calliope.models.schemas import WorkflowAnalyze, WorkflowCreate, WorkflowUpdate
from calliope.events.bus import event_bus
from calliope.models.schemas import (
WorkflowAnalyze,
WorkflowCheckRequest,
WorkflowCreate,
WorkflowTestRequest,
WorkflowUpdate,
)
from calliope.queue.manager import queue_manager
from calliope.queue.workflow_test import (
TEST_SOURCE,
find_active_test_job,
list_test_jobs,
purge_workflow_tests,
)
router = APIRouter()
@@ -23,28 +50,102 @@ def _serialize_workflow(row: Any) -> dict[str, Any]:
data["workflow_json"] = json.loads(data["workflow_json"])
stored = json.loads(data["input_schema"]) if data.get("input_schema") else []
data["input_schema"] = effective_input_schema(stored, data["workflow_json"])
data["output_schema"] = json.loads(data["output_schema"]) if data.get("output_schema") else []
# Outputs are pure graph derivation (no manual overrides) — always fresh,
# so parser upgrades reach old rows without a re-import.
data["output_schema"] = parse_dynamic_outputs(data["workflow_json"])
data["is_enabled"] = bool(data.get("is_enabled"))
data["warnings"] = workflow_warnings(data["workflow_json"])
raw_map = data.get("output_map")
data["output_map"] = load_output_map(raw_map)
# Pending flag: unknown output candidates the user has not mapped yet.
data["needs_mapping"] = (
mapping_problem(data["workflow_json"], raw_map, data.get("output_map_source")) is not None
)
return data
async def _connection_check(
endpoint_id: str | None, workflow_json: dict[str, Any], refresh: bool = False
) -> dict[str, Any]:
"""L2 preflight (HEL-643): workflow vs the target ComfyUI's /object_info.
An unreachable connection degrades to ``reachable: False`` with an honest
「无法核查」 message — it never blocks and never pretends to pass.
"""
endpoint = settings.resolve_comfyui_endpoint(endpoint_id)
if endpoint is None:
return {
"ok": False,
"reachable": False,
"endpoint_id": endpoint_id,
"endpoint_name": None,
"findings": [],
"message": "没有可用的 ComfyUI 连接,无法核查节点与模型",
}
base = {
"endpoint_id": endpoint.get("id"),
"endpoint_name": endpoint.get("name"),
"base_url": endpoint.get("base_url"),
}
client = client_for(endpoint)
try:
object_info = await client.object_info(force_refresh=refresh)
except Exception as exc:
return {
**base,
"ok": False,
"reachable": False,
"findings": [],
"message": f"无法核查(连不上该 ComfyUI):{type(exc).__name__}",
}
finally:
await client.close()
findings = check_workflow_against(object_info, workflow_json)
ok = not any(f.get("level") == "error" for f in findings)
return {**base, "ok": ok, "reachable": True, "findings": findings}
@router.post("/analyze")
async def analyze_workflow(payload: WorkflowAnalyze) -> dict[str, Any]:
inputs = parse_dynamic_inputs(payload.workflow_json)
outputs = parse_dynamic_outputs(payload.workflow_json)
return {
judgment = classify_usage(payload.workflow_json)
result: dict[str, Any] = {
"inputs": inputs,
"outputs": outputs,
"suggested_profile": detect_prompt_profile(payload.workflow_json),
"warnings": workflow_warnings(payload.workflow_json),
"usage": judgment["usage"],
"usage_ambiguous": judgment["ambiguous"],
"needs_mapping": judgment["needs_mapping"],
"usage_problem": judgment["problem"],
"usage_evidence": judgment["evidence"],
"usable_usage": judgment["usable_usage"],
}
# L2 (optional): with a target connection the analyze response also
# reports which nodes/models that ComfyUI actually has (HEL-643).
if payload.endpoint_id:
result["connection_check"] = await _connection_check(
payload.endpoint_id, payload.workflow_json, payload.refresh
)
return result
def _stored_schema(payload_schema: list[dict[str, Any]] | None, workflow: dict[str, Any]) -> str:
"""Schema to persist: the confirm page's corrected copy, else the auto one."""
if payload_schema and all(isinstance(e, dict) for e in payload_schema):
return json.dumps(payload_schema)
return json.dumps(parse_dynamic_inputs(workflow))
@router.post("/{workflow_id}/reanalyze")
async def reanalyze_workflow(workflow_id: int) -> dict[str, Any]:
"""Recompute input/output schemas from the stored workflow JSON.
"""Recompute usage and input/output schemas from the stored workflow JSON.
Workflows imported before a parser upgrade keep stale (often empty)
schemas — this refreshes them without re-importing.
schemas — this refreshes them without re-importing. A usage or output
mapping the user set by hand is never overwritten; only ``auto`` (and
pending NULL) rows get the new judgment.
"""
conn = get_db(settings.db_path)
try:
@@ -53,11 +154,40 @@ async def reanalyze_workflow(workflow_id: int) -> dict[str, Any]:
raise HTTPException(status_code=404, detail="Workflow not found")
data = row_to_dict(row)
workflow = json.loads(data["workflow_json"])
inputs = parse_dynamic_inputs(workflow)
judgment = classify_usage(workflow)
usage = data["usage"]
usage_source = data["usage_source"]
if data["usage_source"] != "user" and judgment["usage"]:
usage = judgment["usage"]
usage_source = "auto"
stored = json.loads(data["input_schema"]) if data["input_schema"] else []
schema = effective_input_schema(stored, workflow)
outputs = parse_dynamic_outputs(workflow)
if data["output_map_source"] == "user":
output_map, output_map_source = data["output_map"], "user"
elif needs_user_output_map(workflow):
# Unknown output candidates: no auto map, and the row must not
# generate until the user designates the output nodes.
output_map, output_map_source = None, None
else:
output_map, output_map_source = json.dumps(auto_output_map(workflow)), "auto"
is_enabled = data["is_enabled"]
if output_map_source is None or usage is None:
is_enabled = 0
conn.execute(
"UPDATE workflows SET input_schema = ?, output_schema = ? WHERE id = ?",
(json.dumps(inputs), json.dumps(outputs), workflow_id),
"UPDATE workflows SET input_schema = ?, output_schema = ?,"
" usage = ?, usage_source = ?, output_map = ?, output_map_source = ?,"
" is_enabled = ? WHERE id = ?",
(
json.dumps(schema),
json.dumps(outputs),
usage,
usage_source,
output_map,
output_map_source,
is_enabled,
workflow_id,
),
)
conn.commit()
fresh = conn.execute(
@@ -68,16 +198,64 @@ async def reanalyze_workflow(workflow_id: int) -> dict[str, Any]:
conn.close()
def _last_test_summary(job: dict[str, Any]) -> dict[str, Any]:
"""Slim "上次测试" record for a workflow row (queried live, never stored)."""
try:
outputs = json.loads(job.get("output_paths_json") or "[]")
except (json.JSONDecodeError, TypeError):
outputs = []
return {
"id": job["id"],
"status": job.get("status"),
"phase": job.get("phase"),
"error": job.get("error"),
"created_at": job.get("created_at"),
"completed_at": job.get("completed_at"),
"output_count": len(outputs) if isinstance(outputs, list) else 0,
}
@router.get("")
async def list_workflows() -> list[dict[str, Any]]:
conn = get_db(settings.db_path)
try:
rows = conn.execute("SELECT * FROM workflows ORDER BY id DESC").fetchall()
return [_serialize_workflow(r) for r in rows]
out = [_serialize_workflow(r) for r in rows]
# 上次测试 state is read live from the newest test job per workflow —
# no cached column that could go stale (HEL-643).
latest: dict[int, dict[str, Any]] = {}
for jr in conn.execute(
"SELECT * FROM jobs WHERE origin = 'workflow_test' AND id IN"
" (SELECT MAX(id) FROM jobs WHERE origin = 'workflow_test' GROUP BY workflow_id)"
).fetchall():
latest[int(jr["workflow_id"])] = _last_test_summary(dict(jr))
for data in out:
data["last_test"] = latest.get(int(data["id"]))
return out
finally:
conn.close()
@router.post("/{workflow_id}/check")
async def check_workflow(workflow_id: int, payload: WorkflowCheckRequest) -> dict[str, Any]:
"""L2 re-check of a saved workflow against its (or a chosen) connection.
The user installs missing nodes/models in ComfyUI, comes back here and
re-checks — no re-import needed.
"""
conn = get_db(settings.db_path)
try:
row = conn.execute(
"SELECT workflow_json, endpoint_id FROM workflows WHERE id = ?", (workflow_id,)
).fetchone()
finally:
conn.close()
if not row:
raise HTTPException(status_code=404, detail="Workflow not found")
endpoint_id = payload.endpoint_id or row["endpoint_id"]
return await _connection_check(endpoint_id, json.loads(row["workflow_json"]), payload.refresh)
@router.post("/dedupe")
async def dedupe_workflows() -> dict[str, Any]:
"""Delete byte-identical duplicate workflows, keeping the lowest id.
@@ -115,38 +293,77 @@ async def dedupe_workflows() -> dict[str, Any]:
@router.post("")
async def create_workflow(payload: WorkflowCreate) -> dict[str, Any]:
inputs = parse_dynamic_inputs(payload.workflow_json)
outputs = parse_dynamic_outputs(payload.workflow_json)
judgment = classify_usage(payload.workflow_json)
usage = payload.usage or judgment["usage"]
usage_source = "user" if payload.usage else "auto"
kind = payload.kind or usage_to_kind(usage)
if kind is None:
# Indeterminate and nothing chosen: classify_output hint keeps old
# callers working while the workflow stays pending confirmation.
out_kinds = {
o.get("kind")
for o in parse_dynamic_outputs(payload.workflow_json)
if o.get("kind") in ("image", "video")
}
kind = "video" if out_kinds == {"video"} else "image"
profile = payload.prompt_profile or detect_prompt_profile(payload.workflow_json)
# HEL-638: an explicit user output map wins; otherwise the trusted auto
# map. Either way a graph with unknown output candidates is unusable
# until the user designates the output nodes.
if payload.output_map:
problems = validate_output_map(payload.workflow_json, payload.output_map)
if problems:
raise HTTPException(status_code=422, detail=";".join(problems))
output_map = json.dumps(payload.output_map)
output_map_source = payload.output_map_source or "user"
else:
auto_map = auto_output_map(payload.workflow_json)
output_map = json.dumps(auto_map) if auto_map else None
output_map_source = "auto" if auto_map else None
mapping_ok = not needs_user_output_map(payload.workflow_json) or bool(payload.output_map)
conn = get_db(settings.db_path)
try:
# Byte-identical re-imports are the main way the library fills up with
# same-named clones (the "@" typeahead then shows 20 identical rows).
existing = conn.execute(
"SELECT id, name FROM workflows WHERE name = ? AND kind = ? AND workflow_json = ?",
(payload.name, payload.kind, json.dumps(payload.workflow_json)),
(payload.name, kind, json.dumps(payload.workflow_json)),
).fetchone()
if existing:
raise HTTPException(
status_code=409,
detail=f"An identical workflow already exists (id {existing['id']}, “{existing['name']}”).",
detail=(
f"An identical workflow already exists (id {existing['id']},"
f" “{existing['name']}”)."
),
)
# Unconfirmed workflows (ambiguous usage / unknown outputs without a
# user mapping) are stored but disabled: they must not reach the
# generate pages until the user confirms usage AND, for unknown
# output nodes, designates the outputs on the connections page.
is_enabled = 1 if (usage and mapping_ok) else 0
cur = conn.execute(
"""
INSERT INTO workflows (name, kind, workflow_json, input_schema,
output_schema, description, prompt_profile,
endpoint_id, is_enabled)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)
endpoint_id, is_enabled, usage, usage_source,
output_map, output_map_source)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
""",
(
payload.name,
payload.kind,
kind,
json.dumps(payload.workflow_json),
json.dumps(inputs),
json.dumps(outputs),
_stored_schema(payload.input_schema, payload.workflow_json),
json.dumps(parse_dynamic_outputs(payload.workflow_json)),
payload.description,
profile,
payload.endpoint_id,
is_enabled,
usage,
usage_source,
output_map,
output_map_source,
),
)
conn.commit()
@@ -178,9 +395,54 @@ async def update_workflow(workflow_id: int, payload: WorkflowUpdate) -> dict[str
data = payload.model_dump(exclude_unset=True)
if "is_enabled" in data and data["is_enabled"] is not None:
data["is_enabled"] = 1 if data["is_enabled"] else 0
# endpoint_id: explicit null clears the binding; other Nones are skips.
explicit_null = {"endpoint_id"} & {k for k, v in data.items() if v is None}
workflow_json = json.loads(existing["workflow_json"])
# HEL-638: output_map payload. A non-empty list validates against the
# stored JSON and becomes the user decision; an explicit empty list
# resets the row to pending (disabled).
if "output_map" in data:
if data["output_map"]:
problems = validate_output_map(workflow_json, data["output_map"])
if problems:
raise HTTPException(status_code=422, detail=";".join(problems))
data["output_map"] = json.dumps(data["output_map"])
data.setdefault("output_map_source", "user")
else:
data["output_map"] = None
data["output_map_source"] = None
data["is_enabled"] = 0
if data.get("usage"):
# Confirming / correcting the usage is an explicit user decision:
# kind (output media) follows the usage. Whether it re-enables is
# decided by the gate below — with unknown output nodes the user
# must also designate the output nodes (HEL-638).
data.setdefault("usage_source", "user")
data["kind"] = usage_to_kind(data["usage"]) or existing["kind"]
if "input_schema" in data and data["input_schema"] is not None:
if not all(isinstance(e, dict) for e in data["input_schema"]):
raise HTTPException(status_code=422, detail="input_schema 必须是参数对象数组")
data["input_schema"] = json.dumps(data["input_schema"])
# endpoint_id: explicit null clears the binding; other Nones are skips
# (an output_map reset keeps its explicit NULLs).
explicit_null = {"endpoint_id", "output_map", "output_map_source"} & {
k for k, v in data.items() if v is None
}
data = {k: v for k, v in data.items() if v is not None or k in explicit_null}
# Enable gate: usage must be settled and, when the graph carries
# unknown custom output nodes, a user output mapping must exist.
usage_ok = bool(data.get("usage") or existing["usage"])
map_raw = data.get("output_map", existing["output_map"])
map_source = data.get("output_map_source", existing["output_map_source"])
map_problem = mapping_problem(workflow_json, map_raw, map_source)
if data.get("is_enabled"):
if not usage_ok:
raise HTTPException(status_code=400, detail="请先选择工作流用途,再启用该工作流")
if map_problem:
raise HTTPException(status_code=400, detail=map_problem)
elif (data.get("usage") or data.get("output_map")) and "is_enabled" not in data:
# A usage-confirm or output-map-confirm path: enabled only when
# both decisions are settled.
data["is_enabled"] = 1 if (usage_ok and not map_problem) else 0
if data:
fields = ", ".join(f"{k} = :{k}" for k in data)
data["id"] = workflow_id
@@ -192,14 +454,149 @@ async def update_workflow(workflow_id: int, payload: WorkflowUpdate) -> dict[str
conn.close()
def _job_public(job: dict[str, Any]) -> dict[str, Any]:
out = dict(job)
out["payload"] = json.loads(job.get("payload_json") or "{}")
out["output_paths"] = json.loads(job.get("output_paths_json") or "[]")
out.pop("payload_json", None)
out.pop("output_paths_json", None)
return out
@router.post("/{workflow_id}/test")
async def test_workflow(workflow_id: int, payload: WorkflowTestRequest) -> dict[str, Any]:
"""Launch (or re-attach to) one REAL test run of a workflow (HEL-643 L3).
The job goes through the ordinary queue → ComfyUI → outputs pipeline;
only its artifacts and bookkeeping are isolated (origin='workflow_test').
A dry-run setting is refused outright — placeholder output must never
count as a test pass. Repeat clicks reuse the in-flight job.
"""
from calliope import config
if config.settings.dry_run:
raise HTTPException(
status_code=400,
detail=(
"测试工作流必须真实运行:当前设置开启了 Dry-run(占位模式),"
"请到「设置」关闭 Dry-run 后再测试"
),
)
conn = get_db(settings.db_path)
try:
wf = conn.execute(
"SELECT id, kind, workflow_json, input_schema, output_map, output_map_source,"
" endpoint_id FROM workflows WHERE id = ?",
(workflow_id,),
).fetchone()
if not wf:
raise HTTPException(status_code=404, detail="Workflow not found")
workflow_json = json.loads(wf["workflow_json"])
broken = blocking_problem(workflow_json)
if broken:
raise HTTPException(status_code=400, detail=broken)
map_problem = mapping_problem(workflow_json, wf["output_map"], wf["output_map_source"])
if map_problem:
raise HTTPException(status_code=400, detail=map_problem)
schema = effective_input_schema(
json.loads(wf["input_schema"]) if wf["input_schema"] else [], workflow_json
)
input_values, problems = validate_input_values(schema, payload.input_values)
if problems:
raise HTTPException(status_code=400, detail="参数有误:" + ";".join(problems))
endpoint_id = payload.endpoint_id or wf["endpoint_id"] or None
snapshot = endpoint_snapshot(endpoint_id)
active = find_active_test_job(workflow_id, (snapshot or {}).get("id"))
if active is not None:
return {"ok": True, "job": _job_public(active), "reused": True}
from calliope.routers.playground import ensure_playground_project
pid = ensure_playground_project(conn)
finally:
conn.close()
job = queue_manager.enqueue(
project_id=pid,
kind=wf["kind"],
workflow_id=workflow_id,
scene_id=None,
payload={
"input_values": input_values,
"source": TEST_SOURCE,
**({"endpoint_id": payload.endpoint_id} if payload.endpoint_id else {}),
},
origin="workflow_test",
)
await event_bus.publish(
"job.created",
{"job_id": job["id"], "kind": job["kind"], "source": TEST_SOURCE,
"project_id": job["project_id"], "workflow_test": True},
)
return {"ok": True, "job": _job_public(job), "reused": False}
@router.get("/{workflow_id}/tests")
async def list_workflow_tests(workflow_id: int) -> list[dict[str, Any]]:
conn = get_db(settings.db_path)
try:
row = conn.execute("SELECT id FROM workflows WHERE id = ?", (workflow_id,)).fetchone()
finally:
conn.close()
if not row:
raise HTTPException(status_code=404, detail="Workflow not found")
return list_test_jobs(workflow_id)
@router.post("/{workflow_id}/clear-tests")
async def clear_workflow_tests(workflow_id: int) -> dict[str, Any]:
"""Delete every test record and artifact for this workflow."""
conn = get_db(settings.db_path)
try:
row = conn.execute("SELECT id FROM workflows WHERE id = ?", (workflow_id,)).fetchone()
finally:
conn.close()
if not row:
raise HTTPException(status_code=404, detail="Workflow not found")
try:
removed = purge_workflow_tests(workflow_id)
except RuntimeError as exc:
raise HTTPException(status_code=409, detail=str(exc)) from exc
await event_bus.publish("job.deleted", {"workflow_id": workflow_id, "source": TEST_SOURCE})
return {"ok": True, "removed": removed}
@router.delete("/{workflow_id}")
async def delete_workflow(workflow_id: int) -> dict[str, bool]:
conn = get_db(settings.db_path)
try:
cur = conn.execute("DELETE FROM workflows WHERE id = ?", (workflow_id,))
conn.commit()
if cur.rowcount == 0:
# HEL-619: refuse to delete while queued/running jobs still use the
# workflow — deleting sets their workflow_id NULL and the job dies
# with "工作流已被删除" only after the user waits for it.
row = conn.execute(
"SELECT id FROM workflows WHERE id = ?", (workflow_id,)
).fetchone()
if not row:
raise HTTPException(status_code=404, detail="Workflow not found")
pending = conn.execute(
"SELECT COUNT(*) AS n FROM jobs"
" WHERE workflow_id = ? AND status IN ('pending', 'running')",
(workflow_id,),
).fetchone()["n"]
if pending:
raise HTTPException(
status_code=409,
detail=(
f"该工作流还有 {pending} 个排队或执行中的任务,"
"请先等任务完成或取消任务,再删除该工作流"
),
)
# Test records/artifacts belong to the workflow — cascade (HEL-643).
# The 409 above guarantees none are in flight here.
purge_workflow_tests(workflow_id, allow_active=True)
conn.execute("DELETE FROM workflows WHERE id = ?", (workflow_id,))
conn.commit()
return {"ok": True}
finally:
conn.close()
+4
View File
@@ -10,6 +10,10 @@ from fastapi.testclient import TestClient
from calliope.db import migrate_db
from calliope.main import create_app
# Shared fake-ComfyUI HTTP server (defined in test_studio_generation,
# reused by the generation / status / unknown-output-mapping suites).
from tests.test_studio_generation import fake_comfy # noqa: F401,E402
@pytest.fixture
def client(monkeypatch):
@@ -0,0 +1,322 @@
{
"1": {
"inputs": {
"value": "PASTE YOUR PROMPT HERE. For image-to-video describe the motion from the first frame; the frame fixes the look. Use the MiniMax-H3 prompt contract (integrated_multimodal_description / overall_soundscape / non_diegetic_music)."
},
"class_type": "PrimitiveStringMultiline",
"_meta": {
"title": "PROMPT (feeds every stage)"
}
},
"92": {
"inputs": {
"filename_prefix": "video/04_i2v_fl2v_4step_sla",
"format": "auto",
"format.codec": "auto",
"codec": "auto",
"video": [
"130",
0
]
},
"class_type": "SaveVideo",
"_meta": {
"title": "REFERENCE 2026-08-29: fused ref-delta bake + SLA 0.9/64, res_multistep/simple/4, shift 12/3, 1152x640, 243 f, seed 42 -> subway_bake_sla_00001_.mp4"
}
},
"115": {
"inputs": {
"aspect_ratio": "16:9 (Widescreen)",
"megapixels": 0.7,
"multiple": 32
},
"class_type": "ResolutionSelector",
"_meta": {
"title": "ResolutionSelector"
}
},
"116": {
"inputs": {
"expression": "a"
},
"class_type": "ComfyMathExpression",
"_meta": {
"title": "ComfyMathExpression"
}
},
"119": {
"inputs": {
"vae_name": "minimax_h3_video_vae_int8_convrot.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "VAELoader"
}
},
"120": {
"inputs": {
"vae_name": "minimax_h3_audio_vae_fp32.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "VAELoader"
}
},
"121": {
"inputs": {
"samples": [
"125",
0
],
"vae": [
"120",
0
]
},
"class_type": "VAEDecodeAudio",
"_meta": {
"title": "VAEDecodeAudio"
}
},
"122": {
"inputs": {
"samples": [
"125",
0
],
"vae": [
"119",
0
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAEDecode"
}
},
"124": {
"inputs": {
"scheduler": "simple",
"steps": 4,
"denoise": 1,
"model": [
"142",
0
]
},
"class_type": "BasicScheduler",
"_meta": {
"title": "BasicScheduler"
}
},
"125": {
"inputs": {
"noise": [
"129",
0
],
"guider": [
"126",
0
],
"sampler": [
"135",
0
],
"sigmas": [
"124",
0
],
"latent_image": [
"131",
1
]
},
"class_type": "SamplerCustomAdvanced",
"_meta": {
"title": "SamplerCustomAdvanced"
}
},
"126": {
"inputs": {
"model": [
"142",
0
],
"conditioning": [
"131",
0
]
},
"class_type": "BasicGuider",
"_meta": {
"title": "BasicGuider"
}
},
"127": {
"inputs": {
"unet_name": "minimax_h3_fused_refdelta_r1024_turbo8_mystic07_int8_convrot.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": {
"title": "UNETLoader"
}
},
"128": {
"inputs": {
"clip_name": "qwen3vl_32b_heretic_minimax_h3_nvfp4.safetensors",
"type": "minimax",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": {
"title": "CLIPLoader"
}
},
"129": {
"inputs": {
"noise_seed": 42
},
"class_type": "RandomNoise",
"_meta": {
"title": "RandomNoise"
}
},
"130": {
"inputs": {
"fps": 24,
"bit_depth": 8,
"color_space": "sRGB",
"codec": "none",
"images": [
"122",
0
],
"audio": [
"121",
0
]
},
"class_type": "CreateVideo",
"_meta": {
"title": "CreateVideo"
}
},
"131": {
"inputs": {
"prompt": [
"1",
0
],
"width": [
"115",
0
],
"height": [
"115",
1
],
"length": [
"132",
1
],
"clip": [
"128",
0
],
"vae": [
"119",
0
],
"first_frame": [
"901",
0
]
},
"class_type": "MiniMaxH3ImageToVideo",
"_meta": {
"title": "MiniMaxH3ImageToVideo"
}
},
"132": {
"inputs": {
"expression": "max(5, round(a * 24)) + (5 - (max(5, round(a * 24)) % 17)) % 17",
"values.a": [
"133",
0
]
},
"class_type": "ComfyMathExpression",
"_meta": {
"title": "ComfyMathExpression"
}
},
"133": {
"inputs": {
"value": 10
},
"class_type": "PrimitiveFloat",
"_meta": {
"title": "PrimitiveFloat"
}
},
"135": {
"inputs": {
"sampler_name": "res_multistep"
},
"class_type": "KSamplerSelect",
"_meta": {
"title": "KSamplerSelect"
}
},
"142": {
"inputs": {
"shift_video": 12,
"shift_audio": 3,
"model": [
"900",
0
]
},
"class_type": "MiniMaxH3SigmaShift",
"_meta": {
"title": "MiniMaxH3SigmaShift"
}
},
"900": {
"inputs": {
"sparsity_ratio": 0.9,
"block_size": "64",
"min_seq_len": 8192,
"dense_last_steps": 0,
"protect_audio": true,
"enabled": true,
"dense_steps": "1",
"dense_backend": "comfy_kitchen",
"disable_fp16_accum": true,
"stabilize_motion": false,
"reference_protection": "Off",
"tail_correction": false,
"use_int8_qk": true,
"engine": "comfy_kitchen",
"model": [
"127",
0
]
},
"class_type": "H3SLAAttention",
"_meta": {
"title": "H3 SLA Attention 0.9/64 (their graph)"
}
},
"901": {
"inputs": {
"image": "first_frame.png"
},
"class_type": "LoadImage",
"_meta": {
"title": "FIRST FRAME (add a second LoadImage into last_frame for FL2V)"
}
}
}
@@ -0,0 +1,327 @@
{
"1": {
"inputs": {
"value": "PASTE YOUR PROMPT HERE, in the reference contract:\nsubject_definitions:\n<Subject 1> is the person in <Picture 1>; their face, hair and clothing follow <Picture 1>.\n\nsummary:\n[reference generation] one continuous shot of <Subject 1> doing X, appearance taken from <Picture 1>.\n\nretention_analysis:\n<Subject 1> is fully preserved from <Picture 1>.\n\ndetailed_description:\n[Shot 1] ... camera, action, timing ...\n\noverall_soundscape: ...\n\nnon_diegetic_music: N/A"
},
"class_type": "PrimitiveStringMultiline",
"_meta": {
"title": "PROMPT (feeds every stage)"
}
},
"92": {
"inputs": {
"filename_prefix": "video/05_ref2va_4step_sla",
"format": "auto",
"format.codec": "auto",
"codec": "auto",
"video": [
"130",
0
]
},
"class_type": "SaveVideo",
"_meta": {
"title": "REFERENCE 2026-08-29: fused ref-delta bake + SLA 0.9/64, res_multistep/simple/4, shift 12/3, 1152x640, 243 f, seed 42 -> subway_bake_sla_00001_.mp4"
}
},
"115": {
"inputs": {
"aspect_ratio": "16:9 (Widescreen)",
"megapixels": 0.7,
"multiple": 32
},
"class_type": "ResolutionSelector",
"_meta": {
"title": "ResolutionSelector"
}
},
"116": {
"inputs": {
"expression": "a"
},
"class_type": "ComfyMathExpression",
"_meta": {
"title": "ComfyMathExpression"
}
},
"119": {
"inputs": {
"vae_name": "minimax_h3_video_vae_int8_convrot.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "VAELoader"
}
},
"120": {
"inputs": {
"vae_name": "minimax_h3_audio_vae_fp32.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "VAELoader"
}
},
"121": {
"inputs": {
"samples": [
"125",
0
],
"vae": [
"120",
0
]
},
"class_type": "VAEDecodeAudio",
"_meta": {
"title": "VAEDecodeAudio"
}
},
"122": {
"inputs": {
"samples": [
"125",
0
],
"vae": [
"119",
0
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAEDecode"
}
},
"124": {
"inputs": {
"scheduler": "simple",
"steps": 4,
"denoise": 1,
"model": [
"142",
0
]
},
"class_type": "BasicScheduler",
"_meta": {
"title": "BasicScheduler"
}
},
"125": {
"inputs": {
"noise": [
"129",
0
],
"guider": [
"126",
0
],
"sampler": [
"135",
0
],
"sigmas": [
"124",
0
],
"latent_image": [
"131",
1
]
},
"class_type": "SamplerCustomAdvanced",
"_meta": {
"title": "SamplerCustomAdvanced"
}
},
"126": {
"inputs": {
"model": [
"142",
0
],
"conditioning": [
"131",
0
]
},
"class_type": "BasicGuider",
"_meta": {
"title": "BasicGuider"
}
},
"127": {
"inputs": {
"unet_name": "minimax_h3_fused_refdelta_r1024_turbo8_mystic07_int8_convrot.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": {
"title": "UNETLoader"
}
},
"128": {
"inputs": {
"clip_name": "qwen3vl_32b_heretic_minimax_h3_nvfp4.safetensors",
"type": "minimax",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": {
"title": "CLIPLoader"
}
},
"129": {
"inputs": {
"noise_seed": 42
},
"class_type": "RandomNoise",
"_meta": {
"title": "RandomNoise"
}
},
"130": {
"inputs": {
"fps": 24,
"bit_depth": 8,
"color_space": "sRGB",
"codec": "none",
"images": [
"122",
0
],
"audio": [
"121",
0
]
},
"class_type": "CreateVideo",
"_meta": {
"title": "CreateVideo"
}
},
"131": {
"inputs": {
"prompt": [
"1",
0
],
"width": [
"115",
0
],
"height": [
"115",
1
],
"length": [
"132",
1
],
"ref_image_size": "match",
"clip": [
"128",
0
],
"vae": [
"119",
0
],
"audio_vae": [
"120",
0
],
"ref_images.ref_image_0": [
"901",
0
]
},
"class_type": "MiniMaxH3ReferenceToVideo",
"_meta": {
"title": "MiniMaxH3ReferenceToVideo"
}
},
"132": {
"inputs": {
"expression": "max(5, round(a * 24)) + (5 - (max(5, round(a * 24)) % 17)) % 17",
"values.a": [
"133",
0
]
},
"class_type": "ComfyMathExpression",
"_meta": {
"title": "ComfyMathExpression"
}
},
"133": {
"inputs": {
"value": 10
},
"class_type": "PrimitiveFloat",
"_meta": {
"title": "PrimitiveFloat"
}
},
"135": {
"inputs": {
"sampler_name": "res_multistep"
},
"class_type": "KSamplerSelect",
"_meta": {
"title": "KSamplerSelect"
}
},
"142": {
"inputs": {
"shift_video": 12,
"shift_audio": 3,
"model": [
"900",
0
]
},
"class_type": "MiniMaxH3SigmaShift",
"_meta": {
"title": "MiniMaxH3SigmaShift"
}
},
"900": {
"inputs": {
"sparsity_ratio": 0.9,
"block_size": "64",
"min_seq_len": 8192,
"dense_last_steps": 0,
"protect_audio": true,
"enabled": true,
"dense_steps": "1",
"dense_backend": "comfy_kitchen",
"disable_fp16_accum": true,
"stabilize_motion": false,
"reference_protection": "Off",
"tail_correction": false,
"use_int8_qk": true,
"engine": "comfy_kitchen",
"model": [
"127",
0
]
},
"class_type": "H3SLAAttention",
"_meta": {
"title": "H3 SLA Attention 0.9/64 (their graph)"
}
},
"901": {
"inputs": {
"image": "reference_1.png"
},
"class_type": "LoadImage",
"_meta": {
"title": "REFERENCE IMAGE 1 (<Picture 1>); the node grows more image / video / audio slots"
}
}
}
@@ -0,0 +1,136 @@
{
"1": {
"inputs": {
"UNKNOWN": "qwen-image-2.1-Q4_K_M.gguf"
},
"_meta": {
"title": "Unet Loader (GGUF)"
}
},
"2": {
"inputs": {
"clip_name": "qwen3vl_8b_int8_convrot.safetensors",
"type": "qwen_image",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": {
"title": "加载CLIP"
}
},
"3": {
"inputs": {
"vae_name": "qwen_image_2.1_vae_bf16.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "加载VAE"
}
},
"4": {
"inputs": {
"prompt": "参考角色五官,重新生成图片:高细节皮肤质感",
"negative_prompt": "模糊,低质量,文字乱码,变形",
"resolution": 1024,
"clip": [
"2",
0
],
"images.image_1": [
"10",
0
],
"vae": [
"3",
0
]
},
"class_type": "TextEncodeQwenImage21",
"_meta": {
"title": "Text Encode Qwen Image 2.1"
}
},
"5": {
"inputs": {
"width": 1024,
"height": 1024,
"batch_size": 1
},
"class_type": "EmptyLatentImage",
"_meta": {
"title": "空Latent图像"
}
},
"6": {
"inputs": {
"seed": 278835418249884,
"steps": 25,
"cfg": 1,
"sampler_name": "euler",
"scheduler": "simple",
"denoise": 1,
"positive": [
"4",
0
],
"negative": [
"4",
1
],
"latent_image": [
"4",
2
]
},
"class_type": "KSampler",
"_meta": {
"title": "K采样器"
}
},
"7": {
"inputs": {
"samples": [
"6",
0
],
"vae": [
"3",
0
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAE解码"
}
},
"8": {
"inputs": {
"filename_prefix": "qwen_image",
"images": [
"7",
0
]
},
"class_type": "SaveImage",
"_meta": {
"title": "保存图像"
}
},
"9": {
"inputs": {
"UNKNOWN": "auto"
},
"_meta": {
"title": "Patch Sage Attention KJ"
}
},
"10": {
"inputs": {
"image": "3f24a075cd7b4118829be1b222ca1ab9.png"
},
"class_type": "LoadImage",
"_meta": {
"title": "加载图像"
}
}
}
@@ -374,6 +374,61 @@ def test_comfy_test_requires_url(client):
assert r.status_code == 400
def test_schemeless_url_is_format_error_everywhere(client):
"""HEL-619: a schemeless/garbled address is a 400 format error on every
entry point (probe + save), not a silent http:// prefix that later
surfaces as a DNS-classified probe failure."""
prev = _snapshot_settings()
try:
for url in ("192.168.0.1:8188", "http:192.168.0.1", "ht!tp://x", "http://a b.test/"):
r = client.post(
"/api/comfyui/endpoints/test", json={"base_url": url, "timeout_sec": 2}
)
assert r.status_code == 400, url
assert "http://" in r.json()["detail"] or "https://" in r.json()["detail"]
r = client.post(
"/api/comfyui/endpoints", json={"name": "无协议", "base_url": url}
)
assert r.status_code == 400, url
assert "无协议" not in [ep.get("name") for ep in settings.comfyui_endpoints or []]
finally:
for key, value in prev.items():
setattr(settings, key, value)
def test_save_endpoint_runs_ssrf_guard(client):
"""HEL-619: the SSRF guard applies on save (create + edit), not only on
the connectivity probe; loopback stays allowed."""
prev = _snapshot_settings()
try:
_clear_endpoints()
r = client.post(
"/api/comfyui/endpoints",
json={"name": "元数据", "base_url": "http://169.254.169.254/latest"},
)
assert r.status_code == 400
assert "禁止" in r.json()["detail"]
r = client.post(
"/api/comfyui/endpoints",
json={"name": "本机", "base_url": "http://127.0.0.1:8188"},
)
assert r.status_code == 200
eid = r.json()["endpoints"][-1]["id"]
r = client.patch(
f"/api/comfyui/endpoints/{eid}",
json={"base_url": "http://169.254.169.254/latest"},
)
assert r.status_code == 400
# the stored endpoint is untouched
stored = next(ep for ep in settings.comfyui_endpoints if ep["id"] == eid)
assert stored["base_url"] == "http://127.0.0.1:8188"
finally:
for key, value in prev.items():
setattr(settings, key, value)
# ----------------------------------------------------------------------
# workflow binding + job snapshots
# ----------------------------------------------------------------------
@@ -381,10 +436,21 @@ def test_comfy_test_requires_url(client):
def _import_workflow(client, name="H3 视频", kind="video", endpoint_id=None):
wf_json = {
"4": {
"class_type": "CheckpointLoaderSimple",
"inputs": {"ckpt_name": "model.safetensors"},
},
"6": {
"class_type": "CLIPTextEncode",
"inputs": {"text": "placeholder prompt", "clip": ["4", 1]},
},
# HEL-636: a workflow needs a recognizable output node to classify a
# usage and stay enabled; without it generation is refused.
"9": {
"class_type": "VHS_VideoCombine",
"inputs": {"images": ["6", 0]},
"_meta": {"title": "Video Output (Output:video)"},
},
}
payload = {"name": name, "kind": kind, "workflow_json": wf_json}
if endpoint_id is not None:
@@ -531,6 +597,41 @@ def test_queue_enqueue_stamps_all_paths(client):
setattr(settings, key, value)
def test_workflow_delete_blocked_while_jobs_pending(client):
"""HEL-619: deleting a workflow with pending/running jobs is refused
with 409 instead of silently nulling the jobs' workflow_id."""
from calliope.db import get_db
from calliope.queue.manager import queue_manager
wf = _import_workflow(client).json()
project = client.post(
"/api/projects", json={"title": "删除保护测试", "idea": "x"}
).json()
# Pause the lifespan-started worker so the pending job STAYS pending.
queue_manager.paused = True
try:
queue_manager.enqueue(
project_id=project["id"], kind="video", workflow_id=wf["id"], payload={}
)
r = client.delete(f"/api/workflows/{wf['id']}")
assert r.status_code == 409
assert "排队" in r.json()["detail"]
finally:
queue_manager.paused = False
# job finished → deletion allowed again
conn = get_db(settings.db_path)
try:
conn.execute("UPDATE jobs SET status = 'done' WHERE project_id = ?", (project["id"],))
conn.commit()
finally:
conn.close()
r = client.delete(f"/api/workflows/{wf['id']}")
assert r.status_code == 200
assert r.json() == {"ok": True}
def test_settings_public_dict_masks_endpoint_tokens(client):
prev = _snapshot_settings()
try:
@@ -0,0 +1,477 @@
"""HEL-633: the three image-input workflows the user supplied — Qwen Image 2.1
图片编辑, MiniMax H3 首帧图生视频 (04) and H3 参考图生视频 (05, 1–9 refs).
Slots come from real wiring, every picked image is uploaded to ComfyUI and
lands in the node input it belongs to (in order, nothing stale), and a
broken export is refused before anything is queued."""
from __future__ import annotations
import json
import re
import threading
from http.server import ThreadingHTTPServer
from pathlib import Path
import pytest
from calliope.comfyui.lint import blocking_problem, workflow_warnings
from calliope.comfyui.parser import detect_untagged_inputs, parse_dynamic_inputs
from calliope.comfyui.patcher import patch_workflow
from calliope.comfyui.smart_fill import smart_fill_inputs
from calliope.comfyui.validate import validate_input_values
from calliope.config import settings
from tests.test_studio_generation import (
PNG_1PX,
_FakeComfyHandler,
_import_workflow,
_real_run,
_wait_done,
)
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
I2V = "h3_i2v_04_API.json" # 04_i2v_fl2v_4step_sla (1).json
REF = "h3_ref2va_05_API.json" # 05_ref2va_4step_sla (1).json
QWEN_EDIT = "qwen21_edit_sage_API.json" # qwen-image-2.1-图片编辑-sage加速.json
EXAMPLES = Path(__file__).resolve().parents[2] / "example_ComfyUI_workflows"
REF_KEY = "131@ref_images"
def _load(name: str) -> dict:
return json.loads((FIXTURES / name).read_text(encoding="utf-8"))
def _by_node(inputs: list[dict]) -> dict[str, dict]:
return {i["nodeId"]: i for i in inputs}
def _ref_links(wf: dict, node_id: str = "131") -> list[tuple[str, str]]:
"""[(input name, LoadImage image value), …] in slot order."""
inputs = wf[node_id]["inputs"]
names = sorted(
(k for k in inputs if k.startswith("ref_images.ref_image_")),
key=lambda k: int(k.rsplit("_", 1)[1]),
)
return [(k, wf[inputs[k][0]]["inputs"]["image"]) for k in names]
# ---------------------------------------------------------------------------
# Slot detection
# ---------------------------------------------------------------------------
def test_i2v_exposes_one_required_first_frame_and_no_last_frame():
inputs = parse_dynamic_inputs(_load(I2V))
media = [i for i in inputs if i["kind"] in ("image", "image_list", "video", "audio")]
assert media == [
{
"nodeId": "901",
"label": "首帧",
"role": "first_frame",
"kind": "image",
"defaultValue": None,
"required": True,
"auto": True,
}
]
# the title comment about FL2V is not a slot
assert not any(i.get("role") == "last_frame" for i in inputs)
def test_ref2v_exposes_one_group_of_one_to_nine_reference_images():
inputs = parse_dynamic_inputs(_load(REF))
media = [i for i in inputs if i["kind"] in ("image", "image_list", "video", "audio")]
assert len(media) == 1
group = media[0]
assert group["nodeId"] == REF_KEY
assert group["kind"] == "image_list"
assert group["role"] == "reference_image"
assert group["label"] == "参考图"
assert (group["min"], group["max"], group["required"]) == (1, 9, True)
# the parameters HEL-627 wired stay exposed
by_node = _by_node(inputs)
for key in ("1", "115@aspect_ratio", "115@megapixels", "124@steps", "124@denoise",
"129@noise_seed", "133"):
assert key in by_node, key
assert not any(i["kind"] == "video" for i in inputs)
def test_example_five_ref_workflow_folds_into_the_same_group():
# The repo example is (Input:…)-tagged and keeps its tagged slots; stripped
# of tags (as a plain ComfyUI export) its five loaders become one group.
wf = json.loads((EXAMPLES / "video_minimax_h3_r2v_5ref_API.json").read_text(encoding="utf-8"))
inputs = detect_untagged_inputs(wf)
groups = [i for i in inputs if i["kind"] == "image_list"]
assert [g["nodeId"] for g in groups] == ["178@ref_images"]
# its five LoadImages are the group, not five separate slots
assert not any(i["kind"] == "image" for i in inputs if i.get("role") != "mask")
def test_qwen_edit_exposes_input_image_real_resolution_and_hides_orphan_latent():
inputs = parse_dynamic_inputs(_load(QWEN_EDIT))
by_node = _by_node(inputs)
img = by_node["10"]
assert (img["kind"], img["role"], img["label"]) == ("image", "image", "输入图")
assert img["required"] is True
res = by_node["4@resolution"]
assert (res["role"], res["defaultValue"], res["min"], res["max"], res["step"]) == (
"resolution", 1024, 0, 4096, 32,
)
assert by_node["4@prompt"]["role"] == "prompt"
assert by_node["4@negative_prompt"]["role"] == "negative"
for key in ("6@seed", "6@steps", "6@cfg", "6@denoise"):
assert key in by_node
# EmptyLatentImage #5 feeds nothing — its width/height would do nothing
assert not any(i["nodeId"].startswith("5@") for i in inputs)
def test_unwired_load_image_gets_no_slot():
wf = _load(I2V)
wf["950"] = {
"class_type": "LoadImage",
"inputs": {"image": "last.png"},
"_meta": {"title": "LAST"},
}
assert "950" not in _by_node(parse_dynamic_inputs(wf))
# ---------------------------------------------------------------------------
# Broken exports
# ---------------------------------------------------------------------------
def test_broken_qwen_export_is_flagged_and_blocked():
warnings = workflow_warnings(_load(QWEN_EDIT))
errors = {(w["code"], w["node_id"]) for w in warnings if w["level"] == "error"}
assert errors == {
("missing_class_type", "1"),
("missing_class_type", "9"),
("missing_model_link", "6"),
}
assert ("orphan_latent", "5") in {(w["code"], w["node_id"]) for w in warnings}
msg = blocking_problem(_load(QWEN_EDIT))
assert msg and "Unet Loader (GGUF)" in msg and "重新导出" in msg
def test_h3_workflows_are_clean():
assert workflow_warnings(_load(I2V)) == []
assert workflow_warnings(_load(REF)) == []
# ---------------------------------------------------------------------------
# Patching 1 / 4 / 9 reference images
# ---------------------------------------------------------------------------
@pytest.mark.parametrize("count", [1, 4, 9])
def test_patch_wires_each_reference_image_in_order(count):
base = _load(REF)
paths = [f"/assets/uploads/ref-{i}.png" for i in range(1, count + 1)]
wf = patch_workflow(base, {REF_KEY: paths})
links = _ref_links(wf)
assert links == [(f"ref_images.ref_image_{i}", p) for i, p in enumerate(paths)]
# every loader is a real, distinct LoadImage feeding node 131
loader_ids = [wf["131"]["inputs"][name][0] for name, _ in links]
assert len(set(loader_ids)) == count
assert all(wf[n]["class_type"] == "LoadImage" for n in loader_ids)
assert loader_ids[0] == "901"
# the base workflow is untouched
assert _ref_links(base) == [("ref_images.ref_image_0", "reference_1.png")]
def test_patch_shrinking_removes_stale_slots_and_loaders():
nine = patch_workflow(_load(REF), {REF_KEY: [f"/u/{i}.png" for i in range(9)]})
two = patch_workflow(nine, {REF_KEY: ["/u/b.png", "/u/a.png"]})
assert _ref_links(two) == [
("ref_images.ref_image_0", "/u/b.png"),
("ref_images.ref_image_1", "/u/a.png"),
]
load_images = [n for n, v in two.items() if v.get("class_type") == "LoadImage"]
assert len(load_images) == 2
assert not any("/u/8.png" in json.dumps(v) for v in two.values())
def test_single_slot_values_patch_first_frame_and_qwen_input():
i2v = patch_workflow(_load(I2V), {"901": "/assets/uploads/first.png"})
assert i2v["901"]["inputs"]["image"] == "/assets/uploads/first.png"
assert i2v["131"]["inputs"]["first_frame"] == ["901", 0]
qwen = patch_workflow(_load(QWEN_EDIT), {"10": "/assets/uploads/in.png", "4@resolution": 1536})
assert qwen["10"]["inputs"]["image"] == "/assets/uploads/in.png"
assert qwen["4"]["inputs"]["resolution"] == 1536
def test_legacy_job_values_keyed_by_load_image_still_patch():
"""Jobs queued before HEL-633 carry the LoadImage id, not the group key."""
wf = patch_workflow(_load(REF), {"901": "/assets/uploads/old.png"})
assert _ref_links(wf) == [("ref_images.ref_image_0", "/assets/uploads/old.png")]
def test_smart_fill_hands_reference_list_to_the_group():
inputs = parse_dynamic_inputs(_load(REF))
refs = [f"/r/{i}.png" for i in range(12)]
values = smart_fill_inputs(inputs, prompt="p", ref_images=refs)
assert values[REF_KEY] == refs[:9]
# ---------------------------------------------------------------------------
# Validation
# ---------------------------------------------------------------------------
@pytest.fixture
def uploads_dir(client):
d = settings.assets_dir / "uploads"
d.mkdir(parents=True, exist_ok=True)
return d
def _pngs(d: Path, n: int) -> list[str]:
out = []
for i in range(n):
p = d / f"ref{i + 1}.png"
p.write_bytes(PNG_1PX)
out.append(str(p))
return out
def test_validate_reference_count_limits(uploads_dir):
schema = parse_dynamic_inputs(_load(REF))
base = {"1": "prompt"}
for n in (1, 4, 9):
clean, errs = validate_input_values(schema, {**base, REF_KEY: _pngs(uploads_dir, n)})
assert errs == [] and len(clean[REF_KEY]) == n
_, errs = validate_input_values(schema, {**base, REF_KEY: _pngs(uploads_dir, 10)})
assert errs == ["参考图最多 9 张(当前 10 张),请删除多余的图片"]
_, errs = validate_input_values(schema, base)
assert errs == ["需要至少 1 张参考图"]
_, errs = validate_input_values(schema, {**base, REF_KEY: []})
assert errs == ["需要至少 1 张参考图"]
def test_validate_rejects_bad_reference_files(uploads_dir):
schema = parse_dynamic_inputs(_load(REF))
gif = uploads_dir / "anim.gif"
gif.write_bytes(b"GIF89a")
ok = _pngs(uploads_dir, 1)[0]
_, errs = validate_input_values(schema, {"1": "p", REF_KEY: [ok, str(gif)]})
assert errs == ["参考图 2:格式不支持,请使用 PNG / JPG / WebP"]
_, errs = validate_input_values(schema, {"1": "p", REF_KEY: ["/etc/passwd.png"]})
assert errs == ["参考图 1:只能使用在本页上传或从生成结果选入的图片"]
_, errs = validate_input_values(schema, {"1": "p", REF_KEY: [str(uploads_dir / "gone.png")]})
assert errs == ["参考图 1:文件已不存在,请重新上传"]
def test_validate_requires_first_frame_and_input_image():
_, errs = validate_input_values(parse_dynamic_inputs(_load(I2V)), {"1": "p"})
assert errs == ["请上传首帧"]
_, errs = validate_input_values(parse_dynamic_inputs(_load(QWEN_EDIT)), {"4@prompt": "p"})
assert errs == ["请上传输入图"]
# ---------------------------------------------------------------------------
# Full chain against a fake ComfyUI
# ---------------------------------------------------------------------------
class _NamedUploadHandler(_FakeComfyHandler):
"""/upload/image answers with the uploaded file's own name, like ComfyUI."""
def do_POST(self): # noqa: N802 — BaseHTTPRequestHandler hook name
if self.path != "/upload/image":
super().do_POST()
return
length = int(self.headers.get("Content-Length") or 0)
body = self.rfile.read(length) if length else b""
self.server.requests.append(self.path)
self.server.uploads.append(body)
m = re.search(rb'filename="([^"]+)"', body)
name = m.group(1).decode() if m else "x.png"
self.server.upload_names.append(name)
self._json(200, {"name": name, "subfolder": "calliope", "type": "input"})
@pytest.fixture
def named_comfy():
server = ThreadingHTTPServer(("127.0.0.1", 0), _NamedUploadHandler)
server.requests = []
server.prompts = []
server.uploads = []
server.upload_names = []
server.history = {}
server.fail_prompt = False
server.out_name = "ref2v_00001_.mp4"
server.outputs_key = "images"
thread = threading.Thread(target=server.serve_forever, daemon=True)
thread.start()
try:
yield server
finally:
server.shutdown()
server.server_close()
def _upload(client, name: str) -> str:
r = client.post("/api/playground/uploads", files={"file": (name, PNG_1PX, "image/png")})
assert r.status_code == 200, r.text
return r.json()["path"]
def _generate(client, wf_id: int, values: dict, source: str = "studio-video"):
return client.post(
"/api/playground/generate",
json={
"workflow_id": wf_id,
"input_values": values,
"source": source,
"endpoint_id": settings.comfyui_active_id,
},
)
@pytest.mark.parametrize("count", [1, 4, 9])
def test_ref2v_chain_uploads_every_image_and_wires_it_in_order(client, named_comfy, count):
with _real_run(client, named_comfy):
wf_id = _import_workflow(client, "H3 参考生视频", "video", _load(REF))
paths = [_upload(client, f"角色{i}.png") for i in range(1, count + 1)]
r = _generate(
client,
wf_id,
{"1": "<Subject 1> 走进雨夜码头", REF_KEY: paths, "124@steps": 4, "133": 2},
)
assert r.status_code == 200, r.text
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "done", job.get("error")
assert job["payload"]["input_values"][REF_KEY] == paths
assert len(named_comfy.prompts) == 1
prompt = named_comfy.prompts[0]["prompt"]
expected = [f"calliope/{Path(p).name}" for p in paths]
assert [img for _k, img in _ref_links(prompt)] == expected
assert named_comfy.upload_names == [Path(p).name for p in paths]
assert prompt["1"]["inputs"]["value"] == "<Subject 1> 走进雨夜码头"
assert prompt["124"]["inputs"]["steps"] == 4
assert prompt["133"]["inputs"]["value"] == 2
# no leftover default reference and no unconsumed LoadImage
assert "reference_1.png" not in json.dumps(prompt)
loaders = {n for n, v in prompt.items() if v["class_type"] == "LoadImage"}
wired = {v[0] for k, v in prompt["131"]["inputs"].items() if k.startswith("ref_images.")}
assert loaders == wired
def test_ref2v_replace_and_delete_leave_no_stale_image(client, named_comfy):
with _real_run(client, named_comfy):
wf_id = _import_workflow(client, "H3 参考生视频", "video", _load(REF))
a, b, c = (_upload(client, n) for n in ("a.png", "b.png", "c.png"))
r = _generate(client, wf_id, {"1": "x", REF_KEY: [a, b, c]})
assert _wait_done(client, r.json()["job"]["id"])["status"] == "done"
# user replaced #2 with d and deleted #3
d = _upload(client, "d.png")
r = _generate(client, wf_id, {"1": "x", REF_KEY: [a, d]})
assert _wait_done(client, r.json()["job"]["id"])["status"] == "done"
second = named_comfy.prompts[1]["prompt"]
assert [img for _k, img in _ref_links(second)] == [
f"calliope/{Path(a).name}",
f"calliope/{Path(d).name}",
]
dumped = json.dumps(second)
assert Path(b).name not in dumped and Path(c).name not in dumped
def test_ref2v_ten_images_rejected_before_queue(client, named_comfy):
with _real_run(client, named_comfy):
wf_id = _import_workflow(client, "H3 参考生视频", "video", _load(REF))
paths = [_upload(client, f"r{i}.png") for i in range(10)]
r = _generate(client, wf_id, {"1": "x", REF_KEY: paths})
assert r.status_code == 400
assert "参考图最多 9 张" in r.json()["detail"]
r = _generate(client, wf_id, {"1": "x"})
assert r.status_code == 400
assert "需要至少 1 张参考图" in r.json()["detail"]
assert named_comfy.prompts == [] and named_comfy.upload_names == []
def test_i2v_chain_uploads_first_frame(client, named_comfy):
with _real_run(client, named_comfy):
wf_id = _import_workflow(client, "H3 图生视频", "video", _load(I2V))
r = _generate(client, wf_id, {"1": "镜头缓慢推近"})
assert r.status_code == 400 and "请上传首帧" in r.json()["detail"]
first = _upload(client, "首帧.png")
r = _generate(client, wf_id, {"1": "镜头缓慢推近", "901": first, "124@denoise": 0.8})
assert r.status_code == 200, r.text
assert _wait_done(client, r.json()["job"]["id"])["status"] == "done"
prompt = named_comfy.prompts[0]["prompt"]
assert prompt["901"]["inputs"]["image"] == f"calliope/{Path(first).name}"
assert prompt["131"]["inputs"]["first_frame"] == ["901", 0]
assert prompt["124"]["inputs"]["denoise"] == 0.8
def test_broken_qwen_import_warns_and_generation_is_refused(client, named_comfy):
with _real_run(client, named_comfy):
analyzed = client.post("/api/workflows/analyze", json={"workflow_json": _load(QWEN_EDIT)})
assert analyzed.status_code == 200
codes = {w["code"] for w in analyzed.json()["warnings"]}
assert {"missing_class_type", "missing_model_link", "orphan_latent"} <= codes
# importing is allowed (the user may fix it later) …
wf_id = _import_workflow(client, "Qwen 图片编辑", "image", _load(QWEN_EDIT))
listed = next(w for w in client.get("/api/workflows").json() if w["id"] == wf_id)
assert any(w["level"] == "error" for w in listed["warnings"])
# … but it never reaches ComfyUI and never shows as done
img = _upload(client, "门面.png")
r = _generate(client, wf_id, {"4@prompt": "换招牌", "10": img}, source="studio-image")
assert r.status_code == 400
assert "重新导出" in r.json()["detail"]
assert client.get("/api/playground/jobs").json() == []
assert named_comfy.prompts == [] and named_comfy.upload_names == []
def test_repaired_qwen_export_runs_with_its_input_image(client, named_comfy):
wf = _load(QWEN_EDIT)
wf["1"] = {
"class_type": "UNETLoader",
"inputs": {
"unet_name": "qwen_image_2.1_int8_convrot.safetensors",
"weight_dtype": "default",
},
}
del wf["9"]
wf["6"]["inputs"]["model"] = ["1", 0]
with _real_run(client, named_comfy):
named_comfy.out_name = "qwen_image_00001_.png"
wf_id = _import_workflow(client, "Qwen 图片编辑(修复版)", "image", wf)
img = _upload(client, "门面.png")
r = _generate(
client, wf_id, {"4@prompt": "换招牌", "10": img, "4@resolution": 1536, "6@steps": 20},
source="studio-image",
)
assert r.status_code == 200, r.text
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "done" and job["output_paths"]
prompt = named_comfy.prompts[0]["prompt"]
assert prompt["10"]["inputs"]["image"] == f"calliope/{Path(img).name}"
assert prompt["4"]["inputs"]["images.image_1"] == ["10", 0]
assert prompt["4"]["inputs"]["resolution"] == 1536
assert prompt["6"]["inputs"]["steps"] == 20
def test_worker_refuses_broken_workflow_from_other_callers(client, named_comfy):
"""Workbench/agent jobs skip the playground check — the worker still stops them."""
from calliope.db import get_db
from calliope.queue.manager import queue_manager
from calliope.routers.playground import ensure_playground_project
with _real_run(client, named_comfy):
wf_id = _import_workflow(client, "Qwen 图片编辑", "image", _load(QWEN_EDIT))
conn = get_db(settings.db_path)
try:
pid = ensure_playground_project(conn)
finally:
conn.close()
job = queue_manager.enqueue(
project_id=pid, kind="image", workflow_id=wf_id, scene_id=None,
payload={"input_values": {"4@prompt": "x"}, "source": "playground"},
)
done = _wait_done(client, job["id"])
assert done["status"] == "failed"
assert "重新导出" in (done["error"] or "")
assert named_comfy.prompts == []
@@ -216,6 +216,18 @@ def test_settings_accepts_agent_llm_assignments(client):
# Unknown role keys are dropped, known roles stored (incl. explicit None)
assert body["agent_llm_assignments"] == {"video": a_id, "story": None}
# HEL-619: updates are per-role incremental — a partial payload must
# not wipe roles it does not mention (rapid-switch race).
r = client.post(
"/api/settings",
json={"agent_llm_assignments": {"main": a_id}},
)
assert r.status_code == 200
body = r.json()
assert body["agent_llm_assignments"]["main"] == a_id
assert body["agent_llm_assignments"]["video"] == a_id
assert body["agent_llm_assignments"]["story"] is None
r = client.post(
"/api/settings",
json={"agent_llm_assignments": {"video": "no-such-profile"}},
+266
View File
@@ -0,0 +1,266 @@
"""媒体组泛化(HEL-643 批次 3):参考视频/参考音频按 JSON 实际连线进入
input_schema 与提交流程;无连线则无入口;05_ref2va 只保留参考图。
视频/音频参考的真实 H3 JSON 暂无可执行样本(.15 无 ComfyUI),本套用
自造 fixture + fake ComfyUI 验证解析/表单/回填/上传全链路(模拟链路)。
"""
from __future__ import annotations
import json
import time
from pathlib import Path
import pytest
from calliope.comfyui.parser import parse_dynamic_inputs
from calliope.comfyui.patcher import patch_workflow
from calliope.comfyui.validate import validate_input_values
from calliope.config import settings
from tests.test_studio_generation import PNG_1PX, _real_run
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
@pytest.fixture
def uploads_dir(client):
d = settings.assets_dir / "uploads"
d.mkdir(parents=True, exist_ok=True)
return d
def _load_05() -> dict:
return json.loads((FIXTURES / "h3_ref2va_05_API.json").read_text(encoding="utf-8"))
def _ref2va_workflow(*, images=1, videos=1, audios=1) -> dict:
"""H3 Ref2VA 形状的自造 JSON:图/视频/音频各一组 Autogrow 连线。"""
wf: dict = {
"1": {
"class_type": "PrimitiveStringMultiline",
"inputs": {"value": "提示词"},
},
"92": {
"class_type": "SaveVideo",
"inputs": {"video": ["131", 0]},
},
"131": {
"class_type": "MiniMaxH3ReferenceToVideo",
"inputs": {"prompt": ["1", 0]},
},
"901": {"class_type": "LoadImage", "inputs": {"image": "ref.png"}},
"902": {"class_type": "LoadVideo", "inputs": {"file": "ref.mp4", "force_rate": 0}},
"903": {"class_type": "LoadAudio", "inputs": {"audio": "ref.wav"}},
}
ins = wf["131"]["inputs"]
for i in range(images):
ins[f"ref_images.ref_image_{i}"] = ["901", 0]
for i in range(videos):
ins[f"ref_videos.ref_video_{i}"] = ["902", 0]
for i in range(audios):
ins[f"ref_audios.ref_audio_{i}"] = ["903", 0]
return wf
def _entry(schema: list[dict], key_suffix: str) -> dict | None:
for e in schema:
if e["nodeId"].endswith("@" + key_suffix):
return e
return None
# ---------------------------------------------------------------------------
# Schema: 入口只由实际连线决定
# ---------------------------------------------------------------------------
def test_ref2va_schema_exposes_three_media_groups():
schema = parse_dynamic_inputs(_ref2va_workflow())
img = _entry(schema, "ref_images")
vid = _entry(schema, "ref_videos")
aud = _entry(schema, "ref_audios")
assert img and img["kind"] == "image_list" and img["role"] == "reference_image"
assert img["max"] == 9 and img["label"] == "参考图"
assert vid and vid["kind"] == "video_list" and vid["role"] == "reference_video"
assert vid["max"] == 3 and vid["label"] == "参考视频"
assert aud and aud["kind"] == "audio_list" and aud["role"] == "reference_audio"
assert aud["max"] == 3 and aud["label"] == "参考音频"
# 官方限额提示按节点类名驱动(通用检测不携带 hint)
assert img["media_hint"] == vid["media_hint"] == aud["media_hint"] == "minimax_h3_ref2va"
# 被组吸收的 loader 不再单独出现
assert not any(e["nodeId"] == "902" for e in schema)
assert not any(e["nodeId"] == "903" for e in schema)
def test_unwired_media_kinds_produce_no_entry():
schema = parse_dynamic_inputs(_ref2va_workflow(videos=0, audios=0))
assert _entry(schema, "ref_images") is not None
assert _entry(schema, "ref_videos") is None
assert _entry(schema, "ref_audios") is None
def test_generic_class_gets_group_without_hint():
wf = _ref2va_workflow(videos=0, audios=0)
wf["20"] = {"class_type": "GenericRefNode", "inputs": {}}
wf["701"] = {"class_type": "VHS_LoadVideo", "inputs": {"video": "a.mp4"}}
wf["702"] = {"class_type": "VHS_LoadVideo", "inputs": {"video": "b.mp4"}}
wf["20"]["inputs"]["media.clip_0"] = ["701", 0]
wf["20"]["inputs"]["media.clip_1"] = ["702", 0]
schema = parse_dynamic_inputs(wf)
g = _entry(schema, "media")
assert g and g["kind"] == "video_list" and g["max"] == 9
assert "media_hint" not in g
def test_05_ref2va_fixture_stays_image_only():
schema = parse_dynamic_inputs(_load_05())
lists = [e for e in schema if e["kind"].endswith("_list")]
assert len(lists) == 1
assert lists[0]["kind"] == "image_list" and lists[0]["max"] == 9
assert lists[0]["nodeId"] == "131@ref_images"
# ---------------------------------------------------------------------------
# Validation
# ---------------------------------------------------------------------------
def _media_file(path: str, data: bytes) -> str:
p = Path(path)
p.parent.mkdir(parents=True, exist_ok=True)
p.write_bytes(data)
return str(p)
def test_validate_video_and_audio_lists(uploads_dir):
schema = parse_dynamic_inputs(_ref2va_workflow())
img_key = _entry(schema, "ref_images")["nodeId"]
vid_key = _entry(schema, "ref_videos")["nodeId"]
aud_key = _entry(schema, "ref_audios")["nodeId"]
png = _media_file(str(uploads_dir / "ok.png"), PNG_1PX)
mp4 = _media_file(str(uploads_dir / "ok.mp4"), b"00")
mp3 = _media_file(str(uploads_dir / "ok.mp3"), b"00")
clean, errs = validate_input_values(
schema, {"1": "p", img_key: [png], vid_key: [mp4], aud_key: [mp3]}
)
assert errs == [] and clean[vid_key] == [mp4] and clean[aud_key] == [mp3]
# 错误格式(图片文件填视频槽 / 视频文件填音频槽)
_, errs = validate_input_values(
schema, {"1": "p", img_key: [png], vid_key: [png], aud_key: [mp3]}
)
assert errs == ["参考视频 1:格式不支持,请使用 MP4 / WebM / MOV"]
_, errs = validate_input_values(
schema, {"1": "p", img_key: [png], vid_key: [mp4], aud_key: [mp4]}
)
assert errs == ["参考音频 1:格式不支持,请使用 MP3 / WAV / M4A"]
# 上限(H3 官方 3 段)与最少 1 段
four = [_media_file(str(uploads_dir / f"v{i}.mp4"), b"00") for i in range(4)]
_, errs = validate_input_values(
schema, {"1": "p", img_key: [png], vid_key: four, aud_key: [mp3]}
)
assert errs == ["参考视频最多 3 段(当前 4 段),请删除多余的视频"]
_, errs = validate_input_values(
schema, {"1": "p", img_key: [png], aud_key: [mp3]}
)
assert errs == ["需要至少 1 段参考视频"]
# ---------------------------------------------------------------------------
# Patcher + full chain against fake ComfyUI
# ---------------------------------------------------------------------------
def test_patcher_clones_and_backfills_each_media_kind(uploads_dir):
wf = _ref2va_workflow()
schema = parse_dynamic_inputs(wf)
pngs = [_media_file(str(uploads_dir / "r1.png"), PNG_1PX),
_media_file(str(uploads_dir / "r2.png"), PNG_1PX)]
mp4 = _media_file(str(uploads_dir / "v1.mp4"), b"00")
mp3 = _media_file(str(uploads_dir / "a1.mp3"), b"00")
patched = patch_workflow(
wf,
{
_entry(schema, "ref_images")["nodeId"]: pngs,
_entry(schema, "ref_videos")["nodeId"]: [mp4],
_entry(schema, "ref_audios")["nodeId"]: [mp3],
},
)
ins = patched["131"]["inputs"]
image_links = [v for k, v in ins.items() if k.startswith("ref_images.")]
video_links = [v for k, v in ins.items() if k.startswith("ref_videos.")]
audio_links = [v for k, v in ins.items() if k.startswith("ref_audios.")]
assert len(image_links) == 2 and len(video_links) == 1 and len(audio_links) == 1
loaders = {nid: n for nid, n in patched.items()
if n.get("class_type") in ("LoadImage", "LoadVideo", "LoadAudio")}
imgs = [n for n in loaders.values() if n["class_type"] == "LoadImage"]
vids = [n for n in loaders.values() if n["class_type"] == "LoadVideo"]
auds = [n for n in loaders.values() if n["class_type"] == "LoadAudio"]
assert len(imgs) == 2 and all(n["inputs"]["image"] in pngs for n in imgs)
assert vids and vids[0]["inputs"]["file"] == mp4
assert auds and auds[0]["inputs"]["audio"] == mp3
# 克隆出的节点带中文槽位标题
assert {n["_meta"]["title"] for n in imgs} == {"参考图 1", "参考图 2"}
assert vids[0]["_meta"]["title"] == "参考视频 1"
assert auds[0]["_meta"]["title"] == "参考音频 1"
def test_full_chain_uploads_and_backfills_media_groups(client, fake_comfy, uploads_dir):
"""提交 → 上传 → 回填:fake ComfyUI 收到的 prompt 里每类 loader 都
指向已上传文件(模拟链路:fake 端点,非真机 H3)。"""
wf = _ref2va_workflow()
png = _media_file(str(uploads_dir / "ref.png"), PNG_1PX)
mp4 = _media_file(str(uploads_dir / "ref.mp4"), b"00")
mp3 = _media_file(str(uploads_dir / "ref.mp3"), b"00")
r = client.post(
"/api/workflows",
json={"name": "媒体组链路", "workflow_json": wf, "usage": "ref2video"},
)
assert r.status_code == 200, r.text
wf_id = r.json()["id"]
schema = r.json()["input_schema"]
with _real_run(client, fake_comfy):
fake_comfy.out_name = "media_out.mp4"
r = client.post(
f"/api/workflows/{wf_id}/test",
json={
"input_values": {
_entry(schema, "ref_images")["nodeId"]: [png],
_entry(schema, "ref_videos")["nodeId"]: [mp4],
_entry(schema, "ref_audios")["nodeId"]: [mp3],
}
},
)
assert r.status_code == 200, r.text
job_id = r.json()["job"]["id"]
deadline = time.time() + 25
job = {}
while time.time() < deadline:
job = client.get(f"/api/jobs/{job_id}").json()
if job["status"] not in ("pending", "running"):
break
time.sleep(0.4)
assert job["status"] == "done", job.get("error")
assert len(fake_comfy.uploads) >= 3 # 图、视频、音频各一次
queued = fake_comfy.prompts[-1]["prompt"]
loaders = [n for n in queued.values()
if n.get("class_type") in ("LoadImage", "LoadVideo", "LoadAudio")]
by_field = {
(n["class_type"], k): v
for n in loaders
for k, v in n["inputs"].items()
if isinstance(v, str) and "uploaded-input" in v
}
assert ("LoadImage", "image") in by_field
assert ("LoadVideo", "file") in by_field
assert ("LoadAudio", "audio") in by_field
# 组连线数与提交数一致
ins = queued["131"]["inputs"]
assert len([k for k in ins if k.startswith("ref_images.")]) == 1
assert len([k for k in ins if k.startswith("ref_videos.")]) == 1
assert len([k for k in ins if k.startswith("ref_audios.")]) == 1
+54 -15
View File
@@ -13,6 +13,7 @@ The shell is default-OFF; every guard branch here is a security contract:
from __future__ import annotations
import asyncio
import os
import sys
from pathlib import Path
@@ -25,6 +26,23 @@ from calliope.agent.harness.registry import ToolContext
PYTHON = Path(sys.executable).stem # bare name ("python") — the tool refuses paths
@pytest.fixture(autouse=True, scope="module")
def _interpreter_on_path():
"""Make the bare interpreter name resolvable via PATH (HEL-619).
The guard resolves the command with ``shutil.which`` against PATH —
running pytest as ``path/to/.venv/bin/python -m pytest`` (or on a box
with no ``python`` alias) leaves the stem unresolvable and every
exec-path test fails for environmental reasons only. Prepending the
interpreter's own bin dir (restored afterwards) pins the lookup to the
interpreter actually running the suite, on every OS.
"""
prev = os.environ.get("PATH", "")
os.environ["PATH"] = f"{Path(sys.executable).parent}{os.pathsep}{prev}"
yield
os.environ["PATH"] = prev
@pytest.fixture(autouse=True, scope="module")
def _never_touch_real_db():
"""Redirect data_dir before ANY write in this module (repo test rule)."""
@@ -210,12 +228,19 @@ def test_structured_shell_approval_allows(enabled):
def test_cwd_outside_workspace_denied(enabled):
"""Guard denial tests use PYTHON + a structured approval card (not
ffprobe): the interpreter resolves on every machine, and the card
clears the approval gate so the LATER containment check is what fires
(HEL-619 — ffprobe-absent boxes used to fail these for environmental
reasons)."""
registry, _ = build_harness()
sid = _session()
_answer_card(sid, "Yes, run it")
out = asyncio.run(
registry.execute(
_ctx(),
ToolContext(session_id=sid, project_id=None),
"run_command",
{"command": "ffprobe", "cwd": str(Path(settings_data_dir_home()))},
{"command": PYTHON, "cwd": str(settings_data_dir_home())},
)
)
assert out["reason_code"] == "guard_shell_outside_workspace"
@@ -230,11 +255,13 @@ def test_sensitive_arg_denied(enabled, tmp_path):
registry, _ = build_harness()
secret = tmp_path / "calliope_config.json"
secret.write_text("{}", encoding="utf-8")
sid = _session()
_answer_card(sid, "Yes, run it")
out = asyncio.run(
registry.execute(
_ctx(),
ToolContext(session_id=sid, project_id=None),
"run_command",
{"command": "ffprobe", "args": [str(secret)]},
{"command": PYTHON, "args": ["-c", "print('x')", str(secret)]},
)
)
assert out["reason_code"] == "guard_shell_denied_path"
@@ -244,11 +271,13 @@ def test_db_arg_denied(enabled, tmp_path):
registry, _ = build_harness()
db = tmp_path / "calliope.db"
db.write_bytes(b"")
sid = _session()
_answer_card(sid, "Yes, run it")
out = asyncio.run(
registry.execute(
_ctx(),
ToolContext(session_id=sid, project_id=None),
"run_command",
{"command": "ffprobe", "args": [str(db)]},
{"command": PYTHON, "args": ["-c", "print('x')", str(db)]},
)
)
assert out["reason_code"] == "guard_shell_denied_path"
@@ -256,11 +285,13 @@ def test_db_arg_denied(enabled, tmp_path):
def test_env_file_arg_denied(enabled):
registry, _ = build_harness()
sid = _session()
_answer_card(sid, "Yes, run it")
out = asyncio.run(
registry.execute(
_ctx(),
ToolContext(session_id=sid, project_id=None),
"run_command",
{"command": "ffprobe", "args": ["--", ".env"]},
{"command": PYTHON, "args": ["-c", "print('x')", "--", ".env"]},
)
)
assert out["reason_code"] == "guard_shell_denied_path"
@@ -270,11 +301,13 @@ def test_outside_absolute_arg_denied(enabled, tmp_path):
registry, _ = build_harness()
outside = tmp_path / "movie.mp4"
outside.write_bytes(b"00")
sid = _session()
_answer_card(sid, "Yes, run it")
out = asyncio.run(
registry.execute(
_ctx(),
ToolContext(session_id=sid, project_id=None),
"run_command",
{"command": "ffprobe", "args": [str(outside)]},
{"command": PYTHON, "args": ["-c", "print('x')", str(outside)]},
)
)
assert out["reason_code"] == "guard_shell_outside_workspace"
@@ -287,16 +320,22 @@ def test_inside_asset_arg_allowed(enabled):
registry, _ = build_harness()
ref = settings.assets_dir / "ref.mp4"
ref.write_bytes(b"00")
sid = _session()
_answer_card(sid, "Yes, run it")
out = asyncio.run(
registry.execute(
_ctx(),
ToolContext(session_id=sid, project_id=None),
"run_command",
{"command": "ffprobe", "args": ["-v", "error", str(ref)]},
{
# The asset path is a real argv entry the guard must allow
# (and the interpreter actually reads it).
"command": PYTHON,
"args": ["-c", "import sys; print(open(sys.argv[1]).read())", str(ref)],
},
)
)
# Not a real mp4 — ffprobe fails, but the GUARD must not have denied it.
assert out.get("reason_code") is None
assert out.get("exit_code") != 0 or out.get("ok") is False or out["ok"] is True
assert out["ok"] is True, out
assert "00" in out["stdout"]
def test_workspace_relative_cwd_allowed(enabled, tmp_path):
@@ -25,9 +25,19 @@ PNG_1PX = bytes.fromhex(
class _FakeComfyHandler(BaseHTTPRequestHandler):
"""Minimal ComfyUI: /system_stats, /prompt, /history/{id}, /view, /upload/image."""
"""Minimal ComfyUI: /system_stats, /prompt, /history/{id}, /view, /upload/image.
History outputs are keyed by the prompt's real output node id (what
ComfyUI does); a known output class that is absent falls back to
``server.forced_output_node`` (default "9"). Scripted tests can pin
``server.forced_output_node`` or drop entries via ``server.drop_outputs``.
"""
server_version = "FakeComfy/1.0"
KNOWN_OUTPUT_CLASSES = {
"SaveImage", "PreviewImage", "SaveImageAdvanced", "SaveImageWebsocket",
"SaveVideo", "VideoOutput", "VHS_VideoCombine", "AnimateDiffCombine",
}
def do_GET(self):
self.server.requests.append(self.path)
@@ -40,6 +50,9 @@ class _FakeComfyHandler(BaseHTTPRequestHandler):
},
)
return
if self.path == "/object_info":
self._json(200, dict(getattr(self.server, "object_info", None) or {}))
return
if self.path.startswith("/history/"):
pid = self.path[len("/history/") :]
entry = self.server.history.get(pid)
@@ -64,11 +77,17 @@ class _FakeComfyHandler(BaseHTTPRequestHandler):
prompt_id = uuid.uuid4().hex
outputs_key = self.server.outputs_key
out_entry = {
outputs_key: [{"filename": self.server.out_name, "subfolder": "", "type": "output"}]
outputs_key: [
{"filename": self.server.out_name, "subfolder": "", "type": "output"}
]
}
outputs = (
{} if getattr(self.server, "drop_outputs", False) else
{self._output_node(body): out_entry}
)
self.server.history[prompt_id] = {
"status": {"status_str": "success", "completed": True},
"outputs": {"9": out_entry},
"outputs": outputs,
"prompt": [],
}
self.server.prompts.append(json.loads(body.decode("utf-8") or "{}"))
@@ -80,6 +99,19 @@ class _FakeComfyHandler(BaseHTTPRequestHandler):
return
self._json(404, {"error": "not found"})
def _output_node(self, body: bytes) -> str:
forced = getattr(self.server, "forced_output_node", None)
if forced:
return forced
try:
prompt = json.loads(body.decode("utf-8") or "{}").get("prompt") or {}
except json.JSONDecodeError:
prompt = {}
for nid, node in prompt.items():
if isinstance(node, dict) and node.get("class_type") in self.KNOWN_OUTPUT_CLASSES:
return str(nid)
return "9"
def _json(self, status: int, payload: dict) -> None:
data = json.dumps(payload).encode("utf-8")
self.send_response(status)
@@ -109,6 +141,9 @@ def fake_comfy():
server.fail_prompt = False
server.out_name = "out-1.png"
server.outputs_key = "images"
server.forced_output_node = None
server.object_info = {}
server.drop_outputs = False
thread = threading.Thread(target=server.serve_forever, daemon=True)
thread.start()
try:
@@ -0,0 +1,371 @@
"""HEL-638: unknown custom output nodes close the loop — no name-based
auto-typing, feature-less sinks become mappable candidates, a usage choice
alone never bypasses the output designation, and generation harvests (and
checks) exactly the nodes the user mapped.
Two brand-new class names drive the cases:
* ``NebulaGlaxVideoVault`` — screams "video" in its name and carries a
filename_prefix; before HEL-638 the fuzzy name match auto-typed it video
and enabled the workflow.
* ``QuarkMuffinDisplay`` — no save widget, no media link name; before
HEL-638 such a graph only reported ``no_output`` with no way to map.
"""
from __future__ import annotations
import json
from pathlib import Path
from calliope.config import settings
from calliope.db import get_db, migrate_db
from tests.test_studio_generation import _real_run, _wait_done
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
def _vault_workflow() -> dict:
return {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"7": {
"class_type": "GlaxSamplerNode",
"inputs": {"prompt": ["1", 0], "length": 121},
},
"12": {
"class_type": "NebulaGlaxVideoVault",
"inputs": {"filename_prefix": "anim", "frames": ["7", 0]},
},
}
def _muffin_workflow() -> dict:
return {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"7": {
"class_type": "GlaxSamplerNode",
"inputs": {"prompt": ["1", 0], "length": 121},
},
"15": {"class_type": "QuarkMuffinDisplay", "inputs": {"payload": ["7", 0]}},
}
def _analyze(client, wf: dict) -> dict:
r = client.post("/api/workflows/analyze", json={"workflow_json": wf})
assert r.status_code == 200, r.text
return r.json()
# ---------------------------------------------------------------------------
# 1. Unknown outputs stay pending — names never decide (gap 1)
# ---------------------------------------------------------------------------
def test_video_semantic_unknown_node_is_never_auto_typed(client):
body = _analyze(client, _vault_workflow())
entry = next(o for o in body["usage_evidence"]["outputs"] if o["nodeId"] == "12")
assert entry["evidence"] == "unknown_node"
assert entry["kind"] is None # the user picks the media type
assert entry["suggested_kind"] == "video" # only a form default
assert body["needs_mapping"] is True
assert body["usage"] is None and body["usage_ambiguous"] is True
assert "指定实际输出节点" in body["usage_problem"]
codes = {(w["level"], w["code"]) for w in body["warnings"]}
assert ("warning", "unknown_output_node") in codes
assert ("error", "no_output") not in codes
def test_choosing_a_usage_alone_does_not_bypass_output_mapping(client):
"""create/PATCH with a usage but no output map keeps the row disabled."""
r = client.post(
"/api/workflows",
json={"name": "未知·视频语义", "workflow_json": _vault_workflow(),
"usage": "text2video", "usage_source": "user"},
)
assert r.status_code == 200, r.text
wf = r.json()
assert wf["usage"] == "text2video" and wf["usage_source"] == "user"
assert wf["is_enabled"] is False # usage set, outputs still unconfirmed
assert wf["needs_mapping"] is True and not wf["output_map"]
gen = client.post(
"/api/playground/generate",
json={"workflow_id": wf["id"], "input_values": {"1": "x"}},
)
assert gen.status_code == 400
# forcing the switch on is refused with the mapping reason
r = client.patch(f"/api/workflows/{wf['id']}", json={"is_enabled": True})
assert r.status_code == 400
assert "指定" in r.json()["detail"] and "输出节点" in r.json()["detail"]
# ---------------------------------------------------------------------------
# 2. Feature-less unknown sinks become mappable candidates (gap 2)
# ---------------------------------------------------------------------------
def test_featureless_unknown_node_is_a_candidate_not_a_hard_error(client):
body = _analyze(client, _muffin_workflow())
entry = next(o for o in body["usage_evidence"]["outputs"] if o["nodeId"] == "15")
assert entry["evidence"] == "unknown_node" and entry["kind"] is None
assert body["needs_mapping"] is True
codes = {(w["level"], w["code"]) for w in body["warnings"]}
assert ("warning", "unknown_output_node") in codes
assert ("error", "no_output") not in codes
def test_truly_outputless_graph_still_reports_the_chinese_error(client):
wf = {
"1": {"class_type": "CLIPTextEncode", "inputs": {"text": "p"}},
"2": {"class_type": "VAEDecode", "inputs": {"samples": ["1", 0]}},
}
body = _analyze(client, wf)
assert body["usage"] is None and body["needs_mapping"] is False
assert "未在图中找到输出节点" in body["usage_problem"]
# ---------------------------------------------------------------------------
# 3. Manual mapping → enable → scoped generation (fake ComfyUI round trip)
# ---------------------------------------------------------------------------
def test_manual_mapping_enables_and_extracts_from_the_mapped_node(client, fake_comfy):
fake_comfy.outputs_key = "gifs"
fake_comfy.out_name = "clip.mp4"
fake_comfy.forced_output_node = "12" # the mapped node reports results
with _real_run(client, fake_comfy):
r = client.post(
"/api/workflows",
json={
"name": "映射·视频库",
"workflow_json": _vault_workflow(),
"usage": "text2video",
"usage_source": "user",
"output_map": [{"nodeId": "12", "kind": "video"}],
"output_map_source": "user",
},
)
assert r.status_code == 200, r.text
wf = r.json()
assert wf["is_enabled"] is True
assert wf["output_map"] == [{"nodeId": "12", "kind": "video"}]
assert wf["output_map_source"] == "user"
r = client.post(
"/api/playground/generate",
json={"workflow_id": wf["id"], "input_values": {"1": "星空延时"},
"source": "studio-video"},
)
assert r.status_code == 200, r.text
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "done", job.get("error")
assert job["output_paths"][0].endswith(".mp4")
def test_mapped_node_returning_nothing_fails_for_real(client, fake_comfy):
"""Results that only land on an unmapped node are NOT a completion."""
fake_comfy.forced_output_node = "7" # something else reports results
with _real_run(client, fake_comfy):
r = client.post(
"/api/workflows",
json={
"name": "映射·空手而归",
"workflow_json": _muffin_workflow(),
"usage": "text2image",
"usage_source": "user",
"output_map": [{"nodeId": "15", "kind": "image"}],
},
)
assert r.status_code == 200 and r.json()["is_enabled"] is True
r = client.post(
"/api/playground/generate",
json={"workflow_id": r.json()["id"], "input_values": {"1": "x"}},
)
assert r.status_code == 200, r.text
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "failed"
assert "没有返回任何图片或视频" in job["error"]
assert "15" in job["error"] # names the node it waited on
assert job["output_paths"] == []
def test_media_type_mismatch_fails_for_real(client, fake_comfy):
"""A video mapping that only yields a png is a real failure."""
fake_comfy.outputs_key = "images"
fake_comfy.out_name = "still.png"
fake_comfy.forced_output_node = "12"
with _real_run(client, fake_comfy):
r = client.post(
"/api/workflows",
json={
"name": "映射·类型不符",
"workflow_json": _vault_workflow(),
"usage": "text2video",
"usage_source": "user",
"output_map": [{"nodeId": "12", "kind": "video"}],
},
)
wid = r.json()["id"]
r = client.post(
"/api/playground/generate",
json={"workflow_id": wid, "input_values": {"1": "x"}},
)
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "failed"
assert "媒体类型与映射不符" in job["error"]
assert job["output_paths"] == []
# ---------------------------------------------------------------------------
# 4. Bad / cancelled mappings
# ---------------------------------------------------------------------------
def test_invalid_mappings_are_rejected_in_chinese(client):
r = client.post(
"/api/workflows",
json={"name": "坏映射", "workflow_json": _vault_workflow(),
"usage": "text2video",
"output_map": [{"nodeId": "999", "kind": "video"}]},
)
assert r.status_code == 422 and "不存在" in r.json()["detail"]
r = client.post(
"/api/workflows",
json={"name": "坏映射2", "workflow_json": _vault_workflow(),
"usage": "text2video",
"output_map": [{"nodeId": "12", "kind": "audio"}]},
)
assert r.status_code == 422 and "媒体类型" in r.json()["detail"]
# a prompt/parameter node can never be an output
r = client.post(
"/api/workflows",
json={"name": "坏映射3", "workflow_json": _vault_workflow(),
"usage": "text2video",
"output_map": [{"nodeId": "1", "kind": "video"}]},
)
assert r.status_code == 422 and "不能作为输出节点" in r.json()["detail"]
wid = client.post(
"/api/workflows",
json={"name": "先好后坏", "workflow_json": _vault_workflow(),
"usage": "text2video",
"output_map": [{"nodeId": "12", "kind": "video"}]},
).json()["id"]
r = client.patch(
f"/api/workflows/{wid}", json={"output_map": [{"nodeId": "42", "kind": "image"}]}
)
assert r.status_code == 422 and "不存在" in r.json()["detail"]
def test_clearing_the_mapping_resets_to_pending(client):
wid = client.post(
"/api/workflows",
json={"name": "映射后清空", "workflow_json": _vault_workflow(),
"usage": "text2video",
"output_map": [{"nodeId": "12", "kind": "video"}]},
).json()["id"]
wf = client.get(f"/api/workflows/{wid}").json()
assert wf["is_enabled"] is True
r = client.patch(f"/api/workflows/{wid}", json={"output_map": []})
assert r.status_code == 200
wf = r.json()
assert wf["is_enabled"] is False and not wf["output_map"]
assert wf["usage"] == "text2video" # the usage decision survives
gen = client.post(
"/api/playground/generate",
json={"workflow_id": wid, "input_values": {"1": "x"}},
)
assert gen.status_code == 400
# ---------------------------------------------------------------------------
# 5. Saved mappings survive reanalyze / field edits / migration
# ---------------------------------------------------------------------------
def test_saved_mapping_survives_reanalyze_and_field_edits(client):
r = client.post(
"/api/workflows",
json={"name": "重分析·保映射", "workflow_json": _vault_workflow(),
"usage": "text2video",
"output_map": [{"nodeId": "12", "kind": "video"}]},
)
wid = r.json()["id"]
r = client.patch(f"/api/workflows/{wid}", json={"name": "改名不影响映射",
"description": "编辑其他字段"})
wf = r.json()
assert wf["output_map"] == [{"nodeId": "12", "kind": "video"}]
assert wf["output_map_source"] == "user" and wf["is_enabled"] is True
r = client.post(f"/api/workflows/{wid}/reanalyze")
assert r.status_code == 200
wf = r.json()
assert wf["output_map"] == [{"nodeId": "12", "kind": "video"}]
assert wf["output_map_source"] == "user"
assert wf["usage"] == "text2video" and wf["usage_source"] == "user"
assert wf["is_enabled"] is True
def test_sql_forced_enabled_row_without_mapping_is_blocked(client):
"""Backend-direct generation on an unconfirmed row is refused."""
wid = client.post(
"/api/workflows",
json={"name": "强开", "workflow_json": _vault_workflow(),
"usage": "text2video"},
).json()["id"]
conn = get_db(settings.db_path)
try:
conn.execute("UPDATE workflows SET is_enabled = 1 WHERE id = ?", (wid,))
conn.commit()
finally:
conn.close()
gen = client.post(
"/api/playground/generate",
json={"workflow_id": wid, "input_values": {"1": "x"}},
)
assert gen.status_code == 400
assert "输出节点" in gen.json()["detail"]
def test_migration_parks_unknown_output_rows_and_keeps_trusted_ones(client):
import asyncio
conn = get_db(settings.db_path)
try:
# Pre-HEL-638 shape: user confirmed a usage on an unknown-output
# graph and the old PATCH re-enabled it.
conn.execute(
"INSERT INTO workflows (name, kind, workflow_json, input_schema,"
" output_schema, is_enabled, usage, usage_source)"
" VALUES (?, 'video', ?, '[]', '[]', 1, 'text2video', 'user')",
("存量·未知输出", json.dumps(_vault_workflow())),
)
conn.commit()
finally:
conn.close()
asyncio.run(migrate_db(settings.db_path)) # idempotent re-run
wfs = {w["name"]: w for w in client.get("/api/workflows").json()}
parked = wfs["存量·未知输出"]
assert parked["is_enabled"] is False
assert parked["usage"] == "text2video" # decision preserved
assert not parked["output_map"] and parked["needs_mapping"] is True
# A trusted five-type import keeps working untouched.
r = client.post(
"/api/workflows",
json={"name": "存量·可信", "kind": "image",
"workflow_json": json.loads(
(FIXTURES / "qwen_image_t2i_API.json").read_text(encoding="utf-8")
)},
)
assert r.status_code == 200
trusted = next(w for w in client.get("/api/workflows").json() if w["id"] == r.json()["id"])
assert trusted["is_enabled"] is True
assert trusted["output_map_source"] == "auto"
assert any(e["nodeId"] == "60" and e["kind"] == "image" for e in trusted["output_map"])
@@ -58,8 +58,9 @@ def test_native_qwen_edit_detects_image_and_mask_slots():
assert set(media) == {"78", "95"}
assert media["95"]["role"] == "mask"
assert "mask" in media["95"]["label"].lower() or "遮罩" in media["95"]["label"]
# the workflow's own image names stay valid, so the slots are optional
assert not media["78"]["required"] and not media["95"]["required"]
# HEL-633: a wired input image must be uploaded (the export's own file name
# rarely exists on the target ComfyUI); the mask stays optional
assert media["78"]["required"] and not media["95"]["required"]
def test_untagged_h3_video_detects_prompt_duration_seed():
@@ -0,0 +1,308 @@
"""HEL-636 A1–A6: the five-usage classifier judges from graph evidence only.
Every case feeds real (or minimally mutated) ComfyUI API exports — never a
file name, model name or fixed node id — and asserts the usage, the media
slots it implies, and the failure paths for ambiguous / unknown graphs.
"""
from __future__ import annotations
import json
from pathlib import Path
from calliope.comfyui.lint import blocking_problem, workflow_warnings
from calliope.comfyui.parser import (
classify_usage,
detect_untagged_inputs,
parse_dynamic_inputs,
parse_dynamic_outputs,
)
from calliope.comfyui.patcher import patch_workflow
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
EXAMPLES = Path(__file__).resolve().parents[2] / "example_ComfyUI_workflows"
def _load(path: Path) -> dict:
return json.loads(path.read_text(encoding="utf-8"))
def _rename_everything(wf: dict, id_shift: int = 7) -> dict:
"""Change every node id, title and widget value the classifier must not
depend on (model file names / prompt texts)."""
def new_id(nid: str) -> str:
return f"x{int(nid) * id_shift + 3}" if nid.isdigit() else "x" + nid.replace(":", "_")
out: dict = {}
for nid, node in wf.items():
out[new_id(nid)] = json.loads(json.dumps(node))
for node in out.values():
for val in (node.get("inputs") or {}).values():
if isinstance(val, list) and len(val) == 2 and str(val[0]).isdigit():
val[0] = new_id(str(val[0]))
if node.get("_meta", {}).get("title"):
node["_meta"]["title"] = f"改·{node['_meta']['title']}"
for key, val in list((node.get("inputs") or {}).items()):
if isinstance(val, str) and val.endswith((".safetensors", ".gguf")):
node["inputs"][key] = "另一个模型_" + val
return out
def _media(inputs: list[dict]) -> list[dict]:
return [
i
for i in inputs
if i["kind"] in ("image", "image_list", "video", "audio")
]
# ---------------------------------------------------------------------------
# A1 / A2 / A3: the three real shapes, plus id/title/model renames
# ---------------------------------------------------------------------------
def test_a1_native_t2i_is_text2image_and_form_has_no_image_slot():
wf = _load(FIXTURES / "qwen_image_t2i_API.json")
c = classify_usage(wf)
assert c["usage"] == "text2image"
assert c["ambiguous"] is False and c["needs_mapping"] is False
assert _media(parse_dynamic_inputs(wf)) == []
outs = parse_dynamic_outputs(wf)
assert [(o["nodeId"], o["kind"]) for o in outs] == [("60", "image")]
def test_a2_qwen_edit_variant_with_new_ids_titles_and_model_stays_image2image():
wf = _rename_everything(_load(FIXTURES / "qwen_image_edit_mask_API.json"))
c = classify_usage(wf)
assert c["usage"] == "image2image"
inputs = parse_dynamic_inputs(wf)
img = [i for i in _media(inputs) if i.get("role") == "image"]
assert len(img) == 1 and img[0]["required"] is True
mask = [i for i in _media(inputs) if i.get("role") == "mask"]
assert len(mask) == 1 # mask never counts as an input image
def test_a3_i2v_variant_renamed_still_image2video_first_frame_only():
wf = _rename_everything(_load(FIXTURES / "h3_i2v_04_API.json"))
c = classify_usage(wf)
assert c["usage"] == "image2video"
media = _media(parse_dynamic_inputs(wf))
assert [i.get("role") for i in media] == ["first_frame"]
# A3: no first/last pair → the pair validation must not fire
assert blocking_problem(wf) is None
def test_a4_ref2va_variant_with_renamed_class_and_prefix_still_groups():
wf = _rename_everything(_load(FIXTURES / "h3_ref2va_05_API.json"))
for node in wf.values():
if node.get("class_type") == "MiniMaxH3ReferenceToVideo":
node["class_type"] = "MyFancyRefToVideo"
inputs = node["inputs"]
for k in list(inputs):
if k.startswith("ref_images.ref_image_"):
inputs[k.replace("ref_images.ref_image_", "refs.pic_")] = inputs.pop(k)
c = classify_usage(wf)
assert c["usage"] == "ref2video"
groups = [i for i in detect_untagged_inputs(wf) if i["kind"] == "image_list"]
assert len(groups) == 1
g = groups[0]
assert g["role"] == "reference_image" and (g["min"], g["max"]) == (1, 9)
# patch rewires the renamed group in order and refuses a 10th image
key = g["nodeId"]
node_id = key.split("@")[0]
patched = patch_workflow(wf, {key: [f"/u/{i}.png" for i in range(4)]})
names = sorted(
(k for k in patched[node_id]["inputs"] if k.startswith("refs.pic_")),
key=lambda k: int(k.rsplit("_", 1)[-1]) if k.rsplit("_", 1)[-1].isdigit() else int(k[-1]),
)
assert names == [f"refs.pic_{i}" for i in range(4)]
from calliope.comfyui.validate import validate_input_values
_c, errs = validate_input_values(
detect_untagged_inputs(wf), {key: [f"/u/{i}.png" for i in range(10)]}
)
assert any("最多 9 张" in e for e in errs)
def test_qwen_single_numbered_encoder_input_is_not_mistaken_for_a_group():
"""TextEncodeQwenImage21's ``images.image_1`` stays an ordinary input slot."""
inputs = parse_dynamic_inputs(_load(FIXTURES / "qwen21_edit_sage_API.json"))
assert not any(i["kind"] == "image_list" for i in inputs)
assert any(i.get("role") == "image" for i in inputs)
# ---------------------------------------------------------------------------
# Judgment table rows from the real example library
# ---------------------------------------------------------------------------
def test_all_real_exports_classify():
expect = {
"qwen_image_t2i_API.json": "text2image",
"qwen_image_edit_mask_API.json": "image2image",
"qwen21_edit_sage_API.json": "image2image",
"h3_i2v_04_API.json": "image2video",
"h3_ref2va_05_API.json": "ref2video",
"minimax_h3_t2v_untagged_API.json": "text2video",
"wen_sheng_tu_API.json": "text2image",
"wen_sheng_shipin_API.json": "text2video",
}
for name, usage in expect.items():
assert classify_usage(_load(FIXTURES / name))["usage"] == usage, name
examples = {
"Krea2_t2i_20260818_API.json": "text2image",
"krea2_T2I_CharSheetV1_API.json": "text2image",
"minimax_h3-Turbo_Text2Video_20260813_API.json": "text2video",
"minimax_h3-Turbo_Image2Video_20260813_API.json": "text2video",
"MiniMax-H3-Turbo-R2V-Extend-2Refs1Vid_API.json": "ref2video",
"video_minimax_h3_r2v_2ref_API.json": "ref2video",
"video_minimax_h3_r2v_3ref_API.json": "ref2video",
"video_minimax_h3_r2v_4ref_API.json": "ref2video",
"video_minimax_h3_r2v_5ref_API.json": "ref2video",
}
for name, usage in examples.items():
assert classify_usage(_load(EXAMPLES / name))["usage"] == usage, name
def test_r2v_extend_reports_its_video_input_slot():
wf = _load(EXAMPLES / "MiniMax-H3-Turbo-R2V-Extend-2Refs1Vid_API.json")
c = classify_usage(wf)
assert c["usage"] == "ref2video"
assert c["evidence"]["video_slots"], "the reference-video slot must be reported"
assert any("视频输入槽" in line for line in c["evidence"]["summary"])
# ---------------------------------------------------------------------------
# A5: ambiguity — single loose image into a video graph; multi-output graph
# ---------------------------------------------------------------------------
def _load_image(nid: str) -> dict:
return {
"class_type": "LoadImage",
"inputs": {"image": "x.png"},
"_meta": {"title": f"图 {nid}"},
}
def test_single_loose_image_with_video_output_is_ambiguous():
wf = {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"5": {"class_type": "LoadImage", "inputs": {"image": "x.png"}},
"7": {
"class_type": "SomeVideoSampler",
"inputs": {"prompt": ["1", 0], "image": ["5", 0]},
},
"9": {"class_type": "SaveVideo", "inputs": {"images": ["7", 0]}},
}
c = classify_usage(wf)
assert c["usage"] is None and c["ambiguous"] is True
assert "首帧还是参考图" in c["problem"]
def test_first_frame_role_decides_image2video_without_ambiguity():
wf = {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"5": {"class_type": "LoadImage", "inputs": {"image": "x.png"}},
"7": {
"class_type": "SomeVideoSampler",
"inputs": {"prompt": ["1", 0], "first_frame": ["5", 0]},
},
"9": {"class_type": "SaveVideo", "inputs": {"images": ["7", 0]}},
}
assert classify_usage(wf)["usage"] == "image2video"
def test_same_graph_both_image_and_video_outputs_is_ambiguous():
wf = {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"5": {"class_type": "LoadImage", "inputs": {"image": "x.png"}},
"7": {
"class_type": "SomeVideoSampler",
"inputs": {"prompt": ["1", 0], "image": ["5", 0]},
},
"9": {"class_type": "SaveVideo", "inputs": {"images": ["7", 0]}},
"10": {"class_type": "SaveImage", "inputs": {"images": ["7", 1]}},
}
c = classify_usage(wf)
assert c["usage"] is None and c["ambiguous"] is True
assert "同时输出图片和视频" in c["problem"]
def test_two_reference_images_into_a_custom_node_become_a_group_ref2video():
wf = {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"5": {"class_type": "LoadImage", "inputs": {"image": "a.png"}},
"6": {"class_type": "LoadImage", "inputs": {"image": "b.png"}},
"7": {
"class_type": "GenericRefToVideo",
"inputs": {
"prompt": ["1", 0],
"refs.pic_1": ["5", 0],
"refs.pic_2": ["6", 0],
},
},
"9": {"class_type": "SaveVideo", "inputs": {"images": ["7", 0]}},
}
c = classify_usage(wf)
assert c["usage"] == "ref2video"
groups = [i for i in detect_untagged_inputs(wf) if i["kind"] == "image_list"]
assert [g["nodeId"] for g in groups] == ["7@refs"]
# ---------------------------------------------------------------------------
# A6: failure paths — no output, unknown custom output nodes
# ---------------------------------------------------------------------------
def test_no_output_graph_reports_chinese_error_and_blocks():
wf = {
"1": {"class_type": "CLIPTextEncode", "inputs": {"text": "p"}},
"2": {"class_type": "VAEDecode", "inputs": {"samples": ["1", 0]}},
}
c = classify_usage(wf)
assert c["usage"] is None and c["ambiguous"] is False
assert "未在图中找到输出节点" in c["problem"]
assert blocking_problem(wf) and "未在图中找到输出节点" in blocking_problem(wf)
def test_unknown_custom_save_node_needs_mapping_and_keeps_a_runnable_path():
wf = {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"7": {
"class_type": "MyCloudExporter",
"inputs": {"filename_prefix": "out", "render": ["8", 0]},
},
"8": {"class_type": "VAEDecode", "inputs": {"samples": ["1", 0]}},
}
c = classify_usage(wf)
assert c["needs_mapping"] is True
assert c["usage"] is None and "无法识别" in (c["problem"] or "")
# unknown savers are a warning (user maps them at import), not a block —
# once the user confirms the usage the job can still run and results are
# pulled from ComfyUI history's images/gifs/videos keys.
codes = {(w["level"], w["code"]) for w in workflow_warnings(wf)}
assert ("warning", "unknown_output_node") in codes
assert ("error", "no_output") not in codes
def test_utility_sink_tail_is_not_an_output_and_does_not_break_detection():
"""VideoCombine feeding a cache-cleanup tail still counts as the output."""
wf = _load(FIXTURES / "minimax_h3_t2v_untagged_API.json")
wf["9999"] = {
"class_type": "easy cleanGpuUsed",
"inputs": {"anything": ["5978", 0]},
}
c = classify_usage(wf)
assert c["usage"] == "text2video"
assert c["needs_mapping"] is False
assert workflow_warnings(wf) == []
def test_evidence_lists_output_nodes_and_slots():
wf = _load(FIXTURES / "h3_ref2va_05_API.json")
c = classify_usage(wf)
ev = c["evidence"]
assert any(o["nodeId"] == "92" and o["kind"] == "video" for o in ev["outputs"])
assert any(s["kind"] == "image_list" for s in ev["image_slots"])
assert any("输出" in line for line in ev["summary"])
+28 -4
View File
@@ -26,6 +26,15 @@ VIDEO_WORKFLOW = {
"inputs": {"file": ""},
"_meta": {"title": "Previous Clip (Input:video)"},
},
"30": {
"class_type": "VHS_VideoCombine",
"inputs": {"images": ["40", 0]},
"_meta": {"title": "Video Output (Output:video)"},
},
"40": {
"class_type": "VAEDecode",
"inputs": {"samples": ["10", 0]},
},
}
# Same but the video slot is missing entirely — must be rejected at enqueue.
@@ -35,6 +44,15 @@ NO_VIDEO_WORKFLOW = {
"inputs": {"text": ""},
"_meta": {"title": "Main Prompt (Input:prompt)"},
},
"30": {
"class_type": "VHS_VideoCombine",
"inputs": {"images": ["40", 0]},
"_meta": {"title": "Video Output (Output:video)"},
},
"40": {
"class_type": "VAEDecode",
"inputs": {"samples": ["10", 0]},
},
}
@@ -250,12 +268,14 @@ def _scene_ids(pid: int) -> list[int]:
async def _fake_history(_client, _prompt_id, *_args):
"""A successful ComfyUI history with one video output named out.mp4.
Extra positional args (job_id) are accepted for the cancel-check wiring."""
"""A successful ComfyUI history with one video output named out.mp4,
reported under the workflow's real output node (30 = the tagged
VHS_VideoCombine). Extra positional args (job_id) are accepted for the
cancel-check wiring."""
return {
"status": {"status_str": "success", "completed": True},
"outputs": {
"99": {"videos": [{"filename": "out.mp4", "subfolder": "", "type": "output"}]}
"30": {"videos": [{"filename": "out.mp4", "subfolder": "", "type": "output"}]}
},
}
@@ -269,7 +289,11 @@ def _stub_comfy(monkeypatch, captured: dict) -> list[str]:
prepare_media_inputs handed it; download_image writes out.mp4. Returns
the list that collects uploaded local paths.
"""
queue_manager.paused = True
# monkeypatch (not bare assignment): queue_manager is a process-level
# singleton — a bare `paused = True` leaks into every later test and
# stalls e.g. test_workbench's worker (HEL-619). monkeypatch restores
# the previous value at teardown.
monkeypatch.setattr(queue_manager, "paused", True)
uploads: list[str] = []
async def fake_upload_video(self, path, subfolder="calliope"):
@@ -0,0 +1,235 @@
"""HEL-636: the two-step import closes the loop — analyze → confirm → save,
user corrections stick (reanalyze never overwrites them), pending workflows
cannot generate, and legacy rows migrate losslessly."""
from __future__ import annotations
import json
from pathlib import Path
from calliope.config import settings
from calliope.db import get_db, migrate_db
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
def _load(name: str) -> dict:
return json.loads((FIXTURES / name).read_text(encoding="utf-8"))
AMBIGUOUS = {
"1": {"class_type": "PrimitiveStringMultiline", "inputs": {"value": "p"}},
"5": {"class_type": "LoadImage", "inputs": {"image": "x.png"}},
"7": {
"class_type": "SomeVideoSampler",
"inputs": {"prompt": ["1", 0], "image": ["5", 0]},
},
"9": {"class_type": "SaveVideo", "inputs": {"images": ["7", 0]}},
}
def test_analyze_returns_usage_evidence_and_problem(client):
wf = _load("qwen_image_t2i_API.json")
r = client.post("/api/workflows/analyze", json={"workflow_json": wf})
assert r.status_code == 200
body = r.json()
assert body["usage"] == "text2image"
assert body["usage_ambiguous"] is False and body["needs_mapping"] is False
assert any(o["kind"] == "image" for o in body["usage_evidence"]["outputs"])
assert body["usable_usage"] == [
"text2image", "image2image", "text2video", "image2video", "ref2video",
]
r = client.post("/api/workflows/analyze", json={"workflow_json": AMBIGUOUS})
body = r.json()
assert body["usage"] is None and body["usage_ambiguous"] is True
assert "首帧还是参考图" in body["usage_problem"]
assert body["usage_evidence"]["image_slots"][0]["nodeId"] == "5"
bare = {"1": {"class_type": "Note", "inputs": {}}}
r = client.post("/api/workflows/analyze", json={"workflow_json": bare})
body = r.json()
assert "未在图中找到输出节点" in body["usage_problem"]
def test_create_stores_auto_usage_and_kind(client):
r = client.post(
"/api/workflows",
json={"name": "自动·文生图", "workflow_json": _load("qwen_image_t2i_API.json")},
)
assert r.status_code == 200, r.text
wf = r.json()
assert wf["usage"] == "text2image" and wf["usage_source"] == "auto"
assert wf["kind"] == "image" and wf["is_enabled"] is True
r = client.post(
"/api/workflows",
json={"name": "自动·参考生视频", "workflow_json": _load("h3_ref2va_05_API.json")},
)
wf = r.json()
assert wf["usage"] == "ref2video" and wf["kind"] == "video"
def test_ambiguous_import_stays_pending_and_cannot_generate(client):
r = client.post("/api/workflows", json={"name": "歧义", "workflow_json": AMBIGUOUS})
assert r.status_code == 200
wf = r.json()
assert wf["usage"] is None and wf["is_enabled"] is False
gen = client.post(
"/api/playground/generate",
json={"workflow_id": wf["id"], "input_values": {"1": "x"}},
)
assert gen.status_code == 400
assert "已停用" in gen.json()["detail"]
assert client.get("/api/playground/jobs").json() == []
def test_confirm_page_correction_roundtrip(client):
"""analyze → user picks usage + fixes the slot role → create carries both."""
analyzed = client.post("/api/workflows/analyze", json={"workflow_json": AMBIGUOUS}).json()
assert analyzed["usage"] is None
slot = analyzed["usage_evidence"]["image_slots"][0]
schema = [
{**i, "role": "first_frame", "manual": True} if i["nodeId"] == slot["nodeId"] else i
for i in analyzed["inputs"]
]
r = client.post(
"/api/workflows",
json={
"name": "确认·图生视频",
"workflow_json": AMBIGUOUS,
"usage": "image2video",
"usage_source": "user",
"input_schema": schema,
},
)
assert r.status_code == 200, r.text
wf = r.json()
assert wf["usage"] == "image2video" and wf["usage_source"] == "user"
assert wf["kind"] == "video" and wf["is_enabled"] is True
# the manual role sticks on read (and through re-derivation)
entry = next(i for i in wf["input_schema"] if i["nodeId"] == slot["nodeId"])
assert entry["role"] == "first_frame"
# reanalyze refreshes the auto schema but never the user's usage
r = client.post(f"/api/workflows/{wf['id']}/reanalyze")
assert r.status_code == 200
fresh = r.json()
assert fresh["usage"] == "image2video" and fresh["usage_source"] == "user"
entry = next(i for i in fresh["input_schema"] if i["nodeId"] == slot["nodeId"])
assert entry["role"] == "first_frame" and entry.get("manual") is True
def test_patch_usage_confirms_pending_workflow(client):
r = client.post("/api/workflows", json={"name": "待确认", "workflow_json": AMBIGUOUS})
wid = r.json()["id"]
assert r.json()["is_enabled"] is False
r = client.patch(f"/api/workflows/{wid}", json={"usage": "ref2video"})
assert r.status_code == 200
wf = r.json()
assert wf["usage"] == "ref2video" and wf["usage_source"] == "user"
assert wf["kind"] == "video" and wf["is_enabled"] is True
listed = next(w for w in client.get("/api/workflows").json() if w["id"] == wid)
assert listed["usage"] == "ref2video"
def test_reanalyze_upgrades_auto_usage_only(client):
r = client.post(
"/api/workflows",
json={"name": "重分析", "workflow_json": _load("qwen_image_t2i_API.json")},
)
wid = r.json()["id"]
r = client.patch(f"/api/workflows/{wid}", json={"usage": "image2image", "usage_source": "user"})
assert r.json()["usage"] == "image2image"
r = client.post(f"/api/workflows/{wid}/reanalyze")
assert r.json()["usage"] == "image2image" # user decision survives
assert r.json()["usage_source"] == "user"
def test_legacy_kind_only_callers_still_work(client):
"""Old clients post kind without usage — determinate graphs classify, the
row is enabled and generation proceeds as before."""
r = client.post(
"/api/workflows",
json={"name": "旧调用", "kind": "image", "workflow_json": _load("qwen_image_t2i_API.json")},
)
assert r.status_code == 200
wf = r.json()
assert wf["usage"] == "text2image" and wf["is_enabled"] is True
def test_migration_backfills_usage_and_keeps_history(client):
"""A8: pre-HEL-636 rows (direct SQL, no usage) settle on re-migration;
determinate ones gain usage, ambiguous ones are parked disabled, and
existing jobs/history stay readable with their original kind."""
pid = client.post("/api/projects", json={"title": "存量项目", "idea": "x"}).json()["id"]
conn = get_db(settings.db_path)
try:
conn.execute(
"INSERT INTO workflows (name, kind, workflow_json, input_schema,"
" output_schema, is_enabled) VALUES (?, 'image', ?, '[]', '[]', 1)",
("存量·文生图", json.dumps(_load("qwen_image_t2i_API.json"))),
)
conn.execute(
"INSERT INTO workflows (name, kind, workflow_json, input_schema,"
" output_schema, is_enabled) VALUES (?, 'video', ?, '[]', '[]', 1)",
("存量·歧义", json.dumps(AMBIGUOUS)),
)
conn.execute(
"INSERT INTO jobs (project_id, kind, workflow_id, status, payload_json,"
" output_paths_json) VALUES (?, 'image', NULL, 'done', '{}', ?)",
(pid, json.dumps(["/old/result.png"])),
)
conn.commit()
finally:
conn.close()
import asyncio
asyncio.run(migrate_db(settings.db_path)) # idempotent re-run
wfs = {w["name"]: w for w in client.get("/api/workflows").json()}
assert wfs["存量·文生图"]["usage"] == "text2image"
assert wfs["存量·文生图"]["is_enabled"] is True
assert wfs["存量·歧义"]["usage"] is None
assert wfs["存量·歧义"]["is_enabled"] is False
assert wfs["存量·歧义"]["kind"] == "video" # old kind semantics untouched
jobs = client.get(f"/api/jobs?project_id={pid}").json()
assert any(
j["status"] == "done" and j["kind"] == "image" and j["output_paths"] == ["/old/result.png"]
for j in jobs
)
# a third run changes nothing (idempotent)
asyncio.run(migrate_db(settings.db_path))
wfs2 = {w["name"]: w for w in client.get("/api/workflows").json()}
assert wfs2["存量·文生图"]["usage"] == "text2image"
assert wfs2["存量·歧义"]["usage"] is None
def test_broken_qwen_import_stays_blocked_but_recorded(client):
"""The damaged Qwen export classifies fine (image2image); its structural
lint errors still refuse generation — a broken file case, not a usage case."""
wf_json = _load("qwen21_edit_sage_API.json")
r = client.post(
"/api/workflows/analyze", json={"workflow_json": wf_json}
)
assert r.json()["usage"] == "image2image"
r = client.post(
"/api/workflows", json={"name": "损坏·Qwen", "kind": "image", "workflow_json": wf_json}
)
assert r.status_code == 200
wf = r.json()
assert wf["usage"] == "image2image" and wf["is_enabled"] is True
assert any(w["level"] == "error" for w in wf["warnings"])
gen = client.post(
"/api/playground/generate",
json={"workflow_id": wf["id"], "input_values": {"4@prompt": "x"}},
)
assert gen.status_code == 400 and "重新导出" in gen.json()["detail"]
@@ -0,0 +1,272 @@
"""L2 连接核查(HEL-643 批次 1):导入/复查时用目标 ComfyUI 的 /object_info
预检节点与模型可用性。全部基于 fake ComfyUI 的脚本化 /object_info,
不针对任何固定 JSON 或模型名写死判定。"""
from __future__ import annotations
import json
import socket
from pathlib import Path
import pytest
from calliope.comfyui.client import clear_object_info_cache
from calliope.comfyui.preflight import check_workflow_against
from calliope.config import settings
from tests.test_studio_generation import _url
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
def _load_05() -> dict:
return json.loads((FIXTURES / "h3_ref2va_05_API.json").read_text(encoding="utf-8"))
def build_object_info(workflow: dict) -> dict:
"""A catalogue where every widget value the JSON carries is legal.
String widgets become combos whose candidates include the workflow's own
value (merged across nodes of the same class); numbers/booleans are typed
inputs; wired inputs are link types — none of those can mismatch.
"""
info: dict = {}
for node in workflow.values():
if not isinstance(node, dict):
continue
ct = str(node.get("class_type") or "")
if not ct:
continue
spec = info.setdefault(ct, {"input": {"required": {}}, "output": ["*"]})
required = spec["input"]["required"]
for name, val in (node.get("inputs") or {}).items():
if isinstance(val, str):
# Merge: two nodes of one class with different values → both legal.
if name in required and isinstance(required[name][0], list):
if val not in required[name][0]:
required[name][0] = [*required[name][0], val]
continue
required[name] = [[val], {}]
elif name in required:
continue
elif isinstance(val, list):
required[name] = ["*", {}]
elif isinstance(val, bool):
required[name] = ["BOOLEAN", {}]
elif isinstance(val, (int, float)):
required[name] = ["NUMBER", {}]
return info
@pytest.fixture(autouse=True)
def _fresh_cache():
clear_object_info_cache()
yield
clear_object_info_cache()
@pytest.fixture
def endpoint_at(client, fake_comfy): # noqa: F811
"""Register a connection pointing at the fake server; yields its id."""
prev_eps = [dict(ep) for ep in (settings.comfyui_endpoints or [])]
prev_active = settings.comfyui_active_id
r = client.post(
"/api/comfyui/endpoints",
json={"name": "预检桩", "base_url": _url(fake_comfy), "auth_type": "none"},
)
assert r.status_code == 200, r.text
endpoints = r.json()["endpoints"]
ep = next(e for e in endpoints if e["base_url"] == _url(fake_comfy))
settings.comfyui_endpoints = [dict(e) for e in endpoints if e["base_url"] == _url(fake_comfy)]
settings.comfyui_active_id = ep["id"]
settings.apply_active_comfyui()
try:
yield ep["id"]
finally:
settings.comfyui_endpoints = prev_eps
settings.comfyui_active_id = prev_active
settings.apply_active_comfyui()
# ---------------------------------------------------------------------------
# Unit rules
# ---------------------------------------------------------------------------
def test_unit_missing_node_reported_with_node_context():
wf = {"900": {"class_type": "H3SLAAttention", "inputs": {"enabled": True},
"_meta": {"title": "H3 SLA Attention"}}}
findings = check_workflow_against({"OtherNode": {}}, wf)
assert len(findings) == 1
f = findings[0]
assert f["code"] == "missing_node" and f["level"] == "error"
msg = f["message"]
assert "H3SLAAttention" in msg and "900" in msg and "H3 SLA Attention" in msg
assert "重新检查" in f["hint"]
def test_unit_combo_value_not_in_list():
wf = {"127": {"class_type": "UNETLoader",
"inputs": {"unet_name": "missing_model.safetensors", "weight_dtype": "default"}}}
info = {"UNETLoader": {"input": {"required": {
"unet_name": [["installed_model.safetensors"], {}],
"weight_dtype": [["default", "fp8"], {"upload": False}],
}}, "output": ["MODEL"]}}
findings = check_workflow_against(info, wf)
assert len(findings) == 1
f = findings[0]
assert f["code"] == "value_not_in_list" and f["node_id"] == "127"
assert "missing_model.safetensors" in f["message"] and "unet_name" in f["message"]
assert "模型文件" in f["message"]
assert "installed_model.safetensors" in f["hint"]
def test_unit_upload_backed_and_wired_inputs_skipped():
wf = {
"1": {"class_type": "LoadImage", "inputs": {"image": "placeholder.png"}},
"2": {"class_type": "LoadVideo", "inputs": {"file": "clip.mp4"}},
"3": {"class_type": "LoadAudio", "inputs": {"audio": "voice.wav"}},
"4": {"class_type": "KSampler", "inputs": {"seed": 7, "model": ["9", 0]}},
}
info = {
"LoadImage": {"input": {"required": {"image": [["other.png"], {"image_upload": True}]}},
"output": ["IMAGE"]},
"LoadVideo": {"input": {"required": {"file": [[], {}]}}, "output": ["IMAGE"]},
"LoadAudio": {"input": {"required": {"audio": [[], {}]}}, "output": ["AUDIO"]},
"KSampler": {"input": {"required": {"seed": ["INT", {}], "model": ["MODEL", {}]}},
"output": ["IMAGE"]},
}
assert check_workflow_against(info, wf) == []
# ---------------------------------------------------------------------------
# Analyze with a target connection
# ---------------------------------------------------------------------------
def test_analyze_all_green_against_fake_object_info(client, endpoint_at, fake_comfy):
fake_comfy.object_info = build_object_info(_load_05())
r = client.post(
"/api/workflows/analyze",
json={"workflow_json": _load_05(), "endpoint_id": endpoint_at},
)
assert r.status_code == 200, r.text
check = r.json()["connection_check"]
assert check["reachable"] is True and check["ok"] is True
assert check["findings"] == []
def test_analyze_reports_missing_custom_node(client, endpoint_at, fake_comfy):
info = build_object_info(_load_05())
info.pop("H3SLAAttention")
fake_comfy.object_info = info
r = client.post(
"/api/workflows/analyze",
json={"workflow_json": _load_05(), "endpoint_id": endpoint_at},
)
check = r.json()["connection_check"]
assert check["ok"] is False
missing = [f for f in check["findings"] if f["code"] == "missing_node"]
assert missing and "H3SLAAttention" in missing[0]["message"]
assert "900" in missing[0]["message"]
def test_analyze_reports_missing_model_value(client, endpoint_at, fake_comfy):
info = build_object_info(_load_05())
# The server has a DIFFERENT unet installed than the one the JSON names.
info["UNETLoader"]["input"]["required"]["unet_name"] = [["another_unet.safetensors"], {}]
fake_comfy.object_info = info
r = client.post(
"/api/workflows/analyze",
json={"workflow_json": _load_05(), "endpoint_id": endpoint_at},
)
check = r.json()["connection_check"]
assert check["ok"] is False
bad = [f for f in check["findings"] if f["code"] == "value_not_in_list"]
assert bad and bad[0]["node_id"] == "127"
assert "minimax_h3_fused_refdelta" in bad[0]["message"]
def test_unreachable_connection_degrades_to_unchecked(client):
# A port that nothing listens on: the endpoint resolves, the server doesn't.
s = socket.socket()
s.bind(("127.0.0.1", 0))
port = s.getsockname()[1]
s.close()
prev_eps = [dict(ep) for ep in (settings.comfyui_endpoints or [])]
prev_active = settings.comfyui_active_id
r = client.post(
"/api/comfyui/endpoints",
json={"name": "断连桩", "base_url": f"http://127.0.0.1:{port}", "auth_type": "none"},
)
endpoints = r.json()["endpoints"]
ep = next(e for e in endpoints if e["base_url"] == f"http://127.0.0.1:{port}")
settings.comfyui_endpoints = [dict(e) for e in endpoints if e["id"] == ep["id"]]
settings.comfyui_active_id = ep["id"]
settings.apply_active_comfyui()
try:
r = client.post(
"/api/workflows/analyze",
json={"workflow_json": _load_05(), "endpoint_id": ep["id"]},
)
check = r.json()["connection_check"]
assert check["reachable"] is False and check["ok"] is False
assert "无法核查" in check["message"]
assert check["findings"] == []
finally:
settings.comfyui_endpoints = prev_eps
settings.comfyui_active_id = prev_active
settings.apply_active_comfyui()
# ---------------------------------------------------------------------------
# Saved-workflow re-check + cache
# ---------------------------------------------------------------------------
def _create_workflow(client, workflow: dict, endpoint_id: str | None = None) -> int:
r = client.post(
"/api/workflows",
json={
"name": "预检工作流",
"workflow_json": workflow,
"usage": "ref2video",
**({"endpoint_id": endpoint_id} if endpoint_id else {}),
},
)
assert r.status_code == 200, r.text
return r.json()["id"]
def test_saved_workflow_recheck_and_refresh(client, endpoint_at, fake_comfy):
wf_id = _create_workflow(client, _load_05(), endpoint_at)
info = build_object_info(_load_05())
info.pop("UNETLoader")
fake_comfy.object_info = info
r = client.post(f"/api/workflows/{wf_id}/check", json={})
assert r.status_code == 200, r.text
body = r.json()
assert body["ok"] is False and body["endpoint_id"] == endpoint_at
assert any(f["code"] == "missing_node" for f in body["findings"])
# User installs the node package, comes back and re-checks with refresh.
fake_comfy.object_info = build_object_info(_load_05())
r = client.post(f"/api/workflows/{wf_id}/check", json={"refresh": True})
body = r.json()
assert body["ok"] is True and body["findings"] == []
def test_object_info_cached_within_ttl(client, endpoint_at, fake_comfy):
fake_comfy.object_info = build_object_info(_load_05())
for _ in range(2):
r = client.post(
"/api/workflows/analyze",
json={"workflow_json": _load_05(), "endpoint_id": endpoint_at},
)
assert r.json()["connection_check"]["ok"] is True
hits = [p for p in fake_comfy.requests if p == "/object_info"]
assert len(hits) == 1 # second call served from the 5-minute cache
wf_id = _create_workflow(client, _load_05())
client.post(f"/api/workflows/{wf_id}/check", json={"refresh": True})
hits = [p for p in fake_comfy.requests if p == "/object_info"]
assert len(hits) == 2 # manual refresh bypasses the TTL
@@ -0,0 +1,197 @@
"""「测试工作流」(HEL-643 批次 2)端到端:真实队列 → fake ComfyUI → 产物隔离。
测试任务与普通任务区分(jobs.origin)、dry-run 拒绝、幂等复用、
保留策略与级联清理,全部对着 fake ComfyUI 跑真实链路。
"""
from __future__ import annotations
import time
from pathlib import Path
from calliope.config import settings
from calliope.queue.workflow_test import workflow_test_dir
from tests.test_studio_generation import (
IMAGE_WORKFLOW,
PNG_1PX,
_real_run,
)
def _wait_terminal(client, job_id: int, timeout: float = 25.0) -> dict:
deadline = time.time() + timeout
while time.time() < deadline:
r = client.get(f"/api/jobs/{job_id}")
assert r.status_code == 200, r.text
job = r.json()
if job["status"] not in ("pending", "running"):
return job
time.sleep(0.4)
raise AssertionError(f"test job {job_id} did not finish in {timeout}s")
def _create_workflow(client, workflow: dict, name: str = "可测工作流") -> int:
r = client.post(
"/api/workflows",
json={"name": name, "workflow_json": workflow, "usage": "text2image"},
)
assert r.status_code == 200, r.text
return r.json()["id"]
def test_passing_test_downloads_real_output_to_scratch_dir(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="通过用例")
r = client.post(
f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "测试提示词"}}
)
assert r.status_code == 200, r.text
body = r.json()
assert body["reused"] is False
job = _wait_terminal(client, body["job"]["id"])
assert job["status"] == "done", job.get("error")
assert job["origin"] == "workflow_test"
assert job["payload"]["source"] == "workflow_test"
assert job["phase"] == "finished"
# 真实拿到可下载输出才算通过:产物落在独立 scratch 目录
assert len(job["output_paths"]) >= 1
out = Path(job["output_paths"][0])
assert out.is_file() and out.read_bytes() == PNG_1PX
assert workflow_test_dir(wf_id) in out.parents
# 提交给 fake ComfyUI 的是补丁后的真实提示词
queued = fake_comfy.prompts[-1]["prompt"]
assert queued["1"]["inputs"]["text"] == "测试提示词"
def test_tasks_list_shows_origin_but_playground_history_hides_it(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="可见性用例")
r = client.post(f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "p"}})
job_id = r.json()["job"]["id"]
_wait_terminal(client, job_id)
listed = client.get("/api/jobs?limit=50").json()
mine = [j for j in listed if j["id"] == job_id]
assert mine and mine[0]["origin"] == "workflow_test"
pg = client.get("/api/playground/jobs").json()
assert all(j["id"] != job_id for j in pg), "test jobs must stay out of studio history"
def test_failed_prompt_reports_chinese_reason(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="排队被拒用例")
fake_comfy.fail_prompt = True
r = client.post(f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "p"}})
job = _wait_terminal(client, r.json()["job"]["id"])
assert job["status"] == "failed"
assert "拒绝执行" in (job["error"] or "")
def test_no_output_does_not_pass(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="无输出用例")
fake_comfy.drop_outputs = True
r = client.post(f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "p"}})
job = _wait_terminal(client, r.json()["job"]["id"])
assert job["status"] == "failed"
assert "没有返回任何图片或视频" in (job["error"] or "")
def test_dry_run_setting_refuses_real_test(client, fake_comfy):
with _real_run(client, fake_comfy):
settings.dry_run = True # conftest default; _real_run clears it — set again
try:
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="dry 拒绝用例")
r = client.post(f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "p"}})
assert r.status_code == 400
assert "Dry-run" in r.json()["detail"]
finally:
settings.dry_run = False
def test_repeat_click_reuses_inflight_job(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="幂等用例")
assert client.post("/api/jobs/pause").status_code == 200
try:
r1 = client.post(
f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "一次就好"}}
)
assert r1.status_code == 200 and r1.json()["reused"] is False
r2 = client.post(
f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "重复点击"}}
)
assert r2.status_code == 200
assert r2.json()["reused"] is True
assert r2.json()["job"]["id"] == r1.json()["job"]["id"]
finally:
client.post("/api/jobs/resume")
client.post(f"/api/jobs/{r1.json()['job']['id']}/cancel")
_wait_terminal(client, r1.json()["job"]["id"])
def test_retention_keeps_newest_records_and_prunes_artifacts(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="保留策略用例")
for i in range(7):
fake_comfy.out_name = f"t{i}.png"
r = client.post(
f"/api/workflows/{wf_id}/test",
json={"input_values": {"1": f"第{i}次"}},
)
_wait_terminal(client, r.json()["job"]["id"])
rows = client.get(f"/api/workflows/{wf_id}/tests").json()
assert len(rows) <= 5
kept_ids = {row["id"] for row in rows}
# 被清掉的旧记录其产物文件也一并删除
leftovers = [p for p in workflow_test_dir(wf_id).iterdir() if p.suffix == ".png"]
assert all(p.stem.lstrip("t").isdigit() and int(p.stem[1:]) >= 2 for p in leftovers)
assert len(kept_ids) == 5
def test_clear_tests_and_workflow_delete_cascade(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_id = _create_workflow(client, IMAGE_WORKFLOW, name="清理用例")
r = client.post(f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "p"}})
_wait_terminal(client, r.json()["job"]["id"])
assert workflow_test_dir(wf_id).is_dir()
r = client.post(f"/api/workflows/{wf_id}/clear-tests")
assert r.status_code == 200 and r.json()["removed"] >= 1
assert not workflow_test_dir(wf_id).exists()
assert client.get(f"/api/workflows/{wf_id}/tests").json() == []
# 进行中的测试:先拒绝清除,取消后删除工作流级联清理
assert client.post("/api/jobs/pause").status_code == 200
try:
job_id = client.post(
f"/api/workflows/{wf_id}/test", json={"input_values": {"1": "p"}}
).json()["job"]["id"]
r = client.post(f"/api/workflows/{wf_id}/clear-tests")
assert r.status_code == 409
finally:
client.post("/api/jobs/resume")
client.post(f"/api/jobs/{job_id}/cancel")
_wait_terminal(client, job_id)
# 工作流列表带出「上次测试」实时状态
listed = client.get("/api/workflows").json()
mine = [w for w in listed if w["id"] == wf_id][0]
assert mine["last_test"]["id"] == job_id
assert client.delete(f"/api/workflows/{wf_id}").status_code == 200
assert not workflow_test_dir(wf_id).exists()
assert client.get(f"/api/workflows/{wf_id}/tests").status_code == 404
def test_last_test_summary_live_on_list(client, fake_comfy):
with _real_run(client, fake_comfy):
wf_a = _create_workflow(client, IMAGE_WORKFLOW, name="A")
wf_b = _create_workflow(client, IMAGE_WORKFLOW, name="B")
r = client.post(f"/api/workflows/{wf_a}/test", json={"input_values": {"1": "p"}})
done = _wait_terminal(client, r.json()["job"]["id"])
listed = {w["id"]: w for w in client.get("/api/workflows").json()}
assert listed[wf_a]["last_test"]["status"] == "done"
assert listed[wf_a]["last_test"]["output_count"] == len(done["output_paths"])
assert listed[wf_b]["last_test"] is None
+61 -8
View File
@@ -133,8 +133,13 @@ import type {
SceneVideoSettings,
Clip,
Workflow,
WorkflowUsage,
WorkflowAnalyzeResult,
ComfyDynamicInput,
ComfyDynamicOutput,
WorkflowOutputMapEntry,
WorkflowConnectionCheck,
WorkflowLastTest,
} from "./comfy/types";
export type {
Job,
@@ -142,8 +147,13 @@ export type {
SceneVideoSettings,
Clip,
Workflow,
WorkflowUsage,
WorkflowAnalyzeResult,
ComfyDynamicInput,
ComfyDynamicOutput,
WorkflowOutputMapEntry,
WorkflowConnectionCheck,
WorkflowLastTest,
};
async function api<T>(path: string, init?: RequestInit): Promise<T> {
@@ -452,21 +462,59 @@ export const comfy = {
export const workflows = {
list: () => api<Workflow[]>("/api/workflows"),
analyze: (workflow_json: Record<string, unknown>) =>
api<{
inputs: ComfyDynamicInput[];
outputs: ComfyDynamicOutput[];
suggested_profile?: string;
}>("/api/workflows/analyze", {
analyze: (
workflow_json: Record<string, unknown>,
endpoint_id?: string | null,
refresh = false,
) =>
api<WorkflowAnalyzeResult>("/api/workflows/analyze", {
method: "POST",
body: JSON.stringify({ workflow_json }),
body: JSON.stringify({
workflow_json,
...(endpoint_id ? { endpoint_id } : {}),
...(refresh ? { refresh } : {}),
}),
}),
reanalyze: (id: number) =>
api<Workflow>(`/api/workflows/${id}/reanalyze`, { method: "POST" }),
/** L2 re-check against a live ComfyUI (HEL-643): node/model availability. */
check: (
id: number,
payload?: { endpoint_id?: string | null; refresh?: boolean },
) =>
api<WorkflowConnectionCheck>(`/api/workflows/${id}/check`, {
method: "POST",
body: JSON.stringify(payload ?? {}),
}),
/** Launch (or re-attach to) one REAL test run (HEL-643 L3). */
test: (
id: number,
payload: {
endpoint_id?: string | null;
input_values?: Record<string, unknown>;
},
) =>
api<{ ok: boolean; job: Job; reused: boolean }>(
`/api/workflows/${id}/test`,
{
method: "POST",
body: JSON.stringify(payload),
},
),
tests: (id: number) => api<Job[]>(`/api/workflows/${id}/tests`),
clearTests: (id: number) =>
api<{ ok: boolean; removed: number }>(`/api/workflows/${id}/clear-tests`, {
method: "POST",
}),
create: (payload: {
name: string;
kind: "image" | "video";
workflow_json: Record<string, unknown>;
kind?: "image" | "video";
usage?: WorkflowUsage;
usage_source?: "auto" | "user";
input_schema?: ComfyDynamicInput[];
output_map?: WorkflowOutputMapEntry[];
output_map_source?: "auto" | "user";
description?: string;
prompt_profile?: string;
endpoint_id?: string | null;
@@ -484,6 +532,11 @@ export const workflows = {
description: string;
prompt_profile: string;
endpoint_id: string | null;
usage: WorkflowUsage;
usage_source: "auto" | "user";
input_schema: ComfyDynamicInput[];
output_map: WorkflowOutputMapEntry[];
output_map_source: "auto" | "user";
}>,
) =>
api<Workflow>(`/api/workflows/${id}`, {
+72
View File
@@ -0,0 +1,72 @@
import { t } from "$lib/i18n.svelte";
/** Studio image slots (ref-upload-spec §3): PNG / JPG / WebP, ≤ 20MB each. */
export const IMAGE_SLOT_ACCEPT =
".png,.jpg,.jpeg,.webp,image/png,image/jpeg,image/webp";
export const IMAGE_SLOT_MAX_BYTES = 20 * 1024 * 1024;
const IMAGE_EXTS = [".png", ".jpg", ".jpeg", ".webp"];
/** Reference video slots (HEL-643): MP4 / WebM / MOV, ≤ 500MB (upload cap). */
export const VIDEO_SLOT_ACCEPT =
"video/mp4,video/webm,video/quicktime,.mp4,.webm,.mov";
export const VIDEO_SLOT_MAX_BYTES = 500 * 1024 * 1024;
const VIDEO_EXTS = [".mp4", ".webm", ".mov"];
/** Reference audio slots (HEL-643): MP3 / WAV / M4A, ≤ 100MB. */
export const AUDIO_SLOT_ACCEPT =
"audio/mpeg,audio/wav,audio/mp4,.mp3,.wav,.m4a";
export const AUDIO_SLOT_MAX_BYTES = 100 * 1024 * 1024;
const AUDIO_EXTS = [".mp3", ".wav", ".m4a"];
export type MediaSlotKind = "image" | "video" | "audio";
export function mediaSlotAccept(kind: MediaSlotKind): string {
if (kind === "video") return VIDEO_SLOT_ACCEPT;
if (kind === "audio") return AUDIO_SLOT_ACCEPT;
return IMAGE_SLOT_ACCEPT;
}
/** Why this file cannot fill a media slot of this kind (null = fine). */
export function mediaFileProblem(
kind: MediaSlotKind,
file: { name: string; size: number },
): string | null {
const dot = file.name.lastIndexOf(".");
const ext = dot >= 0 ? file.name.slice(dot).toLowerCase() : "";
const max =
kind === "video"
? VIDEO_SLOT_MAX_BYTES
: kind === "audio"
? AUDIO_SLOT_MAX_BYTES
: IMAGE_SLOT_MAX_BYTES;
if (kind === "video" && !VIDEO_EXTS.includes(ext))
return t("studio.errVideoFormat", { name: file.name });
if (kind === "audio" && !AUDIO_EXTS.includes(ext))
return t("studio.errAudioFormat", { name: file.name });
if (kind === "image" && !IMAGE_EXTS.includes(ext))
return t("studio.errImageFormat", { name: file.name });
if (file.size > max)
return kind === "image"
? t("studio.errImageSize", { name: file.name })
: t("studio.errMediaSize", { name: file.name });
return null;
}
/** Why this file cannot fill an image slot (null = fine). */
export function imageFileProblem(file: {
name: string;
size: number;
}): string | null {
return mediaFileProblem("image", file);
}
export function formatBytes(bytes: number): string {
if (bytes >= 1024 * 1024) return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
return `${Math.max(1, Math.round(bytes / 1024))} KB`;
}
/** Display name of an uploaded path (strips the uuid8- prefix the upload endpoint writes). */
export function uploadBaseName(p: string): string {
const raw = p.split(/[/\\]/).pop() ?? p;
return /^[0-9a-f]{8}-/.test(raw) ? raw.slice(9) : raw;
}
@@ -44,6 +44,7 @@ export function compactInputValues(
for (const [k, v] of Object.entries(values)) {
if (v === null || v === undefined) continue;
if (typeof v === 'string' && !v.trim()) continue;
if (Array.isArray(v) && !v.length) continue;
out[k] = v;
}
return out;
+122 -3
View File
@@ -6,9 +6,22 @@ export type ComfyInputKind =
| 'image'
| 'image_url'
| 'audio'
| 'video';
| 'video'
/** Ordered list of images for one Autogrow input (e.g. H3 ref_images, min…max). */
| 'image_list'
/** Ordered lists of videos / audios for Autogrow inputs (HEL-643). */
| 'video_list'
| 'audio_list';
export type ComfyOutputKind = 'image' | 'video' | 'other';
/** Structural finding on an imported workflow; `error` blocks generation. */
export interface WorkflowWarning {
level: 'error' | 'warning';
code: string;
node_id: string;
message: string;
}
export interface ComfyDynamicInput {
nodeId: string;
label: string;
@@ -28,14 +41,107 @@ export interface ComfyDynamicInput {
options?: string[];
/** On a ResolutionSelector aspect_ratio entry: its megapixels key and rounding multiple. */
resolution?: { megapixels: string; multiple: number };
/** Official usage-limits hint key for known media groups (HEL-643, e.g. 'minimax_h3_ref2va'). */
media_hint?: string;
}
export interface ComfyDynamicOutput {
nodeId: string;
label: string;
/** Role from title tag, e.g. (Output:image) → "image". */
/** Role from title tag, e.g. (Output:image). */
role?: string | null;
kind: ComfyOutputKind;
/** Null while an unknown custom node awaits the user's media-type pick. */
kind: ComfyOutputKind | null;
/** Untagged detection: node class + which rule typed it. */
class_type?: string;
evidence?: 'registry' | 'class_name_match' | 'unknown_node';
/** Form default for unknown candidates — never auto-applied. */
suggested_kind?: 'image' | 'video' | null;
}
/** One entry of a workflow's confirmed output mapping (HEL-638). */
export interface WorkflowOutputMapEntry {
nodeId: string;
kind: 'image' | 'video';
label?: string;
class_type?: string;
}
/** The five workflow usages the studio distinguishes (HEL-636). */
export type WorkflowUsage =
| 'text2image'
| 'image2image'
| 'text2video'
| 'image2video'
| 'ref2video';
export const WORKFLOW_USAGES: WorkflowUsage[] = [
'text2image',
'image2image',
'text2video',
'image2video',
'ref2video',
];
/** Which usages each generate page serves. */
export const USAGE_BY_KIND: Record<'image' | 'video', WorkflowUsage[]> = {
image: ['text2image', 'image2image'],
video: ['text2video', 'image2video', 'ref2video'],
};
/** One L2 connection-check finding against a live ComfyUI (HEL-643). */
export interface PreflightFinding {
level: 'error' | 'warn' | 'info' | 'ok';
code: string;
node_id?: string;
node_title?: string | null;
message: string;
hint?: string | null;
}
/** Result of checking a workflow against a target connection's /object_info. */
export interface WorkflowConnectionCheck {
endpoint_id: string | null;
endpoint_name: string | null;
base_url?: string | null;
/** False when any error-level finding exists (or the server was unreachable). */
ok: boolean;
/** False → 无法核查 (server down): honest, non-blocking. */
reachable: boolean;
findings: PreflightFinding[];
message?: string | null;
}
/** Slim live record of a workflow's latest test run (HEL-643). */
export interface WorkflowLastTest {
id: number;
status: string;
phase: string | null;
error: string | null;
created_at: string;
completed_at: string | null;
output_count: number;
}
/** Result of POST /api/workflows/analyze (import confirm step 1). */
export interface WorkflowAnalyzeResult {
inputs: ComfyDynamicInput[];
outputs: ComfyDynamicOutput[];
suggested_profile?: string;
warnings?: WorkflowWarning[];
usage: WorkflowUsage | null;
usage_ambiguous: boolean;
needs_mapping: boolean;
usage_problem: string | null;
usage_evidence: {
outputs: ComfyDynamicOutput[];
image_slots: Array<{ nodeId: string; label: string; kind: string; role: string | null }>;
video_slots: Array<{ nodeId: string; label: string; kind: string; role: string | null }>;
summary: string[];
};
usable_usage: WorkflowUsage[];
/** Present when analyze was called with a target endpoint (HEL-643 L2). */
connection_check?: WorkflowConnectionCheck;
}
export interface WorkflowNode {
@@ -48,6 +154,9 @@ export interface Workflow {
id: number;
name: string;
kind: 'image' | 'video';
/** Five-way usage (HEL-636); null = pending human confirmation. */
usage?: WorkflowUsage | null;
usage_source?: 'auto' | 'user' | null;
workflow_json: Record<string, WorkflowNode>;
input_schema: ComfyDynamicInput[];
output_schema: ComfyDynamicOutput[];
@@ -56,6 +165,14 @@ export interface Workflow {
is_enabled: boolean;
/** Bound ComfyUI connection id (settings.comfyui_endpoints); null = active. */
endpoint_id?: string | null;
warnings?: WorkflowWarning[];
/** HEL-638: confirmed output mapping ({nodeId, kind}); null/empty = pending. */
output_map?: WorkflowOutputMapEntry[] | null;
output_map_source?: 'auto' | 'user' | null;
/** True when the graph has unknown output nodes needing designation. */
needs_mapping?: boolean;
/** Latest test-run record, queried live (HEL-643); null = never tested. */
last_test?: WorkflowLastTest | null;
}
export interface Job {
@@ -78,6 +195,8 @@ export interface Job {
comfy_prompt_id?: string | null;
/** connecting · comfy_queued · comfy_running · saving · finished · dry_run */
phase?: string | null;
/** 'user' (normal generation) or 'workflow_test' (HEL-643 test run). */
origin?: string;
}
export interface SceneVideoSettings {
@@ -17,6 +17,10 @@
allowUpload?: boolean;
/** Force required-field error rings visible (e.g. after a blocked Generate). */
showErrors?: boolean;
/** Show each field's workflow value (原值) and mark fields that differ from it. */
showOrig?: boolean;
/** Extra per-field messages keyed by nodeId (e.g. range checks); shown with showErrors. */
errors?: Record<string, string>;
/** Emits labels of required-but-empty inputs whenever the set changes. */
onValidityChange?: (missing: string[]) => void;
onChange?: (values: Record<string, string | number>) => void;
@@ -30,10 +34,23 @@
assetOptions = [],
allowUpload = false,
showErrors = false,
showOrig = false,
errors = {},
onValidityChange,
onChange,
}: Props = $props();
function hasOrig(inp: ComfyDynamicInput): boolean {
return inp.defaultValue !== undefined && inp.defaultValue !== '';
}
function isChanged(inp: ComfyDynamicInput): boolean {
if (!showOrig) return false;
const v = values[inp.nodeId];
if (isBlank(v)) return hasOrig(inp);
return !hasOrig(inp) || String(v) !== String(inp.defaultValue);
}
// Unique per mounted form so label/id pairs never collide across instances.
const uid = Math.random().toString(36).slice(2, 8);
let touched = $state<Record<string, boolean>>({});
@@ -80,6 +97,11 @@
return isMissing(inp) && (showErrors || !!touched[inp.nodeId]);
}
function extraError(inp: ComfyDynamicInput): string | null {
const msg = errors[inp.nodeId]?.trim();
return msg && !isMissing(inp) && (showErrors || !!touched[inp.nodeId]) ? msg : null;
}
function thumbFor(current: string): string | null {
if (!current) return null;
const opt = assetOptions.find((o) => o.path === current);
@@ -224,7 +246,9 @@
{#each inputs as inp (inp.nodeId)}
{@const current = String(values[inp.nodeId] ?? '')}
{@const id = inputId(inp.nodeId)}
{@const errored = showError(inp)}
{@const extra = extraError(inp)}
{@const errored = showError(inp) || !!extra}
{@const changed = isChanged(inp)}
<div class="field">
<label class="label" for={id}>
{inp.label}
@@ -235,6 +259,9 @@
{#if inp.role}<span class="role">{inp.role}</span>{/if}
<span class="kind">{inp.kind}</span>
{/if}
{#if showOrig && hasOrig(inp)}
<span class="orig">{t('cdf.orig', { v: String(inp.defaultValue) })}</span>
{/if}
</label>
{#if readonly}
<div class="readonly">{values[inp.nodeId] ?? inp.defaultValue ?? '—'}</div>
@@ -243,6 +270,7 @@
{id}
rows="3"
class:invalid={errored}
class:changed
aria-required={inp.required || undefined}
aria-invalid={errored || undefined}
value={current}
@@ -254,6 +282,7 @@
{id}
type="number"
class:invalid={errored}
class:changed
aria-required={inp.required || undefined}
aria-invalid={errored || undefined}
value={values[inp.nodeId] ?? ''}
@@ -264,6 +293,7 @@
<select
{id}
class:invalid={errored}
class:changed
value={current || String(inp.defaultValue ?? '')}
onchange={(e) => setValue(inp.nodeId, e.currentTarget.value)}
onblur={() => markTouched(inp.nodeId)}
@@ -445,6 +475,7 @@
{id}
type="text"
class:invalid={errored}
class:changed
aria-required={inp.required || undefined}
aria-invalid={errored || undefined}
value={current}
@@ -453,7 +484,7 @@
/>
{/if}
{#if errored}
<span class="error-msg" role="alert">{t('cdf.requiredMsg', { label: inp.label })}</span>
<span class="error-msg" role="alert">{extra ?? t('cdf.requiredMsg', { label: inp.label })}</span>
{/if}
</div>
{/each}
@@ -516,11 +547,23 @@
border-color: var(--accent);
box-shadow: 0 0 0 3px var(--accent-glow);
}
input.changed,
textarea.changed,
select.changed {
border-color: var(--accent-line);
}
input.invalid,
textarea.invalid,
select.invalid {
border-color: var(--error);
}
.orig {
float: right;
font-weight: 400;
font-size: var(--fs-mini);
font-family: var(--mono);
color: var(--text-muted);
}
input.invalid:focus-visible,
textarea.invalid:focus-visible,
select.invalid:focus-visible {
@@ -37,8 +37,13 @@
<span class="dot"></span>
<Icon name={kindIcon[toast.kind]} size={15} />
</span>
<span class="msg">{toast.message}</span>
<button
<span class="msg">{toast.message}</span>
{#if toast.action}
<button type="button" class="action" onclick={() => (toast.action?.run(), dismissToast(toast.id))}>
{toast.action.label}
</button>
{/if}
<button
type="button"
class="dismiss"
aria-label={t('toast.dismiss')}
@@ -52,15 +57,16 @@
{/if}
<style>
/* §四.5 Toast:右下角堆叠,220ms 上移入场;成功绿点 / 失败红点。 */
.toast-host {
position: fixed;
top: 72px;
right: 20px;
right: 24px;
bottom: 24px;
z-index: 1000;
display: flex;
flex-direction: column;
gap: 8px;
max-width: min(360px, calc(100vw - 32px));
max-width: min(400px, calc(100vw - 32px));
pointer-events: none;
}
.toast {
@@ -69,23 +75,10 @@
align-items: flex-start;
gap: 10px;
padding: 12px 14px;
border-radius: var(--radius-md);
border: 1px solid var(--border);
background: var(--bg-surface);
box-shadow: 0 12px 32px rgba(0, 0, 0, 0.45);
animation: toast-in 0.22s ease-out;
}
.toast.success {
border-color: rgba(34, 197, 94, 0.45);
box-shadow:
0 12px 32px rgba(0, 0, 0, 0.45),
0 0 0 1px rgba(34, 197, 94, 0.12);
}
.toast.error {
border-color: rgba(239, 68, 68, 0.5);
}
.toast.info {
border-color: rgba(59, 130, 246, 0.45);
border-radius: var(--r-lg);
background: var(--float-bg);
box-shadow: var(--shadow-float);
animation: toast-in var(--d-enter) var(--ease-out);
}
.badge {
display: inline-flex;
@@ -101,21 +94,44 @@
background: currentColor;
}
.toast.success .badge {
color: var(--success);
color: var(--ok);
}
.toast.error .badge {
color: var(--error);
color: var(--err);
}
.toast.info .badge {
color: var(--info);
color: var(--text-2);
}
.msg {
flex: 1;
font-size: 13px;
font-size: var(--fs-body);
line-height: 1.4;
color: var(--text-primary);
font-weight: 500;
}
/* §四.5: Toast 动作(如撤销)为金色文字 */
.action {
flex-shrink: 0;
align-self: center;
padding: var(--sp-1) var(--sp-2);
border: 0;
border-radius: var(--r-sm);
background: transparent;
color: var(--accent);
font: inherit;
font-size: var(--fs-aux);
font-weight: 600;
cursor: pointer;
}
@media (hover: hover) and (pointer: fine) {
.action:hover {
background: var(--accent-soft);
}
}
.action:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
}
.dismiss {
display: inline-flex;
align-items: center;
@@ -127,10 +143,12 @@
padding: 0 2px;
min-width: 28px;
min-height: 28px;
border-radius: 4px;
border-radius: var(--r-sm);
}
.dismiss:hover {
color: var(--text-primary);
@media (hover: hover) and (pointer: fine) {
.dismiss:hover {
color: var(--text-primary);
}
}
.dismiss:focus-visible {
outline: 2px solid var(--accent);
@@ -139,7 +157,7 @@
@keyframes toast-in {
from {
opacity: 0;
transform: translateY(-8px);
transform: translateY(8px);
}
to {
opacity: 1;
@@ -151,10 +169,12 @@
animation: none;
}
}
@media (max-width: 640px) {
:global(:root[data-reduce='1']) .toast {
animation: none;
}
@media (max-width: 760px) {
.toast-host {
top: auto;
bottom: 20px;
bottom: calc(var(--tabbar-h) + var(--sp-5) + env(safe-area-inset-bottom));
right: 16px;
left: 16px;
max-width: none;
@@ -0,0 +1,579 @@
<script lang="ts">
import { createQuery, useQueryClient } from '@tanstack/svelte-query';
import { toStore } from 'svelte/store';
import {
apiErrorMessage,
assetUrl,
playgroundApi,
jobsApi,
workflows,
type ComfyEndpoint,
type Job,
type Workflow,
} from '$lib/api';
import ComfyDynamicForm from '$lib/components/ComfyDynamicForm.svelte';
import RefImageGrid from '$lib/components/studio/RefImageGrid.svelte';
import Button from '$lib/components/ui/Button.svelte';
import ConfirmDialog from '$lib/components/ui/ConfirmDialog.svelte';
import Icon from '$lib/components/ui/Icon.svelte';
import Modal from '$lib/components/ui/Modal.svelte';
import SafeMedia from '$lib/components/SafeMedia.svelte';
import { mediaFileProblem, type MediaSlotKind } from '$lib/comfy/imageFile';
import { jobStatusInfo } from '$lib/jobStatus';
import { toast } from '$lib/toast';
import { t } from '$lib/i18n.svelte';
/**
* 测试工作流 (HEL-643 L3): fill the workflow's REAL input slots, submit
* one REAL run to the chosen ComfyUI through the ordinary job queue, and
* call it a pass only when at least one downloadable output of the right
* media kind came back. Test artifacts are isolated from projects.
*/
interface Props {
open?: boolean;
workflow: Workflow | null;
endpoints: ComfyEndpoint[];
onchanged?: () => void;
}
let { open = $bindable(false), workflow, endpoints, onchanged }: Props = $props();
const client = useQueryClient();
let endpointId = $state('');
let values = $state<Record<string, string | number>>({});
let listValues = $state<Record<string, string[]>>({});
let sizes = $state<Record<string, number>>({});
let uploadingName = $state<Record<string, string>>({});
let rejects = $state<Record<string, { name: string; message: string }[]>>({});
let submitError = $state('');
let confirmOpen = $state(false);
let submitting = $state(false);
let testJobId = $state<number | null>(null);
const wf = $derived(workflow);
const schema = $derived(wf?.input_schema ?? []);
const listEntries = $derived(
schema.filter((i) => i.kind === 'image_list' || i.kind === 'video_list' || i.kind === 'audio_list'),
);
const formEntries = $derived(
schema.filter((i) => i.kind !== 'image_list' && i.kind !== 'video_list' && i.kind !== 'audio_list'),
);
const hasH3Hint = $derived(
listEntries.some((e) => e.media_hint === 'minimax_h3_ref2va'),
);
const outputKind = $derived<'image' | 'video'>(wf?.kind === 'video' ? 'video' : 'image');
const testsQuery = createQuery(
toStore(() => ({
queryKey: ['workflow-tests', wf?.id ?? 0],
queryFn: () => workflows.tests(wf!.id),
enabled: !!wf && open,
refetchInterval: 2000,
})),
);
const jobsQuery = createQuery(
toStore(() => ({
queryKey: ['jobs'],
queryFn: () => jobsApi.list(),
enabled: !!wf && open,
refetchInterval: 5000,
})),
);
const queuedCount = $derived(
($jobsQuery.data ?? []).filter((j) => j.status === 'pending' || j.status === 'running')
.length,
);
const history = $derived(($testsQuery.data ?? []) as Job[]);
const activeJob = $derived.by(() => {
if (testJobId != null) {
const mine = history.find((j) => j.id === testJobId);
if (mine && (mine.status === 'pending' || mine.status === 'running')) return mine;
}
return history.find((j) => j.status === 'pending' || j.status === 'running') ?? null;
});
const finishedJob = $derived.by(() => {
if (testJobId != null) return history.find((j) => j.id === testJobId) ?? null;
return null;
});
const queueBusy = $derived(!!activeJob || submitting);
$effect(() => {
if (!open || !wf) return;
endpointId = wf.endpoint_id ?? '';
values = Object.fromEntries(
schema
.filter((i) => i.defaultValue !== undefined && i.defaultValue !== null)
.map((i) => [i.nodeId, i.defaultValue as string | number]),
);
listValues = {};
sizes = {};
rejects = {};
uploadingName = {};
submitError = '';
testJobId = wf.last_test && (wf.last_test.status === 'pending' || wf.last_test.status === 'running')
? wf.last_test.id
: null;
});
function kindOf(entry: { kind: string }): MediaSlotKind {
if (entry.kind === 'video_list') return 'video';
if (entry.kind === 'audio_list') return 'audio';
return 'image';
}
function unitOf(kind: MediaSlotKind): string {
return kind === 'image' ? '张' : '段';
}
function setRejects(key: string, next: { name: string; message: string }[]) {
rejects = { ...rejects, [key]: next };
}
async function uploadOne(file: File): Promise<string | null> {
const res = await playgroundApi.upload(file);
sizes = { ...sizes, [res.path]: file.size };
return res.path;
}
async function mediaAdd(entry: (typeof listEntries)[number], files: File[]) {
const kind = kindOf(entry);
const key = entry.nodeId;
const max = entry.max ?? 9;
const current = listValues[key] ?? [];
const ok: string[] = [];
const bad: { name: string; message: string }[] = [];
for (const f of files) {
const problem = mediaFileProblem(kind, f);
if (problem) bad.push({ name: f.name, message: problem });
else ok.push(f.name);
}
if (current.length + ok.length > max) {
toast.error(
t('studio.errRefMax', { max, n: current.length, k: ok.length }),
);
if (bad.length) setRejects(key, [...(rejects[key] ?? []), ...bad]);
return;
}
setRejects(key, [...(rejects[key] ?? []), ...bad]);
for (const f of files) {
if (!ok.includes(f.name)) continue;
uploadingName = { ...uploadingName, [key]: f.name };
try {
const path = await uploadOne(f);
if (path) listValues = { ...listValues, [key]: [...(listValues[key] ?? []), path] };
} catch (err) {
toast.error(apiErrorMessage(err));
} finally {
uploadingName = { ...uploadingName, [key]: '' };
}
}
}
async function mediaReplace(entry: (typeof listEntries)[number], index: number, file: File) {
const kind = kindOf(entry);
const key = entry.nodeId;
const problem = mediaFileProblem(kind, file);
if (problem) {
setRejects(key, [...(rejects[key] ?? []), { name: file.name, message: problem }]);
return;
}
uploadingName = { ...uploadingName, [key]: file.name };
try {
const path = await uploadOne(file);
if (path) {
const next = [...(listValues[key] ?? [])];
next[index] = path;
listValues = { ...listValues, [key]: next };
}
} catch (err) {
toast.error(apiErrorMessage(err));
} finally {
uploadingName = { ...uploadingName, [key]: '' };
}
}
function mediaRemove(entry: (typeof listEntries)[number], index: number) {
const key = entry.nodeId;
listValues = { ...listValues, [key]: (listValues[key] ?? []).filter((_, i) => i !== index) };
}
/** Mirrors the backend's validate_input_values for immediate feedback. */
function validate(): string[] {
const errs: string[] = [];
for (const e of schema) {
const label = e.label;
if (e.kind === 'image_list' || e.kind === 'video_list' || e.kind === 'audio_list') {
const n = (listValues[e.nodeId] ?? []).length;
const unit = unitOf(kindOf(e));
if (e.required && n < (e.min ?? 1)) errs.push(t('wft.errListMin', { n: e.min ?? 1, unit, label }));
} else if (e.auto && e.required && e.role === 'prompt') {
const v = values[e.nodeId];
if (!(typeof v === 'string' && v.trim()) && !String(e.defaultValue ?? '').trim()) {
errs.push(t('wft.errRequired', { label }));
}
} else if (e.required && (e.kind === 'image' || e.kind === 'video' || e.kind === 'audio') && e.role !== 'mask') {
if (!values[e.nodeId]) errs.push(t('wft.errRequired', { label }));
}
}
return errs;
}
async function submitTest() {
if (!wf) return;
const errs = validate();
if (errs.length) {
submitError = errs.join(';');
return;
}
submitError = '';
confirmOpen = true;
}
async function reallyRunTest() {
if (!wf) return;
submitting = true;
try {
const inputValues: Record<string, unknown> = { ...values };
for (const [k, v] of Object.entries(listValues)) {
if (v.length) inputValues[k] = v;
}
const res = await workflows.test(wf.id, {
...(endpointId ? { endpoint_id: endpointId } : {}),
input_values: inputValues as Record<string, string | number | string[]>,
});
testJobId = res.job.id;
if (res.reused) toast.info(t('wft.reusedToast'));
void $testsQuery.refetch();
} catch (err) {
submitError = apiErrorMessage(err);
} finally {
submitting = false;
confirmOpen = false;
}
}
async function cancelTest() {
if (!activeJob) return;
try {
await jobsApi.cancel(activeJob.id);
void $testsQuery.refetch();
} catch (err) {
toast.error(apiErrorMessage(err));
}
}
async function clearRecords() {
if (!wf) return;
try {
await workflows.clearTests(wf.id);
testJobId = null;
await $testsQuery.refetch();
onchanged?.();
toast.success(t('wft.cleared'));
} catch (err) {
toast.error(apiErrorMessage(err));
}
}
function resultLine(job: Job): string {
if (job.status === 'done' && (job.output_paths?.length ?? 0) > 0) {
return t('wft.passedShort', { n: job.output_paths.length });
}
if (job.error === 'cancelled') return t('wft.cancelledShort');
return job.error ? job.error.slice(0, 120) : t('wft.failedShort');
}
function timeOf(at: string | null): string {
if (!at) return '—';
const ts = Date.parse(at.replace(' ', 'T') + 'Z');
const d = new Date(Number.isFinite(ts) ? ts : at);
const p = (n: number) => String(n).padStart(2, '0');
return `${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
}
const endpointLabel = $derived(
endpoints.find((e) => e.id === endpointId)?.name ?? t('conn.wfConnectionActive'),
);
</script>
<Modal bind:open title={t('wft.title')} size="lg">
{#if wf}
<div class="wft">
<p class="wft-sub">
{wf.name}
<span class="mono wft-id">#{wf.id}</span>
</p>
<label class="f-field">
<span class="f-label">{t('wft.connection')}</span>
<select class="f-input" bind:value={endpointId} disabled={queueBusy}>
<option value="">{t('conn.wfConnectionActive')}</option>
{#each endpoints as ep (ep.id)}
<option value={ep.id}>{ep.name}</option>
{/each}
</select>
<span class="f-hint">{t('wft.costNote')}</span>
</label>
{#if hasH3Hint}
<div class="wft-note" role="note">
<Icon name="info" size={14} />
<p>{t('wfMedia.h3Limits')}</p>
</div>
{/if}
{#if activeJob}
{@const info = jobStatusInfo(activeJob)}
<div class="wft-active" class:ok={activeJob.status === 'done'} class:bad={activeJob.status === 'failed'}>
<div class="wft-active-head">
<span class="status-chip">{t('wft.running')}</span>
<span class="wft-active-detail">{info.detail}</span>
<Button variant="secondary" size="sm" onclick={cancelTest}>{t('wft.cancel')}</Button>
</div>
</div>
{:else if finishedJob && finishedJob.status === 'done' && (finishedJob.output_paths?.length ?? 0) > 0}
<div class="wft-result ok">
<p class="wft-verdict">{t('wft.passed', { n: finishedJob.output_paths.length })}</p>
<div class="wft-outputs">
{#each finishedJob.output_paths.slice(0, 4) as path (path)}
<a
class="wft-out"
href={assetUrl(path)}
download
target="_blank"
rel="noreferrer"
title={t('wft.download')}
>
<SafeMedia kind={outputKind} src={assetUrl(path)} controls={outputKind === 'video'} />
</a>
{/each}
</div>
</div>
{:else if finishedJob && finishedJob.status !== 'pending' && finishedJob.status !== 'running'}
<div class="wft-result bad">
<p class="wft-verdict">{t('wft.failed')}</p>
<p class="wft-error">{finishedJob.error === 'cancelled' ? t('wft.cancelledShort') : finishedJob.error}</p>
</div>
{/if}
{#if !queueBusy}
<div class="wft-form">
{#each listEntries as entry (entry.nodeId)}
{@const kind = kindOf(entry)}
<RefImageGrid
label={entry.label}
mediaKind={kind}
paths={listValues[entry.nodeId] ?? []}
max={entry.max ?? 9}
sizes={sizes}
uploadingName={uploadingName[entry.nodeId] || undefined}
rejects={rejects[entry.nodeId] ?? []}
onAdd={(files) => mediaAdd(entry, files)}
onReplace={(i, file) => mediaReplace(entry, i, file)}
onRemove={(i) => mediaRemove(entry, i)}
onDismissReject={(i) =>
setRejects(entry.nodeId, (rejects[entry.nodeId] ?? []).filter((_, j) => j !== i))}
/>
{/each}
{#if formEntries.length}
<ComfyDynamicForm inputs={formEntries} bind:values allowUpload showErrors={!!submitError} />
{/if}
</div>
{#if submitError}<span class="f-error" role="alert">{submitError}</span>{/if}
<div class="wft-actions">
<Button variant="primary" loading={submitting} onclick={submitTest}>
{t('wft.submit')}
</Button>
</div>
{/if}
<div class="wft-history">
<div class="wft-history-head">
<span class="f-label">{t('wft.history', { n: history.length })}</span>
{#if history.length}
<button type="button" class="link-danger" onclick={clearRecords}>
{t('wft.clear')}
</button>
{/if}
</div>
{#if history.length === 0}
<p class="wft-empty">{t('wft.never')}</p>
{:else}
<ul class="wft-rows">
{#each history as job (job.id)}
<li class:active={job.id === activeJob?.id}>
<span class="mono wft-row-id">#{job.id}</span>
<span class="wft-row-time">{timeOf(job.created_at)}</span>
<span class="wft-row-result" class:ok={job.status === 'done' && (job.output_paths?.length ?? 0) > 0}>
{resultLine(job)}
</span>
</li>
{/each}
</ul>
{/if}
</div>
</div>
{/if}
</Modal>
<ConfirmDialog
bind:open={confirmOpen}
title={t('wft.confirmTitle')}
message={t('wft.confirmBody', { endpoint: endpointLabel, n: queuedCount })}
confirmLabel={t('wft.submit')}
onconfirm={reallyRunTest}
/>
<style>
.wft {
display: flex;
flex-direction: column;
gap: 12px;
min-width: 0;
}
.wft-sub {
margin: 0;
font-size: 13px;
color: var(--text-2);
}
.wft-id {
color: var(--text-3);
font-size: 11px;
margin-left: 6px;
}
.wft-note {
display: flex;
gap: 8px;
align-items: flex-start;
padding: 8px 10px;
border: 1px solid var(--info, #3b82f6);
border-radius: 8px;
background: var(--surface-2);
color: var(--text-2);
font-size: 12px;
line-height: 1.6;
}
.wft-note p {
margin: 0;
}
.wft-active,
.wft-result {
border: 1px solid var(--border-strong);
border-radius: 8px;
padding: 10px 12px;
background: var(--surface-2);
}
.wft-active-head {
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
}
.wft-active-detail {
flex: 1;
min-width: 160px;
font-size: 12px;
color: var(--text-2);
}
.wft-result.ok {
border-color: var(--success);
}
.wft-result.bad {
border-color: var(--error);
}
.wft-verdict {
margin: 0 0 8px;
font-size: 13px;
font-weight: 600;
color: var(--text);
}
.wft-result.ok .wft-verdict {
color: var(--success);
}
.wft-error {
margin: 0;
font-size: 12px;
color: var(--error);
line-height: 1.6;
word-break: break-all;
}
.wft-outputs {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
gap: 8px;
}
.wft-out {
display: block;
border: 1px solid var(--border);
border-radius: 8px;
overflow: hidden;
background: var(--bg);
}
.wft-form {
display: flex;
flex-direction: column;
gap: 14px;
}
.wft-actions {
display: flex;
justify-content: flex-end;
gap: 8px;
}
.wft-history {
border-top: 1px solid var(--border);
padding-top: 10px;
}
.wft-history-head {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
}
.wft-empty {
margin: 6px 0 0;
font-size: 12px;
color: var(--text-3);
}
.wft-rows {
list-style: none;
margin: 6px 0 0;
padding: 0;
display: flex;
flex-direction: column;
gap: 4px;
}
.wft-rows li {
display: flex;
gap: 10px;
align-items: baseline;
font-size: 12px;
color: var(--text-2);
padding: 4px 6px;
border-radius: 6px;
}
.wft-rows li.active {
background: var(--surface-3);
}
.wft-row-id {
color: var(--text-3);
font-size: 11px;
}
.wft-row-time {
color: var(--text-3);
font-size: 11px;
white-space: nowrap;
}
.wft-row-result {
flex: 1;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.wft-row-result.ok {
color: var(--success);
}
</style>
@@ -0,0 +1,410 @@
<script lang="ts">
import Icon from '$lib/components/ui/Icon.svelte';
import ShellPop from '$lib/components/shell/ShellPop.svelte';
import type { ComfyDynamicInput, Workflow } from '$lib/comfy/types';
import { t } from '$lib/i18n.svelte';
import ParamChip from './ParamChip.svelte';
import SlotTray from './SlotTray.svelte';
import WorkflowPicker from './WorkflowPicker.svelte';
import { chipValue, type BlockReason, type DeskSchema, type FormValue, type FormValues } from './schema';
/**
* 输入台 (spec-v2 §3.3): slots from the workflow JSON, the prompt, and one
* row of chips — workflow, connection, common params, 参数 — ending in
* 生成 with its reason line. The whole composer takes dropped files.
* ≤760px it collapses to one line and rises as a bottom sheet on focus.
*/
interface Props {
ds: DeskSchema;
values: FormValues;
workflows: Workflow[];
current: Workflow | null;
endpoints: Array<{ id: string; name: string }>;
endpointId: string;
conn: { state: 'ok' | 'fail' | 'untested' | 'dry'; ms?: number | null };
errors: Record<string, string>;
showErrors: boolean;
block: BlockReason | null;
changedCount: number;
submitting: boolean;
/** Shows 已提交 on the button for --d-flash. */
sent: boolean;
slotBusy?: boolean;
promptEl?: HTMLTextAreaElement | null;
onSet: (nodeId: string, value: FormValue) => void;
onPickWorkflow: (wf: Workflow) => void;
onPickEndpoint: (id: string) => void;
onSubmit: () => void;
onReveal: () => void;
onOpenParams: () => void;
onFromResults: (nodeId: string) => void;
}
let {
ds,
values,
workflows,
current,
endpoints,
endpointId,
conn,
errors,
showErrors,
block,
changedCount,
submitting,
sent,
slotBusy = $bindable(false),
promptEl = $bindable(null),
onSet,
onPickWorkflow,
onPickEndpoint,
onSubmit,
onReveal,
onOpenParams,
onFromResults,
}: Props = $props();
let tray = $state<ReturnType<typeof SlotTray> | null>(null);
let root = $state<HTMLElement | null>(null);
let dragDepth = $state(0);
let expanded = $state(false);
let connOpen = $state(false);
const hasSlots = $derived(ds.slots.length + ds.lists.length > 0);
const promptVal = $derived(ds.prompt ? String(values[ds.prompt.nodeId] ?? '') : '');
const promptErr = $derived(showErrors && ds.prompt ? errors[ds.prompt.nodeId] : undefined);
const endpointName = $derived(endpoints.find((e) => e.id === endpointId)?.name ?? t('desk.noConn'));
/** Composer chips: ratio, the width × height pair, resolution, duration, seed. */
const chips = $derived.by(() => {
const out: Array<{ key: string; inputs: ComfyDynamicInput[]; text: string }> = [];
if (ds.ratio) out.push({ key: ds.ratio.nodeId, inputs: [ds.ratio], text: chipValue(ds.ratio, values, ds) });
if (ds.width && ds.height) {
const w = values[ds.width.nodeId] ?? ds.width.defaultValue ?? '?';
const h = values[ds.height.nodeId] ?? ds.height.defaultValue ?? '?';
out.push({ key: ds.width.nodeId, inputs: [ds.width, ds.height], text: `${w}×${h}` });
} else {
for (const inp of [ds.width, ds.height]) {
if (inp) out.push({ key: inp.nodeId, inputs: [inp], text: `${inp.label} ${chipValue(inp, values, ds)}` });
}
}
for (const inp of [ds.resolution, ds.duration, ds.seed]) {
if (inp) out.push({ key: inp.nodeId, inputs: [inp], text: chipValue(inp, values, ds) });
}
return out;
});
function onDrop(e: DragEvent) {
e.preventDefault();
dragDepth = 0;
const files = Array.from(e.dataTransfer?.files ?? []);
if (files.length) tray?.dropFiles(files);
}
function hasFiles(e: DragEvent): boolean {
return Array.from(e.dataTransfer?.types ?? []).includes('Files');
}
function onFocusOut(e: FocusEvent) {
const next = e.relatedTarget as Node | null;
if (!next || !root?.contains(next)) expanded = false;
}
function onKeydown(e: KeyboardEvent) {
if (e.key === 'Escape' && expanded && !e.defaultPrevented) {
expanded = false;
(document.activeElement as HTMLElement | null)?.blur();
}
}
</script>
<div class="composer-wrap">
<div class="a-sprocket" aria-hidden="true"></div>
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
bind:this={root}
class="composer"
class:drag={dragDepth > 0}
class:expanded
onfocusin={() => (expanded = true)}
onfocusout={onFocusOut}
onkeydown={onKeydown}
ondragenter={(e) => {
if (!hasFiles(e)) return;
e.preventDefault();
dragDepth += 1;
}}
ondragleave={() => (dragDepth = Math.max(0, dragDepth - 1))}
ondragover={(e) => hasFiles(e) && e.preventDefault()}
ondrop={onDrop}
>
{#if hasSlots}
<div class="slots">
<SlotTray bind:this={tray} bind:busy={slotBusy} {ds} {values} {showErrors} {errors} {onSet} {onFromResults} />
</div>
{/if}
{#if ds.prompt}
<textarea
bind:this={promptEl}
id="desk-prompt"
class="prompt"
class:invalid={!!promptErr}
rows="2"
value={promptVal}
placeholder={t('desk.promptPh')}
aria-label={t('studio.promptLabel')}
aria-invalid={!!promptErr || undefined}
aria-keyshortcuts="Control+Enter Meta+Enter /"
oninput={(e) => onSet(ds.prompt!.nodeId, e.currentTarget.value)}
></textarea>
{#if promptErr}<p class="a-slot-hint err prompt-err" role="alert">{promptErr}</p>{/if}
{:else if current}
<p class="no-prompt">{t('desk.noPromptInput')}</p>
{/if}
<div class="foot">
<WorkflowPicker {workflows} {current} {endpoints} onPick={onPickWorkflow} />
<div class="conn opt">
<button
type="button"
id="desk-conn"
class="a-chip"
class:err={conn.state === 'fail'}
aria-haspopup="dialog"
aria-expanded={connOpen}
title={t('studio.connLabel')}
onclick={() => (connOpen = !connOpen)}
>
<span class="status-chip-dot {conn.state === 'ok' ? 'run' : conn.state === 'fail' ? 'fail' : 'idle'}"></span>
<span class="lbl">{endpointName}</span>
{#if conn.state === 'ok' && conn.ms != null}<span class="mono">· {Math.round(conn.ms)} ms</span>{/if}
{#if conn.state === 'dry'}<span>· {t('desk.dryRun')}</span>{/if}
</button>
<ShellPop bind:open={connOpen} label={t('studio.connLabel')} placement="top" width="280px">
<div class="a-menu-group">{t('studio.connLabel')}</div>
{#each endpoints as ep (ep.id)}
<button
type="button"
class="a-menu-item"
aria-current={ep.id === endpointId ? 'true' : undefined}
onclick={() => {
onPickEndpoint(ep.id);
connOpen = false;
}}
>
<span class="a-menu-label">{ep.name}</span>
</button>
{/each}
<a class="a-menu-item" href="/connections">
<Icon name="link" size={15} />
<span class="a-menu-label">{t('studio.connManage')}</span>
</a>
</ShellPop>
</div>
{#each chips as c (c.key)}
<div class="opt">
<ParamChip
inputs={c.inputs}
{values}
text={c.text}
invalid={showErrors && c.inputs.some((i) => !!errors[i.nodeId]?.trim())}
{onSet}
/>
</div>
{/each}
{#if ds.common.length + ds.advanced.length > 0}
<button type="button" class="a-chip opt" class:changed={changedCount > 0} onclick={onOpenParams}>
<Icon name="settings" size={14} />
<span class="lbl">
{changedCount > 0 ? t('desk.paramsChanged', { n: changedCount }) : t('desk.paramsAll')}
</span>
</button>
{/if}
<div class="submit">
{#if block}
<button type="button" class="why" class:err={block.tone === 'err'} onclick={onReveal}>
{block.text}
</button>
{/if}
<button
type="button"
class="a-btn primary gen"
class:sent
disabled={!!block || submitting || slotBusy}
aria-keyshortcuts="Control+Enter Meta+Enter"
title={t('desk.genHint')}
onclick={onSubmit}
>
<span class="l-idle"><Icon name="sparkle" size={13} />{t('desk.generate')}</span>
<span class="l-sent" aria-hidden={!sent}><Icon name="check" size={13} />{t('desk.sent')}</span>
</button>
</div>
</div>
</div>
</div>
<style>
.composer-wrap {
padding: var(--sp-2) var(--sp-7) var(--sp-6);
}
.a-sprocket {
margin: 0 var(--sp-2) var(--sp-3);
}
.composer {
border: 1px solid var(--line-2);
border-radius: var(--r-lg);
background: var(--composer-bg);
transition:
border-color var(--d-state) ease,
box-shadow var(--d-state) ease;
}
.composer:focus-within {
border-color: var(--accent-line);
box-shadow: var(--composer-focus);
}
.composer.drag {
border-color: var(--accent-line);
box-shadow: 0 0 0 3px var(--accent-soft);
}
.slots {
max-height: 40vh;
overflow-y: auto;
}
.prompt {
display: block;
box-sizing: border-box;
width: 100%;
min-height: 52px;
max-height: 180px;
padding: var(--sp-5) var(--sp-6) var(--sp-2);
border: 0;
outline: 0;
background: transparent;
color: var(--text);
font: inherit;
line-height: 1.6;
resize: none;
field-sizing: content;
}
.prompt:focus-visible {
outline: 0;
}
.prompt::placeholder {
color: var(--text-3);
}
.prompt-err,
.no-prompt {
margin: 0;
padding: 0 var(--sp-6);
}
.no-prompt {
padding-top: var(--sp-5);
font-size: var(--fs-aux);
color: var(--text-3);
}
.foot {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: var(--sp-2);
padding: var(--sp-2) var(--sp-3) var(--sp-3);
}
.conn {
position: relative;
}
.submit {
display: flex;
align-items: center;
gap: var(--sp-4);
margin-left: auto;
}
.why {
padding: 0;
border: 0;
background: none;
font: inherit;
font-size: var(--fs-aux);
color: var(--warn);
white-space: nowrap;
text-decoration: underline dotted;
text-underline-offset: 3px;
cursor: pointer;
}
.why.err {
color: var(--err);
}
/* 生成:按下即缩,提交后文字换成「已提交」约 --d-flash,期间仍可再次提交 */
.gen {
display: inline-grid;
min-width: 84px;
border-radius: var(--r-pill);
}
.gen > span {
grid-area: 1 / 1;
display: inline-flex;
align-items: center;
justify-content: center;
gap: var(--sp-1);
transition:
opacity var(--d-state) ease,
transform var(--d-pop) var(--ease-out);
}
.gen .l-sent {
opacity: 0;
transform: translateY(8px);
}
.gen.sent .l-idle {
opacity: 0;
transform: translateY(-8px);
}
.gen.sent .l-sent {
opacity: 1;
transform: none;
}
:global(:root[data-reduce='1']) .gen > span {
transform: none;
}
@media (max-width: 1179px) {
.composer-wrap {
padding: var(--sp-2) var(--sp-6) var(--sp-5);
}
}
@media (max-width: 760px) {
.composer-wrap {
padding: var(--sp-1) var(--sp-4) var(--sp-4);
}
.composer:not(.expanded) .slots,
.composer:not(.expanded) .opt {
display: none;
}
.composer:not(.expanded) .prompt {
min-height: 40px;
max-height: 40px;
padding: var(--sp-4) var(--sp-5) var(--sp-1);
white-space: nowrap;
overflow: hidden;
}
.composer.expanded {
position: fixed;
left: 0;
right: 0;
bottom: calc(var(--tabbar-h) + env(safe-area-inset-bottom));
z-index: 45;
border-bottom: 0;
border-radius: var(--r-lg) var(--r-lg) 0 0;
box-shadow: var(--shadow-float);
max-height: calc(100dvh - var(--topbar-h) - var(--tabbar-h));
overflow-y: auto;
}
.composer.expanded .slots {
max-height: none;
}
.submit {
gap: var(--sp-3);
}
}
</style>
@@ -0,0 +1,70 @@
<script lang="ts">
import Icon from '$lib/components/ui/Icon.svelte';
import { t } from '$lib/i18n.svelte';
import { backHref, type DeskContext } from './context';
/**
* 上下文条 (spec-v2 §3.3): the desk was opened from a creation stage.
* Says where from, and plainly that takes stay in the desk feed — the
* desk's generate call has no shot/asset link to fill back.
*/
interface Props {
ctx: DeskContext;
projectTitle: string;
onDismiss: () => void;
}
let { ctx, projectTitle, onDismiss }: Props = $props();
const stageName = $derived(t(`workbench.stage.${ctx.stage}`));
</script>
<div class="context-bar" role="status">
<Icon name="link" size={14} />
<span class="from">
<b>{t('desk.ctxFrom', { project: projectTitle })}</b>{#if ctx.label}&nbsp;· {ctx.label}{/if}
</span>
<span class="note">{t('desk.ctxNoBackfill', { stage: stageName })}</span>
<a class="a-btn ghost xs back" href={backHref(ctx)}>{t('desk.ctxBack', { stage: stageName })}</a>
<button type="button" class="a-btn ghost xs" aria-label={t('desk.ctxDismiss')} onclick={onDismiss}>
<Icon name="close" size={12} />
</button>
</div>
<style>
.context-bar {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: var(--sp-2) var(--sp-4);
margin: var(--sp-4) var(--sp-7) 0;
padding: var(--sp-3) var(--sp-5);
border-radius: var(--r-md);
background: var(--run-soft);
color: var(--text);
font-size: var(--fs-aux);
}
.context-bar > :global(svg) {
color: var(--run);
}
.from b {
color: var(--run);
font-weight: 600;
}
.note {
color: var(--text-2);
}
.back {
margin-left: auto;
}
@media (max-width: 1179px) {
.context-bar {
margin: var(--sp-4) var(--sp-6) 0;
}
}
@media (max-width: 760px) {
.context-bar {
margin: var(--sp-3) var(--sp-5) 0;
}
}
</style>
@@ -0,0 +1,540 @@
<script lang="ts">
import type { Snippet } from 'svelte';
import Icon from '$lib/components/ui/Icon.svelte';
import { assetUrl } from '$lib/api';
import type { Job, Workflow } from '$lib/comfy/types';
import { progressFor } from '$lib/jobProgress';
import { jobStatusInfo } from '$lib/jobStatus';
import { parseDbTs } from '$lib/dbtime';
import { clearOutputMissing, markOutputMissing, missingOutputsOf } from '$lib/missingOutputs.svelte';
import { t } from '$lib/i18n.svelte';
import { usageLabel } from './schema';
import { elapsedSec, fmtClock, fmtDur, inputsOf, isVideoOutput, promptOf, specOf } from './takes';
/**
* 检视区 (spec-v2 §3.3): 结果 shows the selected take on the projection
* stage with its spec, inputs and workflow; 参数 hosts the full form.
* ≥1180 it is a column (hide with ]), 761–1179 a right overlay, ≤760
* fullscreen — `overlay` / `open` drive the last two.
* D 批 (HEL-654): pointer picks cross-fade the stage 150ms (键盘
* ↑↓/J/K 即时无动画), a finished/just-picked video auto-plays muted,
* failed takes get 重试, and a done take whose files no longer load
* shows the amber 文件缺失 state with 用相同参数重做 / 移除记录.
*/
interface Props {
tab: 'result' | 'params';
job: Job | null;
wf: Workflow | undefined;
nowMs: number;
open: boolean;
/** Collapsed or off-screen — nothing inside may take focus. */
inactive: boolean;
/** Current workflow can take an image output (送入当前图片槽). */
canSendToSlot: boolean;
/** Animate this result change (pointer pick) — 150ms cross-fade. */
crossfade: boolean;
/** Bump to auto-play the stage video (pointer pick / completion). */
playSignal: number;
/** The stage <video> element, for the desk's space-bar toggle. */
videoEl?: HTMLVideoElement | null;
params: Snippet;
onClose: () => void;
onReuse: (job: Job) => void;
onRetry: (job: Job) => void;
onSendToSlot: (path: string) => void;
onDelete: (job: Job) => void;
}
let {
tab = $bindable(),
job,
wf,
nowMs,
open,
inactive,
canSendToSlot,
crossfade,
playSignal,
videoEl = $bindable(null),
params,
onClose,
onReuse,
onRetry,
onSendToSlot,
onDelete,
}: Props = $props();
let outIndex = $state(0);
$effect.pre(() => {
void job?.id;
outIndex = 0;
});
const st = $derived(job ? jobStatusInfo(job) : null);
// §3.4 红/琥珀界线: amber only when the task SUCCEEDED but its files
// cannot be fetched — the failed case stays red.
const gonePaths = $derived(missingOutputsOf(job));
const fileGone = $derived(gonePaths.length > 0);
const outputs = $derived(job && st?.tone === 'ok' ? job.output_paths.filter((p) => !gonePaths.includes(p)) : []);
const output = $derived(outputs[Math.min(outIndex, outputs.length - 1)] ?? null);
const allOutputs = $derived(job && st?.tone === 'ok' ? job.output_paths : []);
const video = $derived(!!job && !!output && isVideoOutput(job, output));
const wfDeleted = $derived(!!job && job.workflow_id == null);
const prompt = $derived(job ? promptOf(job, wf) : '');
const inputs = $derived(job ? inputsOf(job, wf) : []);
const spec = $derived(job ? specOf(job, wf) : []);
const endpoint = $derived(
((job?.payload?.endpoint as Record<string, unknown> | undefined)?.name as string | undefined) ?? '',
);
const progress = $derived.by(() => {
if (!job || job.status !== 'running') return 0;
const live = progressFor(job.id);
const phase = live?.phase ?? job.phase;
if (phase !== 'comfy_running' && phase !== 'saving') return 0;
return live?.progress ?? 3;
});
let dims = $state('');
$effect.pre(() => {
void output;
dims = '';
});
function noteImg(e: Event) {
const img = e.currentTarget as HTMLImageElement;
dims = `${img.naturalWidth}×${img.naturalHeight}`;
}
function noteVideo(e: Event) {
const v = e.currentTarget as HTMLVideoElement;
dims = `${v.videoWidth}×${v.videoHeight}`;
}
// 完成或点选后自动播放(静音);键盘切换不触发。
$effect(() => {
void playSignal;
if (inactive || tab !== 'result' || !videoEl) return;
videoEl.muted = true;
videoEl.play().catch(() => {});
});
function reduced(): boolean {
return (
document.documentElement.dataset.reduce === '1' ||
window.matchMedia('(prefers-reduced-motion: reduce)').matches
);
}
/** 150ms 交叉淡变 on pointer picks; keyboard switches stay instant. */
function xfade(_node: Element) {
const ms = crossfade ? (reduced() ? 120 : 150) : 0;
return { duration: ms, css: (t: number) => `opacity: ${t}` };
}
const mediaKey = $derived(`${job?.id ?? 'none'}:${output ?? st?.tone ?? ''}`);
</script>
<aside class="inspector" class:open inert={inactive} aria-label={t('desk.inspector')}>
<div class="tabs">
<div class="a-seg" role="group" aria-label={t('desk.inspector')}>
<button type="button" aria-pressed={tab === 'result'} onclick={() => (tab = 'result')}>{t('desk.tabResult')}</button>
<button type="button" aria-pressed={tab === 'params'} onclick={() => (tab = 'params')}>{t('desk.tabParams')}</button>
</div>
<span class="keys"><span class="a-kbd">]</span>{t('desk.keyInspector')}</span>
<button type="button" class="a-btn ghost sm close" aria-label={t('desk.closeInspector')} onclick={onClose}>
<Icon name="close" size={14} />
</button>
</div>
<div class="body">
{#if tab === 'params'}
{@render params()}
{:else if !job || !st}
<div class="a-stage stage"><div class="stage-empty">{t('desk.pickTake')}</div></div>
{:else}
<div class="a-stage stage">
{#key mediaKey}
<div class="stage-media" in:xfade out:xfade>
{#if output && video}
<!-- svelte-ignore a11y_media_has_caption -->
<video
bind:this={videoEl}
src={assetUrl(output)}
controls
playsinline
preload="metadata"
onloadedmetadata={(e) => {
clearOutputMissing(output);
noteVideo(e);
}}
onerror={() => output && markOutputMissing(output)}
></video>
{:else if output}
<img
src={assetUrl(output)}
alt={prompt || t('desk.tabResult')}
onload={(e) => {
clearOutputMissing(output);
noteImg(e);
}}
onerror={() => output && markOutputMissing(output)}
/>
{:else if fileGone}
<div class="stage-empty gone">
<span>{t('desk.missingTitle')}</span>
<span class="sub">{t('desk.missingSub')}</span>
</div>
{:else}
<div class="stage-empty">
<span>{st.label}</span>
<span class="sub">{st.tone === 'fail' ? t('desk.notGenerated') : st.detail}</span>
{#if progress > 0}
<div class="a-progress stage-bar" style:--p={progress / 100}><i></i></div>
{/if}
</div>
{/if}
</div>
{/key}
</div>
{#if allOutputs.length > 1}
<div class="strip" role="group" aria-label={t('desk.outputs')}>
{#each allOutputs as p, i (p)}
<button
type="button"
class="strip-item"
class:gone={gonePaths.includes(p)}
aria-pressed={p === output}
aria-label={t('desk.outputN', { n: i + 1 })}
onclick={() => (outIndex = i)}
>
{#if isVideoOutput(job, p)}
<Icon name="film" size={14} />
{:else}
<img src={assetUrl(p)} alt="" loading="lazy" />
{/if}
</button>
{/each}
</div>
{/if}
<div class="meta">
{#if dims}<span class="mono"><b>{dims}</b></span>{/if}
{#each spec as s (s.label)}
{#if !(dims && s.label === t('desk.specSize'))}
<span>{s.label} <b class="mono">{s.value}</b></span>
{/if}
{/each}
<span>{t('desk.elapsed')} <b class="mono">{fmtDur(elapsedSec(job, nowMs))}</b></span>
{#if endpoint}<span>{endpoint}</span>{/if}
</div>
<div class="actions">
{#if fileGone && !outputs.length}
<button type="button" class="a-btn secondary sm" onclick={() => onRetry(job)}>{t('desk.redo')}</button>
<button type="button" class="a-btn danger sm" onclick={() => onDelete(job)}>{t('desk.removeRecord')}</button>
{:else}
<button type="button" class="a-btn secondary sm" onclick={() => onReuse(job)}>{t('desk.reuseToComposer')}</button>
{#if output && !video && canSendToSlot}
<button type="button" class="a-btn secondary sm" onclick={() => onSendToSlot(output)}>
{t('desk.sendToSlot')}
</button>
{/if}
{#if output}
<a class="a-btn secondary sm" href={assetUrl(output)} download>{t('desk.download')}</a>
{/if}
{#if st.tone === 'fail'}
<button type="button" class="a-btn secondary sm" onclick={() => onRetry(job)}>{t('common.retry')}</button>
{/if}
{#if job.status !== 'pending' && job.status !== 'running'}
<button type="button" class="a-btn danger sm" onclick={() => onDelete(job)}>{t('studio.deleteBtn')}</button>
{/if}
{/if}
</div>
{#if st.tone === 'fail'}
<div class="note err" role="alert">{st.detail}</div>
{:else if fileGone}
<div class="note warn" role="alert">{t('jobst.missingDetail')}</div>
{/if}
{#if inputs.length || prompt}
<div class="section-title">{t('desk.inputs')}</div>
{#if inputs.length}
<div class="inputs">
{#each inputs as inp (inp.label + inp.path)}
{#if inp.kind === 'image'}
<img class="mini" src={assetUrl(inp.path)} alt={inp.label} title={inp.label} loading="lazy" />
{:else}
<span class="mini glyph" title={inp.label}><Icon name={inp.kind === 'video' ? 'film' : 'music'} size={14} /></span>
{/if}
{/each}
</div>
{/if}
{#if prompt}<p class="prompt">{prompt}</p>{/if}
{/if}
<div class="section-title">{t('desk.workflow')}</div>
<dl class="kv">
<dt>{t('desk.kvName')}</dt>
<dd>
{wf?.name ?? t('studio.jobName', { id: job.id })}
{#if wfDeleted}<span class="a-tag wf-gone">{t('studio.wfDeletedTag')}</span>{/if}
</dd>
{#if wf?.usage}
<dt>{t('desk.kvUsage')}</dt>
<dd>{usageLabel(wf.usage)}</dd>
{/if}
<dt>{t('desk.kvCreated')}</dt>
<dd class="mono">{fmtClock(parseDbTs(job.created_at))}</dd>
{#if job.comfy_prompt_id}
<dt>{t('desk.kvPromptId')}</dt>
<dd class="mono">{job.comfy_prompt_id}</dd>
{/if}
</dl>
{/if}
</div>
</aside>
<style>
.inspector {
display: flex;
flex-direction: column;
min-width: 0;
min-height: 0;
overflow: hidden;
border-left: 1px solid var(--line);
background: var(--bg);
}
.tabs {
display: flex;
align-items: center;
gap: var(--sp-2);
padding: var(--sp-4) var(--sp-5);
border-bottom: 1px solid var(--line);
}
.keys {
display: inline-flex;
align-items: center;
gap: var(--sp-1);
margin-left: auto;
font-size: var(--fs-mini);
color: var(--text-3);
}
.close {
padding: 0 var(--sp-3);
}
.body {
flex: 1;
min-height: 0;
overflow-y: auto;
padding: var(--sp-6);
}
.stage {
aspect-ratio: 16 / 10;
display: grid;
place-items: center;
}
.stage-media {
position: absolute;
inset: 0;
display: grid;
place-items: center;
}
.stage-media > img,
.stage-media > video {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
object-fit: contain;
}
.stage-empty {
display: grid;
place-items: center;
gap: var(--sp-2);
padding: var(--sp-6);
text-align: center;
color: var(--text-3);
font-size: var(--fs-aux);
}
.stage-empty.gone {
color: var(--warn);
}
.stage-empty .sub {
color: var(--text-3);
font-size: var(--fs-mini);
}
.stage-bar {
width: 160px;
}
.strip {
display: flex;
flex-wrap: wrap;
gap: var(--sp-2);
margin-top: var(--sp-4);
}
.strip-item {
display: grid;
place-items: center;
width: 44px;
height: 44px;
padding: 0;
overflow: hidden;
border: 1px solid var(--line-2);
border-radius: var(--r-sm);
background: var(--bg-3);
color: var(--text-3);
cursor: pointer;
}
.strip-item[aria-pressed='true'] {
border-color: var(--accent);
}
.strip-item.gone {
border-style: dashed;
border-color: var(--warn);
color: var(--warn);
}
.strip-item img {
width: 100%;
height: 100%;
object-fit: cover;
}
.meta {
display: flex;
flex-wrap: wrap;
gap: var(--sp-2) var(--sp-5);
margin: var(--sp-5) 0;
font-size: var(--fs-aux);
color: var(--text-3);
}
.meta b {
color: var(--text-2);
font-weight: 500;
}
.actions {
display: flex;
flex-wrap: wrap;
gap: var(--sp-2);
}
.note {
margin-top: var(--sp-5);
padding: var(--sp-3) var(--sp-4);
border-radius: var(--r-md);
font-size: var(--fs-aux);
word-break: break-word;
}
.note.err {
background: var(--err-soft);
color: var(--err);
}
.note.warn {
background: var(--warn-soft);
color: var(--warn);
}
.section-title {
margin: var(--sp-7) 0 var(--sp-3);
font-size: var(--fs-aux);
color: var(--text-3);
}
.inputs {
display: flex;
flex-wrap: wrap;
gap: var(--sp-2);
margin-bottom: var(--sp-3);
}
.mini {
width: 40px;
height: 40px;
border-radius: var(--r-sm);
border: 1px solid var(--line-2);
object-fit: cover;
}
.mini.glyph {
display: grid;
place-items: center;
background: var(--bg-3);
color: var(--text-3);
box-sizing: border-box;
}
.prompt {
margin: 0;
padding: var(--sp-4) var(--sp-5);
border-radius: var(--r-md);
background: var(--bg-3);
color: var(--text-2);
font-size: var(--fs-aux);
white-space: pre-wrap;
word-break: break-word;
}
.kv {
display: grid;
grid-template-columns: 92px 1fr;
gap: var(--sp-2) var(--sp-4);
margin: 0;
font-size: var(--fs-aux);
}
.kv dt {
color: var(--text-3);
}
.kv dd {
margin: 0;
color: var(--text-2);
word-break: break-all;
}
.kv .wf-gone {
margin-left: var(--sp-2);
}
/* ≥1180: a column of the desk grid; the close button hides it (]) */
@media (max-width: 1179px) {
.inspector {
position: fixed;
top: var(--topbar-h);
right: 0;
bottom: 0;
z-index: 40;
width: min(420px, 100vw);
box-shadow: var(--shadow-float);
transform: translateX(100%);
visibility: hidden;
transition:
transform var(--d-drawer) var(--ease-drawer),
visibility 0s linear var(--d-drawer);
}
.inspector.open {
transform: none;
visibility: visible;
transition:
transform var(--d-drawer) var(--ease-drawer),
visibility 0s;
}
:global(:root[data-reduce='1']) .inspector {
transform: none;
opacity: 0;
transition:
opacity var(--d-drawer) ease,
visibility 0s linear var(--d-drawer);
}
:global(:root[data-reduce='1']) .inspector.open {
opacity: 1;
transition:
opacity var(--d-drawer) ease,
visibility 0s;
}
.keys {
display: none;
}
.close {
margin-left: auto;
}
}
@media (max-width: 760px) {
.inspector {
top: 0;
z-index: 70;
width: 100vw;
border-left: 0;
}
.body {
padding: var(--sp-5);
}
}
</style>
@@ -0,0 +1,179 @@
<script lang="ts">
import ShellPop from '$lib/components/shell/ShellPop.svelte';
import type { ComfyDynamicInput } from '$lib/comfy/types';
import { t } from '$lib/i18n.svelte';
import { inputRole, isChanged, type FormValue, type FormValues } from './schema';
/**
* One common parameter as a composer chip (spec-v2 §3.3 参数芯片): the
* pop edits it in place — options list for selects, a number field for
* the rest (seed adds 随机) — and 恢复原值 returns to the workflow value.
* `inputs` holds two entries for the width × height pair.
*/
interface Props {
inputs: ComfyDynamicInput[];
values: FormValues;
text: string;
title?: string;
invalid?: boolean;
onSet: (nodeId: string, value: FormValue) => void;
}
let { inputs, values, text, title, invalid = false, onSet }: Props = $props();
let open = $state(false);
const changed = $derived(inputs.some((i) => isChanged(i, values)));
const single = $derived(inputs.length === 1 ? inputs[0] : null);
const uid = Math.random().toString(36).slice(2, 8);
function current(inp: ComfyDynamicInput): string {
const v = values[inp.nodeId] ?? inp.defaultValue ?? '';
return Array.isArray(v) ? v.join(',') : String(v);
}
function setNumber(inp: ComfyDynamicInput, raw: string) {
if (raw === '') return onSet(inp.nodeId, '');
const n = Number(raw);
onSet(inp.nodeId, Number.isNaN(n) ? raw : n);
}
function restore() {
for (const inp of inputs) onSet(inp.nodeId, inp.defaultValue ?? '');
}
function randomSeed(inp: ComfyDynamicInput) {
const max = Math.min(inp.max ?? 2 ** 32 - 1, Number.MAX_SAFE_INTEGER);
const min = Math.max(inp.min ?? 0, 0);
onSet(inp.nodeId, min + Math.floor(Math.random() * (max - min + 1)));
}
function pickOption(inp: ComfyDynamicInput, opt: string) {
onSet(inp.nodeId, opt);
open = false;
}
</script>
<div class="param-chip">
<button
type="button"
class="a-chip"
class:changed={changed && !invalid}
class:err={invalid}
aria-haspopup="dialog"
aria-expanded={open}
title={title ?? inputs.map((i) => i.label).join(' × ')}
onclick={() => (open = !open)}
>
<span class="lbl">{text}</span>
</button>
<ShellPop bind:open label={inputs.map((i) => i.label).join(' × ')} placement="top" width="260px">
{#if single?.kind === 'select' && single.options?.length}
<div class="a-menu-group">{single.label}</div>
{#each single.options as opt (opt)}
<button
type="button"
class="a-menu-item"
aria-current={current(single) === opt ? 'true' : undefined}
onclick={() => pickOption(single, opt)}
>
<span class="a-menu-label">{opt}</span>
{#if String(single.defaultValue ?? '') === opt}
<span class="a-menu-meta">{t('desk.origValue')}</span>
{/if}
</button>
{/each}
{:else}
<div class="fields">
{#each inputs as inp (inp.nodeId)}
{@const id = `pc-${uid}-${inp.nodeId.replace(/[^a-zA-Z0-9_-]/g, '')}`}
<div class="field-row">
<label class="field-label" for={id}>
{inp.label}
{#if inp.defaultValue !== undefined && inp.defaultValue !== ''}
<span class="orig mono">{t('cdf.orig', { v: String(inp.defaultValue) })}</span>
{/if}
</label>
<div class="inline">
{#if inp.kind === 'number'}
<input
{id}
class="a-input mono"
class:invalid
type="number"
inputmode="numeric"
value={current(inp)}
oninput={(e) => setNumber(inp, e.currentTarget.value)}
onkeydown={(e) => e.key === 'Enter' && (open = false)}
/>
{:else}
<input
{id}
class="a-input"
class:invalid
type="text"
value={current(inp)}
oninput={(e) => onSet(inp.nodeId, e.currentTarget.value)}
onkeydown={(e) => e.key === 'Enter' && (open = false)}
/>
{/if}
{#if inputRole(inp) === 'seed'}
<button type="button" class="a-btn secondary sm" onclick={() => randomSeed(inp)}>
{t('desk.seedRandom')}
</button>
{/if}
</div>
{#if inp.min != null || inp.max != null}
<span class="field-hint mono">{inp.min ?? '−∞'} – {inp.max ?? '∞'}</span>
{/if}
</div>
{/each}
</div>
{/if}
{#if changed}
<div class="foot">
<button type="button" class="a-btn ghost sm" onclick={restore}>{t('desk.restoreOrig')}</button>
</div>
{/if}
</ShellPop>
</div>
<style>
.param-chip {
position: relative;
min-width: 0;
}
.fields {
display: grid;
gap: var(--sp-5);
padding: var(--sp-3);
}
.field-row {
display: grid;
gap: var(--sp-2);
}
.field-row .field-label {
display: flex;
justify-content: space-between;
gap: var(--sp-3);
margin: 0;
}
.orig {
font-size: var(--fs-mini);
color: var(--text-3);
font-weight: 400;
}
.inline {
display: flex;
gap: var(--sp-2);
}
.field-row .field-hint {
margin: 0;
}
.foot {
display: flex;
justify-content: flex-end;
padding: var(--sp-2) var(--sp-1) 0;
border-top: 1px solid var(--line);
margin-top: var(--sp-2);
}
</style>
@@ -0,0 +1,198 @@
<script lang="ts">
import ComfyDynamicForm from '$lib/components/ComfyDynamicForm.svelte';
import Icon from '$lib/components/ui/Icon.svelte';
import type { ComfyDynamicInput, Workflow } from '$lib/comfy/types';
import { t } from '$lib/i18n.svelte';
import type { DeskSchema, FormValue, FormValues } from './schema';
/**
* 参数 (spec-v2 §3.3 检视区 · 参数): every non-media input the workflow
* declares, each with its 原值 and a gold edge once changed. Common ones
* first; the rest fold under 高级参数 — untouched, they keep the
* workflow's own values.
*/
interface Props {
workflow: Workflow | null;
ds: DeskSchema;
values: FormValues;
errors: Record<string, string>;
showErrors: boolean;
changedCount: number;
onSet: (nodeId: string, value: FormValue) => void;
onRestoreAll: () => void;
}
let { workflow, ds, values, errors, showErrors, changedCount, onSet, onRestoreAll }: Props = $props();
let advancedOpen = $state(false);
const brokenReasons = $derived(
(workflow?.warnings ?? []).filter((w) => w.level === 'error').map((w) => w.message),
);
const advancedErr = $derived(showErrors && ds.advanced.some((i) => !!errors[i.nodeId]?.trim()));
$effect(() => {
if (advancedErr) advancedOpen = true;
});
function patch(inputs: ComfyDynamicInput[], next: Record<string, string | number>) {
for (const inp of inputs) {
const v = next[inp.nodeId];
if (v !== undefined && v !== values[inp.nodeId]) onSet(inp.nodeId, v);
}
}
</script>
<div class="params">
{#if !workflow}
<p class="note">{t('desk.pickWorkflow')}</p>
{:else}
{#if brokenReasons.length}
<div class="note err" role="alert">
<strong>{t('studio.wfBrokenTitle')}</strong>
<ul>
{#each brokenReasons as r (r)}<li>{r}</li>{/each}
</ul>
<span>{t('studio.wfBrokenHint')}</span>
</div>
{/if}
{#if !(workflow.input_schema ?? []).length}
<p class="note">{t('studio.wfNoParamsNote')}</p>
{:else if (workflow.input_schema ?? []).some((i) => i.auto)}
<p class="note">{t('studio.wfAutoParamsNote', { n: workflow.input_schema.length })}</p>
{/if}
{#if ds.common.length}
<div class="section-title">{t('desk.paramsCommon')}</div>
<ComfyDynamicForm
inputs={ds.common}
values={values as Record<string, string | number>}
quiet
showOrig
{errors}
{showErrors}
onChange={(v) => patch(ds.common, v)}
/>
{/if}
{#if ds.advanced.length}
<div class="fold">
<button
type="button"
class="fold-head"
class:err={advancedErr}
aria-expanded={advancedOpen}
aria-controls="desk-advanced"
onclick={() => (advancedOpen = !advancedOpen)}
>
<span class="chev" aria-hidden="true"><Icon name="play" size={10} /></span>
{t('desk.advanced', { n: ds.advanced.length })}
</button>
<div id="desk-advanced" class="collapse" class:open={advancedOpen} inert={!advancedOpen}>
<div class="collapse-in">
<ComfyDynamicForm
inputs={ds.advanced}
values={values as Record<string, string | number>}
quiet
showOrig
{errors}
{showErrors}
onChange={(v) => patch(ds.advanced, v)}
/>
</div>
</div>
</div>
{/if}
{#if changedCount > 0}
<div class="restore">
<button type="button" class="a-btn ghost sm" onclick={onRestoreAll}>
<Icon name="retry" size={13} />
{t('desk.restoreAll')}
</button>
</div>
{/if}
{/if}
</div>
<style>
.params {
display: grid;
gap: var(--sp-4);
}
.note {
margin: 0;
padding: var(--sp-3) var(--sp-4);
border-radius: var(--r-md);
background: var(--bg-3);
color: var(--text-3);
font-size: var(--fs-aux);
}
.note.err {
background: var(--err-soft);
color: var(--err);
}
.note ul {
margin: var(--sp-2) 0;
padding-left: 18px;
}
.section-title {
font-size: var(--fs-aux);
color: var(--text-3);
}
.fold {
border-top: 1px solid var(--line);
}
.fold-head {
display: flex;
align-items: center;
gap: var(--sp-2);
width: 100%;
padding: var(--sp-4) 0;
border: 0;
background: none;
color: var(--text-2);
font: inherit;
font-size: var(--fs-aux);
text-align: left;
cursor: pointer;
transition: color var(--d-state) ease;
}
.fold-head.err {
color: var(--err);
}
.chev {
display: inline-grid;
transition: transform var(--d-pop) var(--ease-out);
}
.fold-head[aria-expanded='true'] .chev {
transform: rotate(90deg);
}
@media (hover: hover) and (pointer: fine) {
.fold-head:hover {
color: var(--text);
}
}
.collapse {
display: grid;
grid-template-rows: 0fr;
opacity: 0;
transition:
grid-template-rows var(--d-enter) var(--ease-out),
opacity var(--d-state) ease;
}
.collapse.open {
grid-template-rows: 1fr;
opacity: 1;
}
.collapse-in {
min-height: 0;
overflow: hidden;
}
.collapse.open .collapse-in {
padding-bottom: var(--sp-2);
}
.restore {
display: flex;
justify-content: flex-end;
}
</style>
@@ -0,0 +1,227 @@
<script lang="ts">
import MediaSlot from '$lib/components/studio/MediaSlot.svelte';
import RefImageGrid from '$lib/components/studio/RefImageGrid.svelte';
import { mediaFileProblem } from '$lib/comfy/imageFile';
import { createUploadManager } from '$lib/comfy/useUpload.svelte';
import type { ComfyDynamicInput } from '$lib/comfy/types';
import { toast } from '$lib/toast';
import { t } from '$lib/i18n.svelte';
import { h3Warnings, listKind, listPaths, type DeskSchema, type FormValue, type FormValues, type SlotDef } from './schema';
/**
* 输入槽 (spec-v2 §3.3): exactly the media inputs the workflow JSON wires —
* text-to-image shows none, image-to-image one input, image-to-video a
* first frame, ref-to-video the 1–N list. Owns uploads and rejects;
* values flow back through `onSet`.
*/
interface Props {
ds: DeskSchema;
values: FormValues;
showErrors: boolean;
errors: Record<string, string>;
/** True while any upload runs (generate waits for it). */
busy?: boolean;
onSet: (nodeId: string, value: FormValue) => void;
onFromResults: (nodeId: string) => void;
}
let { ds, values, showErrors, errors, busy = $bindable(false), onSet, onFromResults }: Props = $props();
const uploads = createUploadManager();
type Reject = { name: string; message: string };
let rejects = $state<Record<string, Reject[]>>({});
let fileSizes = $state<Record<string, number>>({});
let replacingKey = $state('');
let replacingIndex = $state(-1);
$effect(() => {
busy = Object.keys(uploads.uploading).length > 0;
});
// A different workflow starts with no stale rejects.
$effect(() => {
void ds;
rejects = {};
});
const warns = $derived(h3Warnings(ds, values));
function setRejects(nodeId: string, list: Reject[]) {
rejects = { ...rejects, [nodeId]: list };
}
async function upload(nodeId: string, file: File): Promise<string | null> {
const path = await uploads.uploadSafe(nodeId, file);
if (path) fileSizes = { ...fileSizes, [path]: file.size };
return path;
}
async function slotFile(s: SlotDef, file: File) {
const problem = mediaFileProblem(s.mediaKind, file);
if (problem) {
setRejects(s.inp.nodeId, [{ name: file.name, message: problem }]);
return;
}
setRejects(s.inp.nodeId, []);
const path = await upload(s.inp.nodeId, file);
if (path) onSet(s.inp.nodeId, path);
}
/** Add picked/dropped files in order; a batch that would pass `max` is refused whole. */
async function groupAdd(entry: ComfyDynamicInput, files: File[]) {
const key = entry.nodeId;
const mk = listKind(entry);
const max = entry.max ?? 9;
const ok = files.filter((f) => !mediaFileProblem(mk, f));
setRejects(
key,
files.filter((f) => mediaFileProblem(mk, f)).map((f) => ({ name: f.name, message: mediaFileProblem(mk, f)! })),
);
const start = listPaths(values, entry);
if (start.length + ok.length > max) {
toast.error(t('studio.errRefMax', { max, n: start.length, k: ok.length }));
return;
}
for (const f of ok) {
const path = await upload(key, f);
if (!path) break;
onSet(key, [...listPaths(values, entry), path]);
}
}
async function groupReplace(entry: ComfyDynamicInput, index: number, file: File) {
const key = entry.nodeId;
const problem = mediaFileProblem(listKind(entry), file);
if (problem) {
setRejects(key, [{ name: file.name, message: problem }]);
return;
}
setRejects(key, []);
replacingKey = key;
replacingIndex = index;
try {
const path = await upload(key, file);
if (path) onSet(key, listPaths(values, entry).map((p, i) => (i === index ? path : p)));
} finally {
replacingKey = '';
replacingIndex = -1;
}
}
function fileKind(f: File): 'image' | 'video' | 'audio' {
if (f.type.startsWith('video/')) return 'video';
if (f.type.startsWith('audio/')) return 'audio';
return 'image';
}
/** Composer-wide drop: each file goes to the first wired slot of its kind with room. */
export function dropFiles(files: File[]) {
const pending = new Map<string, File[]>();
const taken = new Set<string>();
let unplaced = 0;
for (const f of files) {
const mk = fileKind(f);
const slot = ds.slots.find(
(s) =>
s.mediaKind === mk &&
!s.mask &&
!taken.has(s.inp.nodeId) &&
!String(values[s.inp.nodeId] ?? ''),
);
if (slot) {
taken.add(slot.inp.nodeId);
void slotFile(slot, f);
continue;
}
const list = ds.lists.find((g) => listKind(g) === mk);
if (list) {
pending.set(list.nodeId, [...(pending.get(list.nodeId) ?? []), f]);
continue;
}
unplaced += 1;
}
for (const [nodeId, batch] of pending) {
const entry = ds.lists.find((g) => g.nodeId === nodeId);
if (entry) void groupAdd(entry, batch);
}
if (unplaced) toast.error(t('desk.dropNoSlot', { n: unplaced }));
}
</script>
{#if ds.slots.length || ds.lists.length}
<div class="tray">
{#each ds.slots as s (s.inp.nodeId)}
{@const reject = rejects[s.inp.nodeId]?.[0]}
<MediaSlot
label={s.label}
required={s.inp.required}
value={String(values[s.inp.nodeId] ?? '')}
kind={s.mediaKind}
size={fileSizes[String(values[s.inp.nodeId] ?? '')]}
uploading={uploads.isUploading(s.inp.nodeId)}
uploadName={uploads.uploading[s.inp.nodeId]}
need={showErrors && !!errors[s.inp.nodeId]}
error={reject?.message ?? (showErrors ? errors[s.inp.nodeId] : undefined)}
allowFromResults={s.fromResults}
anchorId={`slot-${s.inp.nodeId}`}
onFile={(f) => slotFile(s, f)}
onFromResults={() => onFromResults(s.inp.nodeId)}
onClear={() => {
setRejects(s.inp.nodeId, []);
onSet(s.inp.nodeId, '');
}}
/>
{/each}
{#each ds.lists as entry (entry.nodeId)}
<RefImageGrid
label={entry.label}
mediaKind={listKind(entry)}
paths={listPaths(values, entry)}
max={entry.max ?? 9}
sizes={fileSizes}
uploadingName={uploads.uploading[entry.nodeId]}
uploadingIndex={replacingKey === entry.nodeId ? replacingIndex : -1}
rejects={rejects[entry.nodeId] ?? []}
need={showErrors && !!errors[entry.nodeId]}
error={showErrors ? errors[entry.nodeId] : undefined}
allowFromResults={entry.kind === 'image_list'}
anchorId={`slot-${entry.nodeId}`}
onAdd={(files) => groupAdd(entry, files)}
onReplace={(i, file) => groupReplace(entry, i, file)}
onRemove={(i) => onSet(entry.nodeId, listPaths(values, entry).filter((_, j) => j !== i))}
onDismissReject={(i) => setRejects(entry.nodeId, (rejects[entry.nodeId] ?? []).filter((_, j) => j !== i))}
onFromResults={entry.kind === 'image_list' ? () => onFromResults(entry.nodeId) : undefined}
/>
{/each}
</div>
{#if showErrors && errors.firstLast}
<p class="a-slot-hint err note">{errors.firstLast}</p>
{/if}
{#if ds.hasH3Hint}
<div class="note" role="note">
<p class="a-slot-hint">{t('wfMedia.h3Limits')}</p>
{#each warns as w (w)}
<p class="a-slot-hint warn">{w}</p>
{/each}
</div>
{/if}
{/if}
<style>
.tray {
display: flex;
flex-wrap: wrap;
gap: var(--sp-3) var(--sp-6);
padding: var(--sp-4) var(--sp-5) 0;
}
.note {
margin: 0;
padding: var(--sp-2) var(--sp-5) 0;
}
.note p {
margin: 0;
}
.warn {
color: var(--warn);
}
</style>
@@ -0,0 +1,568 @@
<script lang="ts">
import Icon from '$lib/components/ui/Icon.svelte';
import { assetUrl } from '$lib/api';
import type { Job, Workflow } from '$lib/comfy/types';
import { progressFor } from '$lib/jobProgress';
import { jobStatusInfo } from '$lib/jobStatus';
import { parseDbTs } from '$lib/dbtime';
import { clearOutputMissing, markOutputMissing, missingOutputsOf } from '$lib/missingOutputs.svelte';
import { t } from '$lib/i18n.svelte';
import { usageLabel } from './schema';
import { elapsedSec, fmtClock, fmtDur, inputsOf, isVideoOutput, promptOf } from './takes';
/**
* 一条记录 (spec-v2 §3.3 记录卡): workflow · usage · time, the prompt, the
* inputs it used, its real state (phase / progress / time / error) and
* the first output. The whole card selects; actions sit above it.
* D 批 (HEL-654): the gold sel-mark frame slides between cards on
* pointer selection (driven by the feed), new takes enter with a
* 220ms rise, completion flashes once, failure shakes once, a done
* take whose files no longer load turns amber (文件缺失) with
* 用相同参数重做 / 移除记录, and takes on a deleted workflow are
* marked as such instead of pretending nothing changed.
*/
interface Props {
job: Job;
wf: Workflow | undefined;
selected: boolean;
nowMs: number;
busy?: boolean;
/** Play the 220ms entrance rise (new take / undo restore). */
enter?: boolean;
/** One-shot 900ms gold flash on completion. */
flash?: boolean;
/** One-shot failure shake. */
shake?: boolean;
onSelect: () => void;
onReuse: () => void;
onRetry: () => void;
onCancel: () => void;
onDelete: () => void;
}
let {
job,
wf,
selected,
nowMs,
busy = false,
enter = false,
flash = false,
shake = false,
onSelect,
onReuse,
onRetry,
onCancel,
onDelete,
}: Props = $props();
const st = $derived(jobStatusInfo(job));
// §3.4 红/琥珀界线: red follows the backend task status only. Amber is
// reserved for a SUCCEEDED take whose product files no longer load.
const gonePaths = $derived(missingOutputsOf(job));
const fileGone = $derived(gonePaths.length > 0);
const tone = $derived(fileGone ? 'warn' : st.tone === 'queue' ? '' : st.tone === 'fail' ? 'err' : st.tone);
const label = $derived(fileGone ? t('jobst.missing') : st.label);
const wfDeleted = $derived(job.workflow_id == null);
const prompt = $derived(promptOf(job, wf));
const inputs = $derived(inputsOf(job, wf).filter((i) => i.kind === 'image'));
const output = $derived(
fileGone
? (job.output_paths.find((p) => !gonePaths.includes(p)) ?? null)
: (job.output_paths[0] ?? null),
);
const progress = $derived.by(() => {
if (job.status !== 'running') return 0;
const live = progressFor(job.id);
const phase = live?.phase ?? job.phase;
if (phase !== 'comfy_running' && phase !== 'saving') return 0;
return live?.progress ?? 3;
});
const active = $derived(job.status === 'pending' || job.status === 'running');
const name = $derived(wf?.name ?? t('studio.jobName', { id: job.id }));
let portrait = $state(false);
let clipSec = $state<number | null>(null);
let errOpen = $state(false);
function noteImage(e: Event) {
const img = e.currentTarget as HTMLImageElement;
portrait = img.naturalHeight > img.naturalWidth;
}
function noteVideo(e: Event) {
const v = e.currentTarget as HTMLVideoElement;
portrait = v.videoHeight > v.videoWidth;
if (Number.isFinite(v.duration)) clipSec = v.duration;
}
</script>
<article
class="take"
class:selected
class:enter
class:done-flash={flash}
class:shake
data-job={job.id}
>
<span class="sel-mark" aria-hidden="true"></span>
<button
type="button"
class="hit"
aria-pressed={selected}
aria-label={`${name} · ${label}`}
onclick={onSelect}
></button>
<div class="head">
<span class="name">{name}</span>
{#if wfDeleted}<span class="a-tag">{t('studio.wfDeletedTag')}</span>{/if}
{#if wf?.usage}<span class="a-tag">{usageLabel(wf.usage)}</span>{/if}
<span class="meta mono">{fmtClock(parseDbTs(job.created_at))}</span>
</div>
{#if prompt}<p class="prompt">{prompt}</p>{/if}
{#if inputs.length}
<div class="inputs" aria-label={t('desk.inputs')}>
{#each inputs.slice(0, 5) as inp (inp.path + inp.label)}
<img class="mini" src={assetUrl(inp.path)} alt={inp.label} title={inp.label} loading="lazy" />
{/each}
{#if inputs.length > 5}<span class="more">+{inputs.length - 5}</span>{/if}
</div>
{/if}
<div class="state">
<span class="a-tag {tone}">{label}</span>
{#if st.tone === 'run'}
{#if progress > 0}
<div class="a-progress bar" style:--p={progress / 100}><i></i></div>
{/if}
<span class="txt">{fmtDur(elapsedSec(job, nowMs))}</span>
{:else if st.tone === 'ok' && !fileGone}
<span class="txt">{t('desk.took', { d: fmtDur(elapsedSec(job, nowMs)) })}</span>
{:else if st.tone === 'fail'}
<button
type="button"
class="err-txt"
class:open={errOpen}
title={st.detail}
aria-expanded={errOpen}
onclick={() => (errOpen = !errOpen)}
>
{st.detail}
</button>
{:else if fileGone}
<span class="gone-txt">{t('jobst.missingDetail')}</span>
{:else}
<span class="txt">{st.detail}</span>
{/if}
<div class="actions">
{#if fileGone}
<button type="button" class="a-btn ghost xs" disabled={busy} onclick={onRetry}>
{t('desk.redo')}
</button>
<button type="button" class="a-btn danger xs" onclick={onDelete}>{t('desk.removeRecord')}</button>
{:else}
<button type="button" class="a-btn ghost xs" onclick={onReuse}>{t('desk.reuse')}</button>
{#if st.tone === 'fail' && job.error !== 'cancelled'}
<button type="button" class="a-btn ghost xs" disabled={busy} onclick={onRetry}>{t('common.retry')}</button>
{/if}
{#if active}
<button type="button" class="a-btn ghost xs" disabled={busy} onclick={onCancel}>{t('common.cancel')}</button>
{/if}
{#if output}
<a class="a-btn ghost xs" href={assetUrl(output)} download>{t('desk.download')}</a>
{/if}
{#if !active}
<button type="button" class="a-btn danger xs" onclick={onDelete}>{t('studio.deleteBtn')}</button>
{/if}
{/if}
</div>
</div>
<div class="out">
{#if output}
<div class="thumb" class:portrait>
{#if isVideoOutput(job, output)}
<video
src={assetUrl(output)}
preload="metadata"
muted
playsinline
onloadedmetadata={(e) => {
clearOutputMissing(output);
noteVideo(e);
}}
onerror={() => output && markOutputMissing(output)}
></video>
<span class="play" aria-hidden="true"><Icon name="play" size={10} /></span>
{#if clipSec != null}<span class="badge mono">{fmtDur(clipSec)}</span>{/if}
{:else}
<img
src={assetUrl(output)}
alt=""
loading="lazy"
onload={(e) => {
clearOutputMissing(output);
noteImage(e);
}}
onerror={() => output && markOutputMissing(output)}
/>
{/if}
{#if job.output_paths.length > 1}<span class="count mono">×{job.output_paths.length}</span>{/if}
</div>
{:else if active}
<div class="thumb pending">{st.label}</div>
{:else if fileGone}
<div class="thumb gone">{t('jobst.missing')}</div>
{:else}
<div class="thumb missing">{t('desk.notGenerated')}</div>
{/if}
</div>
</article>
<style>
.take {
position: relative;
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: var(--sp-4) var(--sp-6);
margin-bottom: var(--sp-3);
padding: var(--sp-5) var(--sp-6);
border: 1px solid var(--line);
border-radius: var(--r-lg);
background: var(--bg-2);
transition:
border-color var(--d-state) ease,
background-color var(--d-state) ease,
box-shadow var(--d-state) ease;
}
/* 选中框:金色描边从上一条记录滑到新选中的记录(feed 驱动 WAAPI) */
.sel-mark {
position: absolute;
inset: -1px;
z-index: 3;
display: none;
border: 1px solid var(--accent-line);
border-radius: inherit;
pointer-events: none;
}
.take.selected {
border-color: transparent;
background: var(--accent-wash), var(--bg-3);
box-shadow: var(--sel-shadow);
}
.take.selected > .sel-mark {
display: block;
}
@media (hover: hover) and (pointer: fine) {
.take:hover:not(.selected) {
border-color: var(--line-2);
background: var(--bg-3);
}
}
/* 新记录 / 撤销恢复:220ms 上移 8px 入场(减动效只余淡变) */
.take.enter {
animation: take-in var(--d-enter) var(--ease-out);
}
@keyframes take-in {
from {
opacity: 0;
transform: translateY(8px);
}
}
/* 完成一次性金色光晕 900ms;失败原地轻抖一次 */
.take.done-flash {
animation: done-flash var(--d-flash) var(--ease-out);
}
@keyframes done-flash {
from {
box-shadow: var(--accent-glow), 0 0 0 1px var(--accent-line);
}
}
.take.shake {
animation: take-shake 320ms var(--ease-out);
}
@keyframes take-shake {
20% {
transform: translateX(-4px);
}
45% {
transform: translateX(4px);
}
70% {
transform: translateX(-2px);
}
}
:global(:root[data-reduce='1']) .take.enter {
animation: take-fade var(--d-state) ease;
}
:global(:root[data-reduce='1']) .take.done-flash,
:global(:root[data-reduce='1']) .take.shake {
animation: none;
}
@keyframes take-fade {
from {
opacity: 0;
}
}
.hit {
position: absolute;
inset: 0;
z-index: 0;
padding: 0;
border: 0;
border-radius: inherit;
background: transparent;
cursor: pointer;
}
.hit:focus-visible {
outline-offset: -2px;
border-radius: var(--r-lg);
}
.head,
.prompt,
.inputs,
.state {
grid-column: 1;
position: relative;
pointer-events: none;
}
.head {
display: flex;
align-items: center;
gap: var(--sp-3);
min-width: 0;
}
.name {
font-weight: 600;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.meta {
color: var(--text-3);
font-size: var(--fs-aux);
white-space: nowrap;
}
.prompt {
margin: 0;
color: var(--text-2);
font-size: var(--fs-body-sm);
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
.inputs {
display: flex;
align-items: center;
gap: var(--sp-1);
}
.mini {
width: 26px;
height: 26px;
border-radius: 5px;
object-fit: cover;
border: 1px solid var(--line-2);
}
.more {
padding-left: 2px;
font-size: var(--fs-mini);
color: var(--text-3);
}
.state {
display: flex;
align-items: center;
gap: var(--sp-3);
min-height: 22px;
font-size: var(--fs-aux);
}
.bar {
flex: 0 0 140px;
}
.txt {
color: var(--text-2);
white-space: nowrap;
}
.gone-txt {
min-width: 0;
color: var(--warn);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/* 失败:一行中文结论自动展开,点开看完整详情 */
.err-txt {
min-width: 0;
max-width: 100%;
padding: 0;
border: 0;
background: transparent;
color: var(--err);
font: inherit;
font-size: var(--fs-aux);
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
pointer-events: auto;
cursor: pointer;
}
.err-txt.open {
white-space: normal;
word-break: break-word;
}
.err-txt:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
border-radius: var(--r-sm);
}
.actions {
display: flex;
gap: var(--sp-1);
margin-left: auto;
pointer-events: auto;
opacity: 0;
transition: opacity var(--d-state) ease;
}
.take:focus-within .actions,
.take.selected .actions {
opacity: 1;
}
@media (hover: hover) and (pointer: fine) {
.take:hover .actions {
opacity: 1;
}
}
@media (hover: none) {
.actions {
opacity: 1;
}
}
.out {
grid-column: 2;
grid-row: 1 / span 4;
align-self: start;
position: relative;
pointer-events: none;
}
.thumb {
position: relative;
width: 150px;
aspect-ratio: 16 / 9;
overflow: hidden;
border-radius: var(--r-md);
background: var(--bg-4);
box-shadow: inset 0 0 0 1px var(--on-media-line);
}
.thumb.portrait {
width: 96px;
aspect-ratio: 3 / 4;
}
.thumb img,
.thumb video {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
}
.badge,
.count {
position: absolute;
bottom: var(--sp-2);
padding: 1px 5px;
border-radius: 4px;
background: var(--media-scrim);
color: var(--on-media);
font-size: var(--fs-mini);
}
.badge {
right: var(--sp-2);
}
.count {
right: var(--sp-2);
top: var(--sp-2);
bottom: auto;
}
.play {
position: absolute;
left: var(--sp-2);
bottom: var(--sp-2);
display: grid;
place-items: center;
width: 22px;
height: 22px;
border-radius: 50%;
background: var(--media-scrim);
color: var(--on-media);
}
.thumb.pending,
.thumb.missing,
.thumb.gone {
display: grid;
place-items: center;
padding: var(--sp-2);
box-sizing: border-box;
text-align: center;
font-size: var(--fs-mini);
color: var(--text-3);
border: 1px dashed var(--line-2);
background: var(--bg-2);
box-shadow: none;
}
.thumb.pending {
border-style: solid;
color: var(--run);
}
.thumb.gone {
color: var(--warn);
border-color: var(--warn);
}
.thumb.pending::after {
content: '';
position: absolute;
inset: 0;
background: linear-gradient(100deg, transparent 30%, var(--run-soft) 50%, transparent 70%);
animation: take-sheen 1.4s linear infinite;
}
@keyframes take-sheen {
from {
transform: translateX(-100%);
}
to {
transform: translateX(100%);
}
}
:global(:root[data-reduce='1']) .thumb.pending::after {
animation: none;
}
@media (max-width: 760px) {
.take {
padding: var(--sp-4);
}
.head {
flex-wrap: wrap;
row-gap: 2px;
}
.out {
grid-row: 1 / span 2;
}
.state {
grid-column: 1 / -1;
flex-wrap: wrap;
}
.thumb {
width: 108px;
}
.thumb.portrait {
width: 72px;
}
.bar {
flex-basis: 80px;
}
}
</style>
@@ -0,0 +1,344 @@
<script lang="ts">
import type { Snippet } from 'svelte';
import { cubicOut } from 'svelte/easing';
import { SvelteSet } from 'svelte/reactivity';
import Icon from '$lib/components/ui/Icon.svelte';
import type { Job, Workflow } from '$lib/comfy/types';
import { parseDbTs } from '$lib/dbtime';
import { t } from '$lib/i18n.svelte';
import TakeCard from './TakeCard.svelte';
import { dayLabel, matchesFilter, type FeedFilter } from './takes';
/**
* 记录流 (spec-v2 §3.3): every desk take, newest last above the composer,
* filtered 全部 / 图片 / 视频 / 失败 and grouped by day.
* D 批 (HEL-654): rows pending their 5-second undo collapse out
* (200ms) instead of vanishing, new/restored takes rise in (220ms),
* the gold selection frame slides between cards on pointer picks
* (键盘 ↑↓/J/K 即时切换无动画 — driven by the desk through the
* exported helpers), and long histories page in from the top
* (spec §五: 记录流超 200 条分页).
*/
interface Props {
jobs: Job[];
workflowOf: (job: Job) => Workflow | undefined;
filter: FeedFilter;
selectedId: number | null;
nowMs: number;
busyId: number | null;
loading: boolean;
/** Takes whose delete is inside the 5s undo window — hidden. */
pendingIds: SvelteSet<number>;
/** One-shot completion flashes / failure shakes (driven by SSE). */
flashIds: SvelteSet<number>;
shakeIds: SvelteSet<number>;
/** Ordered visible ids (oldest first) for ↑↓/J/K. */
orderedIds?: number[];
/** Shown under the filters (e.g. the workbench context bar). */
banner?: Snippet;
/** Inspector toggle when it is hidden (desktop) or an overlay (mid). */
inspectorToggle?: Snippet;
onSelect: (job: Job) => void;
onReuse: (job: Job) => void;
onRetry: (job: Job) => void;
onCancel: (job: Job) => void;
onDelete: (job: Job) => void;
}
let {
jobs,
workflowOf,
filter = $bindable(),
selectedId,
nowMs,
busyId,
loading,
pendingIds,
flashIds,
shakeIds,
orderedIds = $bindable(),
banner,
inspectorToggle,
onSelect,
onReuse,
onRetry,
onCancel,
onDelete,
}: Props = $props();
const FILTERS: Array<{ id: FeedFilter; key: string }> = [
{ id: 'all', key: 'desk.filterAll' },
{ id: 'image', key: 'desk.filterImage' },
{ id: 'video', key: 'desk.filterVideo' },
{ id: 'failed', key: 'desk.filterFailed' },
];
/** §五 分页: render the newest PAGE_SIZE takes; older ones load on demand. */
const PAGE_SIZE = 80;
let limit = $state(PAGE_SIZE);
let scroller = $state<HTMLElement | null>(null);
/** Oldest first so the newest take sits right above the composer. */
const shown = $derived(
jobs
.filter((j) => matchesFilter(j, filter) && !pendingIds.has(j.id))
.sort((a, b) => parseDbTs(a.created_at) - parseDbTs(b.created_at)),
);
const hiddenEarlier = $derived(Math.max(0, shown.length - limit));
const visible = $derived(hiddenEarlier > 0 ? shown.slice(-limit) : shown);
$effect(() => {
orderedIds = visible.map((j) => j.id);
});
const activeCount = $derived(jobs.filter((j) => j.status === 'pending' || j.status === 'running').length);
const days = $derived.by(() => {
const out: Array<{ label: string; items: Job[] }> = [];
for (const job of visible) {
const label = dayLabel(parseDbTs(job.created_at), nowMs);
const last = out[out.length - 1];
if (last?.label === label) last.items.push(job);
else out.push({ label, items: [job] });
}
return out;
});
// Stick to the bottom as takes arrive, unless the user scrolled up to read.
let pinned = true;
function onScroll() {
if (!scroller) return;
pinned = scroller.scrollHeight - scroller.scrollTop - scroller.clientHeight < 80;
}
$effect(() => {
void visible.length;
void filter;
if (!scroller || !pinned) return;
const el = scroller;
requestAnimationFrame(() => (el.scrollTop = el.scrollHeight));
});
// ------------------------------------------------------------------
// Entrance bookkeeping: only takes that appear AFTER the first fill
// (or come back from an undo) play the 220ms rise.
// ------------------------------------------------------------------
const seenIds = new Set<number>();
const animateIds = new SvelteSet<number>();
let hydrated = false;
$effect(() => {
if (!hydrated) {
if (jobs.length) {
for (const j of jobs) seenIds.add(j.id);
hydrated = true;
}
return;
}
for (const j of jobs) {
if (seenIds.has(j.id)) continue;
seenIds.add(j.id);
animateIds.add(j.id);
}
});
export function markEnter(jobId: number) {
seenIds.add(jobId);
animateIds.add(jobId);
}
function reduced(): boolean {
return (
document.documentElement.dataset.reduce === '1' ||
window.matchMedia('(prefers-reduced-motion: reduce)').matches
);
}
// ------------------------------------------------------------------
// Gold selection frame (HEL-648 slideMark): pointer picks only.
// ------------------------------------------------------------------
export function markRect(): DOMRect | null {
const el = scroller?.querySelector(`.take[data-job="${selectedId}"]`);
return el instanceof HTMLElement ? el.getBoundingClientRect() : null;
}
export function slideFrom(fromRect: DOMRect | null) {
if (!fromRect || reduced()) return;
const el = scroller?.querySelector(`.take[data-job="${selectedId}"]`);
const mark = el?.querySelector('.sel-mark');
if (!(el instanceof HTMLElement) || !(mark instanceof HTMLElement)) return;
const to = el.getBoundingClientRect();
if (Math.abs(fromRect.top - to.top) < 1 && Math.abs(fromRect.height - to.height) < 1) return;
mark.animate(
[
{ top: `${fromRect.top - to.top - 1}px`, bottom: `${to.bottom - fromRect.bottom - 1}px` },
{ top: '-1px', bottom: '-1px' },
],
{ duration: 220, easing: 'cubic-bezier(0.23, 1, 0.32, 1)' },
);
}
/** Bring a keyboard-selected take into view without animation. */
export function scrollToJob(jobId: number) {
const el = scroller?.querySelector(`.take[data-job="${jobId}"]`);
el?.scrollIntoView({ block: 'nearest', behavior: 'auto' });
}
// ------------------------------------------------------------------
// Row transitions: undo-pending rows collapse out (200ms 收起 + 补位),
// new/restored takes rise in (220ms). Everything else is instant.
// ------------------------------------------------------------------
function takeEnter(_node: HTMLElement, should: () => boolean) {
if (!should()) return { duration: 0 };
if (reduced()) return { duration: 120, css: (t: number) => `opacity: ${t}` };
return {
duration: 220,
easing: cubicOut,
css: (t: number) => `opacity: ${t}; transform: translateY(${8 * (1 - t)}px)`,
};
}
function takeLeave(node: HTMLElement, isPending: () => boolean) {
if (!isPending()) return { duration: 0 };
if (reduced()) return { duration: 120, css: (t: number) => `opacity: ${t}` };
const h = node.offsetHeight;
const cs = getComputedStyle(node);
const num = (v: string) => parseFloat(v) || 0;
const padT = num(cs.paddingTop);
const padB = num(cs.paddingBottom);
const mb = num(cs.marginBottom);
return {
duration: 200,
easing: cubicOut,
css: (t: number, u: number) =>
`height:${h * t}px;padding-top:${padT * t}px;padding-bottom:${padB * t}px;` +
`margin-bottom:${mb * t}px;opacity:${t};transform:translateX(${-10 * u}px);overflow:hidden;`,
};
}
</script>
<div class="filters">
<div class="a-seg" role="group" aria-label={t('desk.filterAria')}>
{#each FILTERS as f (f.id)}
<button type="button" aria-pressed={filter === f.id} onclick={() => (filter = f.id)}>{t(f.key)}</button>
{/each}
</div>
<span class="count">
{t('desk.countTakes', { n: shown.length })}{#if activeCount}&nbsp;· {t('desk.countActive', { n: activeCount })}{/if}
</span>
{@render inspectorToggle?.()}
</div>
{@render banner?.()}
<div class="feed" bind:this={scroller} onscroll={onScroll}>
{#if loading && !jobs.length}
<p class="empty">{t('common.loading')}</p>
{:else if !shown.length}
<div class="empty">
<Icon name={filter === 'video' ? 'film' : filter === 'failed' ? 'check' : 'image'} size={20} />
<p>{filter === 'failed' ? t('desk.emptyFailed') : t('desk.emptyFeed')}</p>
</div>
{:else}
{#if hiddenEarlier > 0}
<button type="button" class="a-btn ghost sm earlier" onclick={() => (limit += PAGE_SIZE)}>
<Icon name="chevron-up" size={13} />
{t('desk.loadEarlier', { n: hiddenEarlier })}
</button>
{/if}
{#each days as day (day.label)}
<div class="day">{day.label}</div>
{#each day.items as job (job.id)}
<div
class="take-slot"
in:takeEnter={() => animateIds.has(job.id)}
out:takeLeave={() => pendingIds.has(job.id)}
>
<TakeCard
{job}
wf={workflowOf(job)}
selected={job.id === selectedId}
{nowMs}
busy={busyId === job.id}
enter={animateIds.has(job.id)}
flash={flashIds.has(job.id)}
shake={shakeIds.has(job.id)}
onSelect={() => onSelect(job)}
onReuse={() => onReuse(job)}
onRetry={() => onRetry(job)}
onCancel={() => onCancel(job)}
onDelete={() => onDelete(job)}
/>
</div>
{/each}
{/each}
{/if}
</div>
<style>
.filters {
display: flex;
align-items: center;
gap: var(--sp-2);
padding: var(--sp-4) var(--sp-7);
border-bottom: 1px solid var(--line);
}
.count {
margin-left: auto;
color: var(--text-3);
font-size: var(--fs-aux);
white-space: nowrap;
}
.feed {
flex: 1;
min-height: 0;
overflow-y: auto;
padding: var(--sp-6) var(--sp-7) var(--sp-3);
}
.earlier {
display: flex;
margin: 0 auto var(--sp-4);
}
.day {
display: flex;
align-items: center;
gap: var(--sp-3);
margin: var(--sp-4) 0 var(--sp-3);
color: var(--text-3);
font-size: var(--fs-aux);
}
.day::after {
content: '';
flex: 1;
height: 1px;
background: var(--line);
}
.empty {
display: grid;
place-items: center;
gap: var(--sp-3);
margin: 0;
padding: var(--sp-8) var(--sp-6);
color: var(--text-3);
text-align: center;
font-size: var(--fs-aux);
}
.empty p {
margin: 0;
}
@media (max-width: 1179px) {
.filters {
padding: var(--sp-4) var(--sp-6);
}
.feed {
padding: var(--sp-5) var(--sp-6) var(--sp-3);
}
}
@media (max-width: 760px) {
.filters {
padding: var(--sp-3) var(--sp-5);
overflow-x: auto;
}
.count {
display: none;
}
.feed {
padding: var(--sp-5) var(--sp-5) var(--sp-2);
}
}
</style>
@@ -0,0 +1,277 @@
<script lang="ts">
import Icon from '$lib/components/ui/Icon.svelte';
import ShellPop from '$lib/components/shell/ShellPop.svelte';
import { WORKFLOW_USAGES, type Workflow } from '$lib/comfy/types';
import { t } from '$lib/i18n.svelte';
import { slotSummary, usageLabel } from './schema';
/**
* 工作流选择 (spec-v2 §3.3 工作流面板): the composer's first chip opens a
* pop grouped by usage with search; each row shows what the workflow
* really takes (slot summary from its JSON), its connection and whether
* it last ran. Picking keeps the prompt and carried-over images.
* D 批 (HEL-654): the footer's「↑↓ 选择」is now literally true — an
* active row follows ↑↓ (and the pointer), Enter uses it, and the
* search's Enter picks the active row instead of always the first.
*/
interface Props {
workflows: Workflow[];
current: Workflow | null;
endpoints: Array<{ id: string; name: string }>;
onPick: (wf: Workflow) => void;
}
let { workflows, current, endpoints, onPick }: Props = $props();
let open = $state(false);
let query = $state('');
let activeId = $state<number | null>(null);
type Status = { tone: '' | 'ok' | 'warn' | 'err'; label: string };
function statusOf(wf: Workflow): Status {
if ((wf.warnings ?? []).some((w) => w.level === 'error')) return { tone: 'err', label: t('desk.wfBroken') };
const lt = wf.last_test;
if (!lt) return { tone: '', label: t('desk.wfUntested') };
if (lt.status === 'done' && lt.output_count > 0) return { tone: 'ok', label: t('desk.wfOk') };
if (lt.status === 'failed' || lt.status === 'done') return { tone: 'warn', label: t('desk.wfLastFailed') };
return { tone: '', label: t('desk.wfTesting') };
}
function endpointLabel(wf: Workflow): string {
const ep = endpoints.find((e) => e.id === wf.endpoint_id);
return ep ? ep.name : t('desk.wfDefaultConn');
}
const rows = $derived(
workflows.map((wf) => ({
wf,
summary: slotSummary(wf),
conn: endpointLabel(wf),
status: statusOf(wf),
usage: wf.usage ? usageLabel(wf.usage) : '',
})),
);
const groups = $derived.by(() => {
const q = query.trim().toLowerCase();
const hit = (r: (typeof rows)[number]) =>
!q || `${r.wf.name} ${r.usage} ${r.summary}`.toLowerCase().includes(q);
return WORKFLOW_USAGES.map((u) => ({
usage: u,
items: rows.filter((r) => r.wf.usage === u && hit(r)),
})).filter((g) => g.items.length);
});
/** Flattened rows in display order — the roving selection walks these. */
const flat = $derived(groups.flatMap((g) => g.items));
// Keep the active row real: default to the current workflow, clamp on
// filter changes, never point at a row that is no longer listed.
$effect(() => {
if (!open) return;
if (activeId != null && flat.some((r) => r.wf.id === activeId)) return;
activeId = flat.find((r) => r.wf.id === current?.id)?.wf.id ?? flat[0]?.wf.id ?? null;
});
function moveActive(delta: number) {
if (!flat.length) return;
let i = flat.findIndex((r) => r.wf.id === activeId);
i = i < 0 ? (delta > 0 ? 0 : flat.length - 1) : i + delta;
activeId = flat[Math.max(0, Math.min(flat.length - 1, i))].wf.id;
}
function pickActive() {
const row = flat.find((r) => r.wf.id === activeId) ?? flat[0];
if (row) pick(row.wf);
}
function pick(wf: Workflow) {
open = false;
query = '';
if (wf.id !== current?.id) onPick(wf);
}
function onKeydown(e: KeyboardEvent) {
if (e.key === 'ArrowDown') {
e.preventDefault();
moveActive(1);
} else if (e.key === 'ArrowUp') {
e.preventDefault();
moveActive(-1);
} else if (e.key === 'Enter') {
e.preventDefault();
pickActive();
}
}
</script>
<div class="picker">
<button
type="button"
id="desk-wf"
class="a-chip wf"
aria-haspopup="dialog"
aria-expanded={open}
title={current?.name ?? t('desk.pickWorkflow')}
onclick={() => (open = !open)}
>
<Icon name="playground" size={14} />
<span class="lbl">{current?.name ?? t('desk.pickWorkflow')}</span>
</button>
<ShellPop
bind:open
label={t('desk.pickWorkflow')}
placement="top"
width="520px"
arrowRoving={false}
onclose={() => (query = '')}
>
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div class="pop-body" onkeydown={onKeydown}>
<div class="search">
<Icon name="search" size={14} />
<input
class="search-input"
type="search"
bind:value={query}
placeholder={t('desk.wfSearchPh')}
aria-label={t('desk.wfSearchPh')}
/>
</div>
<div class="list" role="listbox" aria-label={t('desk.pickWorkflow')}>
{#each groups as g (g.usage)}
<div class="a-menu-group">{usageLabel(g.usage)} · {g.items.length}</div>
{#each g.items as r (r.wf.id)}
{@const cur = r.wf.id === current?.id}
<button
type="button"
class="a-menu-item row"
class:off={r.status.tone === 'err'}
class:active={r.wf.id === activeId}
role="option"
aria-current={cur ? 'true' : undefined}
aria-selected={r.wf.id === activeId ? 'true' : undefined}
onclick={() => pick(r.wf)}
onpointermove={() => (activeId = r.wf.id)}
>
<span class="main">
<span class="a-menu-label">{r.wf.name}{cur ? ` · ${t('desk.wfCurrent')}` : ''}</span>
<span class="sub">
<span class="a-tag">{r.summary}</span>
<span class="a-tag">{r.conn}</span>
</span>
</span>
<span class="a-tag {r.status.tone}">{r.status.label}</span>
</button>
{/each}
{:else}
<p class="empty">{t('desk.wfNoMatch')}</p>
{/each}
</div>
<div class="foot">
<a class="a-btn ghost sm" href="/connections">
<Icon name="upload" size={13} />
{t('desk.wfImport')}
</a>
<span class="keys">
<span class="a-kbd">↑↓</span>{t('desk.keySelect')}
<span class="a-kbd">Enter</span>{t('desk.keyUse')}
<span class="a-kbd">Esc</span>{t('desk.keyClose')}
</span>
</div>
</div>
</ShellPop>
</div>
<style>
.picker {
position: relative;
min-width: 0;
}
.pop-body {
display: flex;
flex-direction: column;
}
.search {
display: flex;
align-items: center;
gap: var(--sp-3);
padding: var(--sp-3) var(--sp-4) var(--sp-4);
border-bottom: 1px solid var(--line);
color: var(--text-3);
}
.search-input {
flex: 1;
min-width: 0;
border: 0;
outline: 0;
background: transparent;
color: var(--text);
font: inherit;
font-size: var(--fs-section);
}
.search-input::placeholder {
color: var(--text-3);
}
/* Search and foot stay put; only the list scrolls inside the pop's max-height. */
.list {
max-height: min(380px, 50vh);
overflow-y: auto;
padding: var(--sp-1) 0;
}
.row {
align-items: center;
}
/* 键盘游走选中态(↑↓ 选择 · Enter 使用) */
.row.active {
background: var(--bg-4);
}
.main {
display: grid;
gap: 2px;
flex: 1;
min-width: 0;
}
.main .a-menu-label {
font-weight: 500;
}
.row.off .a-menu-label {
color: var(--text-3);
}
.sub {
display: flex;
flex-wrap: wrap;
gap: var(--sp-1);
}
.empty {
margin: 0;
padding: var(--sp-6) var(--sp-4);
color: var(--text-3);
font-size: var(--fs-aux);
}
.foot {
display: flex;
align-items: center;
gap: var(--sp-2);
padding: var(--sp-3) var(--sp-1) 0;
border-top: 1px solid var(--line);
}
.keys {
display: inline-flex;
align-items: center;
gap: var(--sp-1);
margin-left: auto;
font-size: var(--fs-mini);
color: var(--text-3);
white-space: nowrap;
}
.keys .a-kbd:not(:first-child) {
margin-left: var(--sp-2);
}
@media (max-width: 760px) {
.keys {
display: none;
}
}
</style>
@@ -0,0 +1,55 @@
import type { WorkbenchStageKey } from '$lib/api';
import type { DeskKind } from './schema';
/**
* 五段创作 → 生成台 handoff, carried in the URL so a reload keeps it.
* The desk only prefills from it; the playground generate API has no
* project/shot link, so results stay in the desk feed (no backfill).
*/
export interface DeskContext {
kind: DeskKind;
projectId: number;
stage: WorkbenchStageKey;
/** Human label of the source row, e.g. 镜头 S1 / 角色「林夏」. */
label: string;
prompt?: string;
negative?: string;
durationSec?: number;
}
const STAGES: WorkbenchStageKey[] = ['script', 'style', 'storyboard', 'assets', 'shot'];
export function deskHref(ctx: DeskContext): string {
const q = new URLSearchParams({
from: 'workbench',
project: String(ctx.projectId),
stage: ctx.stage,
label: ctx.label,
});
if (ctx.prompt) q.set('prompt', ctx.prompt);
if (ctx.negative) q.set('negative', ctx.negative);
if (ctx.durationSec != null) q.set('duration', String(ctx.durationSec));
return `/${ctx.kind}?${q.toString()}`;
}
export function readDeskContext(url: URL, kind: DeskKind): DeskContext | null {
const q = url.searchParams;
if (q.get('from') !== 'workbench') return null;
const projectId = Number(q.get('project'));
const stage = q.get('stage') as WorkbenchStageKey | null;
if (!Number.isInteger(projectId) || projectId <= 0 || !stage || !STAGES.includes(stage)) return null;
const duration = Number(q.get('duration'));
return {
kind,
projectId,
stage,
label: q.get('label') ?? '',
prompt: q.get('prompt') ?? undefined,
negative: q.get('negative') ?? undefined,
durationSec: Number.isFinite(duration) && duration > 0 ? duration : undefined,
};
}
export function backHref(ctx: DeskContext): string {
return `/workbench/${ctx.projectId}?stage=${ctx.stage}`;
}
@@ -0,0 +1,372 @@
import type { ComfyDynamicInput, Workflow, WorkflowUsage } from '$lib/comfy/types';
import { normalizeInputRole } from '$lib/comfy/parser';
import { ratioShort, resolutionSelectorSize } from '$lib/comfy/resolution';
import { t } from '$lib/i18n.svelte';
/**
* 生成台表单识别 (HEL-653, moved verbatim from StudioGenerate): slots and
* structured params come from what the workflow JSON actually declares —
* never from model names. No wiring → no slot.
*/
export type DeskKind = 'image' | 'video';
export type FormValue = string | number | string[];
export type FormValues = Record<string, FormValue>;
export interface SlotDef {
inp: ComfyDynamicInput;
label: string;
mediaKind: 'image' | 'video' | 'audio';
fromResults: boolean;
/** Required-slot message when left empty (ref-upload-spec §3). */
missing: string;
firstFrame: boolean;
lastFrame: boolean;
mask: boolean;
}
/** Why 生成 is disabled — the line next to the button (spec-v2 §1.2). */
export interface BlockReason {
text: string;
tone: 'warn' | 'err';
/** Element id to focus when the reason is clicked. */
target?: string;
/** Open the params tab instead of focusing. */
params?: boolean;
}
export interface DeskSchema {
prompt: ComfyDynamicInput | null;
negative: ComfyDynamicInput | null;
seed: ComfyDynamicInput | null;
width: ComfyDynamicInput | null;
height: ComfyDynamicInput | null;
resolution: ComfyDynamicInput | null;
duration: ComfyDynamicInput | null;
batch: ComfyDynamicInput | null;
/** ComfyUI ResolutionSelector: the ratio + megapixels pair decides width/height. */
ratio: ComfyDynamicInput | null;
megapixels: ComfyDynamicInput | null;
/** Single media inputs (input image, first/last frame, mask, ref video/audio). */
slots: SlotDef[];
/** Autogrow media lists actually wired (image / video / audio). */
lists: ComfyDynamicInput[];
/** Parameters shown as composer chips (比例 / 尺寸 / 分辨率 / 时长 / 种子). */
common: ComfyDynamicInput[];
/** Everything else that is not media and not the prompt — folded. */
advanced: ComfyDynamicInput[];
hasH3Hint: boolean;
}
export function inputRole(inp: ComfyDynamicInput): string | null {
return normalizeInputRole(inp.role ?? null);
}
function hay(inp: ComfyDynamicInput): string {
return `${inp.role ?? ''} ${inp.label}`.toLowerCase();
}
export function isMedia(inp: ComfyDynamicInput): boolean {
return (
inp.kind === 'image' ||
inp.kind === 'image_url' ||
inp.kind === 'video' ||
inp.kind === 'audio' ||
inp.kind === 'image_list' ||
inp.kind === 'video_list' ||
inp.kind === 'audio_list'
);
}
function isList(inp: ComfyDynamicInput): boolean {
return inp.kind === 'image_list' || inp.kind === 'video_list' || inp.kind === 'audio_list';
}
function isMask(inp: ComfyDynamicInput): boolean {
return inputRole(inp) === 'mask' || /mask|遮罩/.test(hay(inp));
}
// Auto-detected slots carry their role from the wiring; tagged (Input:…)
// workflows still name frames only in the title.
export function isFirstFrame(inp: ComfyDynamicInput, kind: DeskKind): boolean {
return inputRole(inp) === 'first_frame' || (!inp.auto && kind === 'video' && /first|start|首帧/.test(hay(inp)));
}
export function isLastFrame(inp: ComfyDynamicInput, kind: DeskKind): boolean {
return inputRole(inp) === 'last_frame' || (!inp.auto && kind === 'video' && /last|end|尾帧/.test(hay(inp)));
}
export function listKind(entry: ComfyDynamicInput): 'image' | 'video' | 'audio' {
if (entry.kind === 'video_list') return 'video';
if (entry.kind === 'audio_list') return 'audio';
return 'image';
}
export function listPaths(values: FormValues, entry: ComfyDynamicInput): string[] {
const v = values[entry.nodeId];
if (Array.isArray(v)) return v;
return typeof v === 'string' && v ? [v] : [];
}
export function classifySchema(schema: ComfyDynamicInput[], kind: DeskKind): DeskSchema {
const plain = (pred: (i: ComfyDynamicInput) => boolean) =>
schema.find((i) => !isMedia(i) && pred(i)) ?? null;
const byRole = (r: string) => plain((i) => inputRole(i) === r);
const prompt = byRole('prompt');
const negative = byRole('negative');
const seed = byRole('seed');
const width = byRole('width');
const height = byRole('height');
const resolution = byRole('resolution');
const duration = byRole('duration');
const batch = plain((i) => /批次|batch/.test(hay(i)));
const ratio =
schema.find((i) => i.kind === 'select' && inputRole(i) === 'aspect_ratio' && i.resolution) ?? null;
const megapixels = ratio ? (schema.find((i) => i.nodeId === ratio.resolution!.megapixels) ?? null) : null;
const media = schema.filter((i) => isMedia(i) && !isList(i));
const plainImages = media.filter(
(i) => i.kind === 'image' && !isMask(i) && !isFirstFrame(i, kind) && !isLastFrame(i, kind),
);
const editInput = kind === 'image' && plainImages.length === 1 ? plainImages[0] : null;
const slots: SlotDef[] = [];
let refIdx = 0;
for (const inp of media) {
const base = { inp, missing: '', firstFrame: false, lastFrame: false, mask: false };
if (inp.kind === 'video') {
slots.push({ ...base, label: t('studio.slotRefVideo'), mediaKind: 'video', fromResults: false });
} else if (inp.kind === 'audio') {
slots.push({ ...base, label: t('studio.slotAudio'), mediaKind: 'audio', fromResults: false });
} else if (isMask(inp)) {
slots.push({ ...base, mask: true, label: t('studio.slotMask'), mediaKind: 'image', fromResults: false });
} else if (isFirstFrame(inp, kind)) {
slots.push({
...base,
firstFrame: true,
label: t('studio.slotFirst'),
mediaKind: 'image',
fromResults: true,
missing: t('studio.errNeedFirstFrame'),
});
} else if (isLastFrame(inp, kind)) {
slots.push({ ...base, lastFrame: true, label: t('studio.slotLast'), mediaKind: 'image', fromResults: true });
} else if (inp === editInput) {
slots.push({
...base,
label: t('studio.slotInput'),
mediaKind: 'image',
fromResults: true,
missing: t('studio.errNeedInputImage'),
});
} else {
refIdx += 1;
const label = inp.auto
? inp.label
: refIdx === 1 && media.length === 1
? t('studio.slotRef')
: t('studio.slotRefN', { n: refIdx });
slots.push({
...base,
label,
mediaKind: 'image',
fromResults: true,
missing: t('studio.errUpload', { label }),
});
}
}
const lists = schema.filter(isList);
const common = [ratio, width, height, resolution, duration, seed].filter(
(i): i is ComfyDynamicInput => !!i,
);
const commonIds = new Set(common.map((i) => i.nodeId));
const advanced = schema.filter((i) => !isMedia(i) && i !== prompt && !commonIds.has(i.nodeId));
return {
prompt,
negative,
seed,
width,
height,
resolution,
duration,
batch,
ratio,
megapixels,
slots,
lists,
common,
advanced,
hasH3Hint: lists.some((e) => e.media_hint === 'minimax_h3_ref2va'),
};
}
/** Workflow JSON defaults — the 原值 every parameter falls back to. */
export function schemaDefaults(schema: ComfyDynamicInput[]): FormValues {
const out: FormValues = {};
for (const inp of schema) {
if (inp.defaultValue !== undefined && inp.defaultValue !== '') out[inp.nodeId] = inp.defaultValue;
}
return out;
}
export function isChanged(inp: ComfyDynamicInput, values: FormValues): boolean {
const v = values[inp.nodeId];
const orig = inp.defaultValue;
if (v === undefined || v === '') return orig !== undefined && orig !== '';
if (orig === undefined || orig === '') return true;
return String(v) !== String(orig);
}
export function changedParams(ds: DeskSchema, values: FormValues): ComfyDynamicInput[] {
return [...ds.common, ...ds.advanced].filter((i) => isChanged(i, values));
}
export function outputSize(ds: DeskSchema, values: FormValues): { width: number; height: number } | null {
if (!ds.ratio?.resolution) return null;
const mp = Number(values[ds.megapixels?.nodeId ?? ''] ?? ds.megapixels?.defaultValue);
return resolutionSelectorSize(
String(values[ds.ratio.nodeId] ?? ds.ratio.defaultValue ?? ''),
mp,
ds.ratio.resolution.multiple,
);
}
export function batchCount(ds: DeskSchema, values: FormValues): number {
if (!ds.batch) return 1;
const n = Number(values[ds.batch.nodeId]);
return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
}
/** H3 Ref2VA official limits (soft hint, keyed off the node class only). */
export function h3Warnings(ds: DeskSchema, values: FormValues): string[] {
if (!ds.hasH3Hint) return [];
const warns: string[] = [];
const counts = { image: 0, video: 0, audio: 0 };
for (const g of ds.lists) counts[listKind(g)] += listPaths(values, g).length;
const total = counts.image + counts.video + counts.audio;
if (total > 12) warns.push(t('wfMedia.h3TotalOver', { n: total }));
if (counts.audio > 0 && counts.image === 0 && counts.video === 0) warns.push(t('wfMedia.h3AudioAlone'));
return warns;
}
/** Same rules the backend enforces before queueing (comfyui/validate.py). */
export function valueError(inp: ComfyDynamicInput, raw: string | number): string | null {
const label = inp.label;
if (inp.kind === 'select') {
return inp.options?.length && !inp.options.includes(String(raw)) ? t('studio.errOption', { label }) : null;
}
if (inp.kind !== 'number') return null;
const n = Number(raw);
if (!Number.isFinite(n)) return t('studio.errNumber', { label });
if (inp.integer && !Number.isInteger(n)) return t('studio.errInteger', { label });
if (inp.min != null && n < inp.min) return t('studio.errMin', { label, v: inp.min });
if (inp.max != null && n > inp.max) return t('studio.errMax', { label, v: inp.max });
return null;
}
/** Field errors keyed by nodeId (spec §6.2 wording); '' keys never block. */
export function validateForm(
schema: ComfyDynamicInput[],
ds: DeskSchema,
values: FormValues,
): Record<string, string> {
const errs: Record<string, string> = {};
if (ds.prompt?.required) {
const v = String(values[ds.prompt.nodeId] ?? '');
if (!v.trim()) errs[ds.prompt.nodeId] = t('studio.errPrompt');
else if (v.length > 2000) errs[ds.prompt.nodeId] = t('studio.errPromptLong');
}
const first = ds.slots.find((s) => s.firstFrame);
const last = ds.slots.find((s) => s.lastFrame);
if (first && last) {
const a = String(values[first.inp.nodeId] ?? '');
const b = String(values[last.inp.nodeId] ?? '');
if ((!a || !b) && (a || b)) {
errs.firstLast = t('studio.errFirstLast');
if (!a) errs[first.inp.nodeId] = ' ';
if (!b) errs[last.inp.nodeId] = ' ';
}
}
for (const s of ds.slots) {
if (!s.inp.required) continue;
if (!String(values[s.inp.nodeId] ?? '').trim()) {
errs[s.inp.nodeId] = s.missing || t('studio.errUpload', { label: s.label });
}
}
for (const g of ds.lists) {
const n = listPaths(values, g).length;
const max = g.max ?? 9;
if (n < (g.min ?? 1)) {
errs[g.nodeId] =
g.kind === 'image_list'
? t('studio.errNeedRef')
: t('studio.errNeedRefMedia', { n: g.min ?? 1, label: g.label });
} else if (n > max) {
errs[g.nodeId] = t('studio.errRefMax', { max, n, k: n - max });
}
}
for (const inp of [...ds.common, ...ds.advanced]) {
if (inp.required && !String(values[inp.nodeId] ?? '').trim()) {
errs[inp.nodeId] = t('studio.errFill', { label: inp.label });
}
}
for (const inp of schema) {
const raw = values[inp.nodeId];
if (raw === undefined || Array.isArray(raw) || String(raw).trim() === '' || errs[inp.nodeId]) continue;
const msg = valueError(inp, raw);
if (msg) errs[inp.nodeId] = msg;
}
return errs;
}
/** Media a slot still waits for — the 「还缺:…」 hint next to 生成. */
export function missingMedia(ds: DeskSchema, values: FormValues): Array<{ nodeId: string; label: string }> {
const out: Array<{ nodeId: string; label: string }> = [];
for (const s of ds.slots) {
if (s.inp.required && !String(values[s.inp.nodeId] ?? '').trim()) out.push({ nodeId: s.inp.nodeId, label: s.label });
}
for (const g of ds.lists) {
if (listPaths(values, g).length < (g.min ?? 1)) out.push({ nodeId: g.nodeId, label: g.label });
}
return out;
}
export function usageLabel(u: WorkflowUsage): string {
return t(`usage.${u}`);
}
/** Mode badge: the stored usage when we have one, else the wiring shape. */
export function modeLabel(wf: Workflow | null, ds: DeskSchema, kind: DeskKind): string {
if (wf?.usage) return usageLabel(wf.usage);
if (ds.lists.some((g) => g.kind === 'image_list')) return t('studio.modeRefToVideo');
if (ds.slots.some((s) => s.firstFrame)) return t('studio.modeImageToVideo');
if (kind === 'image' && ds.slots.some((s) => s.mediaKind === 'image' && !s.mask))
return t('studio.modeImageEdit');
if (ds.slots.length) return ds.slots.map((s) => s.label).join(' · ');
return kind === 'image' ? t('studio.modeTextToImage') : t('studio.modeTextToVideo');
}
/** Picker row summary of a workflow's real media inputs, e.g. 参考图 1–9 张. */
export function slotSummary(wf: Workflow): string {
const ds = classifySchema(wf.input_schema ?? [], wf.kind);
const parts = [
...ds.slots.map((s) => t('desk.slotOne', { label: s.label })),
...ds.lists.map((g) => t('desk.slotRange', { label: g.label, min: g.min ?? 1, max: g.max ?? 9 })),
];
return parts.length ? parts.join(' · ') : t('desk.promptOnly');
}
/** Short chip text for one common parameter value. */
export function chipValue(inp: ComfyDynamicInput, values: FormValues, ds: DeskSchema): string {
const raw = values[inp.nodeId] ?? inp.defaultValue ?? '';
const v = Array.isArray(raw) ? raw.join(',') : String(raw);
if (inp === ds.ratio) {
const size = outputSize(ds, values);
return size ? `${ratioShort(v)} · ${size.width}×${size.height}` : ratioShort(v);
}
if (inp === ds.duration) return v ? t('desk.chipSeconds', { v }) : t('studio.durationLabel');
if (inp === ds.seed) return t('desk.chipSeed', { v: v.length > 8 ? `${v.slice(0, 8)}…` : v || '—' });
if (inp === ds.resolution) return t('desk.chipResolution', { v: v || '—' });
return v || inp.label;
}
@@ -0,0 +1,120 @@
import { SvelteSet } from 'svelte/reactivity';
import type { QueryClient } from '@tanstack/svelte-query';
import { apiErrorMessage, playgroundApi } from '$lib/api';
import type { Job } from '$lib/comfy/types';
import { showToast } from '$lib/toast';
import { t } from '$lib/i18n.svelte';
/**
* 撤销删除 (spec-v2 §四.4 删除两级制 · HEL-654 D 批): deleting a single
* take/task never opens a dialog. The row leaves the view right away, a
* 5-second Toast offers 撤销, and the backend DELETE is only sent when
* that window closes without an undo — the backend removes result files,
* so an undo after the call would be impossible. Leaving the page (SPA
* route change or hard unload) flushes pending deletes instead of
* dropping them.
*/
export interface TakeDeleteHandlers {
/** Localized toast message for this take. */
message: (job: Job) => string;
/** Undo: the row comes back — reselect / replay its entrance here. */
onUndo?: (job: Job) => void;
/** Called after the delete really hit the backend. */
onCommitted?: (job: Job) => void;
}
export interface TakeDeleteQueue {
/** Ids whose rows should be hidden (commit pending). */
readonly pending: SvelteSet<number>;
request: (job: Job, handlers: TakeDeleteHandlers) => void;
destroy: () => void;
}
const UNDO_MS = 5000;
export function createTakeDeleteQueue(client: QueryClient): TakeDeleteQueue {
const pending = new SvelteSet<number>();
const entries = new Map<
number,
{
job: Job;
handlers: TakeDeleteHandlers;
timer: ReturnType<typeof setTimeout>;
}
>();
let destroyed = false;
async function invalidate() {
await Promise.allSettled([
client.invalidateQueries({ queryKey: ['playground-jobs'] }),
client.invalidateQueries({ queryKey: ['jobs'] }),
]);
}
async function commit(id: number) {
const entry = entries.get(id);
if (!entry) return;
entries.delete(id);
try {
await playgroundApi.deleteJob(id);
pending.delete(id);
entry.handlers.onCommitted?.(entry.job);
} catch (err) {
// Delete failed: the take stays — bring the row back honestly.
pending.delete(id);
showToast(
t('studio.deleteFailedToast', { detail: apiErrorMessage(err) }),
'error',
);
}
await invalidate();
}
/** Hard unload (tab close / external nav): fire-and-forget with keepalive. */
function onPageHide() {
for (const [id] of entries) {
void fetch(`/api/playground/jobs/${id}`, {
method: 'DELETE',
keepalive: true,
});
}
}
function destroy() {
if (destroyed) return;
destroyed = true;
if (inBrowser) window.removeEventListener('pagehide', onPageHide);
// SPA route change: the JS context survives, normal commits are fine.
for (const [id] of entries) {
const entry = entries.get(id)!;
clearTimeout(entry.timer);
void commit(id);
}
}
const inBrowser = typeof window !== 'undefined';
if (inBrowser) window.addEventListener('pagehide', onPageHide);
return {
pending,
request(job, handlers) {
if (destroyed || pending.has(job.id)) return;
pending.add(job.id);
const timer = setTimeout(() => void commit(job.id), UNDO_MS);
entries.set(job.id, { job, handlers, timer });
showToast(handlers.message(job), 'info', UNDO_MS, {
label: t('toast.undo'),
run: () => {
const e = entries.get(job.id);
if (!e) return;
clearTimeout(e.timer);
entries.delete(job.id);
pending.delete(job.id);
handlers.onUndo?.(job);
},
});
},
destroy,
};
}
@@ -0,0 +1,129 @@
import type { Job, Workflow } from '$lib/comfy/types';
import { parseDbTs } from '$lib/dbtime';
import { jobStatusInfo } from '$lib/jobStatus';
import { resolutionSelectorSize } from '$lib/comfy/resolution';
import { t } from '$lib/i18n.svelte';
import { classifySchema, inputRole, isFirstFrame, isLastFrame, isMedia } from './schema';
/** Read-only views of a finished / running take (one playground job). */
export type FeedFilter = 'all' | 'image' | 'video' | 'failed';
export function jobValues(job: Job): Record<string, unknown> {
return (job.payload?.input_values ?? {}) as Record<string, unknown>;
}
export function jobValueByRole(job: Job, wf: Workflow | undefined, ...roles: string[]): string | null {
if (!wf) return null;
const vals = jobValues(job);
for (const inp of wf.input_schema ?? []) {
const r = inputRole(inp);
if (r && roles.includes(r)) {
const v = vals[inp.nodeId];
if (v !== undefined && v !== null && String(v).trim() !== '') return String(v);
}
}
return null;
}
export function promptOf(job: Job, wf: Workflow | undefined): string {
return jobValueByRole(job, wf, 'prompt') ?? '';
}
export interface TakeInput {
label: string;
path: string;
kind: 'image' | 'video' | 'audio';
}
/** Media the take was generated from, in workflow order. */
export function inputsOf(job: Job, wf: Workflow | undefined): TakeInput[] {
if (!wf) return [];
const kind = wf.kind;
const vals = jobValues(job);
const out: TakeInput[] = [];
let refIdx = 0;
for (const inp of wf.input_schema ?? []) {
if (!isMedia(inp)) continue;
const v = vals[inp.nodeId];
const list = Array.isArray(v) ? v : typeof v === 'string' && v ? [v] : [];
const mk = inp.kind.startsWith('video') ? 'video' : inp.kind.startsWith('audio') ? 'audio' : 'image';
list.forEach((p, i) => {
if (typeof p !== 'string' || !p) return;
let label = inp.label;
if (inp.kind === 'image_list') label = t('studio.slotRefN', { n: i + 1 });
else if (isFirstFrame(inp, kind)) label = t('studio.slotFirst');
else if (isLastFrame(inp, kind)) label = t('studio.slotLast');
else if (inp.kind === 'image' && inputRole(inp) !== 'mask') label = t('studio.slotRefN', { n: ++refIdx });
out.push({ label, path: p, kind: mk });
});
}
return out;
}
/** 888×1184 · 种子 42 · 5 秒 — values that differ per take. */
export function specOf(job: Job, wf: Workflow | undefined): Array<{ label: string; value: string }> {
const out: Array<{ label: string; value: string }> = [];
if (!wf) return out;
const w = jobValueByRole(job, wf, 'width');
const h = jobValueByRole(job, wf, 'height');
if (w && h) out.push({ label: t('desk.specSize'), value: `${w}×${h}` });
else {
const ds = classifySchema(wf.input_schema ?? [], wf.kind);
if (ds.ratio?.resolution) {
const vals = jobValues(job);
const size = resolutionSelectorSize(
String(vals[ds.ratio.nodeId] ?? ds.ratio.defaultValue ?? ''),
Number(vals[ds.ratio.resolution.megapixels] ?? ds.megapixels?.defaultValue),
ds.ratio.resolution.multiple,
);
if (size) out.push({ label: t('desk.specSize'), value: `${size.width}×${size.height}` });
}
}
const seed = jobValueByRole(job, wf, 'seed');
if (seed) out.push({ label: t('studio.seedLabel'), value: seed });
const dur = jobValueByRole(job, wf, 'duration');
if (dur) out.push({ label: t('studio.durationLabel'), value: t('desk.chipSeconds', { v: dur }) });
return out;
}
export function isVideoOutput(job: Job, path: string): boolean {
return job.kind === 'video' && !/\.(png|jpe?g|webp)$/i.test(path);
}
export function elapsedSec(job: Job, nowMs: number): number | null {
const from = job.started_at ? parseDbTs(job.started_at) : parseDbTs(job.created_at);
if (!Number.isFinite(from)) return null;
const to = job.completed_at ? parseDbTs(job.completed_at) : nowMs;
return Math.max(0, (to - from) / 1000);
}
export function fmtDur(sec: number | null): string {
if (sec == null) return '—';
if (sec < 60) return t('desk.durSec', { s: Math.floor(sec) });
const m = Math.floor(sec / 60);
const s = Math.floor(sec % 60);
return t('desk.durMin', { m, s: String(s).padStart(2, '0') });
}
export function fmtClock(ms: number): string {
const d = new Date(ms);
return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`;
}
/** 今天 / 昨天 / 9月28日 heading for the feed. */
export function dayLabel(ms: number, nowMs: number): string {
const d = new Date(ms);
const today = new Date(nowMs);
const startOf = (x: Date) => new Date(x.getFullYear(), x.getMonth(), x.getDate()).getTime();
const diff = Math.round((startOf(today) - startOf(d)) / 86_400_000);
if (diff === 0) return t('desk.today');
if (diff === 1) return t('desk.yesterday');
return t('desk.dayDate', { m: d.getMonth() + 1, d: d.getDate() });
}
export function matchesFilter(job: Job, filter: FeedFilter): boolean {
if (filter === 'all') return true;
if (filter === 'failed') return jobStatusInfo(job).tone === 'fail';
return job.kind === filter;
}
@@ -39,7 +39,8 @@
function segClass(key: string): string {
const state = stats.stage_status?.[key];
if (state === 'confirmed') return 'seg-confirmed';
if (state === 'running' || state === 'awaiting_confirm') return 'seg-draft';
if (state === 'running') return 'seg-running';
if (state === 'awaiting_confirm') return 'seg-draft';
return '';
}
@@ -70,7 +71,7 @@
return { cls: 'st-progress', label: `${stageName} · ${t('workbench.state.running')}` };
}
if (state === 'awaiting_confirm') {
return { cls: 'st-progress', label: `${stageName} · ${t('workbench.state.draft')}` };
return { cls: 'st-pending', label: `${stageName} · ${t('workbench.state.draft')}` };
}
if (stats.stage_confirmed > 0) {
return { cls: 'st-progress', label: `${stageName} · ${t('home.statusProgress')}` };
@@ -329,7 +330,7 @@
display: inline-flex;
align-items: center;
justify-content: center;
color: rgba(22, 19, 10, 0.82);
color: color-mix(in srgb, var(--accent-ink) 82%, transparent);
opacity: 0.9;
}
.status-tag {
@@ -340,7 +341,7 @@
border-radius: 999px;
font-size: 10.5px;
font-weight: 600;
background: rgba(13, 14, 17, 0.78);
background: var(--media-scrim);
border: 1px solid var(--border-strong);
backdrop-filter: blur(4px);
}
@@ -350,7 +351,10 @@
color: var(--text-2);
}
.st-progress {
color: var(--accent);
color: var(--run);
}
.st-pending {
color: var(--warn);
}
.st-done {
color: var(--success);
@@ -409,8 +413,11 @@
border-radius: 2px;
background: var(--surface-3);
}
.seg-running {
background: var(--run);
}
.seg-draft {
background: var(--accent);
background: var(--warn);
}
.seg-confirmed {
background: var(--success);
@@ -425,8 +432,8 @@
margin-left: auto;
padding: 1px 8px;
border-radius: 999px;
background: var(--accent-dim);
color: var(--accent);
background: var(--run-soft);
color: var(--run);
font-size: 10px;
font-weight: 600;
font-variant-numeric: tabular-nums;
@@ -462,7 +469,7 @@
height: 28px;
border: 1px solid transparent;
border-radius: 7px;
background: rgba(13, 14, 17, 0.6);
background: var(--media-scrim);
color: var(--text-2);
font-size: 15px;
line-height: 1;
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,218 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { createQuery } from '@tanstack/svelte-query';
import { toStore } from 'svelte/store';
import { projects } from '$lib/api';
import { t } from '$lib/i18n.svelte';
import Icon from '$lib/components/ui/Icon.svelte';
import Modal from '$lib/components/ui/Modal.svelte';
import type { IconName } from '$lib/components/ui/icons';
import { NAV } from './nav';
/** Ctrl/⌘K 搜索:跳到任一页面或项目(↑↓ 选择,Enter 打开,Esc 关闭). */
let { open = $bindable(false) }: { open?: boolean } = $props();
interface Entry {
key: string;
group: 'pages' | 'projects';
label: string;
icon: IconName;
href: string;
}
const listId = `palette-${Math.random().toString(36).slice(2, 9)}`;
let query = $state('');
let activeIndex = $state(0);
let list = $state<HTMLDivElement | null>(null);
const projectsQuery = createQuery(
toStore(() => ({
queryKey: ['projects'],
queryFn: projects.list,
enabled: open,
staleTime: 30_000,
})),
);
const entries = $derived.by<Entry[]>(() => {
const pages: Entry[] = NAV.map((item) => ({
key: `page-${item.id}`,
group: 'pages',
label: t(item.labelKey),
icon: item.icon,
href: item.href,
}));
const projectEntries: Entry[] = ($projectsQuery.data ?? []).map((p) => ({
key: `project-${p.id}`,
group: 'projects',
label: p.title,
icon: 'story',
href: `/workbench/${p.id}`,
}));
const q = query.trim().toLowerCase();
const all = [...pages, ...projectEntries];
return q ? all.filter((e) => e.label.toLowerCase().includes(q)) : all;
});
$effect(() => {
void query;
activeIndex = 0;
});
$effect(() => {
if (!open) query = '';
});
function optionId(index: number) {
return `${listId}-${index}`;
}
function go(entry: Entry) {
open = false;
void goto(entry.href);
}
function move(step: number) {
if (entries.length === 0) return;
activeIndex = (activeIndex + step + entries.length) % entries.length;
list?.querySelector(`#${optionId(activeIndex)}`)?.scrollIntoView({ block: 'nearest' });
}
function handleKeydown(event: KeyboardEvent) {
if (event.key === 'ArrowDown') {
event.preventDefault();
move(1);
} else if (event.key === 'ArrowUp') {
event.preventDefault();
move(-1);
} else if (event.key === 'Enter') {
const entry = entries[activeIndex];
if (entry) {
event.preventDefault();
go(entry);
}
}
}
function focusOnMount(node: HTMLInputElement) {
requestAnimationFrame(() => node.focus());
}
</script>
<Modal bind:open title={t('shell.searchTitle')}>
<div class="palette">
<div class="palette-search">
<Icon name="search" size={16} />
<input
use:focusOnMount
class="palette-input"
type="text"
bind:value={query}
placeholder={t('shell.searchPlaceholder')}
role="combobox"
aria-expanded="true"
aria-controls={listId}
aria-autocomplete="list"
aria-activedescendant={entries.length ? optionId(activeIndex) : undefined}
aria-label={t('shell.searchTitle')}
onkeydown={handleKeydown}
/>
</div>
<div class="palette-list" id={listId} role="listbox" bind:this={list} aria-label={t('shell.searchTitle')}>
{#if entries.length === 0}
<p class="palette-empty">{t('shell.searchEmpty', { q: query.trim() })}</p>
{/if}
{#each entries as entry, i (entry.key)}
{#if i === 0 || entries[i - 1].group !== entry.group}
<div class="a-menu-group" role="presentation">
{entry.group === 'pages' ? t('shell.searchGroupPages') : t('shell.searchGroupProjects')}
</div>
{/if}
<div
id={optionId(i)}
class="a-menu-item"
class:active={i === activeIndex}
role="option"
tabindex="-1"
aria-selected={i === activeIndex}
onpointermove={() => (activeIndex = i)}
onmousedown={(e) => e.preventDefault()}
onclick={() => go(entry)}
onkeydown={handleKeydown}
>
<Icon name={entry.icon} size={15} />
<span class="a-menu-label">{entry.label}</span>
<span class="a-menu-meta mono">{entry.href}</span>
</div>
{/each}
</div>
<p class="palette-hint">
<span class="a-kbd">↑↓</span>{t('shell.searchHintMove')}
<span class="a-kbd">Enter</span>{t('shell.searchHintOpen')}
<span class="a-kbd">Esc</span>{t('shell.searchHintClose')}
</p>
</div>
</Modal>
<style>
.palette {
display: flex;
flex-direction: column;
gap: var(--sp-3);
}
.palette-search {
display: flex;
align-items: center;
gap: var(--sp-3);
padding: 0 var(--sp-5);
border: 1px solid var(--line);
border-radius: var(--r-md);
background: var(--bg-3);
color: var(--text-3);
transition: border-color var(--d-state) ease;
}
.palette-search:focus-within {
border-color: var(--accent-line);
}
.palette-input {
flex: 1;
min-width: 0;
height: 40px;
border: 0;
outline: 0;
background: transparent;
color: var(--text);
font-family: inherit;
font-size: var(--fs-section);
}
.palette-input::placeholder {
color: var(--text-3);
}
.palette-list {
max-height: min(360px, 50vh);
overflow-y: auto;
}
.palette-empty {
margin: 0;
padding: var(--sp-6) var(--sp-4);
font-size: var(--fs-aux);
color: var(--text-3);
text-align: center;
}
.palette-hint {
display: flex;
align-items: center;
gap: var(--sp-2);
margin: 0;
font-size: var(--fs-mini);
color: var(--text-3);
}
.palette-hint .a-kbd:not(:first-child) {
margin-left: var(--sp-3);
}
@media (hover: none) {
.palette-hint {
display: none;
}
}
</style>
@@ -0,0 +1,127 @@
<script lang="ts">
import { createQuery } from '@tanstack/svelte-query';
import { toStore } from 'svelte/store';
import { projects } from '$lib/api';
import { parseDbTs } from '$lib/dbtime';
import { t } from '$lib/i18n.svelte';
import Icon from '$lib/components/ui/Icon.svelte';
import ShellPop from './ShellPop.svelte';
/**
* 顶栏范围胶囊 — the project picker that replaced the old sidebar project
* entry: shows the project the page belongs to (or 全部项目) and lists
* recent projects, each opening its five-stage workbench.
*/
interface Props {
projectId: number | null;
onProjectsList: boolean;
}
let { projectId, onProjectsList }: Props = $props();
const RECENT_LIMIT = 8;
let open = $state(false);
const projectsQuery = createQuery(
toStore(() => ({
queryKey: ['projects'],
queryFn: projects.list,
enabled: open || projectId != null,
staleTime: 30_000,
})),
);
const all = $derived($projectsQuery.data ?? []);
const current = $derived(projectId == null ? null : (all.find((p) => p.id === projectId) ?? null));
const recent = $derived(
[...all]
.sort((a, b) => (parseDbTs(b.updated_at) || 0) - (parseDbTs(a.updated_at) || 0))
.slice(0, RECENT_LIMIT),
);
</script>
<div class="scope">
<button
type="button"
class="status-chip scope-btn"
aria-haspopup="dialog"
aria-expanded={open}
title={t('shell.scopeHint')}
onclick={() => (open = !open)}
>
<span class="scope-label">{current?.title ?? t('shell.scopeAll')}</span>
<Icon name="chevron-down" size={12} />
</button>
<ShellPop bind:open label={t('shell.scopeHint')} width="300px">
<a
class="a-menu-item"
href="/"
aria-current={onProjectsList ? 'page' : undefined}
onclick={() => (open = false)}
>
<Icon name="folder" size={15} />
<span class="a-menu-label">{t('shell.scopeAllList')}</span>
{#if all.length > 0}<span class="a-menu-meta mono">{all.length}</span>{/if}
</a>
<div class="a-menu-group">{t('shell.scopeRecent')}</div>
{#if $projectsQuery.isPending}
<p class="scope-note">{t('common.loading')}…</p>
{:else if $projectsQuery.isError}
<p class="scope-note err">{t('shell.scopeLoadFailed')}</p>
{:else if recent.length === 0}
<a class="a-menu-item" href="/" onclick={() => (open = false)}>
<Icon name="plus" size={15} />
<span class="a-menu-label">{t('shell.scopeEmpty')}</span>
</a>
{:else}
{#each recent as project (project.id)}
<a
class="a-menu-item"
href="/workbench/{project.id}"
aria-current={project.id === projectId ? 'true' : undefined}
onclick={() => (open = false)}
>
<Icon name="story" size={15} />
<span class="a-menu-label">{project.title}</span>
{#if project.stats}
<span class="a-menu-meta">
{t('shell.scopeStage', { n: project.stats.stage_confirmed })}
</span>
{/if}
</a>
{/each}
{/if}
</ShellPop>
</div>
<style>
.scope {
position: relative;
display: flex;
flex-shrink: 0;
}
.scope-btn {
max-width: 220px;
gap: var(--sp-1);
}
.scope-label {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
}
.scope-note {
margin: 0;
padding: var(--sp-3) var(--sp-4);
font-size: var(--fs-aux);
color: var(--text-3);
}
.scope-note.err {
color: var(--err);
}
@media (max-width: 760px) {
.scope-btn {
max-width: 132px;
}
}
</style>
@@ -0,0 +1,164 @@
<script lang="ts">
import { createQuery } from '@tanstack/svelte-query';
import { toStore } from 'svelte/store';
import { workflows, type Job } from '$lib/api';
import { parseDbTs } from '$lib/dbtime';
import { t } from '$lib/i18n.svelte';
import { jobSourceLabel } from '$lib/jobLabels';
import { jobStatusInfo, type JobStatusTone } from '$lib/jobStatus';
import ShellPop from './ShellPop.svelte';
/**
* 顶栏队列胶囊 + 任务托盘 (§二). The dot is cyan only while something is
* actually generating — queued work stays gray, as on the task page.
*/
let { jobs }: { jobs: Job[] } = $props();
const TRAY_LIMIT = 6;
const TAG_CLASS: Record<JobStatusTone, string> = { ok: 'ok', run: 'run', queue: '', fail: 'err' };
let open = $state(false);
let capsule = $state<HTMLButtonElement | null>(null);
const workflowsQuery = createQuery(
toStore(() => ({
queryKey: ['workflows'],
queryFn: workflows.list,
enabled: open,
staleTime: 60_000,
})),
);
const active = $derived(jobs.filter((j) => j.status === 'pending' || j.status === 'running'));
const running = $derived(active.filter((j) => jobStatusInfo(j).tone === 'run').length);
const queued = $derived(active.length - running);
const recent = $derived([...jobs].sort((a, b) => b.id - a.id).slice(0, TRAY_LIMIT));
const label = $derived.by(() => {
const parts: string[] = [];
if (running > 0) parts.push(t('shell.queueRunning', { n: running }));
if (queued > 0) parts.push(t('shell.queueQueued', { n: queued }));
return parts.length ? parts.join(' · ') : t('shell.queueIdle');
});
// 任务数变化时胶囊轻弹一次(320ms,只播一次).
let lastCount: number | null = null;
$effect(() => {
const count = active.length;
if (lastCount !== null && count !== lastCount && capsule) {
capsule.classList.remove('bump');
void capsule.offsetWidth;
capsule.classList.add('bump');
}
lastCount = count;
});
function workflowName(job: Job): string {
return (
($workflowsQuery.data ?? []).find((w) => w.id === job.workflow_id)?.name ??
t('studio.jobName', { id: job.id })
);
}
function timeOf(job: Job): string {
const ts = parseDbTs(job.created_at);
if (!Number.isFinite(ts)) return '—';
const d = new Date(ts);
const p = (n: number) => String(n).padStart(2, '0');
return `${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
}
</script>
<div class="tray">
<button
bind:this={capsule}
type="button"
class="status-chip queue-btn"
aria-haspopup="dialog"
aria-expanded={open}
aria-label={label}
title={label}
onclick={() => (open = !open)}
onanimationend={() => capsule?.classList.remove('bump')}
>
<span class="status-chip-dot {running > 0 ? 'run' : 'idle'}" aria-hidden="true"></span>
<span class="queue-label">{label}</span>
<span class="queue-count mono">{active.length}</span>
</button>
<ShellPop bind:open label={t('shell.trayTitle')} align="end" width="340px">
<div class="a-menu-group">{t('shell.trayRecent')}</div>
{#if recent.length === 0}
<p class="tray-note">{t('shell.trayEmpty')}</p>
{:else}
{#each recent as job (job.id)}
{@const info = jobStatusInfo(job)}
<a class="a-menu-item tray-row" href="/tasks" title={info.detail} onclick={() => (open = false)}>
<span class="tray-copy">
<span class="a-menu-label">{workflowName(job)}</span>
<span class="tray-meta">{jobSourceLabel(job)} · <span class="mono">{timeOf(job)}</span></span>
</span>
<span class="a-tag {TAG_CLASS[info.tone]}">{info.label}</span>
</a>
{/each}
{/if}
<a class="a-menu-item tray-all" href="/tasks" onclick={() => (open = false)}>
<span class="a-menu-label">{t('shell.trayAll')}</span>
</a>
</ShellPop>
</div>
<style>
.tray {
position: relative;
flex-shrink: 0;
}
.queue-btn:global(.bump) {
animation: queue-bump 320ms var(--ease-out);
}
@keyframes queue-bump {
40% {
transform: scale(1.06);
}
}
.queue-count {
display: none;
}
@media (max-width: 1179px) {
.queue-label {
display: none;
}
.queue-count {
display: inline;
}
}
.tray-row {
align-items: center;
}
.tray-copy {
display: flex;
flex-direction: column;
flex: 1;
min-width: 0;
line-height: 1.4;
}
.tray-meta {
font-size: var(--fs-mini);
color: var(--text-3);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.tray-note {
margin: 0;
padding: var(--sp-3) var(--sp-4) var(--sp-5);
font-size: var(--fs-aux);
color: var(--text-3);
}
.tray-all {
margin-top: var(--sp-1);
border-top: 1px solid var(--line);
border-radius: 0 0 var(--r-md) var(--r-md);
justify-content: center;
}
</style>
@@ -0,0 +1,199 @@
<script lang="ts">
import type { Snippet } from 'svelte';
import { cubicOut, quintOut } from 'svelte/easing';
/**
* Anchored pop for the shell (§四.3 pop): opens 180ms from its trigger,
* closes on Esc / outside press, Tab cycles inside, ↑↓ move between rows.
* At ≤760px it becomes a bottom sheet. Render it next to its trigger
* inside a `position: relative` wrapper — that wrapper counts as inside.
*/
interface Props {
open?: boolean;
label: string;
align?: 'start' | 'end';
/** `top` opens above the trigger (triggers near the bottom edge, e.g. the composer). */
placement?: 'bottom' | 'top';
width?: string;
/** Set false when the content runs its own ↑↓ roving selection. */
arrowRoving?: boolean;
onclose?: () => void;
children: Snippet;
}
let {
open = $bindable(false),
label,
align = 'start',
placement = 'bottom',
width = '300px',
arrowRoving = true,
onclose,
children,
}: Props = $props();
const FOCUSABLE =
'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])';
const SHEET_QUERY = '(max-width: 760px)';
let panel = $state<HTMLDivElement | null>(null);
let scrim = $state<HTMLDivElement | null>(null);
function focusables(): HTMLElement[] {
if (!panel) return [];
return Array.from(panel.querySelectorAll<HTMLElement>(FOCUSABLE)).filter(
(el) => el.getClientRects().length > 0,
);
}
function handleKeydown(event: KeyboardEvent) {
if (event.key === 'Escape') {
event.preventDefault();
event.stopPropagation();
open = false;
return;
}
const list = focusables();
if (list.length === 0) return;
const current = document.activeElement as HTMLElement | null;
const index = current ? list.indexOf(current) : -1;
if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
if (!arrowRoving || current?.tagName === 'SELECT') return;
event.preventDefault();
const step = event.key === 'ArrowDown' ? 1 : -1;
const next = index < 0 ? (step > 0 ? 0 : list.length - 1) : index + step;
list[(next + list.length) % list.length].focus();
} else if (event.key === 'Tab') {
if (event.shiftKey && index <= 0) {
event.preventDefault();
list[list.length - 1].focus();
} else if (!event.shiftKey && (index < 0 || index === list.length - 1)) {
event.preventDefault();
list[0].focus();
}
}
}
function handlePointerDown(event: PointerEvent) {
const host = panel?.parentElement;
const target = event.target as Node;
if (!host) return;
if (!host.contains(target) || target === scrim) open = false;
}
$effect(() => {
if (!open) return;
const invoker = document.activeElement as HTMLElement | null;
document.addEventListener('keydown', handleKeydown, true);
document.addEventListener('pointerdown', handlePointerDown, true);
requestAnimationFrame(() => focusables()[0]?.focus());
return () => {
document.removeEventListener('keydown', handleKeydown, true);
document.removeEventListener('pointerdown', handlePointerDown, true);
const focusWasInside =
document.activeElement === document.body || !!panel?.contains(document.activeElement);
if (focusWasInside && invoker?.isConnected) invoker.focus();
onclose?.();
};
});
function cssMs(name: string, fallback: number): number {
const raw = getComputedStyle(document.documentElement).getPropertyValue(name);
const ms = parseFloat(raw);
return Number.isFinite(ms) ? ms : fallback;
}
function popIn(_node: Element) {
const reduced = document.documentElement.dataset.reduce === '1';
const sheet = window.matchMedia(SHEET_QUERY).matches;
if (reduced) {
return { duration: cssMs('--d-state', 120), css: (t: number) => `opacity: ${t}` };
}
if (sheet) {
return {
duration: cssMs('--d-drawer', 280),
easing: quintOut,
css: (t: number) => `transform: translateY(${(1 - t) * 100}%)`,
};
}
return {
duration: cssMs('--d-pop', 180),
easing: cubicOut,
css: (t: number) => `opacity: ${t}; transform: scale(${0.96 + 0.04 * t})`,
};
}
function fadeScrim(_node: Element) {
return { duration: cssMs('--d-pop', 180), css: (t: number) => `opacity: ${t}` };
}
</script>
{#if open}
<div class="pop-scrim" bind:this={scrim} aria-hidden="true" transition:fadeScrim></div>
<div
bind:this={panel}
class="shell-pop a-float align-{align} place-{placement}"
style:--pop-w={width}
role="dialog"
aria-label={label}
transition:popIn
>
{@render children()}
</div>
{/if}
<style>
.shell-pop {
position: absolute;
top: calc(100% + var(--sp-2));
z-index: 60;
width: var(--pop-w);
max-width: calc(100vw - 2 * var(--sp-5));
max-height: min(520px, 70vh);
overflow-y: auto;
padding: var(--sp-2);
box-sizing: border-box;
transform-origin: top left;
}
.shell-pop.align-start {
left: 0;
}
.shell-pop.align-end {
right: 0;
transform-origin: top right;
}
.shell-pop.place-top {
top: auto;
bottom: calc(100% + var(--sp-2));
transform-origin: bottom left;
}
.shell-pop.place-top.align-end {
transform-origin: bottom right;
}
.pop-scrim {
display: none;
}
@media (max-width: 760px) {
.pop-scrim {
display: block;
position: fixed;
inset: 0;
z-index: 59;
background: var(--overlay);
}
.shell-pop,
.shell-pop.place-top {
position: fixed;
top: auto;
left: 0;
right: 0;
bottom: 0;
width: 100vw;
max-width: none;
max-height: 78vh;
border-radius: var(--r-lg) var(--r-lg) 0 0;
padding: var(--sp-3) var(--sp-3) calc(var(--sp-3) + env(safe-area-inset-bottom));
}
}
</style>
@@ -0,0 +1,70 @@
import type { IconName } from '$lib/components/ui/icons';
export type NavId =
| 'projects'
| 'workbench'
| 'image'
| 'video'
| 'tasks'
| 'agents'
| 'connections'
| 'models'
| 'settings';
export interface NavItem {
id: NavId;
labelKey: string;
icon: IconName;
href: string;
}
// Order is fixed by spec-v2 §3: 项目 / 创作工作台 / 生图 / 生视频 / 生成任务 /
// 智能体 / ComfyUI 连接 / 模型设置 / 设置. HEL-649 §二 puts the connection
// and settings entries at the foot of the 60px rail.
export const NAV_MAIN: NavItem[] = [
{ id: 'projects', labelKey: 'shell.navProjects', icon: 'home', href: '/' },
{ id: 'workbench', labelKey: 'shell.navWorkbench', icon: 'story', href: '/workbench' },
{ id: 'image', labelKey: 'shell.navImage', icon: 'image', href: '/image' },
{ id: 'video', labelKey: 'shell.navVideo', icon: 'film', href: '/video' },
{ id: 'tasks', labelKey: 'shell.navTasks', icon: 'queue', href: '/tasks' },
{ id: 'agents', labelKey: 'shell.navAgents', icon: 'sparkle', href: '/agents' },
];
export const NAV_FOOT: NavItem[] = [
{ id: 'connections', labelKey: 'shell.navConnections', icon: 'link', href: '/connections' },
{ id: 'models', labelKey: 'shell.navModels', icon: 'assets', href: '/models' },
{ id: 'settings', labelKey: 'shell.navSettings', icon: 'settings', href: '/settings' },
];
export const NAV: NavItem[] = [...NAV_MAIN, ...NAV_FOOT];
export interface TabItem {
id: 'projects' | 'workbench' | 'generate';
labelKey: string;
icon: IconName;
href: string;
/** Pages that light this tab up. */
covers: NavId[];
}
/** ≤760px bottom tab bar (§二): 项目 / 创作 / 生成 / 更多. */
export const TABS: TabItem[] = [
{ id: 'projects', labelKey: 'shell.tabProjects', icon: 'home', href: '/', covers: ['projects'] },
{ id: 'workbench', labelKey: 'shell.tabCreate', icon: 'story', href: '/workbench', covers: ['workbench'] },
{
id: 'generate',
labelKey: 'shell.tabGenerate',
icon: 'image',
href: '/image',
covers: ['image', 'video'],
},
];
/**
* Every page a tab does not link to directly lives in the 更多 sheet. 生视频
* is still its own route, so it is listed there too until the two
* generation pages merge.
*/
export const MORE_ITEMS: NavItem[] = NAV.filter(
(item) => !TABS.some((tab) => tab.href === item.href),
);
@@ -1,28 +1,33 @@
<script lang="ts">
import Icon from '$lib/components/ui/Icon.svelte';
import Spinner from '$lib/components/ui/Spinner.svelte';
import { assetUrl } from '$lib/api';
import { IMAGE_SLOT_ACCEPT, formatBytes, uploadBaseName } from '$lib/comfy/imageFile';
import { t } from '$lib/i18n.svelte';
/**
* A-style media upload slot (spec-v2 §5 上传槽): empty = 1.5px dashed
* border + "click or drop", drag-hover = amber dashed, filled = solid
* border + thumbnail + mono name + ✕, error = red border + red reason.
* Single media input slot as a composer tile (spec-v2 §3.3 输入槽):
* empty = dashed + "+", drag-hover = gold, uploading = ring, filled = thumb
* (click to replace) with a ✕ on hover/focus. `need` = required but empty
* after a blocked 生成 (amber); `error` = rejected file / invalid (red).
*/
interface Props {
label: string;
/** Extra hint under the label, e.g. 可从生图结果送入. */
/** Hint after the label, e.g. 必填 · 1 张. */
hint?: string;
required?: boolean;
/** Current value: a server-side path ('' = empty). */
value: string;
kind: 'image' | 'video' | 'audio';
/** Thumb aspect: wide = 16:9 (first/last frame slots). */
aspect?: 'square' | 'wide';
/** Byte size of the current file when known. */
size?: number;
uploading?: boolean;
uploadName?: string;
need?: boolean;
error?: string;
/** Show the "pick from image results" link (video-page image slots). */
/** Show the 从结果选 action (image slots fed from finished takes). */
allowFromResults?: boolean;
/** Anchor id so 「还缺:…」 can jump focus here. */
anchorId?: string;
onFile: (file: File) => void;
onFromResults?: () => void;
onClear: () => void;
@@ -31,13 +36,16 @@
let {
label,
hint,
required = false,
value,
kind,
aspect = 'square',
size,
uploading = false,
uploadName,
need = false,
error,
allowFromResults = false,
anchorId,
onFile,
onFromResults,
onClear,
@@ -46,21 +54,27 @@
let fileInput = $state<HTMLInputElement | null>(null);
let dragDepth = $state(0);
let broken = $state(false);
let dims = $state('');
$effect(() => {
void value;
broken = false;
dims = '';
});
const filled = $derived(!!value && !broken);
const meta = $derived(
[uploadBaseName(value), dims, size != null ? formatBytes(size) : ''].filter(Boolean).join(' · '),
);
function accept(): string {
if (kind === 'video') return 'video/*,.mp4,.webm,.mov,.mkv';
if (kind === 'audio') return 'audio/*';
return 'image/*';
return IMAGE_SLOT_ACCEPT;
}
function baseName(p: string): string {
const raw = p.split(/[/\\]/).pop() ?? p;
// strip uuid8- prefix the upload endpoint writes
return /^[0-9a-f]{8}-/.test(raw) ? raw.slice(9) : raw;
function noteDims(e: Event) {
const img = e.currentTarget as HTMLImageElement;
if (img.naturalWidth) dims = `${img.naturalWidth}×${img.naturalHeight}`;
}
function pick() {
@@ -71,17 +85,34 @@
function onDrop(e: DragEvent) {
e.preventDefault();
e.stopPropagation();
dragDepth = 0;
if (uploading) return;
const file = e.dataTransfer?.files?.[0];
if (file) onFile(file);
}
const dragHandlers = {
ondragenter: (e: DragEvent) => {
e.preventDefault();
dragDepth += 1;
},
ondragleave: () => (dragDepth = Math.max(0, dragDepth - 1)),
ondragover: (e: DragEvent) => e.preventDefault(),
ondrop: onDrop,
};
</script>
<div class="media-slot" class:wide={aspect === 'wide'}>
<div class="slot-label">
<span class="lbl">{label}</span>
{#if hint}<span class="slot-hint">{hint}</span>{/if}
<div class="a-slot">
<div class="a-slot-label">
<span>{label}</span>
{#if required}<span class="req" aria-hidden="true">*</span>{/if}
{#if hint}<span>{hint}</span>{/if}
{#if allowFromResults && onFromResults}
<button type="button" class="a-btn ghost xs" onclick={onFromResults}>
{t('studio.slotFromResultsShort')}
</button>
{/if}
</div>
<input
@@ -97,95 +128,61 @@
}}
/>
{#if value && !broken}
<div class="slot-filled" class:invalid={!!error}>
<div class="slot-thumb">
{#if kind === 'image'}
<img src={assetUrl(value)} alt={label} onerror={() => (broken = true)} />
{:else if kind === 'video'}
<video src={assetUrl(value)} preload="metadata" muted></video>
<span class="kind-badge" aria-hidden="true"><Icon name="film" size={12} /></span>
<div class="a-slot-row">
{#if filled}
<div class="a-tile" class:drag={dragDepth > 0} class:bad={!!error} {...dragHandlers}>
<button
type="button"
id={anchorId}
class="a-tile-hit"
title={`${t('studio.refReplace')} · ${meta}`}
aria-label={`${t('studio.refReplace')} ${label}`}
disabled={uploading}
onclick={pick}
>
{#if kind === 'image'}
<img src={assetUrl(value)} alt="" onload={noteDims} onerror={() => (broken = true)} />
{:else if kind === 'video'}
<video src={assetUrl(value)} preload="metadata" muted playsinline></video>
{:else}
<Icon name="music" size={18} />
{/if}
</button>
{#if uploading}
<span class="a-tile-ring" title={uploadName}><i></i></span>
{:else}
<span class="kind-badge" aria-hidden="true"><Icon name="music" size={12} /></span>
<button type="button" class="a-tile-x" aria-label={`${t('studio.deleteBtn')} ${label}`} onclick={onClear}>
<Icon name="close" size={10} />
</button>
{/if}
</div>
<div class="slot-meta">
<span class="mono name" title={baseName(value)}>{baseName(value)}</span>
<div class="slot-actions">
{#if allowFromResults && onFromResults}
<button type="button" class="mini-link" onclick={onFromResults}>
{t('studio.slotFromResults')}
</button>
{/if}
<button
type="button"
class="slot-clear"
aria-label={t('studio.deleteBtn')}
onclick={onClear}
>
<Icon name="close" size={13} />
</button>
</div>
</div>
</div>
{:else}
<button
type="button"
class="slot-empty"
class:drag={dragDepth > 0}
class:invalid={!!error}
class:wide={aspect === 'wide'}
disabled={uploading}
aria-busy={uploading || undefined}
onclick={pick}
ondragenter={(e) => {
e.preventDefault();
dragDepth += 1;
}}
ondragleave={() => (dragDepth = Math.max(0, dragDepth - 1))}
ondragover={(e) => e.preventDefault()}
ondrop={onDrop}
>
{#if uploading}
<Spinner size="sm" />
<span class="pick-text">{uploadName ?? t('studio.slotPick')}</span>
{:else}
<Icon name={kind === 'video' ? 'film' : kind === 'audio' ? 'music' : 'image'} size={16} />
<span class="pick-text">{t('studio.slotPick')}</span>
{/if}
</button>
{#if allowFromResults && onFromResults}
<button type="button" class="from-results-link" onclick={onFromResults}>
{t('studio.slotFromResults')}
{:else}
<button
type="button"
id={anchorId}
class="a-tile add"
class:drag={dragDepth > 0}
class:need={need && !error}
class:bad={!!error}
title={t('studio.slotPick')}
aria-label={`${label} · ${t('studio.slotPick')}`}
aria-busy={uploading || undefined}
disabled={uploading}
onclick={pick}
{...dragHandlers}
>
{#if uploading}
<span class="a-tile-ring" title={uploadName}><i></i></span>
{:else}
<Icon name={kind === 'video' ? 'film' : kind === 'audio' ? 'music' : 'plus'} size={18} />
{/if}
</button>
{/if}
{/if}
{#if error}<span class="slot-error" role="alert">{error}</span>{/if}
</div>
{#if error?.trim()}<span class="a-slot-hint err" role="alert">{error}</span>{/if}
</div>
<style>
.media-slot {
display: flex;
flex-direction: column;
gap: 5px;
min-width: 0;
}
.slot-label {
display: flex;
align-items: baseline;
justify-content: space-between;
gap: 8px;
}
.lbl {
font-size: 12px;
font-weight: 600;
color: var(--text-2);
}
.slot-hint {
font-size: 10.5px;
color: var(--text-3);
white-space: nowrap;
}
.sr-file {
position: absolute;
width: 1px;
@@ -195,151 +192,4 @@
white-space: nowrap;
border: 0;
}
.slot-empty {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 6px;
min-height: 86px;
border: 1.5px dashed var(--border-strong);
border-radius: 8px;
background: var(--surface-2);
color: var(--text-3);
font-family: inherit;
font-size: 11.5px;
cursor: pointer;
transition:
border-color 150ms,
color 150ms;
}
.media-slot.wide .slot-empty {
aspect-ratio: 16 / 9;
min-height: 0;
width: 100%;
}
.slot-empty:hover:not(:disabled) {
color: var(--text-2);
border-color: rgba(255, 255, 255, 0.28);
}
.slot-empty.drag {
border-color: var(--accent);
color: var(--accent);
}
.slot-empty.invalid {
border-color: rgba(229, 72, 77, 0.65);
}
.slot-empty:disabled {
cursor: default;
opacity: 0.7;
}
.pick-text {
font-size: 11px;
}
.from-results-link {
align-self: flex-end;
background: none;
border: none;
padding: 0;
font-family: inherit;
font-size: 11px;
color: var(--accent);
cursor: pointer;
}
.from-results-link:hover {
text-decoration: underline;
}
.slot-filled {
display: flex;
flex-direction: column;
gap: 6px;
border: 1px solid var(--border-strong);
border-radius: 8px;
background: var(--surface-2);
padding: 8px;
}
.slot-filled.invalid {
border-color: rgba(229, 72, 77, 0.65);
}
.slot-thumb {
border-radius: 7px;
overflow: hidden;
background: var(--bg);
border: 1px solid var(--border);
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
.slot-thumb img,
.slot-thumb video {
display: block;
width: 100%;
max-height: 140px;
object-fit: cover;
}
.media-slot.wide .slot-thumb {
aspect-ratio: 16 / 9;
}
.media-slot.wide .slot-thumb img,
.media-slot.wide .slot-thumb video {
max-height: none;
height: 100%;
}
.slot-thumb .kind-badge {
color: var(--text-3);
}
.slot-meta {
display: flex;
align-items: center;
gap: 8px;
min-width: 0;
}
.name {
flex: 1;
min-width: 0;
font-size: 10.5px;
color: var(--text-3);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.slot-actions {
display: inline-flex;
align-items: center;
gap: 8px;
flex-shrink: 0;
}
.mini-link {
background: none;
border: none;
padding: 0;
font-family: inherit;
font-size: 10.5px;
color: var(--accent);
cursor: pointer;
}
.mini-link:hover {
text-decoration: underline;
}
.slot-clear {
display: inline-flex;
align-items: center;
justify-content: center;
width: 22px;
height: 22px;
border: none;
border-radius: 6px;
background: transparent;
color: var(--text-3);
cursor: pointer;
}
.slot-clear:hover {
color: var(--error);
background: var(--error-dim);
}
.slot-error {
font-size: 11.5px;
color: var(--error);
}
</style>
@@ -0,0 +1,282 @@
<script lang="ts">
import Icon from '$lib/components/ui/Icon.svelte';
import { assetUrl } from '$lib/api';
import {
IMAGE_SLOT_ACCEPT,
formatBytes,
mediaSlotAccept,
uploadBaseName,
type MediaSlotKind,
} from '$lib/comfy/imageFile';
import { t } from '$lib/i18n.svelte';
/**
* Reference-media list as numbered composer tiles (spec-v2 §3.3 参考图):
* 1…N in the order they reach the workflow — click a tile to replace it,
* ✕ to remove; a dashed add tile while below `max`; rejected files show
* as red tiles that take no place in the list.
*/
interface Reject {
name: string;
message: string;
}
interface Props {
label: string;
paths: string[];
max: number;
/** Media family of the slots — drives thumbnails, accept and copy. */
mediaKind?: MediaSlotKind;
/** Byte sizes of files uploaded in this session, by server path. */
sizes?: Record<string, number>;
/** Name of the file being uploaded (add or replace), if any. */
uploadingName?: string;
/** Index being replaced while uploading (-1 = adding). */
uploadingIndex?: number;
rejects?: Reject[];
/** Below the minimum after a blocked 生成 (amber add tile). */
need?: boolean;
error?: string;
allowFromResults?: boolean;
/** Anchor id on the add tile so 「还缺:…」 can jump focus here. */
anchorId?: string;
onAdd: (files: File[]) => void;
onReplace: (index: number, file: File) => void;
onRemove: (index: number) => void;
onDismissReject: (index: number) => void;
onFromResults?: () => void;
}
let {
label,
paths,
max,
mediaKind = 'image',
sizes = {},
uploadingName,
uploadingIndex = -1,
rejects = [],
need = false,
error,
allowFromResults = false,
anchorId,
onAdd,
onReplace,
onRemove,
onDismissReject,
onFromResults,
}: Props = $props();
let addInput = $state<HTMLInputElement | null>(null);
let replaceInput = $state<HTMLInputElement | null>(null);
let replaceIndex = $state(-1);
let dragDepth = $state(0);
let dims = $state<Record<string, string>>({});
let durations = $state<Record<string, number>>({});
const uploading = $derived(!!uploadingName);
const remaining = $derived(Math.max(0, max - paths.length));
const accept = $derived(mediaKind === 'image' ? IMAGE_SLOT_ACCEPT : mediaSlotAccept(mediaKind));
const isMedia = $derived(mediaKind !== 'image');
const hintLabel = $derived(
isMedia
? t('studio.refHintMedia', { n: paths.length, max })
: t('studio.refHint', { n: paths.length, max }),
);
function noteDuration(path: string, e: Event): void {
const el = e.currentTarget as HTMLVideoElement | HTMLAudioElement | null;
if (el && Number.isFinite(el.duration)) durations = { ...durations, [path]: el.duration };
}
function noteDims(path: string, e: Event) {
const img = e.currentTarget as HTMLImageElement;
if (img.naturalWidth) dims = { ...dims, [path]: `${img.naturalWidth}×${img.naturalHeight}` };
}
function metaOf(path: string): string {
const d = durations[path];
return [
uploadBaseName(path),
dims[path],
d != null && Number.isFinite(d) ? `${d.toFixed(1)}s` : null,
sizes[path] != null ? formatBytes(sizes[path]) : null,
]
.filter(Boolean)
.join(' · ');
}
function pickAdd() {
if (uploading || !addInput) return;
addInput.value = '';
addInput.click();
}
function pickReplace(i: number) {
if (uploading || !replaceInput) return;
replaceIndex = i;
replaceInput.value = '';
replaceInput.click();
}
function onDrop(e: DragEvent) {
e.preventDefault();
e.stopPropagation();
dragDepth = 0;
if (uploading) return;
const files = Array.from(e.dataTransfer?.files ?? []);
if (files.length) onAdd(files);
}
</script>
<div class="a-slot">
<div class="a-slot-label">
<span>{label}</span>
<span class="req" aria-hidden="true">*</span>
<span class="mono">{hintLabel}</span>
{#if allowFromResults && onFromResults && remaining > 0}
<button type="button" class="a-btn ghost xs" onclick={onFromResults}>
{t('studio.slotFromResultsShort')}
</button>
{/if}
</div>
<input
bind:this={addInput}
type="file"
class="sr-file"
tabindex="-1"
aria-hidden="true"
{accept}
multiple
onchange={(e) => {
const files = Array.from(e.currentTarget.files ?? []);
if (files.length) onAdd(files);
}}
/>
<input
bind:this={replaceInput}
type="file"
class="sr-file"
tabindex="-1"
aria-hidden="true"
{accept}
onchange={(e) => {
const f = e.currentTarget.files?.[0];
if (f && replaceIndex >= 0) onReplace(replaceIndex, f);
}}
/>
<div class="a-slot-row">
{#each paths as path, i (path + i)}
<div class="a-tile">
<button
type="button"
class="a-tile-hit"
title={`${t('studio.refReplace')} · ${metaOf(path)}`}
aria-label={`${t('studio.refReplace')} ${label} ${i + 1}`}
disabled={uploading}
onclick={() => pickReplace(i)}
>
{#if mediaKind === 'image'}
<img src={assetUrl(path)} alt="" onload={(e) => noteDims(path, e)} />
{:else if mediaKind === 'video'}
<video
src={assetUrl(path)}
preload="metadata"
muted
playsinline
onloadedmetadata={(e) => noteDuration(path, e)}
></video>
{:else}
<Icon name="music" size={18} />
<audio src={assetUrl(path)} preload="metadata" onloadedmetadata={(e) => noteDuration(path, e)}
></audio>
{/if}
</button>
<span class="a-tile-idx">{i + 1}</span>
{#if uploadingIndex === i}
<span class="a-tile-ring" title={uploadingName}><i></i></span>
{:else}
<button
type="button"
class="a-tile-x"
aria-label={isMedia
? t('studio.refRemoveMedia', { kind: label, n: i + 1 })
: t('studio.refRemove', { n: i + 1 })}
onclick={() => onRemove(i)}
>
<Icon name="close" size={10} />
</button>
{/if}
</div>
{/each}
{#each rejects as rej, i (rej.name + i)}
<div class="a-tile bad" title={`${rej.name} · ${rej.message}`} role="img" aria-label={rej.name}>
<Icon name="alert" size={16} />
<button
type="button"
class="a-tile-x"
aria-label={`${t('studio.deleteBtn')} ${rej.name}`}
onclick={() => onDismissReject(i)}
>
<Icon name="close" size={10} />
</button>
</div>
{/each}
{#if remaining > 0}
<button
type="button"
id={anchorId}
class="a-tile add"
class:drag={dragDepth > 0}
class:need={need && !error?.trim()}
class:bad={!!error?.trim()}
title={isMedia
? t('studio.refAddSubMedia', { n: remaining, max })
: t('studio.refAddSub', { n: remaining, max })}
aria-label={isMedia ? t('studio.refAddMedia', { kind: label }) : t('studio.refAdd')}
aria-busy={uploading || undefined}
disabled={uploading}
onclick={pickAdd}
ondragenter={(e) => {
e.preventDefault();
dragDepth += 1;
}}
ondragleave={() => (dragDepth = Math.max(0, dragDepth - 1))}
ondragover={(e) => e.preventDefault()}
ondrop={onDrop}
>
{#if uploading && uploadingIndex < 0}
<span class="a-tile-ring" title={uploadingName}><i></i></span>
{:else}
<Icon name="plus" size={18} />
{/if}
</button>
{/if}
</div>
{#if remaining === 0}
<span class="a-slot-hint">{isMedia ? t('studio.refFullMedia', { max }) : t('studio.refFull', { max })}</span>
{/if}
{#each rejects as rej, i (rej.name + i)}
<span class="a-slot-hint err" role="alert">{rej.message}</span>
{/each}
{#if error?.trim()}<span class="a-slot-hint err" role="alert">{error}</span>{/if}
</div>
<style>
.sr-file {
position: absolute;
width: 1px;
height: 1px;
overflow: hidden;
clip: rect(0 0 0 0);
white-space: nowrap;
border: 0;
}
audio {
display: none;
}
</style>
File diff suppressed because it is too large Load Diff
@@ -3,8 +3,9 @@
import Spinner from './Spinner.svelte';
interface Props {
variant?: 'primary' | 'secondary' | 'ghost' | 'danger';
size?: 'sm' | 'md';
/** `danger` = outlined (list rows); `danger-solid` = confirm dialogs only. */
variant?: 'primary' | 'secondary' | 'ghost' | 'danger' | 'danger-solid';
size?: 'sm' | 'md' | 'lg';
/** Stretch to the container width (e.g. a panel's main action). */
block?: boolean;
disabled?: boolean;
@@ -32,6 +33,7 @@
{type}
class="a-btn btn {variant}"
class:sm={size === 'sm'}
class:lg={size === 'lg'}
class:block
class:loading
disabled={disabled || loading}
@@ -49,7 +51,7 @@
</button>
<style>
/* Look comes from the shared `.a-btn` rules in app.css (§5). */
/* Look comes from the shared `.a-btn` rules in app.css (§四.1). */
.btn {
position: relative;
}
@@ -72,10 +74,14 @@
justify-content: center;
}
.btn.primary .btn-spinner {
--spinner-track: rgba(22, 19, 10, 0.3);
--spinner-arc: var(--accent-contrast);
--spinner-track: color-mix(in srgb, var(--accent-ink) 30%, transparent);
--spinner-arc: var(--accent-ink);
}
.btn.danger .btn-spinner {
--spinner-arc: var(--error);
--spinner-arc: var(--err);
}
.btn.danger-solid .btn-spinner {
--spinner-track: color-mix(in srgb, var(--on-media) 30%, transparent);
--spinner-arc: var(--on-media);
}
</style>
@@ -46,16 +46,18 @@
.card {
background: var(--bg-surface);
border: 1px solid var(--border);
border-radius: var(--radius-md);
border-radius: var(--r-lg);
}
.card.hoverable {
transition:
border-color 150ms ease,
transform 150ms ease;
border-color var(--d-state) ease,
transform var(--d-state) var(--ease-out);
}
.card.hoverable:hover {
border-color: #3f3f46;
transform: translateY(-1px);
@media (hover: hover) and (pointer: fine) {
.card.hoverable:hover {
border-color: var(--line-2);
transform: translateY(-1px);
}
}
.card-header {
display: flex;
@@ -47,7 +47,7 @@
{#snippet footer()}
<Button variant="ghost" onclick={() => (open = false)}>{cancelLabel}</Button
>
<Button variant={danger ? 'danger' : 'primary'} onclick={handleConfirm}
<Button variant={danger ? 'danger-solid' : 'primary'} onclick={handleConfirm}
>{confirmLabel}</Button
>
{/snippet}
+14 -15
View File
@@ -144,22 +144,19 @@
align-items: center;
justify-content: center;
padding: 24px;
background: rgba(5, 5, 8, 0.6);
backdrop-filter: blur(6px);
-webkit-backdrop-filter: blur(6px);
animation: modal-fade 150ms ease-out;
background: var(--overlay);
animation: modal-fade var(--d-state) ease-out;
}
.modal-panel {
width: min(520px, 100%);
max-height: calc(100vh - 96px);
display: flex;
flex-direction: column;
background: var(--bg-surface);
border: 1px solid var(--border);
border-radius: var(--radius-lg);
box-shadow: 0 24px 64px rgba(0, 0, 0, 0.5);
background: var(--float-bg);
border-radius: var(--r-lg);
box-shadow: var(--shadow-float);
outline: none;
animation: modal-rise 180ms ease-out;
animation: modal-rise var(--d-pop) var(--ease-out);
}
.modal-panel.size-lg {
width: min(920px, 100%);
@@ -177,7 +174,7 @@
.modal-title {
margin: 0;
font-family: var(--font-display);
font-size: 16px;
font-size: var(--fs-title);
font-weight: 600;
color: var(--text-primary);
}
@@ -194,12 +191,14 @@
color: var(--text-muted);
cursor: pointer;
transition:
background-color 150ms ease,
color 150ms ease;
background-color var(--d-state) ease,
color var(--d-state) ease;
}
.modal-close:hover {
background: rgba(255, 255, 255, 0.06);
color: var(--text-primary);
@media (hover: hover) and (pointer: fine) {
.modal-close:hover {
background: var(--bg-4);
color: var(--text-primary);
}
}
.modal-close:focus-visible {
outline: 2px solid var(--accent);
@@ -4,8 +4,8 @@
indeterminate?: boolean;
label?: string;
size?: 'sm' | 'md';
/** §5 进度条: running = amber, done = green, failed = red (static). */
tone?: 'accent' | 'success' | 'error';
/** 进度条: running = 信号青, done = green, failed = red (static). */
tone?: 'run' | 'success' | 'error';
/** Track only — no label / percentage row. */
bare?: boolean;
}
@@ -15,7 +15,7 @@
indeterminate = false,
label,
size = 'md',
tone = 'accent',
tone = 'run',
bare = false,
}: Props = $props();
@@ -45,7 +45,7 @@
{#if indeterminate}
<div class="fill indeterminate"></div>
{:else}
<div class="fill" style:width={pct + '%'}></div>
<div class="fill" style:transform="scaleX({pct / 100})"></div>
{/if}
</div>
</div>
@@ -75,8 +75,8 @@
position: relative;
width: 100%;
overflow: hidden;
background: var(--surface-3);
border-radius: 999px;
background: var(--bg-4);
border-radius: var(--r-pill);
}
.progress-sm .track {
height: 4px;
@@ -86,15 +86,18 @@
}
.fill {
height: 100%;
background: var(--accent);
border-radius: 999px;
transition: width 300ms cubic-bezier(0.16, 1, 0.3, 1);
background: var(--run-grad);
box-shadow: 0 0 8px var(--run-soft);
transform-origin: left;
transition: transform var(--d-progress) linear;
}
.tone-success .fill {
background: var(--success);
background: var(--ok);
box-shadow: none;
}
.tone-error .fill {
background: var(--error);
background: var(--err);
box-shadow: none;
}
.fill.indeterminate {
position: absolute;
@@ -104,10 +107,11 @@
background: linear-gradient(
90deg,
transparent,
var(--accent) 40%,
var(--accent) 60%,
var(--run) 40%,
var(--run) 60%,
transparent
);
box-shadow: none;
transition: none;
animation: progress-slide 1.2s ease-in-out infinite;
}
@@ -19,36 +19,26 @@
></div>
<style>
/* §四.9 骨架屏:--bg-3 圆角块,1.4s 呼吸透明度;减少动态时静态。 */
.skeleton {
position: relative;
overflow: hidden;
background: var(--bg-elevated);
border-radius: var(--radius-sm);
background: var(--bg-3);
border-radius: var(--r-sm);
animation: skeleton-breath 1.4s ease-in-out infinite;
}
.skeleton.circle {
border-radius: 50%;
}
.skeleton::after {
content: '';
position: absolute;
inset: 0;
background: linear-gradient(
90deg,
transparent,
rgba(255, 255, 255, 0.06),
transparent
);
transform: translateX(-100%);
animation: skeleton-shimmer 1.6s ease-in-out infinite;
}
@keyframes skeleton-shimmer {
to {
transform: translateX(100%);
@keyframes skeleton-breath {
50% {
opacity: 0.5;
}
}
@media (prefers-reduced-motion: reduce) {
.skeleton::after {
display: none;
.skeleton {
animation: none;
}
}
:global(:root[data-reduce='1']) .skeleton {
animation: none;
}
</style>
@@ -6,27 +6,27 @@
let { status, label }: Props = $props();
type Tone = 'success' | 'info' | 'muted' | 'error' | 'warning' | 'accent';
type Tone = 'ok' | 'run' | 'muted' | 'err' | 'warn';
const toneByStatus: Record<string, Tone> = {
ready: 'success',
done: 'success',
completed: 'success',
running: 'info',
generating: 'info',
queued: 'info',
ready: 'ok',
done: 'ok',
completed: 'ok',
running: 'run',
generating: 'run',
in_progress: 'run',
queued: 'muted',
pending: 'muted',
idle: 'muted',
draft: 'muted',
failed: 'error',
error: 'error',
paused: 'warning',
in_progress: 'accent',
failed: 'err',
error: 'err',
paused: 'warn',
};
const key = $derived(status.trim().toLowerCase());
const tone: Tone = $derived(toneByStatus[key] ?? 'muted');
const pulsing = $derived(key === 'running');
const pulsing = $derived(tone === 'run');
</script>
<span class="chip chip-{tone}">
@@ -35,59 +35,48 @@
</span>
<style>
/* §四.2 状态标签:20px 高、--r-sm、12px;语义色文字 + 13% 软底。 */
.chip {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 3px 9px;
border: 1px solid;
border-radius: 999px;
font-size: 10px;
gap: var(--sp-2);
height: 20px;
padding: 0 var(--sp-2);
border-radius: var(--r-sm);
font-size: var(--fs-aux);
font-weight: 600;
letter-spacing: 0.08em;
text-transform: uppercase;
line-height: 1.4;
white-space: nowrap;
box-sizing: border-box;
}
.dot {
width: 6px;
height: 6px;
width: 7px;
height: 7px;
border-radius: 50%;
background: currentColor;
flex-shrink: 0;
}
.chip-success {
color: var(--success);
background: color-mix(in srgb, var(--success) 12%, transparent);
border-color: color-mix(in srgb, var(--success) 35%, transparent);
.chip-ok {
color: var(--ok);
background: var(--ok-soft);
}
.chip-info {
color: var(--info);
background: color-mix(in srgb, var(--info) 12%, transparent);
border-color: color-mix(in srgb, var(--info) 35%, transparent);
.chip-run {
color: var(--run);
background: var(--run-soft);
}
.chip-error {
color: var(--error);
background: color-mix(in srgb, var(--error) 12%, transparent);
border-color: color-mix(in srgb, var(--error) 35%, transparent);
.chip-err {
color: var(--err);
background: var(--err-soft);
}
.chip-warning {
color: var(--warning);
background: color-mix(in srgb, var(--warning) 12%, transparent);
border-color: color-mix(in srgb, var(--warning) 35%, transparent);
}
.chip-accent {
color: var(--accent);
background: color-mix(in srgb, var(--accent) 12%, transparent);
border-color: color-mix(in srgb, var(--accent) 35%, transparent);
.chip-warn {
color: var(--warn);
background: var(--warn-soft);
}
.chip-muted {
color: var(--text-secondary);
background: rgba(255, 255, 255, 0.04);
border-color: var(--border);
color: var(--text-2);
background: var(--bg-4);
}
.dot.pulsing {
animation: chip-pulse 1.2s ease-in-out infinite;
animation: chip-pulse 1.4s ease-in-out infinite;
}
@keyframes chip-pulse {
0%,
@@ -103,4 +92,7 @@
animation: none;
}
}
:global(:root[data-reduce='1']) .dot.pulsing {
animation: none;
}
</style>
@@ -9,7 +9,7 @@
let { checked, label, disabled = false, onchange }: Props = $props();
</script>
<!-- §5 开关: 34×19 capsule; on = amber track + dark knob, off = --surface-3. -->
<!-- §3.10 开关: 34×19 capsule; on = --accent-lo track + ink knob, off = --bg-4. -->
<button
type="button"
class="switch"
@@ -28,38 +28,38 @@
flex-shrink: 0;
width: 34px;
height: 19px;
border-radius: 999px;
border: 1px solid var(--border-strong);
background: var(--surface-3);
border-radius: var(--r-pill);
border: 1px solid var(--line-2);
background: var(--bg-4);
position: relative;
cursor: pointer;
padding: 0;
transition:
background-color 150ms,
border-color 150ms;
background-color var(--d-state) ease,
border-color var(--d-state) ease;
}
.switch:disabled {
opacity: 0.4;
opacity: 0.45;
cursor: not-allowed;
}
.knob {
position: absolute;
top: 2px;
left: 2px;
top: 1px;
left: 1px;
width: 15px;
height: 15px;
border-radius: 999px;
border-radius: var(--r-pill);
background: var(--text-3);
transition:
transform 150ms cubic-bezier(0.16, 1, 0.3, 1),
background-color 150ms;
transform var(--d-state) var(--ease-out),
background-color var(--d-state) ease;
}
.switch.on {
background: var(--accent);
border-color: var(--accent);
background: var(--accent-lo);
border-color: var(--accent-lo);
}
.switch.on .knob {
transform: translateX(15px);
background: var(--accent-contrast);
background: var(--accent-ink);
}
</style>
@@ -4,10 +4,13 @@
import Icon from '$lib/components/ui/Icon.svelte';
import JobChip from './JobChip.svelte';
import PromptBlock from './PromptBlock.svelte';
import { deskHref } from '$lib/components/generate/context';
import { t } from '$lib/i18n.svelte';
interface Props {
stage: WorkbenchStage;
/** Enables the 在生成台调参 link (desk opens with this asset's context). */
projectId?: number;
onSave?: (content: Record<string, unknown>) => void;
onRun?: (instruction?: string) => void;
onGenerate?: (payload: {
@@ -20,7 +23,7 @@
busy?: boolean;
}
let { stage, onSave, onRun, onGenerate, onRetryJob, busy = false }: Props = $props();
let { stage, projectId, onSave, onRun, onGenerate, onRetryJob, busy = false }: Props = $props();
let editing = $state(false);
let draft = $state<WorkbenchAsset[]>([]);
@@ -168,6 +171,25 @@
<PromptBlock label={t('workbench.style.negativeLabel')} text={asset.negative_prompt} />
{/if}
<div class="asset-foot">
{#if projectId}
<a
class="a-btn ghost sm"
href={deskHref({
kind: 'image',
projectId,
stage: 'assets',
label: t('desk.ctxAsset', {
kind: t(KIND_LABEL[asset.kind] ?? 'workbench.asset.kindProp'),
name: asset.name,
}),
prompt: asset.prompt,
negative: asset.negative_prompt || undefined,
})}
title={t('desk.openInDeskHint')}
>
{t('desk.openInDesk')}
</a>
{/if}
<button
type="button"
class="btn ghost gen"
@@ -294,7 +316,9 @@
}
.asset-foot {
display: flex;
align-items: center;
justify-content: flex-end;
gap: var(--sp-2);
}
.retry-link {
@@ -369,7 +393,7 @@
}
.wb-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.wb-input::placeholder {
color: var(--text-3);
@@ -438,7 +462,7 @@
}
.btn.ghost:hover:not(:disabled) {
color: var(--text);
border-color: rgba(255, 255, 255, 0.24);
border-color: var(--line-2);
}
.btn.gen {
color: var(--accent);
@@ -60,8 +60,8 @@
background: var(--surface-3);
}
.st-running {
color: var(--accent);
background: var(--accent-dim);
color: var(--run);
background: var(--run-soft);
}
.st-done {
color: var(--success);
@@ -258,7 +258,7 @@
}
.wb-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.wb-input::placeholder {
color: var(--text-3);
@@ -294,7 +294,7 @@
}
.btn.ghost:hover:not(:disabled) {
color: var(--text);
border-color: rgba(255, 255, 255, 0.24);
border-color: var(--line-2);
}
.btn.sm {
padding: 6px 12px;
@@ -4,10 +4,13 @@
import Icon from '$lib/components/ui/Icon.svelte';
import JobChip from './JobChip.svelte';
import PromptBlock from './PromptBlock.svelte';
import { deskHref } from '$lib/components/generate/context';
import { t } from '$lib/i18n.svelte';
interface Props {
stage: WorkbenchStage;
/** Enables the 在生成台调参 link (desk opens with this shot's context). */
projectId?: number;
onSave?: (content: Record<string, unknown>) => void;
onRun?: (instruction?: string) => void;
onGenerate?: (payload: {
@@ -20,7 +23,7 @@
busy?: boolean;
}
let { stage, onSave, onRun, onGenerate, onRetryJob, busy = false }: Props = $props();
let { stage, projectId, onSave, onRun, onGenerate, onRetryJob, busy = false }: Props = $props();
let editing = $state(false);
let draft = $state<VideoShot[]>([]);
@@ -159,6 +162,22 @@
{/if}
<PromptBlock label={t('workbench.vshot.promptLabel')} text={shot.prompt} />
<div class="vshot-foot">
{#if projectId}
<a
class="a-btn ghost sm"
href={deskHref({
kind: 'video',
projectId,
stage: 'shot',
label: t('desk.ctxShot', { no: shot.shot_no }),
prompt: shot.prompt,
durationSec: shot.duration_sec,
})}
title={t('desk.openInDeskHint')}
>
{t('desk.openInDesk')}
</a>
{/if}
<button
type="button"
class="btn ghost gen"
@@ -266,7 +285,9 @@
}
.vshot-foot {
display: flex;
align-items: center;
justify-content: flex-end;
gap: var(--sp-2);
}
.retry-link {
@@ -341,7 +362,7 @@
}
.wb-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.wb-input::placeholder {
color: var(--text-3);
@@ -412,7 +433,7 @@
}
.btn.ghost:hover:not(:disabled) {
color: var(--text);
border-color: rgba(255, 255, 255, 0.24);
border-color: var(--line-2);
}
.btn.gen {
color: var(--accent);
@@ -3,9 +3,9 @@
import { t } from '$lib/i18n.svelte';
/**
* Five-stage stepper (a2): one step per agent with the spec §2.1 semantic
* colors — gray=待开始, amber=进行中/待确认 (+breath while running),
* green=已确认, blue=用户改过草稿. A step unlocks when itself or any
* Five-stage stepper (a2): one step per agent with the fusion status
* colors — gray=待开始, cyan=进行中 (+breath), amber=待确认,
* green=已确认, --info=用户改过草稿. A step unlocks when itself or any
* earlier stage has content; later steps stay clickable only after the
* previous one is confirmed.
*/
@@ -159,7 +159,7 @@
justify-content: center;
font-size: 14px;
font-weight: 700;
color: #edeef0;
color: var(--text);
flex-shrink: 0;
}
@@ -188,12 +188,14 @@
.st-todo {
color: var(--text-3);
}
.st-running,
.st-running {
color: var(--run);
}
.st-draft {
color: var(--accent);
color: var(--warn);
}
.st-edited {
color: var(--info);
color: var(--warn);
}
.st-confirmed {
color: var(--success);
@@ -201,14 +203,14 @@
.step-btn.active[data-state='running'] .avatar,
.step-btn[data-state='running'] .avatar {
box-shadow: 0 0 10px rgba(232, 163, 61, 0.35);
box-shadow: 0 0 10px var(--run-soft);
}
.breath {
width: 6px;
height: 6px;
border-radius: 50%;
background: var(--accent);
background: var(--run);
animation: wb-breath 2s cubic-bezier(0.16, 1, 0.3, 1) infinite;
}
@@ -297,7 +297,7 @@
}
.wb-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.wb-input::placeholder {
color: var(--text-3);
@@ -386,7 +386,7 @@
}
.btn.ghost:hover:not(:disabled) {
color: var(--text);
border-color: rgba(255, 255, 255, 0.24);
border-color: var(--line-2);
}
.btn:disabled {
opacity: 0.4;
@@ -214,7 +214,7 @@
}
.dir-card.chosen {
border-color: var(--accent);
box-shadow: 0 0 10px rgba(232, 163, 61, 0.35);
box-shadow: 0 0 10px var(--accent-glow);
}
.dir-card input[type='radio'] {
position: absolute;
@@ -310,7 +310,7 @@
}
.wb-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.wb-input::placeholder {
color: var(--text-3);
@@ -375,7 +375,7 @@
}
.btn.ghost:hover:not(:disabled) {
color: var(--text);
border-color: rgba(255, 255, 255, 0.24);
border-color: var(--line-2);
}
.btn:disabled {
opacity: 0.4;
+270 -8
View File
@@ -64,6 +64,7 @@ export const de: Dict = {
// --- Toast ---
'toast.dismiss': 'Ausblenden',
'toast.undo': 'Rückgängig',
'toast.uploadFailed': 'Upload fehlgeschlagen',
// --- Modal ---
@@ -1260,14 +1261,44 @@ export const de: Dict = {
'shell.navConnections': 'ComfyUI-Verbindungen',
'shell.navModels': 'Modelle',
'shell.navSettings': 'Einstellungen',
'shell.wip': 'In Entwicklung',
'shell.wipHint': 'Diese Seite ist noch im Bau und folgt später',
'shell.comfy_ok': '{name} verbunden',
'shell.comfy_fail': '{name} nicht erreichbar',
'shell.comfy_testing': '{name} wird getestet…',
'shell.comfyUnset': 'ComfyUI · nicht konfiguriert',
'shell.comfyManage': 'ComfyUI-Adresse in den Einstellungen pflegen',
'shell.mobileNotice': 'Bitte öffne diese Werkbank in einem Desktop-Browser (mindestens 768px breit); Handys werden noch nicht unterstützt.',
'shell.scopeHint': 'Projekt wechseln',
'shell.scopeAll': 'Alle Projekte',
'shell.scopeAllList': 'Liste aller Projekte',
'shell.scopeRecent': 'Letzte Projekte',
'shell.scopeLoadFailed': 'Projekte konnten nicht geladen werden',
'shell.scopeEmpty': 'Noch keine Projekte – jetzt anlegen',
'shell.scopeStage': '{n}/5 bestätigt',
'shell.queueRunning': '{n} in Arbeit',
'shell.queueQueued': '{n} in der Warteschlange',
'shell.queueIdle': 'Warteschlange leer',
'shell.queueActive': '{n} aktiv',
'shell.trayTitle': 'Auftragsablage',
'shell.trayRecent': 'Letzte Aufträge · klicken für alle Aufträge',
'shell.trayEmpty': 'Noch keine Generierungsaufträge',
'shell.trayAll': 'Alle Aufträge anzeigen',
'shell.searchTitle': 'Seiten und Projekte suchen',
'shell.searchPlaceholder': 'Seiten, Projekte suchen',
'shell.searchShortcut': 'Suchen (Strg/⌘ + K)',
'shell.searchEmpty': 'Keine Seite und kein Projekt passt zu „{q}“',
'shell.searchGroupPages': 'Seiten',
'shell.searchGroupProjects': 'Projekte · Werkbank öffnen',
'shell.searchHintMove': 'auswählen',
'shell.searchHintOpen': 'öffnen',
'shell.searchHintClose': 'schließen',
'shell.reduceMotion': 'Weniger Bewegung',
'shell.reduceHint': 'Bewegungs-, Zoom- und Glüheffekte aus; nur kurze Überblendungen',
'shell.reduceSystem': 'Folgt der Systemeinstellung „Bewegung reduzieren“',
'shell.tabAria': 'Hauptnavigation (schmal)',
'shell.tabProjects': 'Projekte',
'shell.tabCreate': 'Erstellen',
'shell.tabGenerate': 'Generieren',
'shell.tabMore': 'Mehr',
'shell.morePages': 'Weitere Seiten',
'shell.moreTools': 'Werkzeuge',
'home.title': 'Projektübersicht',
'home.subtitle': 'Verwalte deine Projekte — starte mit einer Idee oder einem fertigen Drehbuch.',
'home.projectCount': '{n} Projekte · {m} in Arbeit',
@@ -1398,6 +1429,54 @@ export const de: Dict = {
'conn.wfJsonInvalid': 'Kein gültiges API-Format-JSON (erwartet: Objekt aus Knoten-ID → {{…class_type…}})',
'conn.wfJsonPh': 'ComfyUI-API-JSON hier einfügen oder rechts eine Datei wählen',
'conn.wfDeleted': 'Workflow gelöscht',
'conn.wfImportedBroken': 'Imported, but the workflow file is incomplete and must be re-exported before generating: {detail}',
'conn.wfBrokenBadge': 'Incomplete file — cannot generate',
// --- Five usages & import confirmation (HEL-636) ---
'usage.text2image': 'Text → Image',
'usage.image2image': 'Image → Image',
'usage.text2video': 'Text → Video',
'usage.image2video': 'Image → Video',
'usage.ref2video': 'Reference → Video',
'usage.pending': 'Usage pending',
'wfRole.image': 'Input image',
'wfRole.first_frame': 'First frame',
'wfRole.last_frame': 'Last frame',
'wfRole.reference_image': 'Reference',
'wfRole.mask': 'Mask',
'conn.wfImportAction': 'Import workflow',
'conn.wfConfirmTitle': 'Confirm detection',
'conn.wfStepAnalyze': 'Paste & analyze',
'conn.wfStepConfirm': 'Confirm & save',
'conn.wfChooseFile': 'Choose file',
'conn.wfAnalyze': 'Analyze',
'conn.wfAnalyzing': 'Analyzing…',
'conn.wfConfirmHint': 'Review the evidence, output nodes and image slots; correct the usage or slot roles before saving.',
'conn.wfUsageLabel': 'Usage',
'conn.wfUsageAuto': 'Auto-detected: {usage}',
'conn.wfUsageNeedPick': 'Pick manually',
'conn.wfPickUsage': 'Choose a usage first',
'conn.wfSlotsLabel': 'Image slots',
'conn.wfSlotsHint': 'Roles are inferred from wiring; override them (input image / first / last frame / reference / mask) and the manual choice sticks.',
'conn.wfBack': 'Back',
'conn.wfConfirmSave': 'Confirm & save',
'conn.wfImportedWithUsage': 'Saved as “{usage}” with {n} fillable parameters',
'conn.wfPendingCount': '{n} pending',
'conn.wfConfirmed': 'Usage confirmed: {usage} — the workflow can generate now',
'conn.wfSourceUser': 'Usage set manually; re-analysis will not overwrite it',
'conn.wfSourceAuto': 'Usage auto-detected',
'conn.wfDisabledBadge': 'Disabled',
'conn.wfConfirmAria': 'Confirm workflow usage',
'conn.wfOutputLabel': 'Ausgabeknoten',
'conn.wfOutputNeedPick': 'Unbekannte benutzerdefinierte Ausgabeknoten — bitte zuordnen',
'conn.wfOutputHint': 'Markieren Sie die Knoten, die tatsächlich Ergebnisse liefern, und wählen Sie je den Medientyp; die Generierung sammelt Bilder/Videos nur aus diesen Knoten.',
'conn.wfOutputPick': 'Mindestens einen Ausgabeknoten markieren',
'conn.wfOutputKindAria': 'Medientyp des Ausgabeknotens',
'conn.wfOutputPendingBadge': 'Ausgabe offen',
'conn.wfOutputNeedMap': 'Dieser Workflow enthält nicht erkannte Ausgabeknoten; ordnen Sie sie samt Medientyp zu, um ihn zu aktivieren',
'conn.wfOutputApply': 'Ausgabezuordnung speichern',
'conn.wfMapCancel': 'Abbrechen',
'conn.wfOutputApplied': 'Ausgabezuordnung gespeichert: Knoten {nodes}',
'conn.wfOutputCleared': 'Ausgabezuordnung gelöscht — der Workflow ist wieder ausstehend',
'conn.missingMaterial': 'Ein dediziertes Qwen Image 2.1-Workflow-JSON fehlt noch im Repo: aus ComfyUI exportieren und hier importieren — der generische Importweg steht bereit.',
// --- Eigenständige Bild-/Videogenerierung (a3/a4, HEL-612) ---
@@ -1408,13 +1487,11 @@ export const de: Dict = {
'studio.genParams': 'Parameter',
'studio.modeTextToImage': 'Text zu Bild',
'studio.modeTextToVideo': 'Text zu Video',
'studio.chipIdle': '{name} · Warteschlange frei',
'studio.chipBusy': '{name} · {n} in Warteschlange',
'studio.video.resultsTitle': 'Vorschau',
'studio.image.historyTitle': 'Bildverlauf',
'studio.video.historyTitle': 'Videoverlauf',
'studio.historyCount': '{n} gesamt',
'studio.lastDone': 'Zuletzt fertig · {time}',
'studio.doneAt': 'Fertiggestellt um {time}',
'studio.kindImageText': 'Bild',
'studio.kindVideoText': 'Video',
'studio.loading': 'Lädt…',
@@ -1499,10 +1576,45 @@ export const de: Dict = {
'studio.wfNoParamsNote': 'Dieser Workflow hat keine ausfüllbaren Parameter und läuft mit eingebautem Prompt und Einstellungen. Um sie hier auszufüllen, Knotentitel in ComfyUI mit (Input:prompt) usw. markieren und neu importieren.',
'studio.wfAutoParamsNote': 'Keine (Input:…)-Titelmarken – {n} Parameter anhand der Knotentypen erkannt; leere Felder behalten die Workflow-Werte.',
'studio.promptNotDeclared': 'Dieser Workflow hat keinen Prompt-Knoten',
'studio.modeImageEdit': 'Image edit',
'studio.modeImageToVideo': 'Image to video',
'studio.modeRefToVideo': 'Reference to video',
'studio.slotInput': 'Input image',
'studio.slotHintOne': 'Required · 1 image',
'studio.slotEmptyInput': 'Click or drop the input image',
'studio.slotEmptyFirst': 'Click or drop the first frame',
'studio.slotEmptySub': 'PNG / JPG / WebP · ≤ 20MB each',
'studio.slotFromResultsShort': 'From results',
'studio.errImageFormat': '"{name}" is not supported — use PNG / JPG / WebP; this file will not be used',
'studio.errImageSize': '"{name}" is larger than 20MB — compress it and upload again',
'studio.errNeedInputImage': 'Image edit needs an input image',
'studio.errNeedFirstFrame': 'Image to video needs a first frame',
'studio.errNeedRef': 'Reference to video needs at least 1 reference image',
'studio.errRefMax': 'At most {max} reference images: {n} selected, these {k} were not added',
'studio.refHint': 'Required · 1–{max} · {n} selected',
'studio.refAdd': 'Add reference image',
'studio.refAddSub': '{n} more · max {max}',
'studio.refReplace': 'Replace',
'studio.refRemove': 'Remove reference {n}',
'studio.refRejectedShort': 'Not added',
'studio.refFull': 'Limit of {max} reached — remove one to add another',
'studio.refStrip': 'Reference images ({n} used)',
'studio.resolutionLabel': 'Output resolution',
'studio.resolutionHint': 'About {v}×{v} px, keeps the input aspect; 0 = original size',
'studio.wfBrokenTitle': 'This workflow file is incomplete — ComfyUI cannot run it, generation is blocked',
'studio.wfBrokenHint': 'Re-export the API-format JSON from a ComfyUI that has the custom nodes installed, then import it again under ComfyUI connections.',
'studio.errWfBroken': 'Workflow file is incomplete — re-export it before generating',
'studio.cancelToast': 'Abbruch angefordert',
'studio.deleteBtn': 'Löschen',
'studio.delTitle': 'Aufgabeneintrag löschen',
'studio.delConfirm': 'Die Ergebnisdateien werden mitgelöscht. Löschen?',
'studio.delConfirm': 'Beim Löschen werden auch die Ergebnisdateien dieses Auftrags entfernt; der Verlauf ist nicht wiederherstellbar. Löschen?',
'studio.delTitleJob': 'Auftrag „{name}“ löschen',
'studio.delConfirmMulti': 'Dieser Auftrag hat {n} Ergebnisse. Beim Löschen werden der gesamte Auftragsdatensatz und alle {n} Ergebnisdateien entfernt; dies ist unwiderruflich. Löschen?',
'studio.deleteFailedToast': 'Löschen fehlgeschlagen: {detail}',
'studio.deletedTakeNoFilesToast': '„{name}“ gelöscht',
'studio.deletedTakeToast': '„{name}“ und seine Ergebnisdateien wurden gelöscht',
'studio.deletedToast': 'Auftrag und zugehörige Ergebnisdateien gelöscht',
'studio.wfDeletedTag': 'Workflow gelöscht',
'studio.wfEmptyTitle': 'Noch keine {kind}-Workflows',
'studio.wfEmptyBody': 'Entwicklermodus in ComfyUI aktivieren, Workflow als API-JSON exportieren und auf der Seite ComfyUI-Verbindungen als {kind} importieren.',
'studio.wfEmptyGo': 'In ComfyUI-Verbindungen importieren',
@@ -1521,9 +1633,12 @@ export const de: Dict = {
'tasks.subtitle': 'Alle Bild-/Videoaufgaben — eigenständige Fenster und Kreativfluss',
'tasks.filterAll': 'Alle',
'tasks.filterImage': 'Bilder',
'tasks.filterFailed': 'Fehlgeschlagen',
'tasks.filterActive': 'Aktiv',
'tasks.filterVideo': 'Videos',
'tasks.count': '{n} Aufgaben · {m} aktiv',
'tasks.empty': 'Noch keine Aufgaben. Reiche die erste in Bild oder Video ein.',
'tasks.emptyFiltered': 'Keine Aufgaben passen zum aktuellen Filter.',
'tasks.goGenerate': 'Bild öffnen',
'tasks.sourceStudioImage': 'Eigenständiges Bild',
'tasks.sourceStudioVideo': 'Eigenständiges Video',
@@ -1537,8 +1652,10 @@ export const de: Dict = {
'tasks.retry': 'Erneut',
'tasks.cancel': 'Abbrechen',
'tasks.delete': 'Löschen',
'tasks.download': 'Herunterladen',
'tasks.delTitle': 'Aufgabe löschen',
'tasks.delConfirm': 'Die Ergebnisdateien werden mitgelöscht. Löschen?',
'tasks.searchPh': 'Aufgaben suchen…',
'tasks.outputs': '{n} Ergebnisse',
'agentsPage.title': 'Agenten',
@@ -1768,6 +1885,8 @@ export const de: Dict = {
'jobst.dryRunDetail': 'Nur Platzhalter: Dry-run ist aktiv, ComfyUI wurde nicht aufgerufen',
'jobst.noOutput': 'Keine Ausgabe',
'jobst.noOutputDetail': 'Der Job endete ohne Ergebnisdatei – keine fertige Generierung',
'jobst.missing': 'Dateien fehlen',
'jobst.missingDetail': 'Der Task lief erfolgreich, aber die Ergebnisdateien sind nicht mehr auf dem Server',
'jobst.queued': 'Wartet',
'jobst.queuedDetail': 'Wartet in der Workbench-Warteschlange auf ComfyUI',
'jobst.connecting': 'Verbinde',
@@ -1796,4 +1915,147 @@ export const de: Dict = {
'studio.doneToast': 'Fertig: {n} Datei(en) (ComfyUI-Prompt-ID {id})',
'studio.dryRunToast': 'Nur Platzhalter: Dry-run ist aktiv, ComfyUI wurde nicht aufgerufen',
'studio.dryRunNote': 'Dry-run ist aktiv: Generieren schreibt nur Platzhalter und ruft ComfyUI nie auf. In den Einstellungen abschalten.',
// --- HEL-643: Import-Prüfung / Echtlauf-Test / Mediengruppen ---
'studio.errVideoFormat': '„{name}“ ist kein unterstütztes Videoformat — MP4 / WebM / MOV verwenden',
'studio.errAudioFormat': '„{name}“ ist kein unterstütztes Audioformat — MP3 / WAV / M4A verwenden',
'studio.errMediaSize': '„{name}“ überschreitet die Größenbeschränkung — bitte vorher komprimieren',
'studio.errNeedRefMedia': '„{label}“ benötigt mindestens {n} Clips',
'studio.refHintMedia': 'Pflicht · 1–{max} Clips · {n} ausgewählt',
'studio.refAddMedia': '{kind} hinzufügen',
'studio.refAddSubMedia': 'Noch {n} · max {max}',
'studio.refRemoveMedia': '{kind} {n} entfernen',
'studio.refFullMedia': 'Maximum von {max} Clips erreicht — erst eines entfernen',
'wfMedia.h3Limits': 'Offizielle Limits des MiniMax H3 Ref2VA: bis zu 9 Referenzbilder, 3 Referenzvideos und 3 Referenzaudios; je Clip 2–15 s, Summen je Typ ≤15 s; Audio allein ist keine gültige Referenz; insgesamt höchstens 12 Referenzdateien.',
'wfMedia.h3TotalOver': '{n} Referenzdateien — über dem offiziellen Limit von 12; die Generierung kann fehlschlagen',
'wfMedia.h3AudioAlone': 'Audio allein kann nicht die einzige Referenz sein — mindestens ein Bild oder Video ergänzen',
'conn.wfCheckTitle': 'Kompatibilitätsprüfung der Verbindung',
'conn.wfCheckEndpoint': 'Ziel: {name}',
'conn.wfCheckBtn': 'Erneut prüfen',
'conn.wfChecking': 'Prüfe…',
'conn.wfCheckOk': 'Diese Verbindung besitzt die Knoten und Modelle, die dieser Workflow braucht',
'conn.wfCheckProblems': '{n} fehlende Knoten/Modelle gefunden',
'conn.wfCheckUnreachable': 'Keine Prüfung möglich (ComfyUI unerreichbar) — Speichern bleibt möglich; nach Reparatur erneut prüfen',
'conn.wfCheckSaveHint': 'Der Entwurf kann trotzdem gespeichert werden (wird nicht als generierbar markiert); Fehlendes installieren und erneut prüfen.',
'conn.wfTestBtn': 'Testen',
'conn.wfLastTest': 'Letzter Test',
'conn.wfTestPassed': '{time} bestanden ({n} Dateien)',
'conn.wfTestRunning': '{time} läuft',
'conn.wfTestFailed': '{time} nicht bestanden',
'wft.title': 'Workflow testen',
'wft.connection': 'Zielverbindung',
'wft.costNote': 'Ein Test schickt einen echten Auftrag an den gewählten ComfyUI und belegt VRAM und Warteschlange.',
'wft.submit': 'Test starten',
'wft.confirmTitle': 'Echten Lauf bestätigen',
'wft.confirmBody': 'An „{endpoint}“ wird ein echter Auftrag gesendet ({n} Aufträge in der Warteschlange). Der Test gilt nur als bestanden, wenn mindestens eine herunterladbare Ausgabedatei des richtigen Typs zurückkommt.',
'wft.running': 'Test läuft…',
'wft.cancel': 'Test abbrechen',
'wft.passed': 'Test bestanden: {n} Datei(en) erzeugt',
'wft.passedShort': 'Bestanden ({n} Dateien)',
'wft.failed': 'Test nicht bestanden',
'wft.failedShort': 'Nicht bestanden',
'wft.cancelledShort': 'Abgebrochen',
'wft.reusedToast': 'Für diesen Workflow läuft bereits ein Test — angebunden',
'wft.history': 'Testverlauf ({n})',
'wft.clear': 'Testverlauf löschen',
'wft.cleared': 'Testverlauf gelöscht',
'wft.never': 'Nie getestet',
'wft.download': 'Herunterladen',
'wft.errRequired': 'Bitte „{label}“ ausfüllen',
'wft.errListMin': '„{label}“ benötigt mindestens {n} {unit}',
'tasks.testBadge': 'Test',
'tasks.sourceWorkflowTest': 'Workflow-Test',
// --- 生成台 (HEL-653) ---
'cdf.orig': 'Original {v}',
'desk.title': 'Generieren',
'desk.advanced': 'Erweitert · {n} · unverändert gelten die Workflow-Werte',
'desk.chipResolution': 'Auflösung {v}',
'desk.chipSeconds': '{v} s',
'desk.chipSeed': 'Seed {v}',
'desk.closeInspector': 'Inspektor schließen',
'desk.countActive': '{n} laufen',
'desk.countTakes': '{n} Einträge',
'desk.ctxAsset': '{kind} „{name}“',
'desk.ctxShot': 'Einstellung {no}',
'desk.ctxBack': 'Zurück zu {stage}',
'desk.ctxDismiss': 'Herkunftshinweis schließen',
'desk.ctxFrom': 'Aus „{project}“',
'desk.ctxNoBackfill': 'Ergebnisse bleiben im Verlauf und werden nicht in {stage} übernommen',
'desk.dayDate': '{d}.{m}.',
'desk.download': 'Herunterladen',
'desk.dropNoSlot': '{n} Datei(en) ohne passenden Slot: dieser Workflow hat keinen solchen Eingang',
'desk.dryRun': 'Probelauf',
'desk.durMin': '{m} min {s} s',
'desk.durSec': '{s} s',
'desk.elapsed': 'Dauer',
'desk.emptyFailed': 'Keine fehlgeschlagenen Einträge',
'desk.emptyFeed': 'Noch keine Einträge. Prompt unten eingeben und „Generieren“ drücken.',
'desk.filterAria': 'Einträge filtern',
'desk.filterAll': 'Alle',
'desk.filterImage': 'Bilder',
'desk.filterVideo': 'Videos',
'desk.filterFailed': 'Fehlgeschlagen',
'desk.generate': 'Generieren',
'desk.genHint': 'Generieren (Strg/⌘ + Enter)',
'desk.inputs': 'Eingaben',
'desk.inspector': 'Inspektor',
'desk.keyClose': 'Schließen',
'desk.keyInspector': 'Ein- / ausblenden',
'desk.keySelect': 'Auswählen',
'desk.keyUse': 'Verwenden',
'desk.kvCreated': 'Eingereicht',
'desk.kvName': 'Name',
'desk.kvPromptId': 'ComfyUI-Auftrags-ID',
'desk.kvUsage': 'Zweck',
'desk.loadEarlier': '{n} ältere Takes anzeigen',
'desk.missingSub': 'Mit gleichen Parametern wiederholen oder diesen Take entfernen',
'desk.missingTitle': 'Die Ergebnisdateien sind nicht mehr auf dem Server',
'desk.needWorkflow': 'Fehlt: Workflow',
'desk.noConn': 'Nicht verbunden',
'desk.noPromptInput': 'Dieser Workflow hat keinen Prompt-Eingang und läuft mit seinen eigenen Werten.',
'desk.notGenerated': 'Nicht erzeugt',
'desk.noWorkflows': 'Noch kein Bild- oder Video-Workflow bereit',
'desk.openInDesk': 'Im Generator anpassen',
'desk.openInDeskHint': 'Generator mit diesem Prompt öffnen, Workflow und Parameter selbst wählen; Ergebnisse bleiben im Verlauf',
'desk.openInspector': 'Inspektor',
'desk.origValue': 'Workflow-Wert',
'desk.outputN': 'Ergebnis {n}',
'desk.outputs': 'Alle Ergebnisse',
'desk.paramError': 'Ungültiger Parameter: {msg}',
'desk.paramsAll': 'Alle Parameter',
'desk.paramsChanged': 'Parameter · {n} geändert',
'desk.paramsCommon': 'Häufige Parameter',
'desk.pickTake': 'Eintrag im Verlauf wählen, um das Ergebnis zu sehen',
'desk.pickWorkflow': 'Workflow wählen',
'desk.promptOnly': 'Nur Prompt',
'desk.promptPh': 'Motiv beschreiben… (Strg/⌘ + Enter generiert, / fokussiert)',
'desk.restoreAll': 'Alle Workflow-Werte wiederherstellen',
'desk.redo': 'Mit gleichen Parametern wiederholen',
'desk.removeRecord': 'Eintrag entfernen',
'desk.restoreOrig': 'Original wiederherstellen',
'desk.reuse': 'Wiederverwenden',
'desk.reuseToComposer': 'In Eingabe übernehmen',
'desk.seedRandom': 'Zufall',
'desk.sendToSlot': 'In Bild-Slot senden',
'desk.sent': 'Eingereicht',
'desk.sentToSlotToast': 'In den Bild-Slot des aktuellen Workflows gesendet',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': 'Größe',
'desk.stillNeed': 'Fehlt: {what}',
'desk.tabParams': 'Parameter',
'desk.tabResult': 'Ergebnis',
'desk.today': 'Heute',
'desk.took': 'Dauer {d}',
'desk.wfBroken': 'Nicht nutzbar',
'desk.wfCurrent': 'aktuell',
'desk.wfDefaultConn': 'Standardverbindung',
'desk.wfImport': 'Workflows importieren / verwalten',
'desk.wfLastFailed': 'Letzter Lauf fehlgeschlagen',
'desk.wfNoMatch': 'Kein passender Workflow',
'desk.wfOk': 'Bereit',
'desk.wfSearchPh': 'Workflows oder Zweck suchen: Bild zu Video, Referenz…',
'desk.wfTesting': 'Testlauf läuft',
'desk.wfUntested': 'Nicht getestet',
'desk.workflow': 'Workflow',
'desk.yesterday': 'Gestern',
};
+270 -8
View File
@@ -62,6 +62,7 @@ export const en = {
// --- Toast ---
'toast.dismiss': 'Dismiss',
'toast.undo': 'Undo',
'toast.uploadFailed': 'Upload failed',
// --- Modal ---
@@ -1262,14 +1263,44 @@ export const en = {
'shell.navConnections': 'ComfyUI Connections',
'shell.navModels': 'Models',
'shell.navSettings': 'Settings',
'shell.wip': 'In development',
'shell.wipHint': 'This page is under construction and will open later',
'shell.comfy_ok': '{name} connected',
'shell.comfy_fail': '{name} unreachable',
'shell.comfy_testing': 'Testing {name}…',
'shell.comfyUnset': 'ComfyUI · not configured',
'shell.comfyManage': 'Configure the ComfyUI address in Settings',
'shell.mobileNotice': 'Please open this workbench in a desktop browser (at least 768px wide). Phones are not supported yet.',
'shell.scopeHint': 'Switch project',
'shell.scopeAll': 'All projects',
'shell.scopeAllList': 'All projects list',
'shell.scopeRecent': 'Recent projects',
'shell.scopeLoadFailed': 'Could not load projects',
'shell.scopeEmpty': 'No projects yet — create one',
'shell.scopeStage': '{n}/5 confirmed',
'shell.queueRunning': '{n} generating',
'shell.queueQueued': '{n} queued',
'shell.queueIdle': 'Queue idle',
'shell.queueActive': '{n} active',
'shell.trayTitle': 'Job tray',
'shell.trayRecent': 'Recent jobs · click to see all jobs',
'shell.trayEmpty': 'No generation jobs yet',
'shell.trayAll': 'View all jobs',
'shell.searchTitle': 'Search pages and projects',
'shell.searchPlaceholder': 'Search pages, projects',
'shell.searchShortcut': 'Search (Ctrl/⌘ + K)',
'shell.searchEmpty': 'No page or project matches “{q}”',
'shell.searchGroupPages': 'Pages',
'shell.searchGroupProjects': 'Projects · open the workbench',
'shell.searchHintMove': 'select',
'shell.searchHintOpen': 'open',
'shell.searchHintClose': 'close',
'shell.reduceMotion': 'Reduce motion',
'shell.reduceHint': 'Turn off movement, scaling and glow animations; keep only short fades',
'shell.reduceSystem': 'Following the system “Reduce motion” setting',
'shell.tabAria': 'Primary (narrow screens)',
'shell.tabProjects': 'Projects',
'shell.tabCreate': 'Create',
'shell.tabGenerate': 'Generate',
'shell.tabMore': 'More',
'shell.morePages': 'More pages',
'shell.moreTools': 'Tools',
'home.title': 'Projects overview',
'home.subtitle': 'Manage your projects — start from an idea or a ready-made script.',
'home.projectCount': '{n} projects · {m} in progress',
@@ -1398,6 +1429,54 @@ export const en = {
'conn.wfJsonInvalid': 'Not valid API-format JSON (expected an object of node id to class_type)',
'conn.wfJsonPh': 'Paste the ComfyUI API-format JSON here, or pick a file',
'conn.wfDeleted': 'Workflow deleted',
'conn.wfImportedBroken': 'Imported, but the workflow file is incomplete and must be re-exported before generating: {detail}',
'conn.wfBrokenBadge': 'Incomplete file — cannot generate',
// --- Five usages & import confirmation (HEL-636) ---
'usage.text2image': 'Text → Image',
'usage.image2image': 'Image → Image',
'usage.text2video': 'Text → Video',
'usage.image2video': 'Image → Video',
'usage.ref2video': 'Reference → Video',
'usage.pending': 'Usage pending',
'wfRole.image': 'Input image',
'wfRole.first_frame': 'First frame',
'wfRole.last_frame': 'Last frame',
'wfRole.reference_image': 'Reference',
'wfRole.mask': 'Mask',
'conn.wfImportAction': 'Import workflow',
'conn.wfConfirmTitle': 'Confirm detection',
'conn.wfStepAnalyze': 'Paste & analyze',
'conn.wfStepConfirm': 'Confirm & save',
'conn.wfChooseFile': 'Choose file',
'conn.wfAnalyze': 'Analyze',
'conn.wfAnalyzing': 'Analyzing…',
'conn.wfConfirmHint': 'Review the evidence, output nodes and image slots; correct the usage or slot roles before saving.',
'conn.wfUsageLabel': 'Usage',
'conn.wfUsageAuto': 'Auto-detected: {usage}',
'conn.wfUsageNeedPick': 'Pick manually',
'conn.wfPickUsage': 'Choose a usage first',
'conn.wfSlotsLabel': 'Image slots',
'conn.wfSlotsHint': 'Roles are inferred from wiring; override them (input image / first / last frame / reference / mask) and the manual choice sticks.',
'conn.wfBack': 'Back',
'conn.wfConfirmSave': 'Confirm & save',
'conn.wfImportedWithUsage': 'Saved as “{usage}” with {n} fillable parameters',
'conn.wfPendingCount': '{n} pending',
'conn.wfConfirmed': 'Usage confirmed: {usage} — the workflow can generate now',
'conn.wfSourceUser': 'Usage set manually; re-analysis will not overwrite it',
'conn.wfSourceAuto': 'Usage auto-detected',
'conn.wfDisabledBadge': 'Disabled',
'conn.wfConfirmAria': 'Confirm workflow usage',
'conn.wfOutputLabel': 'Output nodes',
'conn.wfOutputNeedPick': 'Unrecognized custom output nodes — designate them',
'conn.wfOutputHint': 'Check the nodes that actually produce results and pick each one’s media type; generation harvests images/videos only from these nodes.',
'conn.wfOutputPick': 'Check at least one output node',
'conn.wfOutputKindAria': 'Output node media type',
'conn.wfOutputPendingBadge': 'Outputs unset',
'conn.wfOutputNeedMap': 'This workflow has unrecognized output nodes; designate them and their media type to enable it',
'conn.wfOutputApply': 'Save output mapping',
'conn.wfMapCancel': 'Cancel',
'conn.wfOutputApplied': 'Output mapping saved: node {nodes}',
'conn.wfOutputCleared': 'Output mapping cleared — the workflow is pending again',
'conn.missingMaterial': 'A dedicated Qwen Image 2.1 workflow JSON is not in the repo yet: export it from ComfyUI and import it here — the generic import path is ready.',
// --- Standalone image / video generation (a3/a4, HEL-612) ---
'studio.image.title': 'Image',
@@ -1407,13 +1486,11 @@ export const en = {
'studio.genParams': 'Parameters',
'studio.modeTextToImage': 'Text to image',
'studio.modeTextToVideo': 'Text to video',
'studio.chipIdle': '{name} · queue idle',
'studio.chipBusy': '{name} · {n} in queue',
'studio.video.resultsTitle': 'Preview',
'studio.image.historyTitle': 'Image history',
'studio.video.historyTitle': 'Video history',
'studio.historyCount': '{n} total',
'studio.lastDone': 'Last done · {time}',
'studio.doneAt': 'Done at {time}',
'studio.kindImageText': 'image',
'studio.kindVideoText': 'video',
'studio.loading': 'Loading…',
@@ -1498,10 +1575,45 @@ export const en = {
'studio.wfNoParamsNote': 'This workflow has no fillable parameters and will run with its built-in prompt and settings. To fill them here, tag node titles with (Input:prompt) etc. in ComfyUI and re-import.',
'studio.wfAutoParamsNote': 'No (Input:…) title tags found — {n} parameters were detected from node types; blank fields keep the workflow values.',
'studio.promptNotDeclared': 'This workflow has no prompt node — nothing to fill',
'studio.modeImageEdit': 'Image edit',
'studio.modeImageToVideo': 'Image to video',
'studio.modeRefToVideo': 'Reference to video',
'studio.slotInput': 'Input image',
'studio.slotHintOne': 'Required · 1 image',
'studio.slotEmptyInput': 'Click or drop the input image',
'studio.slotEmptyFirst': 'Click or drop the first frame',
'studio.slotEmptySub': 'PNG / JPG / WebP · ≤ 20MB each',
'studio.slotFromResultsShort': 'From results',
'studio.errImageFormat': '"{name}" is not supported — use PNG / JPG / WebP; this file will not be used',
'studio.errImageSize': '"{name}" is larger than 20MB — compress it and upload again',
'studio.errNeedInputImage': 'Image edit needs an input image',
'studio.errNeedFirstFrame': 'Image to video needs a first frame',
'studio.errNeedRef': 'Reference to video needs at least 1 reference image',
'studio.errRefMax': 'At most {max} reference images: {n} selected, these {k} were not added',
'studio.refHint': 'Required · 1–{max} · {n} selected',
'studio.refAdd': 'Add reference image',
'studio.refAddSub': '{n} more · max {max}',
'studio.refReplace': 'Replace',
'studio.refRemove': 'Remove reference {n}',
'studio.refRejectedShort': 'Not added',
'studio.refFull': 'Limit of {max} reached — remove one to add another',
'studio.refStrip': 'Reference images ({n} used)',
'studio.resolutionLabel': 'Output resolution',
'studio.resolutionHint': 'About {v}×{v} px, keeps the input aspect; 0 = original size',
'studio.wfBrokenTitle': 'This workflow file is incomplete — ComfyUI cannot run it, generation is blocked',
'studio.wfBrokenHint': 'Re-export the API-format JSON from a ComfyUI that has the custom nodes installed, then import it again under ComfyUI connections.',
'studio.errWfBroken': 'Workflow file is incomplete — re-export it before generating',
'studio.cancelToast': 'Cancel requested',
'studio.deleteBtn': 'Delete',
'studio.delTitle': 'Delete task record',
'studio.delConfirm': 'The result files will be removed together with the record. Delete it?',
'studio.delConfirm': 'Deleting also removes this job’s result files; the history cannot be restored. Delete?',
'studio.delTitleJob': 'Delete job “{name}”',
'studio.delConfirmMulti': 'This job produced {n} results. Deleting removes the whole job record and all {n} result files; this cannot be undone. Delete?',
'studio.deleteFailedToast': 'Delete failed: {detail}',
'studio.deletedTakeNoFilesToast': 'Deleted “{name}”',
'studio.deletedTakeToast': 'Deleted “{name}” together with its result files',
'studio.deletedToast': 'Job deleted together with its result files',
'studio.wfDeletedTag': 'Workflow deleted',
'studio.wfEmptyTitle': 'No {kind} workflows yet',
'studio.wfEmptyBody': "Enable ComfyUI's developer mode, export the workflow as API JSON, then import it on the ComfyUI Connections page as {kind}.",
'studio.wfEmptyGo': 'Import in ComfyUI Connections',
@@ -1520,9 +1632,12 @@ export const en = {
'tasks.subtitle': 'All image / video tasks — standalone windows and the creation flow',
'tasks.filterAll': 'All',
'tasks.filterImage': 'Images',
'tasks.filterFailed': 'Failed',
'tasks.filterActive': 'Active',
'tasks.filterVideo': 'Videos',
'tasks.count': '{n} tasks · {m} active',
'tasks.empty': 'No generation tasks yet. Submit the first one in Image or Video.',
'tasks.emptyFiltered': 'No tasks match the current filter.',
'tasks.goGenerate': 'Open Image',
'tasks.sourceStudioImage': 'Standalone image',
'tasks.sourceStudioVideo': 'Standalone video',
@@ -1536,8 +1651,10 @@ export const en = {
'tasks.retry': 'Retry',
'tasks.cancel': 'Cancel',
'tasks.delete': 'Delete',
'tasks.download': 'Download',
'tasks.delTitle': 'Delete task',
'tasks.delConfirm': 'The result files will be removed together with the task. Delete it?',
'tasks.searchPh': 'Search tasks…',
'tasks.outputs': '{n} outputs',
'agentsPage.title': 'Agents',
@@ -1767,6 +1884,8 @@ export const en = {
'jobst.dryRunDetail': 'Placeholder only: Dry-run is on, ComfyUI was not called',
'jobst.noOutput': 'No output',
'jobst.noOutputDetail': 'The job ended without any result file — not a finished generation',
'jobst.missing': 'Files missing',
'jobst.missingDetail': 'The task succeeded, but its result files are no longer on the server',
'jobst.queued': 'Queued',
'jobst.queuedDetail': 'Waiting in the workbench queue to be sent to ComfyUI',
'jobst.connecting': 'Connecting',
@@ -1795,6 +1914,149 @@ export const en = {
'studio.doneToast': 'Done: {n} file(s) (ComfyUI prompt ID {id})',
'studio.dryRunToast': 'Placeholder only: Dry-run is on, ComfyUI was not called',
'studio.dryRunNote': 'Dry-run is on: Generate only writes placeholder files and never calls ComfyUI. Turn it off in Settings.',
// --- HEL-643: workflow import check / real test / media groups ---
'studio.errVideoFormat': '"{name}" is not a supported video format — use MP4 / WebM / MOV',
'studio.errAudioFormat': '"{name}" is not a supported audio format — use MP3 / WAV / M4A',
'studio.errMediaSize': '"{name}" exceeds the size limit — compress it first',
'studio.errNeedRefMedia': '"{label}" needs at least {n} clips',
'studio.refHintMedia': 'Required · 1–{max} clips · {n} selected',
'studio.refAddMedia': 'Add {kind}',
'studio.refAddSubMedia': '{n} more · max {max}',
'studio.refRemoveMedia': 'Remove {kind} {n}',
'studio.refFullMedia': 'Limit of {max} clips reached — remove one to add another',
'wfMedia.h3Limits': 'MiniMax H3 Ref2VA official limits: up to 9 reference images, 3 reference videos and 3 reference audios; each clip 2–15s with video/audio totals ≤15s each; audio cannot be the only reference; at most 12 reference files in total.',
'wfMedia.h3TotalOver': '{n} reference files selected — above the official cap of 12; generation may fail',
'wfMedia.h3AudioAlone': 'Audio cannot be the only reference — add at least one reference image or video',
'conn.wfCheckTitle': 'Connection compatibility check',
'conn.wfCheckEndpoint': 'Target: {name}',
'conn.wfCheckBtn': 'Re-check',
'conn.wfChecking': 'Checking…',
'conn.wfCheckOk': 'This connection has the nodes and models this workflow needs',
'conn.wfCheckProblems': '{n} missing node(s)/model(s) found',
'conn.wfCheckUnreachable': 'Cannot verify (ComfyUI unreachable) — saving stays possible; re-check after fixing the connection',
'conn.wfCheckSaveHint': 'You can still save the draft (it is not marked generatable); install the missing pieces and re-check.',
'conn.wfTestBtn': 'Test',
'conn.wfLastTest': 'Last test',
'conn.wfTestPassed': '{time} passed ({n} files)',
'conn.wfTestRunning': '{time} running',
'conn.wfTestFailed': '{time} failed',
'wft.title': 'Test workflow',
'wft.connection': 'Target connection',
'wft.costNote': 'A test submits one real job to the selected ComfyUI and uses its VRAM and queue time.',
'wft.submit': 'Start test',
'wft.confirmTitle': 'Confirm a real run',
'wft.confirmBody': 'One real job will be submitted to "{endpoint}" ({n} jobs in queue). The test only passes when at least one downloadable output of the right media type comes back.',
'wft.running': 'Testing…',
'wft.cancel': 'Cancel test',
'wft.passed': 'Test passed: {n} file(s) produced',
'wft.passedShort': 'Passed ({n} files)',
'wft.failed': 'Test failed',
'wft.failedShort': 'Failed',
'wft.cancelledShort': 'Cancelled',
'wft.reusedToast': 'A test is already running for this workflow — attached to it',
'wft.history': 'Test records ({n})',
'wft.clear': 'Clear test records',
'wft.cleared': 'Test records cleared',
'wft.never': 'Never tested',
'wft.download': 'Download',
'wft.errRequired': 'Please fill in "{label}"',
'wft.errListMin': '"{label}" needs at least {n} {unit}',
'tasks.testBadge': 'Test',
'tasks.sourceWorkflowTest': 'Workflow test',
// --- 生成台 (HEL-653) ---
'cdf.orig': 'Original {v}',
'desk.title': 'Generate',
'desk.advanced': 'Advanced · {n} · untouched ones keep the workflow values',
'desk.chipResolution': 'Resolution {v}',
'desk.chipSeconds': '{v}s',
'desk.chipSeed': 'Seed {v}',
'desk.closeInspector': 'Close inspector',
'desk.countActive': '{n} running',
'desk.countTakes': '{n} takes',
'desk.ctxAsset': '{kind} “{name}”',
'desk.ctxShot': 'Shot {no}',
'desk.ctxBack': 'Back to {stage}',
'desk.ctxDismiss': 'Dismiss source note',
'desk.ctxFrom': 'From “{project}”',
'desk.ctxNoBackfill': 'Results stay in the desk feed and are not filled back into {stage}',
'desk.dayDate': '{m}/{d}',
'desk.download': 'Download',
'desk.dropNoSlot': '{n} file(s) have no slot: this workflow has no input of that kind',
'desk.dryRun': 'Dry run',
'desk.durMin': '{m}m {s}s',
'desk.durSec': '{s}s',
'desk.elapsed': 'Time',
'desk.emptyFailed': 'No failed takes',
'desk.emptyFeed': 'No takes yet. Write a prompt below and press Generate.',
'desk.filterAria': 'Filter takes',
'desk.filterAll': 'All',
'desk.filterImage': 'Images',
'desk.filterVideo': 'Videos',
'desk.filterFailed': 'Failed',
'desk.generate': 'Generate',
'desk.genHint': 'Generate (Ctrl/⌘ + Enter)',
'desk.inputs': 'Inputs',
'desk.inspector': 'Inspector',
'desk.keyClose': 'Close',
'desk.keyInspector': 'Show / hide',
'desk.keySelect': 'Select',
'desk.keyUse': 'Use',
'desk.kvCreated': 'Submitted',
'desk.kvName': 'Name',
'desk.kvPromptId': 'ComfyUI prompt id',
'desk.kvUsage': 'Usage',
'desk.loadEarlier': 'Show {n} earlier takes',
'desk.missingSub': 'Redo with the same params, or remove this take',
'desk.missingTitle': 'The result files are no longer on the server',
'desk.needWorkflow': 'Missing: workflow',
'desk.noConn': 'Not connected',
'desk.noPromptInput': 'This workflow takes no prompt; it runs with its own values.',
'desk.notGenerated': 'Not generated',
'desk.noWorkflows': 'No image or video workflow is ready yet',
'desk.openInDesk': 'Tune in desk',
'desk.openInDeskHint': 'Open the desk with this prompt and pick the workflow and params yourself; results stay in the desk feed',
'desk.openInspector': 'Inspector',
'desk.origValue': 'Workflow value',
'desk.outputN': 'Result {n}',
'desk.outputs': 'All results',
'desk.paramError': 'Invalid parameter: {msg}',
'desk.paramsAll': 'All params',
'desk.paramsChanged': 'Params · {n} changed',
'desk.paramsCommon': 'Common params',
'desk.pickTake': 'Pick a take in the feed to see its result',
'desk.pickWorkflow': 'Choose workflow',
'desk.promptOnly': 'Prompt only',
'desk.promptPh': 'Describe the shot… (Ctrl/⌘ + Enter to generate, / to focus)',
'desk.restoreAll': 'Restore all workflow values',
'desk.redo': 'Redo with same params',
'desk.removeRecord': 'Remove record',
'desk.restoreOrig': 'Restore original',
'desk.reuse': 'Reuse',
'desk.reuseToComposer': 'Reuse in composer',
'desk.seedRandom': 'Random',
'desk.sendToSlot': 'Send to image slot',
'desk.sent': 'Submitted',
'desk.sentToSlotToast': 'Sent to the current workflow’s image slot',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': 'Size',
'desk.stillNeed': 'Missing: {what}',
'desk.tabParams': 'Params',
'desk.tabResult': 'Result',
'desk.today': 'Today',
'desk.took': 'Took {d}',
'desk.wfBroken': 'Unavailable',
'desk.wfCurrent': 'current',
'desk.wfDefaultConn': 'Default connection',
'desk.wfImport': 'Import / manage workflows',
'desk.wfLastFailed': 'Last run failed',
'desk.wfNoMatch': 'No matching workflow',
'desk.wfOk': 'Ready',
'desk.wfSearchPh': 'Search workflows or a usage: image to video, reference…',
'desk.wfTesting': 'Test running',
'desk.wfUntested': 'Not tested',
'desk.workflow': 'Workflow',
'desk.yesterday': 'Yesterday',
};
export type Dict = typeof en;
+270 -8
View File
@@ -64,6 +64,7 @@ export const es: Dict = {
// --- Toast ---
'toast.dismiss': 'Descartar',
'toast.undo': 'Deshacer',
'toast.uploadFailed': 'Error al subir',
// --- Modal ---
@@ -1260,14 +1261,44 @@ export const es: Dict = {
'shell.navConnections': 'Conexiones ComfyUI',
'shell.navModels': 'Modelos',
'shell.navSettings': 'Ajustes',
'shell.wip': 'En desarrollo',
'shell.wipHint': 'Esta página está en construcción y llegará más adelante',
'shell.comfy_ok': '{name} conectado',
'shell.comfy_fail': '{name} sin conexión',
'shell.comfy_testing': 'Probando {name}…',
'shell.comfyUnset': 'ComfyUI · sin configurar',
'shell.comfyManage': 'Configura la dirección de ComfyUI en Ajustes',
'shell.mobileNotice': 'Abre este banco de trabajo en un navegador de escritorio (mínimo 768 px); los móviles aún no se admiten.',
'shell.scopeHint': 'Cambiar de proyecto',
'shell.scopeAll': 'Todos los proyectos',
'shell.scopeAllList': 'Lista de proyectos',
'shell.scopeRecent': 'Proyectos recientes',
'shell.scopeLoadFailed': 'No se pudieron cargar los proyectos',
'shell.scopeEmpty': 'Aún no hay proyectos: crea uno',
'shell.scopeStage': '{n}/5 confirmadas',
'shell.queueRunning': '{n} generando',
'shell.queueQueued': '{n} en cola',
'shell.queueIdle': 'Cola libre',
'shell.queueActive': '{n} activos',
'shell.trayTitle': 'Bandeja de tareas',
'shell.trayRecent': 'Tareas recientes · clic para ver todas',
'shell.trayEmpty': 'Aún no hay tareas de generación',
'shell.trayAll': 'Ver todas las tareas',
'shell.searchTitle': 'Buscar páginas y proyectos',
'shell.searchPlaceholder': 'Buscar páginas, proyectos',
'shell.searchShortcut': 'Buscar (Ctrl/⌘ + K)',
'shell.searchEmpty': 'Ninguna página ni proyecto coincide con «{q}»',
'shell.searchGroupPages': 'Páginas',
'shell.searchGroupProjects': 'Proyectos · abrir el banco de trabajo',
'shell.searchHintMove': 'elegir',
'shell.searchHintOpen': 'abrir',
'shell.searchHintClose': 'cerrar',
'shell.reduceMotion': 'Reducir movimiento',
'shell.reduceHint': 'Desactiva desplazamientos, escalados y brillos; solo quedan fundidos breves',
'shell.reduceSystem': 'Se sigue el ajuste del sistema «Reducir movimiento»',
'shell.tabAria': 'Navegación principal (estrecha)',
'shell.tabProjects': 'Proyectos',
'shell.tabCreate': 'Crear',
'shell.tabGenerate': 'Generar',
'shell.tabMore': 'Más',
'shell.morePages': 'Más páginas',
'shell.moreTools': 'Herramientas',
'home.title': 'Resumen de proyectos',
'home.subtitle': 'Gestiona tus proyectos: empieza con una idea o un guion terminado.',
'home.projectCount': '{n} proyectos · {m} en curso',
@@ -1398,6 +1429,54 @@ export const es: Dict = {
'conn.wfJsonInvalid': 'JSON no válido en formato API (se esperaba un objeto id de nodo → {{…class_type…}})',
'conn.wfJsonPh': 'Pega aquí el JSON en formato API de ComfyUI o elige un archivo',
'conn.wfDeleted': 'Flujo eliminado',
'conn.wfImportedBroken': 'Imported, but the workflow file is incomplete and must be re-exported before generating: {detail}',
'conn.wfBrokenBadge': 'Incomplete file — cannot generate',
// --- Five usages & import confirmation (HEL-636) ---
'usage.text2image': 'Text → Image',
'usage.image2image': 'Image → Image',
'usage.text2video': 'Text → Video',
'usage.image2video': 'Image → Video',
'usage.ref2video': 'Reference → Video',
'usage.pending': 'Usage pending',
'wfRole.image': 'Input image',
'wfRole.first_frame': 'First frame',
'wfRole.last_frame': 'Last frame',
'wfRole.reference_image': 'Reference',
'wfRole.mask': 'Mask',
'conn.wfImportAction': 'Import workflow',
'conn.wfConfirmTitle': 'Confirm detection',
'conn.wfStepAnalyze': 'Paste & analyze',
'conn.wfStepConfirm': 'Confirm & save',
'conn.wfChooseFile': 'Choose file',
'conn.wfAnalyze': 'Analyze',
'conn.wfAnalyzing': 'Analyzing…',
'conn.wfConfirmHint': 'Review the evidence, output nodes and image slots; correct the usage or slot roles before saving.',
'conn.wfUsageLabel': 'Usage',
'conn.wfUsageAuto': 'Auto-detected: {usage}',
'conn.wfUsageNeedPick': 'Pick manually',
'conn.wfPickUsage': 'Choose a usage first',
'conn.wfSlotsLabel': 'Image slots',
'conn.wfSlotsHint': 'Roles are inferred from wiring; override them (input image / first / last frame / reference / mask) and the manual choice sticks.',
'conn.wfBack': 'Back',
'conn.wfConfirmSave': 'Confirm & save',
'conn.wfImportedWithUsage': 'Saved as “{usage}” with {n} fillable parameters',
'conn.wfPendingCount': '{n} pending',
'conn.wfConfirmed': 'Usage confirmed: {usage} — the workflow can generate now',
'conn.wfSourceUser': 'Usage set manually; re-analysis will not overwrite it',
'conn.wfSourceAuto': 'Usage auto-detected',
'conn.wfDisabledBadge': 'Disabled',
'conn.wfConfirmAria': 'Confirm workflow usage',
'conn.wfOutputLabel': 'Nodos de salida',
'conn.wfOutputNeedPick': 'Nodos de salida personalizados no reconocidos: asígnalos',
'conn.wfOutputHint': 'Marca los nodos que realmente producen resultados y elige el tipo de medio de cada uno; la generación solo extrae imágenes/vídeos de estos nodos.',
'conn.wfOutputPick': 'Marca al menos un nodo de salida',
'conn.wfOutputKindAria': 'Tipo de medio del nodo de salida',
'conn.wfOutputPendingBadge': 'Salida pendiente',
'conn.wfOutputNeedMap': 'Este flujo tiene nodos de salida no reconocidos; asígnalos y su tipo de medio para activarlo',
'conn.wfOutputApply': 'Guardar mapeo de salida',
'conn.wfMapCancel': 'Cancelar',
'conn.wfOutputApplied': 'Mapeo de salida guardado: nodo {nodes}',
'conn.wfOutputCleared': 'Mapeo de salida borrado: el flujo vuelve a estar pendiente',
'conn.missingMaterial': 'Aún falta en el repo un JSON dedicado de Qwen Image 2.1: expórtalo desde ComfyUI e impórtalo aquí; la vía genérica ya está lista.',
// --- Generación independiente de imagen / vídeo (a3/a4, HEL-612) ---
@@ -1408,13 +1487,11 @@ export const es: Dict = {
'studio.genParams': 'Parámetros',
'studio.modeTextToImage': 'Texto a imagen',
'studio.modeTextToVideo': 'Texto a vídeo',
'studio.chipIdle': '{name} · cola libre',
'studio.chipBusy': '{name} · {n} en cola',
'studio.video.resultsTitle': 'Vista previa',
'studio.image.historyTitle': 'Historial de imágenes',
'studio.video.historyTitle': 'Historial de vídeos',
'studio.historyCount': '{n} en total',
'studio.lastDone': 'Último · {time}',
'studio.doneAt': 'Completado a las {time}',
'studio.kindImageText': 'imagen',
'studio.kindVideoText': 'vídeo',
'studio.loading': 'Cargando…',
@@ -1499,10 +1576,45 @@ export const es: Dict = {
'studio.wfNoParamsNote': 'Este flujo no tiene parámetros rellenables y se ejecutará con su prompt y ajustes internos. Para rellenarlos aquí, etiqueta los títulos de nodo con (Input:prompt) etc. en ComfyUI y vuelve a importar.',
'studio.wfAutoParamsNote': 'Sin etiquetas (Input:…): se detectaron {n} parámetros por tipo de nodo; los campos vacíos conservan los valores del flujo.',
'studio.promptNotDeclared': 'Este flujo no tiene nodo de prompt',
'studio.modeImageEdit': 'Image edit',
'studio.modeImageToVideo': 'Image to video',
'studio.modeRefToVideo': 'Reference to video',
'studio.slotInput': 'Input image',
'studio.slotHintOne': 'Required · 1 image',
'studio.slotEmptyInput': 'Click or drop the input image',
'studio.slotEmptyFirst': 'Click or drop the first frame',
'studio.slotEmptySub': 'PNG / JPG / WebP · ≤ 20MB each',
'studio.slotFromResultsShort': 'From results',
'studio.errImageFormat': '"{name}" is not supported — use PNG / JPG / WebP; this file will not be used',
'studio.errImageSize': '"{name}" is larger than 20MB — compress it and upload again',
'studio.errNeedInputImage': 'Image edit needs an input image',
'studio.errNeedFirstFrame': 'Image to video needs a first frame',
'studio.errNeedRef': 'Reference to video needs at least 1 reference image',
'studio.errRefMax': 'At most {max} reference images: {n} selected, these {k} were not added',
'studio.refHint': 'Required · 1–{max} · {n} selected',
'studio.refAdd': 'Add reference image',
'studio.refAddSub': '{n} more · max {max}',
'studio.refReplace': 'Replace',
'studio.refRemove': 'Remove reference {n}',
'studio.refRejectedShort': 'Not added',
'studio.refFull': 'Limit of {max} reached — remove one to add another',
'studio.refStrip': 'Reference images ({n} used)',
'studio.resolutionLabel': 'Output resolution',
'studio.resolutionHint': 'About {v}×{v} px, keeps the input aspect; 0 = original size',
'studio.wfBrokenTitle': 'This workflow file is incomplete — ComfyUI cannot run it, generation is blocked',
'studio.wfBrokenHint': 'Re-export the API-format JSON from a ComfyUI that has the custom nodes installed, then import it again under ComfyUI connections.',
'studio.errWfBroken': 'Workflow file is incomplete — re-export it before generating',
'studio.cancelToast': 'Cancelación solicitada',
'studio.deleteBtn': 'Eliminar',
'studio.delTitle': 'Eliminar registro de tarea',
'studio.delConfirm': 'Los archivos de resultados se eliminarán junto con el registro. ¿Eliminar?',
'studio.delConfirm': 'Al eliminar también se quitan los archivos de resultados de esta tarea; el historial no se puede restaurar. ¿Eliminar?',
'studio.delTitleJob': 'Eliminar tarea «{name}»',
'studio.delConfirmMulti': 'Esta tarea produjo {n} resultados. Al eliminarla se quita el registro completo y los {n} archivos de resultados; no se puede deshacer. ¿Eliminar?',
'studio.deleteFailedToast': 'No se pudo eliminar: {detail}',
'studio.deletedTakeNoFilesToast': 'Se eliminó «{name}»',
'studio.deletedTakeToast': 'Se eliminó «{name}» junto con sus archivos de resultado',
'studio.deletedToast': 'Tarea eliminada junto con sus archivos de resultados',
'studio.wfDeletedTag': 'Flujo eliminado',
'studio.wfEmptyTitle': 'Aún no hay flujos de {kind}',
'studio.wfEmptyBody': 'Activa el modo desarrollador de ComfyUI, exporta el flujo como JSON API e impórtalo en Conexiones ComfyUI como {kind}.',
'studio.wfEmptyGo': 'Importar en Conexiones ComfyUI',
@@ -1521,9 +1633,12 @@ export const es: Dict = {
'tasks.subtitle': 'Todas las tareas de imagen / vídeo: ventanas independientes y flujo de creación',
'tasks.filterAll': 'Todas',
'tasks.filterImage': 'Imágenes',
'tasks.filterFailed': 'Fallidas',
'tasks.filterActive': 'En curso',
'tasks.filterVideo': 'Vídeos',
'tasks.count': '{n} tareas · {m} activas',
'tasks.empty': 'Aún no hay tareas. Envía la primera en Imagen o Vídeo.',
'tasks.emptyFiltered': 'Ninguna tarea coincide con el filtro actual.',
'tasks.goGenerate': 'Abrir Imagen',
'tasks.sourceStudioImage': 'Imagen independiente',
'tasks.sourceStudioVideo': 'Vídeo independiente',
@@ -1537,8 +1652,10 @@ export const es: Dict = {
'tasks.retry': 'Reintentar',
'tasks.cancel': 'Cancelar',
'tasks.delete': 'Eliminar',
'tasks.download': 'Descargar',
'tasks.delTitle': 'Eliminar tarea',
'tasks.delConfirm': 'Los archivos de resultados se eliminarán junto con la tarea. ¿Eliminar?',
'tasks.searchPh': 'Buscar tareas…',
'tasks.outputs': '{n} resultados',
'agentsPage.title': 'Agentes',
@@ -1768,6 +1885,8 @@ export const es: Dict = {
'jobst.dryRunDetail': 'Solo marcador: Dry-run activo, no se llamó a ComfyUI',
'jobst.noOutput': 'Sin salida',
'jobst.noOutputDetail': 'El trabajo terminó sin archivos de resultado: no cuenta como generado',
'jobst.missing': 'Archivos no disponibles',
'jobst.missingDetail': 'La tarea terminó correctamente, pero sus archivos ya no están en el servidor',
'jobst.queued': 'En cola',
'jobst.queuedDetail': 'Esperando en la cola del taller para enviarse a ComfyUI',
'jobst.connecting': 'Conectando',
@@ -1796,4 +1915,147 @@ export const es: Dict = {
'studio.doneToast': 'Listo: {n} archivo(s) (ID de prompt de ComfyUI {id})',
'studio.dryRunToast': 'Solo marcador: Dry-run activo, no se llamó a ComfyUI',
'studio.dryRunNote': 'Dry-run activo: Generar solo escribe marcadores y nunca llama a ComfyUI. Desactívalo en Ajustes.',
// --- HEL-643: verificación de importación / prueba real / grupos de medios ---
'studio.errVideoFormat': '«{name}» no es un formato de vídeo admitido: usa MP4 / WebM / MOV',
'studio.errAudioFormat': '«{name}» no es un formato de audio admitido: usa MP3 / WAV / M4A',
'studio.errMediaSize': '«{name}» supera el límite de tamaño, comprímelo primero',
'studio.errNeedRefMedia': '«{label}» necesita al menos {n} clips',
'studio.refHintMedia': 'Obligatorio · 1–{max} clips · {n} seleccionados',
'studio.refAddMedia': 'Añadir {kind}',
'studio.refAddSubMedia': 'Quedan {n} · máx. {max}',
'studio.refRemoveMedia': 'Quitar {kind} {n}',
'studio.refFullMedia': 'Límite de {max} clips alcanzado: quita uno para añadir otro',
'wfMedia.h3Limits': 'Límites oficiales de MiniMax H3 Ref2VA: hasta 9 imágenes, 3 vídeos y 3 audios de referencia; cada clip de 2–15 s con totales ≤15 s por tipo; el audio no puede ser la única referencia; 12 archivos de referencia como máximo.',
'wfMedia.h3TotalOver': '{n} archivos de referencia: por encima del límite oficial de 12; la generación puede fallar',
'wfMedia.h3AudioAlone': 'El audio no puede ser la única referencia: añade al menos una imagen o un vídeo',
'conn.wfCheckTitle': 'Comprobación de compatibilidad de la conexión',
'conn.wfCheckEndpoint': 'Destino: {name}',
'conn.wfCheckBtn': 'Volver a comprobar',
'conn.wfChecking': 'Comprobando…',
'conn.wfCheckOk': 'Esta conexión tiene los nodos y modelos que necesita este flujo',
'conn.wfCheckProblems': 'Se encontraron {n} nodos/modelos ausentes',
'conn.wfCheckUnreachable': 'No se puede verificar (ComfyUI inaccesible): puedes guardar igualmente; vuelve a comprobar tras arreglar la conexión',
'conn.wfCheckSaveHint': 'Puedes guardar el borrador (no se marcará como generable); instala lo que falta y vuelve a comprobar.',
'conn.wfTestBtn': 'Probar',
'conn.wfLastTest': 'Última prueba',
'conn.wfTestPassed': '{time} superada ({n} archivos)',
'conn.wfTestRunning': '{time} en curso',
'conn.wfTestFailed': '{time} no superada',
'wft.title': 'Probar flujo',
'wft.connection': 'Conexión de destino',
'wft.costNote': 'La prueba envía un trabajo real al ComfyUI elegido y usa su VRAM y su cola.',
'wft.submit': 'Iniciar prueba',
'wft.confirmTitle': 'Confirmar ejecución real',
'wft.confirmBody': 'Se enviará un trabajo real a «{endpoint}» ({n} trabajos en cola). La prueba solo se aprueba si vuelve al menos un archivo descargable del tipo correcto.',
'wft.running': 'Probando…',
'wft.cancel': 'Cancelar prueba',
'wft.passed': 'Prueba superada: {n} archivo(s) producidos',
'wft.passedShort': 'Superada ({n} archivos)',
'wft.failed': 'Prueba no superada',
'wft.failedShort': 'No superada',
'wft.cancelledShort': 'Cancelada',
'wft.reusedToast': 'Ya hay una prueba en curso para este flujo: se ha retomado',
'wft.history': 'Registros de prueba ({n})',
'wft.clear': 'Borrar registros de prueba',
'wft.cleared': 'Registros de prueba borrados',
'wft.never': 'Nunca probado',
'wft.download': 'Descargar',
'wft.errRequired': 'Rellena «{label}»',
'wft.errListMin': '«{label}» necesita al menos {n} {unit}',
'tasks.testBadge': 'Prueba',
'tasks.sourceWorkflowTest': 'Prueba de flujo',
// --- 生成台 (HEL-653) ---
'cdf.orig': 'Original {v}',
'desk.title': 'Generar',
'desk.advanced': 'Avanzado · {n} · sin cambios se usan los valores del flujo',
'desk.chipResolution': 'Resolución {v}',
'desk.chipSeconds': '{v} s',
'desk.chipSeed': 'Semilla {v}',
'desk.closeInspector': 'Cerrar inspector',
'desk.countActive': '{n} en curso',
'desk.countTakes': '{n} registros',
'desk.ctxAsset': '{kind} «{name}»',
'desk.ctxShot': 'Plano {no}',
'desk.ctxBack': 'Volver a {stage}',
'desk.ctxDismiss': 'Cerrar aviso de origen',
'desk.ctxFrom': 'De «{project}»',
'desk.ctxNoBackfill': 'Los resultados quedan en el registro y no se devuelven a {stage}',
'desk.dayDate': '{d}/{m}',
'desk.download': 'Descargar',
'desk.dropNoSlot': '{n} archivo(s) sin ranura: este flujo no tiene esa entrada',
'desk.dryRun': 'Simulación',
'desk.durMin': '{m} min {s} s',
'desk.durSec': '{s} s',
'desk.elapsed': 'Tiempo',
'desk.emptyFailed': 'No hay registros fallidos',
'desk.emptyFeed': 'Aún no hay registros. Escribe un prompt abajo y pulsa Generar.',
'desk.filterAria': 'Filtrar registros',
'desk.filterAll': 'Todo',
'desk.filterImage': 'Imágenes',
'desk.filterVideo': 'Vídeos',
'desk.filterFailed': 'Fallidos',
'desk.generate': 'Generar',
'desk.genHint': 'Generar (Ctrl/⌘ + Enter)',
'desk.inputs': 'Entradas',
'desk.inspector': 'Inspector',
'desk.keyClose': 'Cerrar',
'desk.keyInspector': 'Mostrar / ocultar',
'desk.keySelect': 'Elegir',
'desk.keyUse': 'Usar',
'desk.kvCreated': 'Enviado',
'desk.kvName': 'Nombre',
'desk.kvPromptId': 'ID de ComfyUI',
'desk.kvUsage': 'Uso',
'desk.loadEarlier': 'Mostrar {n} tomas anteriores',
'desk.missingSub': 'Rehacer con los mismos parámetros, o quitar esta toma',
'desk.missingTitle': 'Los archivos de resultado ya no están en el servidor',
'desk.needWorkflow': 'Falta: flujo',
'desk.noConn': 'Sin conexión',
'desk.noPromptInput': 'Este flujo no tiene prompt; se ejecuta con sus propios valores.',
'desk.notGenerated': 'No generado',
'desk.noWorkflows': 'Aún no hay flujos de imagen o vídeo listos',
'desk.openInDesk': 'Ajustar en el generador',
'desk.openInDeskHint': 'Abre el generador con este prompt y elige flujo y parámetros; los resultados quedan en el registro',
'desk.openInspector': 'Inspector',
'desk.origValue': 'Valor del flujo',
'desk.outputN': 'Resultado {n}',
'desk.outputs': 'Todos los resultados',
'desk.paramError': 'Parámetro no válido: {msg}',
'desk.paramsAll': 'Todos los parámetros',
'desk.paramsChanged': 'Parámetros · {n} cambiados',
'desk.paramsCommon': 'Parámetros comunes',
'desk.pickTake': 'Elige un registro para ver su resultado',
'desk.pickWorkflow': 'Elegir flujo',
'desk.promptOnly': 'Solo prompt',
'desk.promptPh': 'Describe la escena… (Ctrl/⌘ + Enter genera, / enfoca)',
'desk.restoreAll': 'Restaurar todos los valores del flujo',
'desk.redo': 'Rehacer con los mismos parámetros',
'desk.removeRecord': 'Quitar el registro',
'desk.restoreOrig': 'Restaurar original',
'desk.reuse': 'Reutilizar',
'desk.reuseToComposer': 'Reutilizar en el editor',
'desk.seedRandom': 'Aleatoria',
'desk.sendToSlot': 'Enviar a la ranura de imagen',
'desk.sent': 'Enviado',
'desk.sentToSlotToast': 'Enviado a la ranura de imagen del flujo actual',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': 'Tamaño',
'desk.stillNeed': 'Falta: {what}',
'desk.tabParams': 'Parámetros',
'desk.tabResult': 'Resultado',
'desk.today': 'Hoy',
'desk.took': 'Tardó {d}',
'desk.wfBroken': 'No disponible',
'desk.wfCurrent': 'actual',
'desk.wfDefaultConn': 'Conexión predeterminada',
'desk.wfImport': 'Importar / gestionar flujos',
'desk.wfLastFailed': 'Falló la última vez',
'desk.wfNoMatch': 'Ningún flujo coincide',
'desk.wfOk': 'Listo',
'desk.wfSearchPh': 'Busca flujos o un uso: imagen a vídeo, referencia…',
'desk.wfTesting': 'Prueba en curso',
'desk.wfUntested': 'Sin probar',
'desk.workflow': 'Flujo',
'desk.yesterday': 'Ayer',
};
+270 -8
View File
@@ -64,6 +64,7 @@ export const fr: Dict = {
// --- Toast ---
'toast.dismiss': 'Ignorer',
'toast.undo': 'Annuler',
'toast.uploadFailed': "Échec de l'import",
// --- Modal ---
@@ -1260,14 +1261,44 @@ export const fr: Dict = {
'shell.navConnections': 'Connexions ComfyUI',
'shell.navModels': 'Modèles',
'shell.navSettings': 'Réglages',
'shell.wip': 'En développement',
'shell.wipHint': 'Cette page est en construction et arrivera plus tard',
'shell.comfy_ok': '{name} connecté',
'shell.comfy_fail': '{name} injoignable',
'shell.comfy_testing': 'Test de {name}…',
'shell.comfyUnset': 'ComfyUI · non configuré',
'shell.comfyManage': 'Configurez l\'adresse ComfyUI dans les Réglages',
'shell.mobileNotice': 'Ouvrez cet atelier dans un navigateur de bureau (largeur minimum 768 px) ; les téléphones ne sont pas encore pris en charge.',
'shell.scopeHint': 'Changer de projet',
'shell.scopeAll': 'Tous les projets',
'shell.scopeAllList': 'Liste des projets',
'shell.scopeRecent': 'Projets récents',
'shell.scopeLoadFailed': 'Impossible de charger les projets',
'shell.scopeEmpty': 'Aucun projet — en créer un',
'shell.scopeStage': '{n}/5 validées',
'shell.queueRunning': '{n} en cours',
'shell.queueQueued': '{n} en file',
'shell.queueIdle': 'File libre',
'shell.queueActive': '{n} actifs',
'shell.trayTitle': 'Plateau des tâches',
'shell.trayRecent': 'Tâches récentes · cliquer pour tout voir',
'shell.trayEmpty': 'Aucune tâche de génération',
'shell.trayAll': 'Voir toutes les tâches',
'shell.searchTitle': 'Rechercher pages et projets',
'shell.searchPlaceholder': 'Rechercher pages, projets',
'shell.searchShortcut': 'Rechercher (Ctrl/⌘ + K)',
'shell.searchEmpty': 'Aucune page ni projet ne correspond à « {q} »',
'shell.searchGroupPages': 'Pages',
'shell.searchGroupProjects': 'Projets · ouvrir l’atelier',
'shell.searchHintMove': 'choisir',
'shell.searchHintOpen': 'ouvrir',
'shell.searchHintClose': 'fermer',
'shell.reduceMotion': 'Réduire les animations',
'shell.reduceHint': 'Coupe déplacements, zooms et halos ; garde seulement de courts fondus',
'shell.reduceSystem': 'Réglage système « Réduire les animations » appliqué',
'shell.tabAria': 'Navigation principale (étroite)',
'shell.tabProjects': 'Projets',
'shell.tabCreate': 'Créer',
'shell.tabGenerate': 'Générer',
'shell.tabMore': 'Plus',
'shell.morePages': 'Autres pages',
'shell.moreTools': 'Outils',
'home.title': 'Aperçu des projets',
'home.subtitle': 'Gérez vos projets — commencez avec une idée ou un scénario prêt.',
'home.projectCount': '{n} projets · {m} en cours',
@@ -1398,6 +1429,54 @@ export const fr: Dict = {
'conn.wfJsonInvalid': 'JSON invalide au format API (attendu : objet id de nœud → {{…class_type…}})',
'conn.wfJsonPh': 'Collez ici le JSON format API ComfyUI ou choisissez un fichier',
'conn.wfDeleted': 'Workflow supprimé',
'conn.wfImportedBroken': 'Imported, but the workflow file is incomplete and must be re-exported before generating: {detail}',
'conn.wfBrokenBadge': 'Incomplete file — cannot generate',
// --- Five usages & import confirmation (HEL-636) ---
'usage.text2image': 'Text → Image',
'usage.image2image': 'Image → Image',
'usage.text2video': 'Text → Video',
'usage.image2video': 'Image → Video',
'usage.ref2video': 'Reference → Video',
'usage.pending': 'Usage pending',
'wfRole.image': 'Input image',
'wfRole.first_frame': 'First frame',
'wfRole.last_frame': 'Last frame',
'wfRole.reference_image': 'Reference',
'wfRole.mask': 'Mask',
'conn.wfImportAction': 'Import workflow',
'conn.wfConfirmTitle': 'Confirm detection',
'conn.wfStepAnalyze': 'Paste & analyze',
'conn.wfStepConfirm': 'Confirm & save',
'conn.wfChooseFile': 'Choose file',
'conn.wfAnalyze': 'Analyze',
'conn.wfAnalyzing': 'Analyzing…',
'conn.wfConfirmHint': 'Review the evidence, output nodes and image slots; correct the usage or slot roles before saving.',
'conn.wfUsageLabel': 'Usage',
'conn.wfUsageAuto': 'Auto-detected: {usage}',
'conn.wfUsageNeedPick': 'Pick manually',
'conn.wfPickUsage': 'Choose a usage first',
'conn.wfSlotsLabel': 'Image slots',
'conn.wfSlotsHint': 'Roles are inferred from wiring; override them (input image / first / last frame / reference / mask) and the manual choice sticks.',
'conn.wfBack': 'Back',
'conn.wfConfirmSave': 'Confirm & save',
'conn.wfImportedWithUsage': 'Saved as “{usage}” with {n} fillable parameters',
'conn.wfPendingCount': '{n} pending',
'conn.wfConfirmed': 'Usage confirmed: {usage} — the workflow can generate now',
'conn.wfSourceUser': 'Usage set manually; re-analysis will not overwrite it',
'conn.wfSourceAuto': 'Usage auto-detected',
'conn.wfDisabledBadge': 'Disabled',
'conn.wfConfirmAria': 'Confirm workflow usage',
'conn.wfOutputLabel': 'Nœuds de sortie',
'conn.wfOutputNeedPick': 'Nœuds de sortie personnalisés non reconnus — à désigner',
'conn.wfOutputHint': 'Cochez les nœuds qui produisent réellement les résultats et choisissez leur type de média ; la génération ne collecte les images/vidéos que sur ces nœuds.',
'conn.wfOutputPick': 'Cochez au moins un nœud de sortie',
'conn.wfOutputKindAria': 'Type de média du nœud de sortie',
'conn.wfOutputPendingBadge': 'Sortie à définir',
'conn.wfOutputNeedMap': 'Ce workflow contient des nœuds de sortie non reconnus ; désignez-les avec leur type de média pour l’activer',
'conn.wfOutputApply': 'Enregistrer le mapping de sortie',
'conn.wfMapCancel': 'Annuler',
'conn.wfOutputApplied': 'Mapping de sortie enregistré : nœud {nodes}',
'conn.wfOutputCleared': 'Mapping de sortie effacé — le workflow est de nouveau en attente',
'conn.missingMaterial': 'Un JSON de workflow Qwen Image 2.1 dédié manque encore au dépôt : exportez-le depuis ComfyUI et importez-le ici — le chemin d\'import générique est prêt.',
// --- Génération indépendante image / vidéo (a3/a4, HEL-612) ---
@@ -1408,13 +1487,11 @@ export const fr: Dict = {
'studio.genParams': 'Paramètres',
'studio.modeTextToImage': 'Texte vers image',
'studio.modeTextToVideo': 'Texte vers vidéo',
'studio.chipIdle': '{name} · file libre',
'studio.chipBusy': '{name} · {n} en file',
'studio.video.resultsTitle': 'Aperçu',
'studio.image.historyTitle': 'Historique images',
'studio.video.historyTitle': 'Historique vidéos',
'studio.historyCount': '{n} au total',
'studio.lastDone': 'Dernier · {time}',
'studio.doneAt': 'Terminé à {time}',
'studio.kindImageText': 'image',
'studio.kindVideoText': 'vidéo',
'studio.loading': 'Chargement…',
@@ -1499,10 +1576,45 @@ export const fr: Dict = {
'studio.wfNoParamsNote': 'Ce workflow n\'a aucun paramètre à remplir et sera exécuté avec son prompt et ses réglages intégrés. Pour les remplir ici, ajoutez (Input:prompt) etc. aux titres de nœuds dans ComfyUI puis réimportez.',
'studio.wfAutoParamsNote': 'Aucune balise (Input:…) : {n} paramètres détectés par type de nœud ; les champs vides gardent les valeurs du workflow.',
'studio.promptNotDeclared': 'Ce workflow n\'a pas de nœud de prompt',
'studio.modeImageEdit': 'Image edit',
'studio.modeImageToVideo': 'Image to video',
'studio.modeRefToVideo': 'Reference to video',
'studio.slotInput': 'Input image',
'studio.slotHintOne': 'Required · 1 image',
'studio.slotEmptyInput': 'Click or drop the input image',
'studio.slotEmptyFirst': 'Click or drop the first frame',
'studio.slotEmptySub': 'PNG / JPG / WebP · ≤ 20MB each',
'studio.slotFromResultsShort': 'From results',
'studio.errImageFormat': '"{name}" is not supported — use PNG / JPG / WebP; this file will not be used',
'studio.errImageSize': '"{name}" is larger than 20MB — compress it and upload again',
'studio.errNeedInputImage': 'Image edit needs an input image',
'studio.errNeedFirstFrame': 'Image to video needs a first frame',
'studio.errNeedRef': 'Reference to video needs at least 1 reference image',
'studio.errRefMax': 'At most {max} reference images: {n} selected, these {k} were not added',
'studio.refHint': 'Required · 1–{max} · {n} selected',
'studio.refAdd': 'Add reference image',
'studio.refAddSub': '{n} more · max {max}',
'studio.refReplace': 'Replace',
'studio.refRemove': 'Remove reference {n}',
'studio.refRejectedShort': 'Not added',
'studio.refFull': 'Limit of {max} reached — remove one to add another',
'studio.refStrip': 'Reference images ({n} used)',
'studio.resolutionLabel': 'Output resolution',
'studio.resolutionHint': 'About {v}×{v} px, keeps the input aspect; 0 = original size',
'studio.wfBrokenTitle': 'This workflow file is incomplete — ComfyUI cannot run it, generation is blocked',
'studio.wfBrokenHint': 'Re-export the API-format JSON from a ComfyUI that has the custom nodes installed, then import it again under ComfyUI connections.',
'studio.errWfBroken': 'Workflow file is incomplete — re-export it before generating',
'studio.cancelToast': 'Annulation demandée',
'studio.deleteBtn': 'Supprimer',
'studio.delTitle': 'Supprimer la tâche',
'studio.delConfirm': 'Les fichiers de résultats seront supprimés avec la tâche. Supprimer ?',
'studio.delConfirm': 'La suppression retire aussi les fichiers de résultats de cette tâche ; l’historique est irrécupérable. Supprimer ?',
'studio.delTitleJob': 'Supprimer la tâche « {name} »',
'studio.delConfirmMulti': 'Cette tâche a produit {n} résultats. La suppression retire la tâche entière et ses {n} fichiers de résultats ; action irréversible. Supprimer ?',
'studio.deleteFailedToast': 'Échec de la suppression : {detail}',
'studio.deletedTakeNoFilesToast': '« {name} » supprimé',
'studio.deletedTakeToast': '« {name} » et ses fichiers de résultat ont été supprimés',
'studio.deletedToast': 'Tâche supprimée avec ses fichiers de résultats',
'studio.wfDeletedTag': 'Workflow supprimé',
'studio.wfEmptyTitle': 'Pas encore de workflows {kind}',
'studio.wfEmptyBody': 'Activez le mode développeur de ComfyUI, exportez le workflow en JSON API, puis importez-le dans Connexions ComfyUI comme {kind}.',
'studio.wfEmptyGo': 'Importer dans Connexions ComfyUI',
@@ -1521,9 +1633,12 @@ export const fr: Dict = {
'tasks.subtitle': 'Toutes les tâches image / vidéo : fenêtres indépendantes et flux de création',
'tasks.filterAll': 'Toutes',
'tasks.filterImage': 'Images',
'tasks.filterFailed': 'Échecs',
'tasks.filterActive': 'En cours',
'tasks.filterVideo': 'Vidéos',
'tasks.count': '{n} tâches · {m} actives',
'tasks.empty': 'Aucune tâche. Lancez la première dans Image ou Vidéo.',
'tasks.emptyFiltered': 'Aucune tâche ne correspond au filtre actuel.',
'tasks.goGenerate': 'Ouvrir Image',
'tasks.sourceStudioImage': 'Image indépendante',
'tasks.sourceStudioVideo': 'Vidéo indépendante',
@@ -1537,8 +1652,10 @@ export const fr: Dict = {
'tasks.retry': 'Réessayer',
'tasks.cancel': 'Annuler',
'tasks.delete': 'Supprimer',
'tasks.download': 'Télécharger',
'tasks.delTitle': 'Supprimer la tâche',
'tasks.delConfirm': 'Les fichiers de résultats seront supprimés avec la tâche. Supprimer ?',
'tasks.searchPh': 'Rechercher des tâches…',
'tasks.outputs': '{n} résultats',
'agentsPage.title': 'Agents',
@@ -1768,6 +1885,8 @@ export const fr: Dict = {
'jobst.dryRunDetail': 'Substitut uniquement : Dry-run actif, ComfyUI n\'a pas été appelé',
'jobst.noOutput': 'Aucune sortie',
'jobst.noOutputDetail': 'La tâche s\'est terminée sans fichier de résultat : pas une génération',
'jobst.missing': 'Fichiers manquants',
'jobst.missingDetail': 'La tâche a réussi, mais ses fichiers ne sont plus sur le serveur',
'jobst.queued': 'En attente',
'jobst.queuedDetail': 'En attente dans la file de l\'atelier avant envoi à ComfyUI',
'jobst.connecting': 'Connexion',
@@ -1796,4 +1915,147 @@ export const fr: Dict = {
'studio.doneToast': 'Terminé : {n} fichier(s) (ID de prompt ComfyUI {id})',
'studio.dryRunToast': 'Substitut uniquement : Dry-run actif, ComfyUI n\'a pas été appelé',
'studio.dryRunNote': 'Dry-run actif : Générer n\'écrit que des substituts et n\'appelle jamais ComfyUI. Désactivez-le dans Réglages.',
// --- HEL-643 : vérification d'import / test réel / groupes de médias ---
'studio.errVideoFormat': "« {name} » n'est pas un format vidéo pris en charge — utilisez MP4 / WebM / MOV",
'studio.errAudioFormat': "« {name} » n'est pas un format audio pris en charge — utilisez MP3 / WAV / M4A",
'studio.errMediaSize': "« {name} » dépasse la limite de taille — compressez-le d'abord",
'studio.errNeedRefMedia': '« {label} » exige au moins {n} clips',
'studio.refHintMedia': 'Requis · 1–{max} clips · {n} sélectionnés',
'studio.refAddMedia': 'Ajouter {kind}',
'studio.refAddSubMedia': '{n} de plus · max {max}',
'studio.refRemoveMedia': 'Retirer {kind} {n}',
'studio.refFullMedia': 'Limite de {max} clips atteinte — retirez-en un pour en ajouter un autre',
'wfMedia.h3Limits': "Limites officielles MiniMax H3 Ref2VA : jusqu'à 9 images, 3 vidéos et 3 audios de référence ; chaque clip de 2–15 s, totaux ≤15 s par type ; l'audio ne peut être la seule référence ; 12 fichiers de référence au maximum.",
'wfMedia.h3TotalOver': '{n} fichiers de référence — au-delà du plafond officiel de 12 ; la génération peut échouer',
'wfMedia.h3AudioAlone': "L'audio ne peut pas être la seule référence — ajoutez au moins une image ou une vidéo",
'conn.wfCheckTitle': 'Vérification de compatibilité de la connexion',
'conn.wfCheckEndpoint': 'Cible : {name}',
'conn.wfCheckBtn': 'Revérifier',
'conn.wfChecking': 'Vérification…',
'conn.wfCheckOk': 'Cette connexion possède les nœuds et modèles requis par ce flux',
'conn.wfCheckProblems': '{n} nœud(s)/modèle(s) manquant(s) détecté(s)',
'conn.wfCheckUnreachable': "Vérification impossible (ComfyUI injoignable) — l'enregistrement reste possible ; revérifiez après avoir réparé la connexion",
'conn.wfCheckSaveHint': 'Vous pouvez enregistrer le brouillon (il ne sera pas marqué générable) ; installez le manquant puis revérifiez.',
'conn.wfTestBtn': 'Tester',
'conn.wfLastTest': 'Dernier test',
'conn.wfTestPassed': '{time} réussi ({n} fichiers)',
'conn.wfTestRunning': '{time} en cours',
'conn.wfTestFailed': '{time} échoué',
'wft.title': 'Tester le flux',
'wft.connection': 'Connexion cible',
'wft.costNote': 'Un test envoie une tâche réelle au ComfyUI choisi et mobilise son VRAM et sa file.',
'wft.submit': 'Lancer le test',
'wft.confirmTitle': 'Confirmer une exécution réelle',
'wft.confirmBody': 'Une tâche réelle sera envoyée à « {endpoint} » ({n} tâches en file). Le test ne réussit que si au moins un fichier téléchargeable du bon type revient.',
'wft.running': 'Test en cours…',
'wft.cancel': 'Annuler le test',
'wft.passed': 'Test réussi : {n} fichier(s) produit(s)',
'wft.passedShort': 'Réussi ({n} fichiers)',
'wft.failed': 'Test échoué',
'wft.failedShort': 'Échoué',
'wft.cancelledShort': 'Annulé',
'wft.reusedToast': 'Un test est déjà en cours pour ce flux — rattaché à celui-ci',
'wft.history': 'Historique des tests ({n})',
'wft.clear': "Effacer l'historique des tests",
'wft.cleared': 'Historique des tests effacé',
'wft.never': 'Jamais testé',
'wft.download': 'Télécharger',
'wft.errRequired': 'Veuillez renseigner « {label} »',
'wft.errListMin': '« {label} » exige au moins {n} {unit}',
'tasks.testBadge': 'Test',
'tasks.sourceWorkflowTest': 'Test de flux',
// --- 生成台 (HEL-653) ---
'cdf.orig': 'Original {v}',
'desk.title': 'Générer',
'desk.advanced': 'Avancé · {n} · inchangés, les valeurs du workflow s’appliquent',
'desk.chipResolution': 'Résolution {v}',
'desk.chipSeconds': '{v} s',
'desk.chipSeed': 'Graine {v}',
'desk.closeInspector': 'Fermer l’inspecteur',
'desk.countActive': '{n} en cours',
'desk.countTakes': '{n} prises',
'desk.ctxAsset': '{kind} « {name} »',
'desk.ctxShot': 'Plan {no}',
'desk.ctxBack': 'Retour à {stage}',
'desk.ctxDismiss': 'Fermer la note d’origine',
'desk.ctxFrom': 'Depuis « {project} »',
'desk.ctxNoBackfill': 'Les résultats restent dans le fil et ne sont pas renvoyés vers {stage}',
'desk.dayDate': '{d}/{m}',
'desk.download': 'Télécharger',
'desk.dropNoSlot': '{n} fichier(s) sans emplacement : ce workflow n’a pas cette entrée',
'desk.dryRun': 'Simulation',
'desk.durMin': '{m} min {s} s',
'desk.durSec': '{s} s',
'desk.elapsed': 'Durée',
'desk.emptyFailed': 'Aucune prise échouée',
'desk.emptyFeed': 'Aucune prise. Écrivez un prompt ci-dessous et cliquez sur Générer.',
'desk.filterAria': 'Filtrer les prises',
'desk.filterAll': 'Tout',
'desk.filterImage': 'Images',
'desk.filterVideo': 'Vidéos',
'desk.filterFailed': 'Échecs',
'desk.generate': 'Générer',
'desk.genHint': 'Générer (Ctrl/⌘ + Entrée)',
'desk.inputs': 'Entrées',
'desk.inspector': 'Inspecteur',
'desk.keyClose': 'Fermer',
'desk.keyInspector': 'Afficher / masquer',
'desk.keySelect': 'Choisir',
'desk.keyUse': 'Utiliser',
'desk.kvCreated': 'Soumis',
'desk.kvName': 'Nom',
'desk.kvPromptId': 'ID ComfyUI',
'desk.kvUsage': 'Usage',
'desk.loadEarlier': 'Afficher {n} prises plus anciennes',
'desk.missingSub': 'Refaire avec les mêmes paramètres, ou retirer cette prise',
'desk.missingTitle': 'Les fichiers de résultat ne sont plus sur le serveur',
'desk.needWorkflow': 'Manque : workflow',
'desk.noConn': 'Non connecté',
'desk.noPromptInput': 'Ce workflow n’a pas de prompt ; il s’exécute avec ses propres valeurs.',
'desk.notGenerated': 'Non généré',
'desk.noWorkflows': 'Aucun workflow image ou vidéo prêt',
'desk.openInDesk': 'Régler dans le générateur',
'desk.openInDeskHint': 'Ouvre le générateur avec ce prompt ; choisissez workflow et paramètres, les résultats restent dans le fil',
'desk.openInspector': 'Inspecteur',
'desk.origValue': 'Valeur du workflow',
'desk.outputN': 'Résultat {n}',
'desk.outputs': 'Tous les résultats',
'desk.paramError': 'Paramètre invalide : {msg}',
'desk.paramsAll': 'Tous les paramètres',
'desk.paramsChanged': 'Paramètres · {n} modifiés',
'desk.paramsCommon': 'Paramètres courants',
'desk.pickTake': 'Choisissez une prise pour voir son résultat',
'desk.pickWorkflow': 'Choisir un workflow',
'desk.promptOnly': 'Prompt seul',
'desk.promptPh': 'Décrivez l’image… (Ctrl/⌘ + Entrée pour générer, / pour cibler)',
'desk.restoreAll': 'Rétablir toutes les valeurs du workflow',
'desk.redo': 'Refaire avec les mêmes paramètres',
'desk.removeRecord': 'Retirer la ligne',
'desk.restoreOrig': 'Rétablir l’original',
'desk.reuse': 'Réutiliser',
'desk.reuseToComposer': 'Réutiliser dans l’éditeur',
'desk.seedRandom': 'Aléatoire',
'desk.sendToSlot': 'Envoyer vers l’emplacement image',
'desk.sent': 'Soumis',
'desk.sentToSlotToast': 'Envoyé vers l’emplacement image du workflow actuel',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': 'Taille',
'desk.stillNeed': 'Manque : {what}',
'desk.tabParams': 'Paramètres',
'desk.tabResult': 'Résultat',
'desk.today': 'Aujourd’hui',
'desk.took': 'Durée {d}',
'desk.wfBroken': 'Indisponible',
'desk.wfCurrent': 'actuel',
'desk.wfDefaultConn': 'Connexion par défaut',
'desk.wfImport': 'Importer / gérer les workflows',
'desk.wfLastFailed': 'Dernier essai échoué',
'desk.wfNoMatch': 'Aucun workflow correspondant',
'desk.wfOk': 'Prêt',
'desk.wfSearchPh': 'Chercher un workflow ou un usage : image vers vidéo, référence…',
'desk.wfTesting': 'Test en cours',
'desk.wfUntested': 'Non testé',
'desk.workflow': 'Workflow',
'desk.yesterday': 'Hier',
};
+270 -8
View File
@@ -64,6 +64,7 @@ export const ja: Dict = {
// --- Toast ---
'toast.dismiss': '閉じる',
'toast.undo': '元に戻す',
'toast.uploadFailed': 'アップロードに失敗しました',
// --- Modal ---
@@ -1260,14 +1261,44 @@ export const ja: Dict = {
'shell.navConnections': 'ComfyUI 接続',
'shell.navModels': 'モデル設定',
'shell.navSettings': '設定',
'shell.wip': '開発中',
'shell.wipHint': 'このページは準備中です。後ほど公開されます',
'shell.comfy_ok': '{name} 接続済み',
'shell.comfy_fail': '{name} 接続失敗',
'shell.comfy_testing': '{name} テスト中…',
'shell.comfyUnset': 'ComfyUI · 未設定',
'shell.comfyManage': '「設定」で ComfyUI のアドレスを設定できます',
'shell.mobileNotice': 'このワークベンチはデスクトップブラウザ(幅 768px 以上)で開いてください。スマートフォンには未対応です。',
'shell.scopeHint': 'プロジェクト切替',
'shell.scopeAll': 'すべてのプロジェクト',
'shell.scopeAllList': 'プロジェクト一覧',
'shell.scopeRecent': '最近のプロジェクト',
'shell.scopeLoadFailed': 'プロジェクトを読み込めませんでした',
'shell.scopeEmpty': 'プロジェクトはまだありません — 作成する',
'shell.scopeStage': '{n}/5 確定',
'shell.queueRunning': '{n} 件生成中',
'shell.queueQueued': '{n} 件待機',
'shell.queueIdle': 'キューは空です',
'shell.queueActive': '{n} 件進行中',
'shell.trayTitle': 'タスクトレイ',
'shell.trayRecent': '最近のタスク · クリックで全タスク',
'shell.trayEmpty': '生成タスクはまだありません',
'shell.trayAll': 'すべてのタスクを見る',
'shell.searchTitle': 'ページとプロジェクトを検索',
'shell.searchPlaceholder': 'ページ・プロジェクトを検索',
'shell.searchShortcut': '検索(Ctrl/⌘ + K)',
'shell.searchEmpty': '「{q}」に一致するページやプロジェクトはありません',
'shell.searchGroupPages': 'ページ',
'shell.searchGroupProjects': 'プロジェクト · ワークベンチを開く',
'shell.searchHintMove': '選択',
'shell.searchHintOpen': '開く',
'shell.searchHintClose': '閉じる',
'shell.reduceMotion': '動きを減らす',
'shell.reduceHint': '移動・拡大・発光アニメーションを止め、短いフェードのみ残します',
'shell.reduceSystem': 'システムの「視差効果を減らす」設定に従っています',
'shell.tabAria': 'メインナビ(狭い画面)',
'shell.tabProjects': 'プロジェクト',
'shell.tabCreate': '創作',
'shell.tabGenerate': '生成',
'shell.tabMore': 'その他',
'shell.morePages': 'その他のページ',
'shell.moreTools': 'ツール',
'home.title': 'プロジェクト概要',
'home.subtitle': '創作プロジェクトを管理 — アイデアでも完成台本でも始められます。',
'home.projectCount': 'プロジェクト {n} 件 · 進行中 {m} 件',
@@ -1398,6 +1429,54 @@ export const ja: Dict = {
'conn.wfJsonInvalid': '有効な API 形式 JSON ではありません(ノード ID → {{…class_type…}} のオブジェクトが必要)',
'conn.wfJsonPh': 'ここに ComfyUI の API 形式 JSON を貼り付けるか、右のボタンでファイルを選択',
'conn.wfDeleted': 'ワークフローを削除しました',
'conn.wfImportedBroken': 'Imported, but the workflow file is incomplete and must be re-exported before generating: {detail}',
'conn.wfBrokenBadge': 'Incomplete file — cannot generate',
// --- Five usages & import confirmation (HEL-636) ---
'usage.text2image': 'Text → Image',
'usage.image2image': 'Image → Image',
'usage.text2video': 'Text → Video',
'usage.image2video': 'Image → Video',
'usage.ref2video': 'Reference → Video',
'usage.pending': 'Usage pending',
'wfRole.image': 'Input image',
'wfRole.first_frame': 'First frame',
'wfRole.last_frame': 'Last frame',
'wfRole.reference_image': 'Reference',
'wfRole.mask': 'Mask',
'conn.wfImportAction': 'Import workflow',
'conn.wfConfirmTitle': 'Confirm detection',
'conn.wfStepAnalyze': 'Paste & analyze',
'conn.wfStepConfirm': 'Confirm & save',
'conn.wfChooseFile': 'Choose file',
'conn.wfAnalyze': 'Analyze',
'conn.wfAnalyzing': 'Analyzing…',
'conn.wfConfirmHint': 'Review the evidence, output nodes and image slots; correct the usage or slot roles before saving.',
'conn.wfUsageLabel': 'Usage',
'conn.wfUsageAuto': 'Auto-detected: {usage}',
'conn.wfUsageNeedPick': 'Pick manually',
'conn.wfPickUsage': 'Choose a usage first',
'conn.wfSlotsLabel': 'Image slots',
'conn.wfSlotsHint': 'Roles are inferred from wiring; override them (input image / first / last frame / reference / mask) and the manual choice sticks.',
'conn.wfBack': 'Back',
'conn.wfConfirmSave': 'Confirm & save',
'conn.wfImportedWithUsage': 'Saved as “{usage}” with {n} fillable parameters',
'conn.wfPendingCount': '{n} pending',
'conn.wfConfirmed': 'Usage confirmed: {usage} — the workflow can generate now',
'conn.wfSourceUser': 'Usage set manually; re-analysis will not overwrite it',
'conn.wfSourceAuto': 'Usage auto-detected',
'conn.wfDisabledBadge': 'Disabled',
'conn.wfConfirmAria': 'Confirm workflow usage',
'conn.wfOutputLabel': '出力ノード',
'conn.wfOutputNeedPick': '認識できないカスタム出力ノードがあります。手動で指定してください',
'conn.wfOutputHint': '実際に結果を出すノードにチェックし、それぞれのメディア種別を選んでください。生成時にこれらのノードからのみ画像/動画を取り出します。',
'conn.wfOutputPick': '出力ノードを1つ以上チェックしてください',
'conn.wfOutputKindAria': '出力ノードのメディア種別',
'conn.wfOutputPendingBadge': '出力未指定',
'conn.wfOutputNeedMap': '認識できない出力ノードを含みます。ノードとメディア種別を指定すると有効化できます',
'conn.wfOutputApply': '出力マッピングを保存',
'conn.wfMapCancel': 'キャンセル',
'conn.wfOutputApplied': '出力マッピングを保存しました:ノード {nodes}',
'conn.wfOutputCleared': '出力マッピングを解除しました。ワークフローは保留に戻ります',
'conn.missingMaterial': 'Qwen Image 2.1 専用のワークフロー JSON はまだリポジトリにありません。ComfyUI から書き出してここで取り込んでください。汎用の取り込み経路は用意済みです。',
// --- 独立画像/動画生成(a3/a4、HEL-612)---
@@ -1408,13 +1487,11 @@ export const ja: Dict = {
'studio.genParams': '生成パラメータ',
'studio.modeTextToImage': 'テキストから画像',
'studio.modeTextToVideo': 'テキストから動画',
'studio.chipIdle': '{name} · キュー空き',
'studio.chipBusy': '{name} · キュー {n} 件',
'studio.video.resultsTitle': 'プレビュー',
'studio.image.historyTitle': '画像生成履歴',
'studio.video.historyTitle': '動画生成履歴',
'studio.historyCount': '計 {n} 回',
'studio.lastDone': '最終完了 · {time}',
'studio.doneAt': '完了 {time}',
'studio.kindImageText': '画像',
'studio.kindVideoText': '動画',
'studio.loading': '読み込み中…',
@@ -1499,10 +1576,45 @@ export const ja: Dict = {
'studio.wfNoParamsNote': 'このワークフローには記入可能なパラメータがなく、内蔵のプロンプトと設定で実行されます。ここで記入するには ComfyUI でノードタイトルに (Input:prompt) などを付けて再度取り込んでください。',
'studio.wfAutoParamsNote': '(Input:…) タグがないため、ノード種別から {n} 件のパラメータを自動検出しました。空欄はワークフローの値を使います。',
'studio.promptNotDeclared': 'このワークフローにはプロンプトノードがありません',
'studio.modeImageEdit': 'Image edit',
'studio.modeImageToVideo': 'Image to video',
'studio.modeRefToVideo': 'Reference to video',
'studio.slotInput': 'Input image',
'studio.slotHintOne': 'Required · 1 image',
'studio.slotEmptyInput': 'Click or drop the input image',
'studio.slotEmptyFirst': 'Click or drop the first frame',
'studio.slotEmptySub': 'PNG / JPG / WebP · ≤ 20MB each',
'studio.slotFromResultsShort': 'From results',
'studio.errImageFormat': '"{name}" is not supported — use PNG / JPG / WebP; this file will not be used',
'studio.errImageSize': '"{name}" is larger than 20MB — compress it and upload again',
'studio.errNeedInputImage': 'Image edit needs an input image',
'studio.errNeedFirstFrame': 'Image to video needs a first frame',
'studio.errNeedRef': 'Reference to video needs at least 1 reference image',
'studio.errRefMax': 'At most {max} reference images: {n} selected, these {k} were not added',
'studio.refHint': 'Required · 1–{max} · {n} selected',
'studio.refAdd': 'Add reference image',
'studio.refAddSub': '{n} more · max {max}',
'studio.refReplace': 'Replace',
'studio.refRemove': 'Remove reference {n}',
'studio.refRejectedShort': 'Not added',
'studio.refFull': 'Limit of {max} reached — remove one to add another',
'studio.refStrip': 'Reference images ({n} used)',
'studio.resolutionLabel': 'Output resolution',
'studio.resolutionHint': 'About {v}×{v} px, keeps the input aspect; 0 = original size',
'studio.wfBrokenTitle': 'This workflow file is incomplete — ComfyUI cannot run it, generation is blocked',
'studio.wfBrokenHint': 'Re-export the API-format JSON from a ComfyUI that has the custom nodes installed, then import it again under ComfyUI connections.',
'studio.errWfBroken': 'Workflow file is incomplete — re-export it before generating',
'studio.cancelToast': 'キャンセルを要求しました',
'studio.deleteBtn': '削除',
'studio.delTitle': 'タスク記録を削除',
'studio.delConfirm': '結果ファイルも一緒に削除され、履歴は復元できません。削除しますか?',
'studio.delConfirm': '削除するとこのタスクの結果ファイルも削除され、履歴は元に戻せません。削除しますか?',
'studio.delTitleJob': 'タスク「{name}」を削除',
'studio.delConfirmMulti': 'このタスクには結果が {n} 件あります。削除するとタスク記録と {n} 件すべての結果ファイルが失われ、元に戻せません。削除しますか?',
'studio.deleteFailedToast': '削除に失敗しました:{detail}',
'studio.deletedTakeNoFilesToast': '「{name}」の記録を削除しました',
'studio.deletedTakeToast': '「{name}」の記録と結果ファイルを削除しました',
'studio.deletedToast': 'タスクと結果ファイルを削除しました',
'studio.wfDeletedTag': 'ワークフローは削除済み',
'studio.wfEmptyTitle': '{kind}ワークフローがまだありません',
'studio.wfEmptyBody': 'ComfyUI の開発者モードで API 形式 JSON を書き出し、「ComfyUI 接続」ページで{kind}として取り込んでください。',
'studio.wfEmptyGo': '「ComfyUI 接続」で取り込む',
@@ -1521,9 +1633,12 @@ export const ja: Dict = {
'tasks.subtitle': '独立画像・独立動画・創作フロー内の画像/動画タスクをまとめて表示',
'tasks.filterAll': 'すべて',
'tasks.filterImage': '画像',
'tasks.filterFailed': '失敗',
'tasks.filterActive': '実行中',
'tasks.filterVideo': '動画',
'tasks.count': '{n} 件 · 実行中 {m} 件',
'tasks.empty': '生成タスクがまだありません。「画像生成」「動画生成」から最初のタスクを送信してください。',
'tasks.emptyFiltered': '現在のフィルターに一致するタスクはありません。',
'tasks.goGenerate': '画像生成を開く',
'tasks.sourceStudioImage': '独立画像',
'tasks.sourceStudioVideo': '独立動画',
@@ -1537,8 +1652,10 @@ export const ja: Dict = {
'tasks.retry': '再試行',
'tasks.cancel': 'キャンセル',
'tasks.delete': '削除',
'tasks.download': 'ダウンロード',
'tasks.delTitle': 'タスクを削除',
'tasks.delConfirm': '結果ファイルも一緒に削除されます。削除しますか?',
'tasks.searchPh': 'タスクを検索…',
'tasks.outputs': '結果 {n} 件',
'agentsPage.title': 'エージェント',
@@ -1768,6 +1885,8 @@ export const ja: Dict = {
'jobst.dryRunDetail': 'プレースホルダーのみ:Dry-run が有効で ComfyUI は呼び出されていません',
'jobst.noOutput': '出力なし',
'jobst.noOutputDetail': '結果ファイルなしで終了しました(生成完了ではありません)',
'jobst.missing': 'ファイル欠落',
'jobst.missingDetail': 'タスクは成功しましたが、結果ファイルはサーバー上にありません',
'jobst.queued': '待機中',
'jobst.queuedDetail': 'ワークベンチのキューで ComfyUI への送信を待っています',
'jobst.connecting': '接続中',
@@ -1796,4 +1915,147 @@ export const ja: Dict = {
'studio.doneToast': '完了:{n} ファイル(ComfyUI プロンプト ID {id})',
'studio.dryRunToast': 'プレースホルダーのみ:Dry-run が有効で ComfyUI は呼び出されていません',
'studio.dryRunNote': 'Dry-run が有効です:生成はプレースホルダーを書き出すだけで ComfyUI を呼び出しません。設定でオフにできます。',
// --- HEL-643: インポート検査 / 実テスト / メディアグループ ---
'studio.errVideoFormat': '「{name}」は未対応の動画形式です。MP4 / WebM / MOV を使ってください',
'studio.errAudioFormat': '「{name}」は未対応の音声形式です。MP3 / WAV / M4A を使ってください',
'studio.errMediaSize': '「{name}」はサイズ上限を超えています。先に圧縮してください',
'studio.errNeedRefMedia': '「{label}」は最低 {n} 本必要です',
'studio.refHintMedia': '必須 · 1–{max} 本 · 選択 {n}',
'studio.refAddMedia': '{kind}を追加',
'studio.refAddSubMedia': 'あと {n} 本 · 上限 {max}',
'studio.refRemoveMedia': '{kind} {n} を削除',
'studio.refFullMedia': '上限 {max} 本に達しました。削除してから追加してください',
'wfMedia.h3Limits': 'MiniMax H3 Ref2VA の公式上限:参照画像は最大 9 枠、参照動画は 3 本、参照音声は 3 本。各クリップ 2–15 秒で種類ごとの合計 15 秒以下。音声のみの参照は不可。参照ファイルは合計 12 まで。',
'wfMedia.h3TotalOver': '参照ファイルが {n} 個あり、公式上限 12 を超えています。生成に失敗する可能性があります',
'wfMedia.h3AudioAlone': '音声だけで参照にすることはできません。参照画像か参照動画を少なくとも 1 つ追加してください',
'conn.wfCheckTitle': '接続互換性チェック',
'conn.wfCheckEndpoint': '対象:{name}',
'conn.wfCheckBtn': '再チェック',
'conn.wfChecking': 'チェック中…',
'conn.wfCheckOk': 'この接続にはこのワークフローに必要なノードとモデルがあります',
'conn.wfCheckProblems': '不足しているノード/モデルが {n} 件見つかりました',
'conn.wfCheckUnreachable': '確認できません(ComfyUI に接続不可)。保存は可能です。接続を直してから再チェックしてください',
'conn.wfCheckSaveHint': 'ドラフトは保存できます(生成可能とは表示されません)。不足項目を入れて再チェックしてください。',
'conn.wfTestBtn': 'テスト',
'conn.wfLastTest': '前回のテスト',
'conn.wfTestPassed': '{time} 合格({n} ファイル)',
'conn.wfTestRunning': '{time} 実行中',
'conn.wfTestFailed': '{time} 不合格',
'wft.title': 'ワークフローをテスト',
'wft.connection': '対象接続',
'wft.costNote': 'テストは選択した ComfyUI に実際のジョブを投入し、VRAM と待ち時間を消費します。',
'wft.submit': 'テスト開始',
'wft.confirmTitle': '実行の確認',
'wft.confirmBody': '「{endpoint}」へ実際のジョブを 1 件投入します(現在のキュー {n} 件)。正しい種類のダウンロード可能な出力が 1 つ以上戻った場合のみ合格です。',
'wft.running': 'テスト中…',
'wft.cancel': 'テストを中止',
'wft.passed': 'テスト合格:{n} ファイル生成',
'wft.passedShort': '合格({n} ファイル)',
'wft.failed': 'テスト不合格',
'wft.failedShort': '不合格',
'wft.cancelledShort': '中止しました',
'wft.reusedToast': 'このワークフローはテスト実行中のため、そのジョブに接続しました',
'wft.history': 'テスト記録({n} 件)',
'wft.clear': 'テスト記録を消去',
'wft.cleared': 'テスト記録を消去しました',
'wft.never': '未テスト',
'wft.download': 'ダウンロード',
'wft.errRequired': '「{label}」を入力してください',
'wft.errListMin': '「{label}」は最低 {n} {unit} 必要です',
'tasks.testBadge': 'テスト',
'tasks.sourceWorkflowTest': 'ワークフローテスト',
// --- 生成台 (HEL-653) ---
'cdf.orig': '元の値 {v}',
'desk.title': '生成台',
'desk.advanced': '詳細パラメータ {n} 項目 · 変更しなければワークフローの値を使用',
'desk.chipResolution': '解像度 {v}',
'desk.chipSeconds': '{v} 秒',
'desk.chipSeed': 'シード {v}',
'desk.closeInspector': 'インスペクターを閉じる',
'desk.countActive': '{n} 件実行中',
'desk.countTakes': '{n} 件の記録',
'desk.ctxAsset': '{kind}「{name}」',
'desk.ctxShot': 'ショット {no}',
'desk.ctxBack': '{stage}に戻る',
'desk.ctxDismiss': '出典の表示を閉じる',
'desk.ctxFrom': '『{project}』から',
'desk.ctxNoBackfill': '結果は生成台の記録にのみ残り、{stage}へ自動で戻りません',
'desk.dayDate': '{m}月{d}日',
'desk.download': 'ダウンロード',
'desk.dropNoSlot': '{n} 件のファイルを入れる枠がありません:このワークフローにはその入力がありません',
'desk.dryRun': 'ドライラン',
'desk.durMin': '{m} 分 {s} 秒',
'desk.durSec': '{s} 秒',
'desk.elapsed': '所要時間',
'desk.emptyFailed': '失敗した記録はありません',
'desk.emptyFeed': 'まだ記録がありません。下にプロンプトを書いて「生成」を押してください。',
'desk.filterAria': '記録を絞り込む',
'desk.filterAll': 'すべて',
'desk.filterImage': '画像',
'desk.filterVideo': '動画',
'desk.filterFailed': '失敗',
'desk.generate': '生成',
'desk.genHint': '生成(Ctrl/⌘ + Enter)',
'desk.inputs': '入力',
'desk.inspector': 'インスペクター',
'desk.keyClose': '閉じる',
'desk.keyInspector': '表示 / 非表示',
'desk.keySelect': '選択',
'desk.keyUse': '使用',
'desk.kvCreated': '送信時刻',
'desk.kvName': '名前',
'desk.kvPromptId': 'ComfyUI タスク ID',
'desk.kvUsage': '用途',
'desk.loadEarlier': '過去の {n} 件を表示',
'desk.missingSub': '同じパラメータでやり直すか、この記録を削除できます',
'desk.missingTitle': '結果ファイルはサーバー上にありません',
'desk.needWorkflow': '不足:ワークフロー',
'desk.noConn': '未接続',
'desk.noPromptInput': 'このワークフローにはプロンプト入力がなく、元の値で生成します。',
'desk.notGenerated': '未生成',
'desk.noWorkflows': '使える画像 / 動画ワークフローがまだありません',
'desk.openInDesk': '生成台で調整',
'desk.openInDeskHint': 'このプロンプトで生成台を開き、ワークフローとパラメータを選びます。結果は生成台の記録に残ります',
'desk.openInspector': 'インスペクター',
'desk.origValue': 'ワークフローの値',
'desk.outputN': '結果 {n}',
'desk.outputs': 'すべての結果',
'desk.paramError': 'パラメータが不正です:{msg}',
'desk.paramsAll': 'すべてのパラメータ',
'desk.paramsChanged': 'パラメータ · {n} 項目変更',
'desk.paramsCommon': 'よく使うパラメータ',
'desk.pickTake': '記録を選ぶと結果を表示します',
'desk.pickWorkflow': 'ワークフローを選択',
'desk.promptOnly': 'プロンプトのみ',
'desk.promptPh': '欲しい画面を説明…(Ctrl/⌘ + Enter で生成、/ でフォーカス)',
'desk.restoreAll': 'すべてワークフローの値に戻す',
'desk.redo': '同じパラメータでやり直す',
'desk.removeRecord': '記録を削除',
'desk.restoreOrig': '元に戻す',
'desk.reuse': '再利用',
'desk.reuseToComposer': '入力台で再利用',
'desk.seedRandom': 'ランダム',
'desk.sendToSlot': '現在の画像枠へ送る',
'desk.sent': '送信済み',
'desk.sentToSlotToast': '現在のワークフローの画像枠へ送りました',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': 'サイズ',
'desk.stillNeed': '不足:{what}',
'desk.tabParams': 'パラメータ',
'desk.tabResult': '結果',
'desk.today': '今日',
'desk.took': '所要 {d}',
'desk.wfBroken': '使用不可',
'desk.wfCurrent': '現在',
'desk.wfDefaultConn': '既定の接続に従う',
'desk.wfImport': 'ワークフローを取り込む / 管理',
'desk.wfLastFailed': '前回失敗',
'desk.wfNoMatch': '一致するワークフローがありません',
'desk.wfOk': '使用可',
'desk.wfSearchPh': 'ワークフローや用途を検索:画像から動画、参照画像…',
'desk.wfTesting': 'テスト実行中',
'desk.wfUntested': '未テスト',
'desk.workflow': 'ワークフロー',
'desk.yesterday': '昨日',
};
+270 -8
View File
@@ -64,6 +64,7 @@ export const ko: Dict = {
// --- Toast ---
'toast.dismiss': '닫기',
'toast.undo': '실행 취소',
'toast.uploadFailed': '업로드 실패',
// --- Modal ---
@@ -1260,14 +1261,44 @@ export const ko: Dict = {
'shell.navConnections': 'ComfyUI 연결',
'shell.navModels': '모델 설정',
'shell.navSettings': '설정',
'shell.wip': '개발 중',
'shell.wipHint': '이 페이지는 준비 중이며 곧 열립니다',
'shell.comfy_ok': '{name} 연결됨',
'shell.comfy_fail': '{name} 연결 실패',
'shell.comfy_testing': '{name} 테스트 중…',
'shell.comfyUnset': 'ComfyUI · 미설정',
'shell.comfyManage': '「설정」에서 ComfyUI 주소를 설정하세요',
'shell.mobileNotice': '이 워크벤치는 데스크톱 브라우저(폭 768px 이상)에서 열어 주세요. 휴대폰은 아직 지원되지 않습니다.',
'shell.scopeHint': '프로젝트 전환',
'shell.scopeAll': '전체 프로젝트',
'shell.scopeAllList': '프로젝트 목록',
'shell.scopeRecent': '최근 프로젝트',
'shell.scopeLoadFailed': '프로젝트를 불러오지 못했습니다',
'shell.scopeEmpty': '아직 프로젝트가 없습니다 — 만들기',
'shell.scopeStage': '{n}/5 확정',
'shell.queueRunning': '{n}개 생성 중',
'shell.queueQueued': '{n}개 대기',
'shell.queueIdle': '대기열 비어 있음',
'shell.queueActive': '{n}개 진행 중',
'shell.trayTitle': '작업 트레이',
'shell.trayRecent': '최근 작업 · 클릭하면 전체 작업',
'shell.trayEmpty': '아직 생성 작업이 없습니다',
'shell.trayAll': '전체 작업 보기',
'shell.searchTitle': '페이지와 프로젝트 검색',
'shell.searchPlaceholder': '페이지, 프로젝트 검색',
'shell.searchShortcut': '검색 (Ctrl/⌘ + K)',
'shell.searchEmpty': '‘{q}’와 일치하는 페이지나 프로젝트가 없습니다',
'shell.searchGroupPages': '페이지',
'shell.searchGroupProjects': '프로젝트 · 워크벤치 열기',
'shell.searchHintMove': '선택',
'shell.searchHintOpen': '열기',
'shell.searchHintClose': '닫기',
'shell.reduceMotion': '동작 줄이기',
'shell.reduceHint': '이동·확대·발광 애니메이션을 끄고 짧은 페이드만 남깁니다',
'shell.reduceSystem': '시스템의 ‘동작 줄이기’ 설정을 따르는 중',
'shell.tabAria': '주 탐색 (좁은 화면)',
'shell.tabProjects': '프로젝트',
'shell.tabCreate': '창작',
'shell.tabGenerate': '생성',
'shell.tabMore': '더보기',
'shell.morePages': '더 많은 페이지',
'shell.moreTools': '도구',
'home.title': '프로젝트 개요',
'home.subtitle': '창작 프로젝트를 관리하세요 — 아이디어나 완성된 대본으로 시작할 수 있습니다.',
'home.projectCount': '프로젝트 {n}개 · 진행 중 {m}개',
@@ -1398,6 +1429,54 @@ export const ko: Dict = {
'conn.wfJsonInvalid': '유효한 API 형식 JSON이 아닙니다(노드 ID → {{…class_type…}} 객체 필요)',
'conn.wfJsonPh': '여기에 ComfyUI API 형식 JSON을 붙여넣거나 오른쪽 버튼으로 파일을 선택하세요',
'conn.wfDeleted': '워크플로가 삭제되었습니다',
'conn.wfImportedBroken': 'Imported, but the workflow file is incomplete and must be re-exported before generating: {detail}',
'conn.wfBrokenBadge': 'Incomplete file — cannot generate',
// --- Five usages & import confirmation (HEL-636) ---
'usage.text2image': 'Text → Image',
'usage.image2image': 'Image → Image',
'usage.text2video': 'Text → Video',
'usage.image2video': 'Image → Video',
'usage.ref2video': 'Reference → Video',
'usage.pending': 'Usage pending',
'wfRole.image': 'Input image',
'wfRole.first_frame': 'First frame',
'wfRole.last_frame': 'Last frame',
'wfRole.reference_image': 'Reference',
'wfRole.mask': 'Mask',
'conn.wfImportAction': 'Import workflow',
'conn.wfConfirmTitle': 'Confirm detection',
'conn.wfStepAnalyze': 'Paste & analyze',
'conn.wfStepConfirm': 'Confirm & save',
'conn.wfChooseFile': 'Choose file',
'conn.wfAnalyze': 'Analyze',
'conn.wfAnalyzing': 'Analyzing…',
'conn.wfConfirmHint': 'Review the evidence, output nodes and image slots; correct the usage or slot roles before saving.',
'conn.wfUsageLabel': 'Usage',
'conn.wfUsageAuto': 'Auto-detected: {usage}',
'conn.wfUsageNeedPick': 'Pick manually',
'conn.wfPickUsage': 'Choose a usage first',
'conn.wfSlotsLabel': 'Image slots',
'conn.wfSlotsHint': 'Roles are inferred from wiring; override them (input image / first / last frame / reference / mask) and the manual choice sticks.',
'conn.wfBack': 'Back',
'conn.wfConfirmSave': 'Confirm & save',
'conn.wfImportedWithUsage': 'Saved as “{usage}” with {n} fillable parameters',
'conn.wfPendingCount': '{n} pending',
'conn.wfConfirmed': 'Usage confirmed: {usage} — the workflow can generate now',
'conn.wfSourceUser': 'Usage set manually; re-analysis will not overwrite it',
'conn.wfSourceAuto': 'Usage auto-detected',
'conn.wfDisabledBadge': 'Disabled',
'conn.wfConfirmAria': 'Confirm workflow usage',
'conn.wfOutputLabel': '출력 노드',
'conn.wfOutputNeedPick': '인식할 수 없는 사용자 지정 출력 노드가 있습니다. 직접 지정하세요',
'conn.wfOutputHint': '실제 결과를 내는 노드를 체크하고 각각의 미디어 유형을 선택하세요. 생성 시 이 노드에서만 이미지/동영상을 수집합니다.',
'conn.wfOutputPick': '출력 노드를 하나 이상 체크하세요',
'conn.wfOutputKindAria': '출력 노드 미디어 유형',
'conn.wfOutputPendingBadge': '출력 미지정',
'conn.wfOutputNeedMap': '인식할 수 없는 출력 노드가 포함되어 있습니다. 노드와 미디어 유형을 지정하면 활성화됩니다',
'conn.wfOutputApply': '출력 매핑 저장',
'conn.wfMapCancel': '취소',
'conn.wfOutputApplied': '출력 매핑 저장됨: 노드 {nodes}',
'conn.wfOutputCleared': '출력 매핑이 삭제되었습니다. 워크플로가 다시 대기 상태가 됩니다',
'conn.missingMaterial': 'Qwen Image 2.1 전용 워크플로 JSON이 아직 저장소에 없습니다. ComfyUI에서 내보내 여기서 가져오세요. 범용 가져오기 경로는 준비되어 있습니다.',
// --- 독립 이미지/비디오 생성 (a3/a4, HEL-612) ---
@@ -1408,13 +1487,11 @@ export const ko: Dict = {
'studio.genParams': '생성 매개변수',
'studio.modeTextToImage': '텍스트→이미지',
'studio.modeTextToVideo': '텍스트→영상',
'studio.chipIdle': '{name} · 대기열 비어 있음',
'studio.chipBusy': '{name} · 대기열 {n}건',
'studio.video.resultsTitle': '미리보기',
'studio.image.historyTitle': '이미지 생성 기록',
'studio.video.historyTitle': '영상 생성 기록',
'studio.historyCount': '총 {n}회',
'studio.lastDone': '최근 완료 · {time}',
'studio.doneAt': '완료 {time}',
'studio.kindImageText': '이미지',
'studio.kindVideoText': '비디오',
'studio.loading': '불러오는 중…',
@@ -1499,10 +1576,45 @@ export const ko: Dict = {
'studio.wfNoParamsNote': '이 워크플로에는 채울 매개변수가 없어 내장 프롬프트와 설정으로 실행됩니다. 여기서 입력하려면 ComfyUI에서 노드 제목에 (Input:prompt) 등을 붙인 뒤 다시 가져오세요.',
'studio.wfAutoParamsNote': '(Input:…) 제목 태그가 없어 노드 유형으로 매개변수 {n}개를 자동 감지했습니다. 빈 칸은 워크플로 값을 유지합니다.',
'studio.promptNotDeclared': '이 워크플로에는 프롬프트 노드가 없습니다',
'studio.modeImageEdit': 'Image edit',
'studio.modeImageToVideo': 'Image to video',
'studio.modeRefToVideo': 'Reference to video',
'studio.slotInput': 'Input image',
'studio.slotHintOne': 'Required · 1 image',
'studio.slotEmptyInput': 'Click or drop the input image',
'studio.slotEmptyFirst': 'Click or drop the first frame',
'studio.slotEmptySub': 'PNG / JPG / WebP · ≤ 20MB each',
'studio.slotFromResultsShort': 'From results',
'studio.errImageFormat': '"{name}" is not supported — use PNG / JPG / WebP; this file will not be used',
'studio.errImageSize': '"{name}" is larger than 20MB — compress it and upload again',
'studio.errNeedInputImage': 'Image edit needs an input image',
'studio.errNeedFirstFrame': 'Image to video needs a first frame',
'studio.errNeedRef': 'Reference to video needs at least 1 reference image',
'studio.errRefMax': 'At most {max} reference images: {n} selected, these {k} were not added',
'studio.refHint': 'Required · 1–{max} · {n} selected',
'studio.refAdd': 'Add reference image',
'studio.refAddSub': '{n} more · max {max}',
'studio.refReplace': 'Replace',
'studio.refRemove': 'Remove reference {n}',
'studio.refRejectedShort': 'Not added',
'studio.refFull': 'Limit of {max} reached — remove one to add another',
'studio.refStrip': 'Reference images ({n} used)',
'studio.resolutionLabel': 'Output resolution',
'studio.resolutionHint': 'About {v}×{v} px, keeps the input aspect; 0 = original size',
'studio.wfBrokenTitle': 'This workflow file is incomplete — ComfyUI cannot run it, generation is blocked',
'studio.wfBrokenHint': 'Re-export the API-format JSON from a ComfyUI that has the custom nodes installed, then import it again under ComfyUI connections.',
'studio.errWfBroken': 'Workflow file is incomplete — re-export it before generating',
'studio.cancelToast': '취소를 요청했습니다',
'studio.deleteBtn': '삭제',
'studio.delTitle': '작업 기록 삭제',
'studio.delConfirm': '결과 파일도 함께 삭제되며 기록은 복구할 수 없습니다. 삭제할까요?',
'studio.delConfirm': '삭제 시 이 작업의 결과 파일도 함께 제거되며 기록은 복구할 수 없습니다. 삭제할까요?',
'studio.delTitleJob': '작업 «{name}» 삭제',
'studio.delConfirmMulti': '이 작업에는 결과가 {n}개 있습니다. 삭제하면 작업 기록과 결과 파일 {n}개 모두 제거되며 복구할 수 없습니다. 삭제할까요?',
'studio.deleteFailedToast': '삭제 실패: {detail}',
'studio.deletedTakeNoFilesToast': '\'{name}\' 기록을 삭제했습니다',
'studio.deletedTakeToast': '\'{name}\' 기록과 결과 파일을 삭제했습니다',
'studio.deletedToast': '작업과 결과 파일을 삭제했습니다',
'studio.wfDeletedTag': '삭제된 워크플로',
'studio.wfEmptyTitle': '{kind} 워크플로가 아직 없습니다',
'studio.wfEmptyBody': 'ComfyUI 개발자 모드를 켜고 API 형식 JSON으로 내보낸 뒤, ComfyUI 연결 페이지에서 {kind}(으)로 가져오세요.',
'studio.wfEmptyGo': 'ComfyUI 연결에서 가져오기',
@@ -1521,9 +1633,12 @@ export const ko: Dict = {
'tasks.subtitle': '독립 이미지·독립 비디오·창작 흐름의 이미지/비디오 작업 모아 보기',
'tasks.filterAll': '전체',
'tasks.filterImage': '이미지',
'tasks.filterFailed': '실패',
'tasks.filterActive': '진행 중',
'tasks.filterVideo': '비디오',
'tasks.count': '{n}건 · 진행 중 {m}건',
'tasks.empty': '생성 작업이 아직 없습니다. 이미지/비디오 생성에서 첫 작업을 제출하세요.',
'tasks.emptyFiltered': '현재 필터에 일치하는 작업이 없습니다.',
'tasks.goGenerate': '이미지 생성 열기',
'tasks.sourceStudioImage': '독립 이미지',
'tasks.sourceStudioVideo': '독립 비디오',
@@ -1537,8 +1652,10 @@ export const ko: Dict = {
'tasks.retry': '재시도',
'tasks.cancel': '취소',
'tasks.delete': '삭제',
'tasks.download': '다운로드',
'tasks.delTitle': '작업 삭제',
'tasks.delConfirm': '결과 파일도 함께 삭제됩니다. 삭제할까요?',
'tasks.searchPh': '작업 검색…',
'tasks.outputs': '결과 {n}개',
'agentsPage.title': '에이전트',
@@ -1768,6 +1885,8 @@ export const ko: Dict = {
'jobst.dryRunDetail': '자리표시자만: Dry-run이 켜져 있어 ComfyUI를 호출하지 않았습니다',
'jobst.noOutput': '출력 없음',
'jobst.noOutputDetail': '결과 파일 없이 끝났습니다 — 생성 완료가 아닙니다',
'jobst.missing': '파일 없음',
'jobst.missingDetail': '작업은 성공했지만 결과 파일이 서버에 없습니다',
'jobst.queued': '대기 중',
'jobst.queuedDetail': '워크벤치 대기열에서 ComfyUI 전송을 기다리는 중',
'jobst.connecting': '연결 중',
@@ -1796,4 +1915,147 @@ export const ko: Dict = {
'studio.doneToast': '완료: 파일 {n}개 (ComfyUI 프롬프트 ID {id})',
'studio.dryRunToast': '자리표시자만: Dry-run이 켜져 있어 ComfyUI를 호출하지 않았습니다',
'studio.dryRunNote': 'Dry-run이 켜져 있습니다: 생성은 자리표시자만 쓰고 ComfyUI를 호출하지 않습니다. 설정에서 끌 수 있습니다.',
// --- HEL-643: 가져오기 검사 / 실제 테스트 / 미디어 그룹 ---
'studio.errVideoFormat': '«{name}»은(는) 지원하지 않는 동영상 형식입니다. MP4 / WebM / MOV를 사용하세요',
'studio.errAudioFormat': '«{name}»은(는) 지원하지 않는 오디오 형식입니다. MP3 / WAV / M4A를 사용하세요',
'studio.errMediaSize': '«{name}»이(가) 크기 제한을 초과합니다. 먼저 압축하세요',
'studio.errNeedRefMedia': '«{label}»에 최소 {n}개가 필요합니다',
'studio.refHintMedia': '필수 · 1–{max}개 · 선택 {n}',
'studio.refAddMedia': '{kind} 추가',
'studio.refAddSubMedia': '{n}개 더 · 최대 {max}',
'studio.refRemoveMedia': '{kind} {n} 제거',
'studio.refFullMedia': '최대 {max}개에 도달했습니다. 제거 후 추가하세요',
'wfMedia.h3Limits': 'MiniMax H3 Ref2VA 공식 한도: 참조 이미지 최대 9장, 참조 영상 3개, 참조 오디오 3개. 클립당 2–15초이며 유형별 총합 15초 이하. 오디오만 단독 참조는 불가. 참조 파일은 총 12개까지.',
'wfMedia.h3TotalOver': '참조 파일이 {n}개로 공식 한도 12를 초과했습니다. 생성이 실패할 수 있습니다',
'wfMedia.h3AudioAlone': '오디오만 단독 참조가 될 수 없습니다. 참조 이미지 또는 영상을 1개 이상 추가하세요',
'conn.wfCheckTitle': '연결 호환성 검사',
'conn.wfCheckEndpoint': '대상: {name}',
'conn.wfCheckBtn': '다시 검사',
'conn.wfChecking': '검사 중…',
'conn.wfCheckOk': '이 연결은 이 워크플로에 필요한 노드와 모델을 갖추고 있습니다',
'conn.wfCheckProblems': '누락된 노드/모델 {n}개를 발견했습니다',
'conn.wfCheckUnreachable': '확인할 수 없습니다(ComfyUI 연결 불가). 저장은 가능하며 연결을 고친 뒤 다시 검사하세요',
'conn.wfCheckSaveHint': '초안은 저장할 수 있습니다(생성 가능으로 표시되지 않음). 누락 항목을 설치한 뒤 다시 검사하세요.',
'conn.wfTestBtn': '테스트',
'conn.wfLastTest': '마지막 테스트',
'conn.wfTestPassed': '{time} 통과({n}개 파일)',
'conn.wfTestRunning': '{time} 진행 중',
'conn.wfTestFailed': '{time} 실패',
'wft.title': '워크플로 테스트',
'wft.connection': '대상 연결',
'wft.costNote': '테스트는 선택한 ComfyUI에 실제 작업을 1건 보내 VRAM과 대기열을 사용합니다.',
'wft.submit': '테스트 시작',
'wft.confirmTitle': '실제 실행 확인',
'wft.confirmBody': '«{endpoint}»에 실제 작업 1건을 제출합니다(현재 대기열 {n}건). 올바른 유형의 다운로드 가능한 출력이 1개 이상 돌아와야 통과입니다.',
'wft.running': '테스트 중…',
'wft.cancel': '테스트 취소',
'wft.passed': '테스트 통과: 파일 {n}개 생성',
'wft.passedShort': '통과({n}개 파일)',
'wft.failed': '테스트 실패',
'wft.failedShort': '실패',
'wft.cancelledShort': '취소됨',
'wft.reusedToast': '이 워크플로는 이미 테스트 진행 중입니다. 해당 작업에 연결했습니다',
'wft.history': '테스트 기록({n}건)',
'wft.clear': '테스트 기록 삭제',
'wft.cleared': '테스트 기록을 삭제했습니다',
'wft.never': '테스트 이력 없음',
'wft.download': '다운로드',
'wft.errRequired': '«{label}»을(를) 입력하세요',
'wft.errListMin': '«{label}»에 최소 {n}{unit}이(가) 필요합니다',
'tasks.testBadge': '테스트',
'tasks.sourceWorkflowTest': '워크플로 테스트',
// --- 生成台 (HEL-653) ---
'cdf.orig': '원래 값 {v}',
'desk.title': '생성대',
'desk.advanced': '고급 매개변수 {n}개 · 바꾸지 않으면 워크플로 값을 사용',
'desk.chipResolution': '해상도 {v}',
'desk.chipSeconds': '{v}초',
'desk.chipSeed': '시드 {v}',
'desk.closeInspector': '인스펙터 닫기',
'desk.countActive': '{n}개 진행 중',
'desk.countTakes': '기록 {n}개',
'desk.ctxAsset': '{kind} 「{name}」',
'desk.ctxShot': '샷 {no}',
'desk.ctxBack': '{stage}(으)로 돌아가기',
'desk.ctxDismiss': '출처 안내 닫기',
'desk.ctxFrom': '《{project}》에서',
'desk.ctxNoBackfill': '결과는 생성대 기록에만 남고 {stage}에 자동으로 반영되지 않습니다',
'desk.dayDate': '{m}월 {d}일',
'desk.download': '다운로드',
'desk.dropNoSlot': '파일 {n}개를 넣을 슬롯이 없습니다: 이 워크플로에는 해당 입력이 없습니다',
'desk.dryRun': '드라이런',
'desk.durMin': '{m}분 {s}초',
'desk.durSec': '{s}초',
'desk.elapsed': '소요 시간',
'desk.emptyFailed': '실패한 기록이 없습니다',
'desk.emptyFeed': '아직 기록이 없습니다. 아래에 프롬프트를 쓰고 「생성」을 누르세요.',
'desk.filterAria': '기록 필터',
'desk.filterAll': '전체',
'desk.filterImage': '이미지',
'desk.filterVideo': '동영상',
'desk.filterFailed': '실패',
'desk.generate': '생성',
'desk.genHint': '생성 (Ctrl/⌘ + Enter)',
'desk.inputs': '입력',
'desk.inspector': '인스펙터',
'desk.keyClose': '닫기',
'desk.keyInspector': '표시 / 숨기기',
'desk.keySelect': '선택',
'desk.keyUse': '사용',
'desk.kvCreated': '제출 시각',
'desk.kvName': '이름',
'desk.kvPromptId': 'ComfyUI 작업 ID',
'desk.kvUsage': '용도',
'desk.loadEarlier': '이전 {n}개 표시',
'desk.missingSub': '같은 설정으로 다시 만들거나 이 기록을 제거할 수 있습니다',
'desk.missingTitle': '결과 파일이 서버에 없습니다',
'desk.needWorkflow': '부족: 워크플로',
'desk.noConn': '연결 안 됨',
'desk.noPromptInput': '이 워크플로에는 프롬프트 입력이 없어 원래 값으로 생성합니다.',
'desk.notGenerated': '생성 안 됨',
'desk.noWorkflows': '사용할 수 있는 이미지 / 동영상 워크플로가 아직 없습니다',
'desk.openInDesk': '생성대에서 조정',
'desk.openInDeskHint': '이 프롬프트로 생성대를 열고 워크플로와 매개변수를 직접 고릅니다. 결과는 생성대 기록에 남습니다',
'desk.openInspector': '인스펙터',
'desk.origValue': '워크플로 값',
'desk.outputN': '결과 {n}',
'desk.outputs': '모든 결과',
'desk.paramError': '잘못된 매개변수: {msg}',
'desk.paramsAll': '모든 매개변수',
'desk.paramsChanged': '매개변수 · {n}개 변경',
'desk.paramsCommon': '자주 쓰는 매개변수',
'desk.pickTake': '기록을 선택하면 결과가 표시됩니다',
'desk.pickWorkflow': '워크플로 선택',
'desk.promptOnly': '프롬프트만',
'desk.promptPh': '원하는 장면을 설명… (Ctrl/⌘ + Enter 생성, / 포커스)',
'desk.restoreAll': '모두 워크플로 값으로 되돌리기',
'desk.redo': '같은 설정으로 다시 생성',
'desk.removeRecord': '기록 제거',
'desk.restoreOrig': '원래 값으로',
'desk.reuse': '재사용',
'desk.reuseToComposer': '입력대에서 재사용',
'desk.seedRandom': '무작위',
'desk.sendToSlot': '현재 이미지 슬롯으로 보내기',
'desk.sent': '제출됨',
'desk.sentToSlotToast': '현재 워크플로의 이미지 슬롯으로 보냈습니다',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': '크기',
'desk.stillNeed': '부족: {what}',
'desk.tabParams': '매개변수',
'desk.tabResult': '결과',
'desk.today': '오늘',
'desk.took': '소요 {d}',
'desk.wfBroken': '사용 불가',
'desk.wfCurrent': '현재',
'desk.wfDefaultConn': '기본 연결 따름',
'desk.wfImport': '워크플로 가져오기 / 관리',
'desk.wfLastFailed': '지난번 실패',
'desk.wfNoMatch': '일치하는 워크플로가 없습니다',
'desk.wfOk': '사용 가능',
'desk.wfSearchPh': '워크플로나 용도 검색: 이미지→동영상, 참조 이미지…',
'desk.wfTesting': '테스트 실행 중',
'desk.wfUntested': '테스트 안 함',
'desk.workflow': '워크플로',
'desk.yesterday': '어제',
};
+279 -16
View File
@@ -64,6 +64,7 @@ export const zh: Dict = {
// --- Toast ---
'toast.dismiss': '关闭',
'toast.undo': '撤销',
'toast.uploadFailed': '上传失败',
// --- Modal ---
@@ -1262,14 +1263,44 @@ export const zh: Dict = {
'shell.navConnections': 'ComfyUI 连接',
'shell.navModels': '模型设置',
'shell.navSettings': '设置',
'shell.wip': '开发中',
'shell.wipHint': '该页面正在开发中,稍后开放',
'shell.comfy_ok': '{name} 已连接',
'shell.comfy_fail': '{name} 连接失败',
'shell.comfy_testing': '{name} 测试中…',
'shell.comfyUnset': 'ComfyUI · 未配置',
'shell.comfyManage': '管理 ComfyUI 连接',
'shell.mobileNotice': '请用桌面浏览器(宽 768px 以上)打开影工坊,手机端暂不适配。',
'shell.scopeHint': '切换项目',
'shell.scopeAll': '全部项目',
'shell.scopeAllList': '全部项目列表',
'shell.scopeRecent': '最近项目',
'shell.scopeLoadFailed': '项目列表加载失败',
'shell.scopeEmpty': '还没有项目,去创建',
'shell.scopeStage': '已确认 {n}/5',
'shell.queueRunning': '{n} 个生成中',
'shell.queueQueued': '{n} 个排队',
'shell.queueIdle': '队列空闲',
'shell.queueActive': '{n} 个进行中',
'shell.trayTitle': '任务托盘',
'shell.trayRecent': '最近任务 · 点击查看全部任务',
'shell.trayEmpty': '还没有生成任务',
'shell.trayAll': '查看全部任务',
'shell.searchTitle': '搜索页面和项目',
'shell.searchPlaceholder': '搜索页面、项目',
'shell.searchShortcut': '搜索(Ctrl/⌘ + K)',
'shell.searchEmpty': '没有找到与「{q}」相关的页面或项目',
'shell.searchGroupPages': '页面',
'shell.searchGroupProjects': '项目 · 打开创作工作台',
'shell.searchHintMove': '选择',
'shell.searchHintOpen': '打开',
'shell.searchHintClose': '关闭',
'shell.reduceMotion': '减少动态',
'shell.reduceHint': '关闭位移、缩放和光晕动画,只保留短暂淡入淡出',
'shell.reduceSystem': '已跟随系统的「减少动态效果」设置',
'shell.tabAria': '主导航(窄屏)',
'shell.tabProjects': '项目',
'shell.tabCreate': '创作',
'shell.tabGenerate': '生成',
'shell.tabMore': '更多',
'shell.morePages': '更多页面',
'shell.moreTools': '工具',
'home.title': '项目总览',
'home.subtitle': '管理创作项目,从一个创意或一份现成剧本开始。',
'home.projectCount': '{n} 个项目 · {m} 个进行中',
@@ -1379,7 +1410,7 @@ export const zh: Dict = {
'conn.noticeStrong': '连通性以服务器为准:',
'conn.noticeBody': '地址在浏览器能打开不代表生成可用;测试与生成请求都由运行影工坊的服务器发起。令牌仅存服务端。',
'conn.wfTitle': '工作流库',
'conn.wfHint': '导入 ComfyUI 的 API 格式 JSON,分类为图片 / 视频,并绑定到某个连接',
'conn.wfHint': '导入 ComfyUI 的 API 格式 JSON,自动判定五类用途,并绑定到某个连接',
'conn.wfEmpty': '还没有导入工作流。在 ComfyUI 里启用开发者模式,用「导出(API 格式)」得到 JSON 后粘贴导入。',
'conn.wfCount': '{n} 个工作流 · {m} 图片 · {k} 视频',
'conn.wfKindImage': '图片',
@@ -1391,14 +1422,62 @@ export const zh: Dict = {
'conn.wfImporting': '导入中…',
'conn.wfNodes': '{n} 个节点',
'conn.wfImportedN': '工作流已导入,识别到 {n} 个可填参数',
'conn.wfImportedNoParams': '工作流已导入,但没有识别到可填参数:生成时将按工作流内置设置运行',
'conn.wfImportFailed': '导入失败:{detail}',
'conn.wfImportTitle': '导入 ComfyUI 工作流(API 格式 JSON)',
'conn.wfImportHint': '粘贴或选择文件;名称必填,分类决定它出现在生图还是生视频窗口。',
'conn.wfJsonInvalid': '不是有效的 API 格式 JSON(应为节点 id 到 class_type 的对象)',
'conn.wfJsonPh': '在此粘贴 ComfyUI 导出的 API 格式 JSON,或点右侧按钮选择文件',
'conn.wfDeleted': '工作流已删除',
'conn.missingMaterial': 'Qwen Image 2.1 的专用工作流 JSON 仓库中暂缺:请从 ComfyUI 导出后在此导入,通用导入通道已就绪。',
'conn.wfImportedNoParams': '工作流已导入,但没有识别到可填参数:生成时将按工作流内置设置运行',
'conn.wfImportFailed': '导入失败:{detail}',
'conn.wfImportTitle': '导入 ComfyUI 工作流(API 格式 JSON)',
'conn.wfImportHint': '粘贴或选择文件并点「分析」;系统按输出节点和图片槽位判定五类用途,确认后保存。',
'conn.wfJsonInvalid': '不是有效的 API 格式 JSON(应为节点 id 到 class_type 的对象)',
'conn.wfJsonPh': '在此粘贴 ComfyUI 导出的 API 格式 JSON,或点右侧按钮选择文件',
'conn.wfDeleted': '工作流已删除',
'conn.wfImportedBroken': '已导入,但工作流文件不完整,生成前需重新导出:{detail}',
'conn.wfBrokenBadge': '文件不完整,无法生成',
// --- 五类用途与导入确认(HEL-636)---
'usage.text2image': '文生图',
'usage.image2image': '图生图',
'usage.text2video': '文生视频',
'usage.image2video': '图生视频',
'usage.ref2video': '参考图生视频',
'usage.pending': '用途待确认',
'wfRole.image': '输入图',
'wfRole.first_frame': '首帧',
'wfRole.last_frame': '尾帧',
'wfRole.reference_image': '参考图',
'wfRole.mask': '遮罩',
'conn.wfImportAction': '导入工作流',
'conn.wfConfirmTitle': '确认识别结果',
'conn.wfStepAnalyze': '粘贴分析',
'conn.wfStepConfirm': '确认保存',
'conn.wfChooseFile': '选择文件',
'conn.wfAnalyze': '分析',
'conn.wfAnalyzing': '分析中…',
'conn.wfConfirmHint': '核对判定依据、输出节点与图片槽位;用途或槽位不对可在此纠正后再保存。',
'conn.wfUsageLabel': '用途',
'conn.wfUsageAuto': '自动判定:{usage}',
'conn.wfUsageNeedPick': '需人工选择',
'conn.wfPickUsage': '请先选择工作流用途',
'conn.wfSlotsLabel': '图片槽位',
'conn.wfSlotsHint': '槽位角色按连线推断;不符时可改为输入图 / 首帧 / 尾帧 / 参考图 / 遮罩,保存后以人工选择为准。',
'conn.wfBack': '上一步',
'conn.wfConfirmSave': '确认保存',
'conn.wfImportedWithUsage': '已保存为「{usage}」,识别到 {n} 个可填参数',
'conn.wfPendingCount': '{n} 个待确认',
'conn.wfConfirmed': '已确认用途:{usage},工作流已可生成',
'conn.wfSourceUser': '用途为人工确认,重新分析不会覆盖',
'conn.wfSourceAuto': '用途为自动判定',
'conn.wfDisabledBadge': '已停用',
'conn.wfConfirmAria': '确认工作流用途',
'conn.wfOutputLabel': '输出节点',
'conn.wfOutputNeedPick': '存在无法识别的自定义输出节点,需人工指定',
'conn.wfOutputHint': '勾选实际产生结果的节点,并为每个节点选择媒体类型;生成时只从这些节点提取图片/视频。',
'conn.wfOutputPick': '请至少勾选一个输出节点',
'conn.wfOutputKindAria': '输出节点媒体类型',
'conn.wfOutputPendingBadge': '待指定输出',
'conn.wfOutputNeedMap': '该工作流含无法识别的输出节点,指定输出节点及媒体类型后才能启用',
'conn.wfOutputApply': '保存输出映射',
'conn.wfMapCancel': '取消',
'conn.wfOutputApplied': '已保存输出映射:节点 {nodes}',
'conn.wfOutputCleared': '已清除输出映射,工作流回到待确认状态',
'conn.missingMaterial': 'Qwen Image 2.1 的专用工作流 JSON 仓库中暂缺:请从 ComfyUI 导出后在此导入,通用导入通道已就绪。',
// --- 独立生图 / 生视频(a3/a4,HEL-612)---
'studio.image.title': '生图',
'studio.image.subtitle': '用已导入的图片工作流生成图片 · 连接与队列和「ComfyUI 连接」共用',
@@ -1407,13 +1486,11 @@ export const zh: Dict = {
'studio.genParams': '生成参数',
'studio.modeTextToImage': '文生图',
'studio.modeTextToVideo': '文生视频',
'studio.chipIdle': '{name} · 队列空闲',
'studio.chipBusy': '{name} · 队列 {n} 个任务',
'studio.video.resultsTitle': '成片预览',
'studio.image.historyTitle': '生图历史',
'studio.video.historyTitle': '生视频历史',
'studio.historyCount': '共 {n} 次',
'studio.lastDone': '最近完成 · {time}',
'studio.doneAt': '完成于 {time}',
'studio.kindImageText': '图片',
'studio.kindVideoText': '视频',
'studio.loading': '正在加载…',
@@ -1498,10 +1575,46 @@ export const zh: Dict = {
'studio.wfNoParamsNote': '该工作流没有可填写的参数,将按工作流内置的提示词和设置直接生成。如需在这里填写,请在 ComfyUI 中把节点标题加上 (Input:prompt) 等标记后重新导入。',
'studio.wfAutoParamsNote': '工作流未使用 (Input:…) 标题标记,已按节点类型自动识别出 {n} 个参数;留空的项沿用工作流原值。',
'studio.promptNotDeclared': '该工作流没有提示词节点,无需填写',
// --- 图片输入工作流(HEL-633,ref-upload-spec)---
'studio.modeImageEdit': '图片编辑',
'studio.modeImageToVideo': '图生视频',
'studio.modeRefToVideo': '参考生视频',
'studio.slotInput': '输入图',
'studio.slotHintOne': '必填 · 1 张',
'studio.slotEmptyInput': '点击或拖入输入图',
'studio.slotEmptyFirst': '点击或拖入首帧图',
'studio.slotEmptySub': 'PNG / JPG / WebP · 单张 ≤ 20MB',
'studio.slotFromResultsShort': '从结果选',
'studio.errImageFormat': '「{name}」格式不支持,请使用 PNG / JPG / WebP;该文件不会参与生成',
'studio.errImageSize': '「{name}」超过 20MB,请压缩后再传',
'studio.errNeedInputImage': '图片编辑需要上传输入图',
'studio.errNeedFirstFrame': '图生视频需要上传首帧图',
'studio.errNeedRef': '参考生视频需要至少 1 张参考图',
'studio.errRefMax': '参考图最多 {max} 张:已选 {n} 张,本次的 {k} 张未添加',
'studio.refHint': '必填 · 1–{max} 张 · 已选 {n}',
'studio.refAdd': '添加参考图',
'studio.refAddSub': '还可加 {n} 张 · 上限 {max}',
'studio.refReplace': '替换',
'studio.refRemove': '移除参考图 {n}',
'studio.refRejectedShort': '未添加',
'studio.refFull': '已达上限 {max} 张,移除后才能再添加',
'studio.refStrip': '参考图({n} 张参与生成)',
'studio.resolutionLabel': '输出分辨率',
'studio.resolutionHint': '约 {v}×{v} 像素,按输入图比例;0 = 保持原尺寸',
'studio.wfBrokenTitle': '该工作流文件不完整,ComfyUI 无法执行,已禁止生成',
'studio.wfBrokenHint': '请在已安装对应自定义节点的 ComfyUI 中重新导出 API 格式 JSON,再到「ComfyUI 连接」重新导入。',
'studio.errWfBroken': '工作流文件不完整,需重新导出后才能生成',
'studio.cancelToast': '已发送取消请求',
'studio.deleteBtn': '删除',
'studio.delTitle': '删除任务记录',
'studio.delConfirm': '删除后该任务的结果文件会一并移除,历史不可恢复。确定删除?',
'studio.delTitleJob': '删除任务「{name}」',
'studio.delConfirmMulti': '该任务共生成 {n} 个结果,删除将移除整条任务记录及其全部 {n} 个结果文件,历史不可恢复。确定删除?',
'studio.deleteFailedToast': '删除失败:{detail}',
'studio.deletedTakeNoFilesToast': '已删除「{name}」这条记录',
'studio.deletedTakeToast': '已删除「{name}」这条记录及其结果文件',
'studio.deletedToast': '已删除该任务及其结果文件',
'studio.wfDeletedTag': '工作流已删除',
'studio.wfEmptyTitle': '还没有{kind}工作流',
'studio.wfEmptyBody': '在 ComfyUI 里启用开发者模式,用「导出(API 格式)」得到 JSON,再到「ComfyUI 连接」页导入并分类为{kind}。',
'studio.wfEmptyGo': '去「ComfyUI 连接」导入',
@@ -1520,9 +1633,12 @@ export const zh: Dict = {
'tasks.subtitle': '汇总独立生图、独立生视频与创作流程内的图片 / 视频任务',
'tasks.filterAll': '全部',
'tasks.filterImage': '图片',
'tasks.filterFailed': '失败',
'tasks.filterActive': '进行中',
'tasks.filterVideo': '视频',
'tasks.count': '{n} 个任务 · {m} 个进行中',
'tasks.empty': '还没有生成任务。到「生图」「生视频」提交第一个任务。',
'tasks.emptyFiltered': '没有符合筛选的任务。',
'tasks.goGenerate': '去生图',
'tasks.sourceStudioImage': '独立生图',
'tasks.sourceStudioVideo': '独立生视频',
@@ -1536,8 +1652,10 @@ export const zh: Dict = {
'tasks.retry': '重试',
'tasks.cancel': '取消',
'tasks.delete': '删除',
'tasks.download': '下载',
'tasks.delTitle': '删除任务',
'tasks.delConfirm': '删除后该任务的结果文件会一并移除。确定删除?',
'tasks.searchPh': '搜索任务…',
'tasks.outputs': '{n} 个结果',
'agentsPage.title': '智能体',
@@ -1767,6 +1885,8 @@ export const zh: Dict = {
'jobst.dryRunDetail': '占位结果:当前开启了 Dry-run,没有调用 ComfyUI,不是真实生成',
'jobst.noOutput': '无产出',
'jobst.noOutputDetail': '任务结束但没有任何结果文件,不算生成完成',
'jobst.missing': '文件缺失',
'jobst.missingDetail': '生成成功,但结果文件已不在服务器上',
'jobst.queued': '排队中',
'jobst.queuedDetail': '在工作台队列中等待提交到 ComfyUI',
'jobst.connecting': '连接中',
@@ -1795,4 +1915,147 @@ export const zh: Dict = {
'studio.doneToast': '生成完成:{n} 个文件(ComfyUI 任务 ID {id})',
'studio.dryRunToast': '占位完成:当前开启了 Dry-run,没有调用 ComfyUI,结果不是真实生成',
'studio.dryRunNote': '已开启 Dry-run:点生成只会写占位文件,不会调用 ComfyUI。可在「设置」中关闭。',
// --- HEL-643: workflow import check / real test / media groups ---
'studio.errVideoFormat': '「{name}」不是支持的视频格式,请使用 MP4 / WebM / MOV',
'studio.errAudioFormat': '「{name}」不是支持的音频格式,请使用 MP3 / WAV / M4A',
'studio.errMediaSize': '「{name}」超过大小限制,请压缩后再传',
'studio.errNeedRefMedia': '「{label}」需要至少 {n} 段',
'studio.refHintMedia': '必填 · 1–{max} 段 · 已选 {n}',
'studio.refAddMedia': '添加{kind}',
'studio.refAddSubMedia': '还可加 {n} 段 · 上限 {max}',
'studio.refRemoveMedia': '移除{kind} {n}',
'studio.refFullMedia': '已达上限 {max} 段,移除后才能再添加',
'wfMedia.h3Limits': 'MiniMax H3 Ref2VA 官方限额:参考图最多 9 张、参考视频 3 段、参考音频 3 段;单段音视频 2–15 秒,视频与音频各自总时长不超过 15 秒;音频不能单独作为唯一参考;参考文件总数最多 12。',
'wfMedia.h3TotalOver': '参考文件总数已达 {n} 个,超过官方上限 12,生成可能失败',
'wfMedia.h3AudioAlone': '音频不能单独作为唯一参考,请至少搭配一张参考图或一段参考视频',
'conn.wfCheckTitle': '连接兼容性检查',
'conn.wfCheckEndpoint': '目标:{name}',
'conn.wfCheckBtn': '重新检查',
'conn.wfChecking': '检查中…',
'conn.wfCheckOk': '该连接具备运行此工作流的节点与模型',
'conn.wfCheckProblems': '发现 {n} 个缺失的节点/模型',
'conn.wfCheckUnreachable': '无法核查(连不上该 ComfyUI),不阻断保存;修好连接后可重新检查',
'conn.wfCheckSaveHint': '仍可保存草稿(不会误称可生成);装好缺失项后回来重新检查即可。',
'conn.wfTestBtn': '测试',
'conn.wfLastTest': '上次测试',
'conn.wfTestPassed': '{time} 通过({n} 个文件)',
'conn.wfTestRunning': '{time} 进行中',
'conn.wfTestFailed': '{time} 未通过',
'wft.title': '测试工作流',
'wft.connection': '目标连接',
'wft.costNote': '测试会把一次真实任务加入所选 ComfyUI 的队列,占用其显存与排队时间。',
'wft.submit': '开始测试',
'wft.confirmTitle': '确认真实运行',
'wft.confirmBody': '将向「{endpoint}」提交一次真实任务并占用其资源(当前队列 {n} 个任务)。只有拿到可下载且类型正确的输出文件才算测试通过。',
'wft.running': '测试中…',
'wft.cancel': '取消测试',
'wft.passed': '测试通过:产出 {n} 个文件',
'wft.passedShort': '通过({n} 个文件)',
'wft.failed': '测试未通过',
'wft.failedShort': '未通过',
'wft.cancelledShort': '已取消',
'wft.reusedToast': '该工作流已有进行中的测试,已连接到该任务',
'wft.history': '测试记录({n} 条)',
'wft.clear': '清除测试记录',
'wft.cleared': '已清除测试记录',
'wft.never': '尚未测试过',
'wft.download': '下载',
'wft.errRequired': '请填写「{label}」',
'wft.errListMin': '「{label}」需要至少 {n} {unit}',
'tasks.testBadge': '测试',
'tasks.sourceWorkflowTest': '工作流测试',
// --- 生成台 (HEL-653) ---
'cdf.orig': '原值 {v}',
'desk.title': '生成台',
'desk.advanced': '高级参数 {n} 项 · 不改就沿用工作流原值',
'desk.chipResolution': '分辨率 {v}',
'desk.chipSeconds': '{v} 秒',
'desk.chipSeed': '种子 {v}',
'desk.closeInspector': '关闭检视区',
'desk.countActive': '{n} 个进行中',
'desk.countTakes': '{n} 条记录',
'desk.ctxAsset': '{kind}「{name}」',
'desk.ctxShot': '镜头 {no}',
'desk.ctxBack': '返回{stage}',
'desk.ctxDismiss': '关闭来源提示',
'desk.ctxFrom': '来自《{project}》',
'desk.ctxNoBackfill': '结果只留在生成台记录,不会自动回填到{stage}',
'desk.dayDate': '{m}月{d}日',
'desk.download': '下载',
'desk.dropNoSlot': '{n} 个文件没有可放的槽位:当前工作流没有接这类输入',
'desk.dryRun': '演练模式',
'desk.durMin': '{m} 分 {s} 秒',
'desk.durSec': '{s} 秒',
'desk.elapsed': '用时',
'desk.emptyFailed': '没有失败的记录',
'desk.emptyFeed': '还没有记录。在下方写提示词,点「生成」。',
'desk.filterAria': '筛选记录',
'desk.filterAll': '全部',
'desk.filterImage': '图片',
'desk.filterVideo': '视频',
'desk.filterFailed': '失败',
'desk.generate': '生成',
'desk.genHint': '生成(Ctrl/⌘ + Enter)',
'desk.inputs': '输入',
'desk.inspector': '检视区',
'desk.keyClose': '关闭',
'desk.keyInspector': '显示 / 收起',
'desk.keySelect': '选择',
'desk.keyUse': '使用',
'desk.kvCreated': '提交时间',
'desk.kvName': '名称',
'desk.kvPromptId': 'ComfyUI 任务号',
'desk.kvUsage': '用途',
'desk.loadEarlier': '显示更早的 {n} 条',
'desk.missingSub': '可用相同参数重做,或移除这条记录',
'desk.missingTitle': '结果文件已不在服务器上',
'desk.needWorkflow': '还缺:工作流',
'desk.noConn': '未连接',
'desk.noPromptInput': '这个工作流没有提示词输入,按工作流原值生成。',
'desk.notGenerated': '未生成',
'desk.noWorkflows': '还没有可用的生图 / 生视频工作流',
'desk.openInDesk': '在生成台调参',
'desk.openInDeskHint': '带上提示词打开生成台,自选工作流和参数;结果留在生成台记录',
'desk.openInspector': '检视区',
'desk.origValue': '工作流原值',
'desk.outputN': '第 {n} 个结果',
'desk.outputs': '全部结果',
'desk.paramError': '参数有误:{msg}',
'desk.paramsAll': '全部参数',
'desk.paramsChanged': '参数 · 已改 {n} 项',
'desk.paramsCommon': '常用参数',
'desk.pickTake': '在记录流里选一条查看结果',
'desk.pickWorkflow': '选择工作流',
'desk.promptOnly': '仅提示词',
'desk.promptPh': '描述想要的画面…(Ctrl/⌘ + Enter 生成,/ 快速聚焦)',
'desk.restoreAll': '全部恢复工作流原值',
'desk.redo': '用相同参数重做',
'desk.removeRecord': '移除记录',
'desk.restoreOrig': '恢复原值',
'desk.reuse': '复用',
'desk.reuseToComposer': '复用到输入台',
'desk.seedRandom': '随机',
'desk.sendToSlot': '送入当前图片槽',
'desk.sent': '已提交',
'desk.sentToSlotToast': '已送入当前工作流的图片槽',
'desk.slotOne': '{label} ×1',
'desk.slotRange': '{label} {min}–{max}',
'desk.specSize': '尺寸',
'desk.stillNeed': '还缺:{what}',
'desk.tabParams': '参数',
'desk.tabResult': '结果',
'desk.today': '今天',
'desk.took': '用时 {d}',
'desk.wfBroken': '不可用',
'desk.wfCurrent': '当前',
'desk.wfDefaultConn': '跟随默认连接',
'desk.wfImport': '导入 / 管理工作流',
'desk.wfLastFailed': '上次失败',
'desk.wfNoMatch': '没有匹配的工作流',
'desk.wfOk': '可用',
'desk.wfSearchPh': '搜索工作流,或输入用途:图生视频、参考图…',
'desk.wfTesting': '试运行中',
'desk.wfUntested': '未试运行',
'desk.workflow': '工作流',
'desk.yesterday': '昨天',
};
+28 -14
View File
@@ -1,20 +1,34 @@
import type { Job } from '$lib/api';
import { t } from '$lib/i18n.svelte';
import type { Job } from "$lib/api";
import { t } from "$lib/i18n.svelte";
/** Where a generation job came from: 独立生图 / 独立生视频 / 创作流程 / Playground. */
/** Where a generation job came from: 独立生图 / 独立生视频 / 创作流程 / Playground / 测试. */
export function jobSourceLabel(job: Job): string {
const src = job.payload?.source;
if (src === 'studio-image') return t('tasks.sourceStudioImage');
if (src === 'studio-video') return t('tasks.sourceStudioVideo');
if (src === 'workbench') return t('tasks.sourceWorkbench');
if (src === 'playground') return t('tasks.sourcePlayground');
if (job.scene_id || job.clip_id) return t('tasks.sourceFlow');
if (!src) return t('tasks.sourceFlow');
return t('tasks.sourceOther');
const src = job.payload?.source;
if (src === "studio-image") return t("tasks.sourceStudioImage");
if (src === "studio-video") return t("tasks.sourceStudioVideo");
if (src === "workbench") return t("tasks.sourceWorkbench");
if (src === "playground") return t("tasks.sourcePlayground");
if (src === "workflow_test" || job.origin === "workflow_test")
return t("tasks.sourceWorkflowTest");
if (job.scene_id || job.clip_id) return t("tasks.sourceFlow");
if (!src) return t("tasks.sourceFlow");
return t("tasks.sourceOther");
}
/** Jobs started outside any project (standalone windows / Playground). */
/** A real run launched from the workflow library's 测试 button (HEL-643). */
export function isWorkflowTestJob(job: Job): boolean {
return (
job.origin === "workflow_test" || job.payload?.source === "workflow_test"
);
}
/** Jobs started outside any project (standalone windows / Playground / tests). */
export function isStandaloneJob(job: Job): boolean {
const src = job.payload?.source;
return src === 'studio-image' || src === 'studio-video' || src === 'playground';
const src = job.payload?.source;
return (
src === "studio-image" ||
src === "studio-video" ||
src === "playground" ||
isWorkflowTestJob(job)
);
}
@@ -0,0 +1,38 @@
import { SvelteSet } from 'svelte/reactivity';
import type { Job } from '$lib/comfy/types';
/**
* Output files a done job claims but the asset endpoint could not serve
* (spec-v2 §3.4 红/琥珀界线): the backend task status stays the single
* verdict for red — a FAILED job is red no matter what. Amber means the
* job SUCCEEDED and only its product file is gone (cleaned up, moved,
* storage hiccup). We learn that the only way the frontend can: the
* media element itself failed to load. A later successful load clears
* the mark.
*/
const missing = new SvelteSet<string>();
/** Mark one output path as unreachable (img/video onerror). */
export function markOutputMissing(path: string): void {
if (path) missing.add(path);
}
/** Clear the mark when the same path loads fine after all. */
export function clearOutputMissing(path: string): void {
missing.delete(path);
}
/** Paths of this job's outputs that are currently unreachable. */
export function missingOutputsOf(job: Job | null | undefined): string[] {
if (!job || job.status !== 'done' || !(job.output_paths?.length ?? 0))
return [];
return job.output_paths.filter((p) => missing.has(p));
}
/**
* The take reads as 文件缺失 when it succeeded but at least one claimed
* product file cannot be fetched.
*/
export function isFileMissing(job: Job | null | undefined): boolean {
return missingOutputsOf(job).length > 0;
}
@@ -0,0 +1,45 @@
import { storageGet, storageSet } from './storage';
/**
* 减少动态效果 (HEL-649 §五). The OS setting always wins (app.css also reacts
* to `prefers-reduced-motion` directly, so it cannot be switched off here);
* otherwise the top-bar switch decides. The effective value is mirrored to
* `<html data-reduce="1">`, which is what every reduced-motion rule keys on.
*/
const STORAGE_KEY = 'aigc-reduce-motion';
const QUERY = '(prefers-reduced-motion: reduce)';
export const reduceMotion = $state({ system: false, manual: false });
let stop: (() => void) | null = null;
function apply() {
document.documentElement.dataset.reduce =
reduceMotion.system || reduceMotion.manual ? '1' : '0';
}
/** Call once on the client (root layout). Returns the teardown. */
export function initReduceMotion(): () => void {
if (typeof window === 'undefined') return () => {};
stop?.();
const mq = window.matchMedia(QUERY);
reduceMotion.system = mq.matches;
reduceMotion.manual = storageGet(STORAGE_KEY) === '1';
apply();
const onChange = (e: MediaQueryListEvent) => {
reduceMotion.system = e.matches;
apply();
};
mq.addEventListener('change', onChange);
stop = () => mq.removeEventListener('change', onChange);
return () => {
stop?.();
stop = null;
};
}
export function setReduceMotion(on: boolean) {
reduceMotion.manual = on;
storageSet(STORAGE_KEY, on ? '1' : '0');
apply();
}
+9 -1
View File
@@ -1,11 +1,18 @@
export type ToastKind = 'success' | 'error' | 'info';
/** Inline action on a toast (§四.5: 动作金色文字,如「撤销」). */
export type ToastAction = {
label: string;
run: () => void;
};
export type Toast = {
id: number;
message: string;
kind: ToastKind;
/** Auto-dismiss delay in ms. 0 = sticky until dismissed. */
duration: number;
action?: ToastAction;
};
type Listener = (toasts: Toast[]) => void;
@@ -57,9 +64,10 @@ export function showToast(
message: string,
kind: ToastKind = 'success',
durationMs: number = DEFAULT_DURATION,
action?: ToastAction,
) {
const id = ++seq;
toasts = [...toasts, { id, message, kind, duration: durationMs }];
toasts = [...toasts, { id, message, kind, duration: durationMs, action }];
emit();
if (durationMs > 0) schedule(id, durationMs);
return id;
+4
View File
@@ -1,13 +1,17 @@
<script lang="ts">
import './app.css';
import { onMount } from 'svelte';
import { QueryClient, QueryClientProvider } from '@tanstack/svelte-query';
import ToastHost from '$lib/components/ToastHost.svelte';
import { initReduceMotion } from '$lib/reduceMotion.svelte';
const queryClient = new QueryClient({
defaultOptions: {
queries: { refetchOnWindowFocus: false, retry: 1 },
},
});
onMount(() => initReduceMotion());
</script>
<QueryClientProvider client={queryClient}>
+17 -20
View File
@@ -245,11 +245,11 @@
return parts.filter(Boolean).join(' · ');
}
function jobBar(job: Job): { value: number; tone: 'accent' | 'success' | 'error' } {
function jobBar(job: Job): { value: number; tone: 'run' | 'success' | 'error' } {
if (job.status === 'done') return { value: 100, tone: 'success' };
if (job.status === 'failed') return { value: 100, tone: 'error' };
if (job.status === 'running') return { value: progressFor(job.id)?.progress ?? 3, tone: 'accent' };
return { value: 0, tone: 'accent' };
if (job.status === 'running') return { value: progressFor(job.id)?.progress ?? 3, tone: 'run' };
return { value: 0, tone: 'run' };
}
function jobStatusLabel(status: string): string {
@@ -493,7 +493,7 @@
<aside class="tasks">
<div class="tasks-head">
<h2>{t('home.tasksTitle')}</h2>
<span class="chip" class:amber={activeJobCount > 0}>
<span class="chip" class:run={activeJobCount > 0}>
{t('home.activeJobs', { n: activeJobCount })}
</span>
</div>
@@ -580,9 +580,9 @@
font-size: 11.5px;
white-space: nowrap;
}
.chip.amber {
background: var(--accent-dim);
color: var(--accent);
.chip.run {
background: var(--run-soft);
color: var(--run);
}
.entry-btn {
@@ -616,7 +616,7 @@
color: var(--text);
}
.entry-btn.secondary:hover {
border-color: rgba(255, 255, 255, 0.24);
border-color: var(--line-2);
}
.entry-btn:active {
transform: scale(0.98);
@@ -651,7 +651,7 @@
display: inline-flex;
align-items: center;
justify-content: center;
color: var(--accent);
color: var(--text-2);
}
.entry-card h2 {
margin: 4px 0 0;
@@ -736,10 +736,10 @@
}
.f-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.f-input.invalid {
border-color: rgba(229, 72, 77, 0.65);
border-color: var(--err-line);
}
.f-hint {
display: block;
@@ -908,13 +908,10 @@
flex-shrink: 0;
white-space: nowrap;
}
.tag-local {
background: var(--info-dim);
color: var(--info);
}
.tag-local,
.tag-cloud {
background: var(--cloud-dim);
color: var(--cloud);
background: var(--bg-4);
color: var(--text-2);
}
.job-name {
flex: 1;
@@ -950,7 +947,7 @@
color: var(--success);
}
.running-text {
color: var(--accent);
color: var(--run);
}
.queued-text {
color: var(--text-3);
@@ -966,8 +963,8 @@
width: 6px;
height: 6px;
border-radius: 50%;
background: var(--accent);
box-shadow: 0 0 10px var(--accent-glow);
background: var(--run);
box-shadow: 0 0 10px var(--run-soft);
}
.dot.breathe {
animation: breathe 2s ease-in-out infinite;
+10 -11
View File
@@ -18,7 +18,6 @@
type NamedAgent,
type SkillAdminEntry,
type SkillVersion,
type Settings,
canvasApi,
} from '$lib/api';
import { AGENT_TASK_PROMPTS, AGENT_TASK_TITLE_KEYS, isAgentTaskKind } from '$lib/agentTasks';
@@ -378,10 +377,10 @@
},
});
function setAgentModel(s: Settings, role: string, value: string) {
const merged: Record<string, string | null> = { ...(s.agent_llm_assignments ?? {}) };
merged[role] = value === '' ? null : value;
$assignMutation.mutate(merged);
function setAgentModel(role: string, value: string) {
// Single-role delta only (HEL-619): the whole-snapshot replay races
// concurrent switches; the server merges per role.
$assignMutation.mutate({ [role]: value === '' ? null : value });
}
// ─────────────────────────────────────────────────────────────────────
@@ -718,7 +717,7 @@
<select
class="a-select"
value={s.agent_llm_assignments?.[activeAgent.llm_role] ?? ''}
onchange={(e) => setAgentModel(s, activeAgent.llm_role, e.currentTarget.value)}
onchange={(e) => setAgentModel(activeAgent.llm_role, e.currentTarget.value)}
>
<option value="">{t('agentsPage.modelDefault')}</option>
{#each s.llm_profiles as p (p.id)}
@@ -1134,11 +1133,11 @@
justify-content: center;
font-size: 14px;
font-weight: 700;
color: #edeef0;
color: var(--text);
flex-shrink: 0;
}
.avatar.dark {
color: #16130a;
color: var(--accent-ink);
}
.avatar.lg {
width: 42px;
@@ -1295,8 +1294,8 @@
white-space: nowrap;
}
.status-tag.busy {
background: var(--accent-dim);
color: var(--accent);
background: var(--run-soft);
color: var(--run);
}
.chat-head-actions {
display: flex;
@@ -1619,7 +1618,7 @@
background: var(--success);
}
.dot.amber {
background: var(--accent);
background: var(--run);
}
.dot.amber.breathing {
animation: breathe 2s ease-in-out infinite;
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+21 -20
View File
@@ -420,10 +420,11 @@
},
});
function setAssignment(s: Settings, role: string, value: string) {
const merged: Record<string, string | null> = { ...(s.agent_llm_assignments ?? {}) };
merged[role] = value === '' ? null : value;
$assignMutation.mutate(merged);
function setAssignment(role: string, value: string) {
// Single-role delta only (HEL-619): replaying the whole cached
// snapshot races concurrent dropdown switches — an older snapshot
// could overwrite a newer choice. The server merges per role.
$assignMutation.mutate({ [role]: value === '' ? null : value });
}
// ------------------------------------------------------------------
@@ -630,7 +631,7 @@
<select
class="a-select"
value={s.agent_llm_assignments?.[agent.role] ?? ''}
onchange={(e) => setAssignment(s, agent.role, e.currentTarget.value)}
onchange={(e) => setAssignment(agent.role, e.currentTarget.value)}
>
<option value="">{t('models.agentDefault')}</option>
{#each profiles as p (p.id)}
@@ -928,7 +929,7 @@
transition: border-color 150ms cubic-bezier(0.16, 1, 0.3, 1);
}
.card.failed {
border-color: rgba(229, 72, 77, 0.35);
border-color: color-mix(in srgb, var(--err) 35%, transparent);
}
.card-row {
display: flex;
@@ -945,7 +946,7 @@
display: inline-flex;
align-items: center;
justify-content: center;
color: var(--accent);
color: var(--text-2);
flex-shrink: 0;
}
.card-name {
@@ -962,13 +963,10 @@
font-weight: 600;
}
.tag-local,
.tag-lan {
color: var(--info);
background: var(--info-dim);
}
.tag-lan,
.tag-cloud {
color: var(--cloud);
background: var(--cloud-dim);
color: var(--text-2);
background: var(--bg-4);
}
.tag-default {
color: var(--accent);
@@ -1009,8 +1007,8 @@
background: var(--text-3);
}
.dot.amber {
background: var(--accent);
box-shadow: 0 0 10px var(--accent-glow);
background: var(--run);
box-shadow: 0 0 10px var(--run-soft);
}
.dot.breathing {
animation: breathe 2s ease-in-out infinite;
@@ -1035,7 +1033,7 @@
color: var(--error);
}
.status-text.amber {
color: var(--accent);
color: var(--run);
}
.status-text.gray {
color: var(--text-3);
@@ -1178,7 +1176,7 @@
color: var(--text);
}
.avatar.dark {
color: #16130a;
color: var(--accent-ink);
}
.agent-name {
font-size: 12.5px;
@@ -1195,6 +1193,9 @@
padding: 18px 20px 20px;
position: sticky;
top: 24px;
/* 384px must be the OUTER width per the a6 spec — without
border-box padding+border inflate it to 426px (HEL-619). */
box-sizing: border-box;
}
.form-idle {
display: flex;
@@ -1278,14 +1279,14 @@
}
.f-input:focus {
outline: none;
border-color: rgba(232, 163, 61, 0.6);
border-color: var(--accent-line);
}
.f-input:disabled {
color: var(--text-3);
cursor: not-allowed;
}
.f-input.invalid {
border-color: rgba(229, 72, 77, 0.65);
border-color: var(--err-line);
}
.f-hint {
display: block;
@@ -1429,7 +1430,7 @@
position: fixed;
inset: 0;
z-index: 790;
background: rgba(5, 5, 8, 0.5);
background: var(--overlay);
}
.agents-grid {
grid-template-columns: repeat(3, 1fr);
@@ -669,7 +669,7 @@
color: var(--text-2);
}
.note.warn :global(.icon) {
color: var(--accent);
color: var(--warn);
flex-shrink: 0;
margin-top: 2px;
}
+267 -138
View File
@@ -1,10 +1,9 @@
<script lang="ts">
import { createQuery, useQueryClient } from '@tanstack/svelte-query';
import AppShell from '$lib/components/shell/AppShell.svelte';
import Button from '$lib/components/ui/Button.svelte';
import ConfirmDialog from '$lib/components/ui/ConfirmDialog.svelte';
import Icon from '$lib/components/ui/Icon.svelte';
import {
apiErrorMessage,
assetUrl,
jobsApi,
playgroundApi,
@@ -14,16 +13,21 @@
} from '$lib/api';
import { connectEvents } from '$lib/events';
import { parseDbTs } from '$lib/dbtime';
import { handleJobEvent } from '$lib/jobProgress';
import { handleJobEvent, progressFor } from '$lib/jobProgress';
import { jobStatusInfo } from '$lib/jobStatus';
import { isFileMissing, markOutputMissing } from '$lib/missingOutputs.svelte';
import { toast } from '$lib/toast';
import { t } from '$lib/i18n.svelte';
import { isStandaloneJob, jobSourceLabel } from '$lib/jobLabels';
import { isStandaloneJob, isWorkflowTestJob, jobSourceLabel } from '$lib/jobLabels';
import { createTakeDeleteQueue } from '$lib/components/generate/takeDelete.svelte';
/**
* 生成任务页 (spec-v2 §3 nav item, HEL-612): one table summing both
* 生成任务页 (spec-v2 §3.5, HEL-612/654 D 批): one table summing both
* task classes — image and video — from standalone windows, the
* creation flow, and Playground, with retry / cancel / delete.
* creation flow, and Playground. Filter chips + search; running rows
* carry a 2px progress bar; 重试 is a ghost text op (spec v2 §1.2);
* deleting one task is record-level: 200ms collapse + 5s undo Toast,
* no dialog. The real DELETE only fires after the undo window.
*/
const client = useQueryClient();
@@ -46,13 +50,27 @@
return off;
});
type Filter = 'all' | 'image' | 'video';
type Filter = 'all' | 'image' | 'video' | 'failed' | 'active';
let filter = $state<Filter>('all');
let search = $state('');
const genJobs = $derived(
($jobsQuery.data ?? []).filter((j) => j.kind === 'image' || j.kind === 'video'),
);
const shown = $derived(filter === 'all' ? genJobs : genJobs.filter((j) => j.kind === filter));
const deleteQueue = createTakeDeleteQueue(client);
const pendingIds = deleteQueue.pending;
$effect(() => deleteQueue.destroy);
const genJobs = $derived(($jobsQuery.data ?? []).filter((j) => j.kind === 'image' || j.kind === 'video'));
const shown = $derived.by(() => {
const q = search.trim().toLowerCase();
return genJobs.filter((j) => {
if (pendingIds.has(j.id)) return false;
if (filter === 'image' || filter === 'video') {
if (j.kind !== filter) return false;
} else if (filter === 'failed' && jobStatusInfo(j).tone !== 'fail') return false;
else if (filter === 'active' && j.status !== 'pending' && j.status !== 'running') return false;
if (!q) return true;
return `${wfName(j)} ${jobSourceLabel(j)} ${j.error ?? ''} ${j.id}`.toLowerCase().includes(q);
});
});
const activeCount = $derived(genJobs.filter((j) => j.status === 'pending' || j.status === 'running').length);
function wfName(job: Job): string {
@@ -76,6 +94,35 @@
return `${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
}
/** 2px 进度条贴行底 — real progress from the SSE store only. */
function rowProgress(job: Job): number {
if (job.status !== 'running') return 0;
const live = progressFor(job.id);
const phase = live?.phase ?? job.phase;
if (phase !== 'comfy_running' && phase !== 'saving') return 0;
return live?.progress ?? 3;
}
function toneOf(job: Job, base: string): string {
if (base === 'ok' && isFileMissing(job)) return 'warn';
if (base === 'queue') return '';
if (base === 'fail') return 'err';
return base;
}
function labelOf(job: Job, base: { tone: string; label: string }): string {
return base.tone === 'ok' && isFileMissing(job) ? t('jobst.missing') : base.label;
}
function requestDelete(job: Job) {
if (job.status === 'pending' || job.status === 'running') return;
deleteQueue.request(job, {
message: () =>
(job.output_paths?.length ?? 0) > 0
? t('studio.deletedTakeToast', { name: wfName(job) })
: t('studio.deletedTakeNoFilesToast', { name: wfName(job) }),
});
}
let busyId = $state<number | null>(null);
async function retry(job: Job) {
@@ -86,7 +133,7 @@
toast.success(t('studio.retryQueuedToast'));
await client.invalidateQueries({ queryKey: ['jobs'] });
} catch (err) {
toast.error(t('studio.retryFailedToast', { detail: err instanceof Error ? err.message : String(err) }));
toast.error(t('studio.retryFailedToast', { detail: apiErrorMessage(err) }));
} finally {
busyId = null;
}
@@ -100,28 +147,11 @@
toast.info(t('studio.cancelToast'));
await client.invalidateQueries({ queryKey: ['jobs'] });
} catch (err) {
toast.error(err instanceof Error ? err.message : String(err));
toast.error(apiErrorMessage(err));
} finally {
busyId = null;
}
}
let deleteOpen = $state(false);
let deleteJobId = $state<number | null>(null);
const deleteTarget = $derived(genJobs.find((j) => j.id === deleteJobId) ?? null);
async function doDelete() {
if (!deleteJobId) return;
try {
await playgroundApi.deleteJob(deleteJobId);
await client.invalidateQueries({ queryKey: ['jobs'] });
await client.invalidateQueries({ queryKey: ['playground-jobs'] });
} catch (err) {
toast.error(err instanceof Error ? err.message : String(err));
} finally {
deleteJobId = null;
deleteOpen = false;
}
}
</script>
<AppShell active="tasks" title={t('tasks.title')} subtitle={t('tasks.subtitle')}>
@@ -130,45 +160,61 @@
{/snippet}
<div class="tasks-page">
<div class="seg" role="radiogroup" aria-label={t('tasks.title')}>
{#each [['all', t('tasks.filterAll')], ['image', t('tasks.filterImage')], ['video', t('tasks.filterVideo')]] as [value, label] (value)}
<button
type="button"
class="seg-item"
class:selected={filter === value}
aria-pressed={filter === value}
onclick={() => (filter = value as Filter)}
>
{label}
</button>
{/each}
<div class="toolbar">
<div class="chips" role="group" aria-label={t('tasks.title')}>
{#each [['all', t('tasks.filterAll')], ['image', t('tasks.filterImage')], ['video', t('tasks.filterVideo')], ['failed', t('tasks.filterFailed')], ['active', t('tasks.filterActive')]] as [value, label] (value)}
<button
type="button"
class="a-chip fchip"
class:sel={filter === value}
aria-pressed={filter === value}
onclick={() => (filter = value as Filter)}
>
{label}
</button>
{/each}
</div>
<label class="search">
<Icon name="search" size={13} />
<input type="search" bind:value={search} placeholder={t('tasks.searchPh')} aria-label={t('tasks.searchPh')} />
</label>
</div>
{#if !shown.length}
<div class="empty-card">
<Icon name="queue" size={22} />
<p>{t('tasks.empty')}</p>
<p>{search || filter !== 'all' ? t('tasks.emptyFiltered') : t('tasks.empty')}</p>
<a class="a-btn primary" href="/image">{t('tasks.goGenerate')}</a>
</div>
{:else}
<div class="task-table">
<div class="task-table" role="table" aria-label={t('tasks.title')}>
{#each shown as job (job.id)}
{@const st = jobStatusInfo(job)}
<div class="trow" class:failed={job.status === 'failed'}>
{@const progress = rowProgress(job)}
<div class="trow" class:failed={st.tone === 'fail'} class:running={st.tone === 'run'}>
<span class="tkind {job.kind}">
<Icon name={job.kind === 'image' ? 'image' : 'film'} size={14} />
</span>
<div class="tthumb">
{#if job.output_paths?.[0]}
{#if job.kind === 'image'}
<img src={assetUrl(job.output_paths[0])} alt={wfName(job)} loading="lazy" />
<img
src={assetUrl(job.output_paths[0])}
alt={wfName(job)}
loading="lazy"
onerror={() => job.output_paths[0] && markOutputMissing(job.output_paths[0])}
/>
{:else}
<video src={assetUrl(job.output_paths[0])} preload="metadata" muted></video>
{/if}
{/if}
</div>
<div class="tmain">
<div class="tname" title={wfName(job)}>{wfName(job)}</div>
<div class="tname" title={wfName(job)}>
{#if isWorkflowTestJob(job)}<span class="tag-test">{t('tasks.testBadge')}</span>{/if}
{wfName(job)}
{#if job.workflow_id == null}<span class="a-tag wf-gone">{t('studio.wfDeletedTag')}</span>{/if}
</div>
<div class="tmeta mono">
{#if projectOf(job)}{projectOf(job)} · {/if}{jobSourceLabel(job)} · {timeOf(job)}
{#if (job.output_paths?.length ?? 0) > 0}
@@ -179,13 +225,21 @@
<div class="terror">{job.error}</div>
{:else if st.tone === 'fail' || (job.status === 'done' && job.phase === 'dry_run')}
<div class="terror">{st.detail}</div>
{:else if st.tone === 'ok' && isFileMissing(job)}
<div class="twarn">{t('jobst.missingDetail')}</div>
{/if}
</div>
<div class="tout">
{#if job.output_paths?.length}
<div class="tout-thumbs">
{#each job.output_paths.slice(0, 3) as p (p)}
<a href={assetUrl(p)} target="_blank" rel="noreferrer" title={p.split(/[/\\]/).pop()}>
{#each job.output_paths.slice(0, 4) as p (p)}
<a
href={assetUrl(p)}
download
target="_blank"
rel="noreferrer"
title={t('tasks.download')}
>
{#if job.kind === 'image'}
<img src={assetUrl(p)} alt="" loading="lazy" />
{:else}
@@ -196,32 +250,37 @@
</div>
{/if}
</div>
<span class="tst {st.tone}" title={st.detail}>{st.label}</span>
<span class="a-tag tst {toneOf(job, st.tone)}" title={st.detail}>{labelOf(job, st)}</span>
<span class="tactions">
{#if job.status === 'failed'}
<button type="button" class="link-accent" disabled={busyId === job.id} onclick={() => retry(job)}>
{#if (st.tone === 'fail' || (st.tone === 'ok' && isFileMissing(job))) && job.error !== 'cancelled'}
<button type="button" class="link-ghost" disabled={busyId === job.id} onclick={() => retry(job)}>
{t('tasks.retry')}
</button>
{/if}
{#if job.status === 'pending' || job.status === 'running'}
<button type="button" class="link-danger" disabled={busyId === job.id} onclick={() => cancel(job)}>
<button type="button" class="link-ghost" disabled={busyId === job.id} onclick={() => cancel(job)}>
{t('tasks.cancel')}
</button>
{/if}
{#if isStandaloneJob(job)}
{#if job.output_paths?.length}
<a class="link-ghost" href={assetUrl(job.output_paths[0])} download>
{t('tasks.download')}
</a>
{/if}
{#if isStandaloneJob(job) && job.status !== 'pending' && job.status !== 'running'}
<button
type="button"
class="link-danger"
title={t('tasks.delete')}
onclick={() => {
deleteJobId = job.id;
deleteOpen = true;
}}
onclick={() => requestDelete(job)}
>
<Icon name="trash" size={13} />
</button>
{/if}
</span>
{#if progress > 0}
<div class="rowbar" style:--p={progress / 100}><i></i></div>
{/if}
</div>
{/each}
</div>
@@ -229,19 +288,6 @@
</div>
</AppShell>
<ConfirmDialog
bind:open={deleteOpen}
title={t('tasks.delTitle')}
message={t('tasks.delConfirm')}
confirmLabel={t('tasks.delete')}
danger
onconfirm={doDelete}
oncancel={() => {
deleteJobId = null;
deleteOpen = false;
}}
/>
<style>
.tasks-page {
padding: 20px 28px 40px;
@@ -251,30 +297,52 @@
margin: 0 auto;
display: flex;
flex-direction: column;
gap: 18px;
gap: 16px;
}
.seg {
/* §3.5: 筛选芯片组(选中 = 金色文字 + accent-soft 底)+ 右侧搜索框 */
.toolbar {
display: flex;
align-items: center;
gap: 12px;
flex-wrap: wrap;
}
.chips {
display: flex;
gap: 6px;
width: fit-content;
flex-wrap: wrap;
}
.seg-item {
padding: 7px 18px;
border-radius: 7px;
border: 1px solid var(--border);
background: var(--surface-2);
font-size: 12px;
color: var(--text-2);
cursor: pointer;
font-family: inherit;
.fchip {
height: 28px;
}
.seg-item.selected {
.search {
display: inline-flex;
align-items: center;
gap: 6px;
margin-left: auto;
min-width: 0;
height: 30px;
padding: 0 10px;
border: 1px solid var(--line);
border-radius: var(--r-pill);
background: var(--bg-2);
color: var(--text-3);
}
.search:focus-within {
border-color: var(--accent);
color: var(--accent);
background: var(--accent-dim);
font-weight: 600;
}
.search input {
min-width: 0;
width: 180px;
border: 0;
outline: 0;
background: transparent;
color: var(--text);
font: inherit;
font-size: 12px;
}
.search input::placeholder {
color: var(--text-3);
}
.empty-card {
@@ -283,8 +351,8 @@
align-items: center;
gap: 12px;
padding: 56px 24px;
border: 1.5px dashed var(--border-strong);
border-radius: 10px;
border: 1.5px dashed var(--line-2);
border-radius: var(--r-lg);
color: var(--text-3);
}
.empty-card p {
@@ -293,23 +361,48 @@
line-height: 1.7;
}
/* 表格行:行底 --bg-2,悬停 --bg-3,进行中行底贴 2px 青进度条 */
.task-table {
display: flex;
flex-direction: column;
gap: 4px;
}
.trow {
position: relative;
display: flex;
align-items: center;
gap: 12px;
padding: 10px 12px;
border: 1px solid var(--border);
border-radius: 10px;
background: var(--surface);
padding: 10px 14px 10px 12px;
border: 1px solid var(--line);
border-radius: var(--r-md);
background: var(--bg-2);
min-height: 56px;
}
@media (hover: hover) and (pointer: fine) {
.trow:hover {
background: var(--bg-3);
}
}
.trow.failed {
border-color: rgba(229, 72, 77, 0.35);
border-color: color-mix(in srgb, var(--err) 35%, transparent);
}
.rowbar {
position: absolute;
left: 0;
right: 0;
bottom: 0;
height: 2px;
overflow: hidden;
border-radius: 0 0 var(--r-md) var(--r-md);
}
.rowbar i {
display: block;
height: 100%;
width: 100%;
transform-origin: left;
transform: scaleX(var(--p));
background: linear-gradient(90deg, #3bbfb4, var(--run));
transition: transform var(--d-progress) linear;
}
.tkind {
@@ -320,14 +413,8 @@
align-items: center;
justify-content: center;
flex-shrink: 0;
}
.tkind.image {
color: var(--info);
background: var(--info-dim);
}
.tkind.video {
color: var(--accent);
background: var(--accent-dim);
color: var(--text-2);
background: var(--bg-4);
}
.tthumb {
@@ -335,8 +422,8 @@
height: 32px;
border-radius: 6px;
overflow: hidden;
border: 1px solid var(--border);
background: var(--surface-2);
border: 1px solid var(--line);
background: var(--bg-3);
flex-shrink: 0;
}
.tthumb img,
@@ -352,6 +439,10 @@
min-width: 0;
}
.tname {
display: flex;
align-items: center;
gap: 6px;
min-width: 0;
font-size: 13px;
font-weight: 600;
color: var(--text);
@@ -359,6 +450,9 @@
text-overflow: ellipsis;
white-space: nowrap;
}
.tname .wf-gone {
flex-shrink: 0;
}
.tmeta {
font-size: 10.5px;
color: var(--text-3);
@@ -367,7 +461,13 @@
.terror {
margin-top: 3px;
font-size: 11px;
color: var(--error);
color: var(--err);
line-height: 1.5;
}
.twarn {
margin-top: 3px;
font-size: 11px;
color: var(--warn);
line-height: 1.5;
}
@@ -379,11 +479,11 @@
gap: 4px;
}
.tout-thumbs a {
width: 44px;
height: 30px;
width: 32px;
height: 32px;
border-radius: 5px;
overflow: hidden;
border: 1px solid var(--border);
border: 1px solid var(--line);
display: block;
}
.tout-thumbs img,
@@ -395,45 +495,41 @@
}
.tst {
width: 52px;
text-align: right;
font-size: 11.5px;
font-weight: 600;
width: 64px;
text-align: center;
flex-shrink: 0;
}
.tst.ok {
color: var(--success);
}
.tst.run {
color: var(--accent);
}
.tst.queue {
color: var(--text-3);
font-weight: 400;
}
.tst.fail {
color: var(--error);
}
/* §1.2 ghost:次级文字操作(重试/取消/下载)文字 --text-2,悬停 --text */
.tactions {
display: inline-flex;
align-items: center;
gap: 8px;
flex-shrink: 0;
}
.link-accent {
.link-ghost {
background: none;
border: none;
padding: 4px 6px;
font-family: inherit;
font-size: 12px;
color: var(--accent);
color: var(--text-2);
cursor: pointer;
border-radius: 6px;
text-decoration: none;
display: inline-flex;
align-items: center;
}
.link-accent:hover:not(:disabled) {
text-decoration: underline;
@media (hover: hover) and (pointer: fine) {
.link-ghost:hover:not(:disabled) {
color: var(--text);
}
}
.link-accent:disabled {
.link-ghost:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
}
.link-ghost:disabled {
opacity: 0.5;
cursor: default;
}
@@ -443,33 +539,66 @@
padding: 4px 6px;
font-family: inherit;
font-size: 12px;
color: var(--error);
color: var(--err);
cursor: pointer;
border-radius: 6px;
opacity: 0.85;
display: inline-flex;
align-items: center;
}
.link-danger:hover:not(:disabled) {
opacity: 1;
background: var(--error-dim);
@media (hover: hover) and (pointer: fine) {
.link-danger:hover:not(:disabled) {
opacity: 1;
background: var(--err-soft);
}
}
.link-danger:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
}
.link-danger:disabled {
opacity: 0.35;
cursor: default;
}
.tag-test {
flex-shrink: 0;
background: var(--accent-soft);
color: var(--accent);
font-size: 10px;
font-weight: 600;
padding: 1px 7px;
border-radius: 999px;
}
/* 窄屏:表格转卡片堆叠 */
@media (max-width: 1023px) {
.tasks-page {
padding: 14px 16px 32px;
}
.tout {
display: none;
}
.trow {
flex-wrap: wrap;
row-gap: 8px;
}
.tout {
order: 5;
width: 100%;
}
.tactions {
order: 6;
margin-left: auto;
}
.tst {
order: 4;
width: auto;
margin-left: auto;
}
.search {
margin-left: 0;
width: 100%;
}
.search input {
width: 100%;
flex: 1;
}
}
</style>

Some files were not shown because too many files have changed in this diff Show More