Compare commits

..
Author SHA1 Message Date
施工员andmultica-agent 4109723655 feat: one LLM provider holds many models + fetch provider model list (HEL-624)
- config: llm_providers {id,name,base_url,api_key}; each llm_profile is one
  model with provider_id, endpoint/key mirrored from its provider so every
  existing reader (LLMClient, role resolution, llm-test) is unchanged
- legacy one-model-per-profile configs migrate to one provider each on load
  (ids, default model and agent assignments kept) and are persisted
- POST /api/settings accepts llm_providers; blank key keeps the stored one
- POST /api/settings/llm-models: GET {base}/models (OpenAI data[] and
  models[] shapes), timeout/connect/auth/unsupported/format errors
- models page: provider cards with per-model rows (test / set default /
  delete), provider form with fetch-and-tick list + manual add, agent
  bindings grouped by provider; agents page select grouped likewise

Co-authored-by: multica-agent <github@multica.ai>
2026-09-28 18:11:11 +08:00
33 changed files with 1560 additions and 2606 deletions
@@ -46,10 +46,10 @@ def _surface_error(prefix: str, resp: httpx.Response) -> RuntimeError:
if isinstance(e, dict):
msg = e.get("message") or e.get("details")
if msg:
parts.append(f"节点 {node_id}:{msg}")
detail = ";".join(parts)
suffix = f":{detail}" if detail else ""
return RuntimeError(f"{prefix}(HTTP {resp.status_code}){suffix}")
parts.append(f"node {node_id}: {msg}")
detail = "; ".join(parts)
suffix = f": {detail}" if detail else ""
return RuntimeError(f"{prefix} ({resp.status_code}){suffix}")
class ComfyUIClient:
@@ -75,7 +75,7 @@ class ComfyUIClient:
form = {"overwrite": "true", "subfolder": subfolder}
resp = await self._http.post(f"{self.base_url}/upload/image", files=files, data=form)
if resp.status_code >= 400:
raise _surface_error("图片上传到 ComfyUI 失败", resp)
raise _surface_error("ComfyUI image upload failed", resp)
result = resp.json()
name = result.get("name", path.name)
sub = result.get("subfolder") or subfolder
@@ -95,7 +95,7 @@ class ComfyUIClient:
form["subfolder"] = subfolder
resp = await self._http.post(f"{self.base_url}/upload/image", files=files, data=form)
if resp.status_code >= 400:
raise _surface_error("音频上传到 ComfyUI 失败", resp)
raise _surface_error("ComfyUI audio upload failed", resp)
result = resp.json()
name = result.get("name", path.name)
sub = result.get("subfolder") or subfolder
@@ -108,7 +108,7 @@ class ComfyUIClient:
form = {"overwrite": "true", "subfolder": subfolder, "type": "input"}
resp = await self._http.post(f"{self.base_url}/upload/image", files=files, data=form)
if resp.status_code >= 400:
raise _surface_error("视频上传到 ComfyUI 失败", resp)
raise _surface_error("ComfyUI video upload failed", resp)
result = resp.json()
name = result.get("name", path.name)
sub = result.get("subfolder") or subfolder
@@ -202,13 +202,11 @@ class ComfyUIClient:
payload = {"prompt": workflow, "client_id": self.client_id}
resp = await self._http.post(f"{self.base_url}/prompt", json=payload)
if resp.status_code >= 400:
raise _surface_error(
"ComfyUI 拒绝执行该工作流(常见原因:缺少模型/自定义节点,或参数不合法)", resp
)
raise _surface_error("ComfyUI rejected the workflow", resp)
data = resp.json()
prompt_id = data.get("prompt_id")
if not prompt_id:
raise RuntimeError(f"ComfyUI 返回异常:/prompt 响应缺少 prompt_id({str(data)[:200]})")
raise RuntimeError(f"ComfyUI /prompt missing prompt_id: {data}")
return prompt_id
async def get_history(self, prompt_id: str) -> dict[str, Any] | None:
+3 -316
View File
@@ -1,15 +1,13 @@
"""Parse ComfyUI API-format workflows for (Input[:role]) / (Output[:role]) titled nodes."""
from __future__ import annotations
from typing import Any
from calliope.comfyui.patcher import FIELD_KEY_SEP, resolve_patch_field
from calliope.comfyui.registry import (
AUDIO_CLASSES,
IMAGE_CLASSES,
VIDEO_CLASSES,
ComfyOutputKind,
IMAGE_CLASSES,
AUDIO_CLASSES,
VIDEO_CLASSES,
class_to_input_kind,
class_to_output_kind,
)
@@ -38,12 +36,6 @@ def extract_default_value(node: dict[str, Any]) -> str | int | float | None:
def parse_dynamic_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
"""Tagged ``(Input:role)`` nodes; untagged workflows fall back to detection.
A workflow exported straight from ComfyUI carries default node titles
("CLIP Text Encode (Positive Prompt)", "KSampler", …) and no tags at all —
without the fallback it would expose nothing to fill in.
"""
results: list[dict[str, Any]] = []
for node_id, node in workflow.items():
if not isinstance(node, dict):
@@ -62,314 +54,9 @@ def parse_dynamic_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
"required": True,
}
)
if not results:
results = detect_untagged_inputs(workflow)
return results
# ---------------------------------------------------------------------------
# Untagged detection
# ---------------------------------------------------------------------------
_MASK_IMAGE_CLASSES = frozenset({"LoadImageMask"})
_STRING_PRIMITIVES = frozenset({"PrimitiveString", "PrimitiveStringMultiline"})
_NUMBER_PRIMITIVES = frozenset({"PrimitiveInt", "PrimitiveFloat", "INT", "FLOAT"})
_SAMPLER_CLASSES = frozenset({"KSampler", "KSamplerAdvanced"})
_NEGATIVE_WORDS = ("negative", "负面", "反向", "反面")
_SYSTEM_WORDS = ("system", "系统")
_PROMPT_WORDS = ("prompt", "positive", "提示", "正向")
_NEGATIVE_TEXT_FIELDS = ("negative_prompt", "negative_text", "negative")
# Title keyword → (role, Chinese label) for untagged numeric primitives.
_NUMBER_TITLE_ROLES: tuple[tuple[tuple[str, ...], str, str], ...] = (
(("duration", "seconds", "second", "时长", "秒"), "duration", "时长(秒)"),
(("fps", "frame rate", "framerate", "帧率"), "fps", "帧率"),
(("seed", "种子"), "seed", "随机种子"),
(("width", "宽度"), "width", "宽度"),
(("height", "高度"), "height", "高度"),
(("steps", "步数"), "steps", "采样步数"),
(("cfg",), "cfg", "CFG"),
)
def _is_scalar(value: Any) -> bool:
return isinstance(value, (str, int, float)) and not isinstance(value, bool)
def _title_of(node: dict[str, Any]) -> str:
return str((node.get("_meta") or {}).get("title") or "").strip()
def _node_sort_key(node_id: str) -> tuple:
return tuple(
(0, int(p)) if p.isdigit() else (1, p)
for p in str(node_id).replace(FIELD_KEY_SEP, ":").split(":")
)
def _consumers(workflow: dict[str, Any]) -> dict[str, list[tuple[str, str]]]:
"""source nodeId → [(consumer nodeId, consumer input name), …]."""
out: dict[str, list[tuple[str, str]]] = {}
for nid, node in workflow.items():
if not isinstance(node, dict):
continue
for name, val in (node.get("inputs") or {}).items():
if isinstance(val, list) and len(val) == 2 and isinstance(val[0], (str, int)):
out.setdefault(str(val[0]), []).append((str(nid), str(name)))
return out
def _feeds_negative(
node_id: str, consumers: dict[str, list[tuple[str, str]]], depth: int = 4
) -> bool:
"""True when this node's output reaches a sampler/guider ``negative`` input
and never a ``positive`` one.
A text encoder wired into both (one conditioning reused for positive and
negative) is treated as the positive prompt; only a negative-sounding
title makes it negative (see ``_is_negative``).
"""
frontier = [node_id]
seen = {node_id}
negative = False
for _ in range(depth):
nxt: list[str] = []
for nid in frontier:
for cid, name in consumers.get(nid, []):
if name == "positive":
return False
if name == "negative":
negative = True
continue
if cid not in seen:
seen.add(cid)
nxt.append(cid)
frontier = nxt
return negative
_FRAME_INPUTS = frozenset({"length", "num_frames", "frames", "video_length", "frame_count"})
_SECONDS_INPUTS = frozenset({"duration", "seconds", "duration_seconds"})
_EXPRESSION_HINTS = ("expression", "math")
def _duration_hint(
node_id: str,
workflow: dict[str, Any],
consumers: dict[str, list[tuple[str, str]]],
depth: int = 3,
) -> str | None:
"""How an untitled number feeds the video length downstream.
``"seconds"`` — it reaches a seconds input, or a frame-count input only
after passing through a math/expression node (seconds × fps → frames);
``"frames"`` — it is wired straight into a frame-count input.
"""
frontier = [(node_id, False)]
seen = {node_id}
for _ in range(depth):
nxt: list[tuple[str, bool]] = []
for nid, via_expr in frontier:
for cid, name in consumers.get(nid, []):
if name in _SECONDS_INPUTS:
return "seconds"
if name in _FRAME_INPUTS:
return "seconds" if via_expr else "frames"
if cid in seen:
continue
seen.add(cid)
ct = str((workflow.get(cid) or {}).get("class_type") or "").lower()
nxt.append((cid, via_expr or any(h in ct for h in _EXPRESSION_HINTS)))
frontier = nxt
return None
def _entry(
key: str, label: str, role: str | None, kind: str, default: Any, required: bool
) -> dict[str, Any]:
return {
"nodeId": key,
"label": label,
"role": role,
"kind": kind,
"defaultValue": default if _is_scalar(default) else None,
"required": required,
"auto": True,
}
def _key(node_id: str, node: dict[str, Any], field: str) -> str:
"""Plain nodeId when that already patches ``field``; else ``nodeId@field``."""
return (
str(node_id) if resolve_patch_field(node) == field else f"{node_id}{FIELD_KEY_SEP}{field}"
)
def detect_untagged_inputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
"""Infer fillable inputs from node classes and wiring of an untagged workflow.
Only scalar widgets are exposed (linked inputs are wiring, not values).
The positive prompt is the only required field; everything else keeps the
workflow's own value when left blank.
"""
if not isinstance(workflow, dict):
return []
consumers = _consumers(workflow)
nodes = sorted(
((str(k), v) for k, v in workflow.items() if isinstance(v, dict)),
key=lambda kv: _node_sort_key(kv[0]),
)
texts: list[tuple[str, dict[str, Any], str, bool]] = [] # (id, node, field, negative)
media: list[dict[str, Any]] = []
numbers: list[dict[str, Any]] = []
taken_roles: set[str] = set()
def add_number(nid: str, node: dict[str, Any], field: str, role: str, label: str) -> None:
if role in taken_roles:
return
value = (node.get("inputs") or {}).get(field)
if not _is_scalar(value) or isinstance(value, str):
return
taken_roles.add(role)
numbers.append(_entry(_key(nid, node, field), label, role, "number", value, False))
for nid, node in nodes:
ct = str(node.get("class_type") or "")
inputs = node.get("inputs") or {}
title = _title_of(node)
lowered = title.lower()
if ct in IMAGE_CLASSES or ct in _MASK_IMAGE_CLASSES:
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"))
media.append(
_entry(
_key(nid, node, "image"),
label,
"mask" if is_mask else "image",
"image",
None,
not has_default,
)
)
continue
if ct in VIDEO_CLASSES or ct in AUDIO_CLASSES:
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))
media.append(_entry(str(nid), title or ct, kind, kind, None, not has_default))
continue
if ct in _STRING_PRIMITIVES and isinstance(inputs.get("value"), str):
texts.append((nid, node, "value", _is_negative(nid, lowered, consumers)))
continue
if ct == "CLIPTextEncode" or "TextEncode" in ct:
field = next((f for f in ("text", "prompt") if isinstance(inputs.get(f), str)), None)
neg_field = next(
(f for f in _NEGATIVE_TEXT_FIELDS if isinstance(inputs.get(f), str)), None
)
if field and neg_field:
# One encoder carrying both prompts (TextEncodeQwenImage21…):
# its outputs feed positive *and* negative, so wiring says nothing.
texts.append((nid, node, field, False))
texts.append((nid, node, neg_field, True))
elif field:
texts.append((nid, node, field, _is_negative(nid, lowered, consumers)))
continue
if ct in _SAMPLER_CLASSES:
add_number(nid, node, "seed" if "seed" in inputs else "noise_seed", "seed", "随机种子")
add_number(nid, node, "steps", "steps", "采样步数")
add_number(nid, node, "cfg", "cfg", "CFG")
continue
if ct == "RandomNoise":
add_number(nid, node, "noise_seed", "seed", "随机种子")
continue
if ct == "BasicScheduler":
add_number(nid, node, "steps", "steps", "采样步数")
continue
if ct == "CFGGuider":
add_number(nid, node, "cfg", "cfg", "CFG")
continue
if ct.startswith("Empty") and "Latent" in ct:
add_number(nid, node, "width", "width", "宽度")
add_number(nid, node, "height", "height", "高度")
add_number(nid, node, "batch_size", "batch", "批次数量")
continue
if ct in _NUMBER_PRIMITIVES and _is_scalar(inputs.get("value")):
role, label = None, title if title and title != ct else f"{ct} #{nid}"
for words, r, zh in _NUMBER_TITLE_ROLES:
if any(w in lowered for w in words):
role, label = r, (title if title and title != ct else zh)
break
if role is None and (not title or title == ct):
hint = _duration_hint(nid, workflow, consumers)
if hint == "seconds":
role, label = "duration", "时长(秒)"
elif hint == "frames":
label = "视频帧数"
if role and role in taken_roles:
role = None
if role:
taken_roles.add(role)
numbers.append(
_entry(_key(nid, node, "value"), label, role, "number", inputs["value"], False)
)
results: list[dict[str, Any]] = []
positives = [t for t in texts if not t[3]]
negatives = [t for t in texts if t[3]]
def rank(t: tuple[str, dict[str, Any], str, bool]) -> tuple[int, int]:
title = _title_of(t[1]).lower()
system = any(w in title for w in _SYSTEM_WORDS)
named = any(w in title for w in _PROMPT_WORDS)
return (1 if system else 0, 0 if named else 1)
positives.sort(key=rank)
for i, (nid, node, field, _neg) in enumerate(positives):
title = _title_of(node)
if i == 0:
results.append(
_entry(
_key(nid, node, field),
"正向提示词",
"prompt",
"textarea",
node["inputs"][field],
True,
)
)
else:
label = title if title and title != node.get("class_type") else f"文本 #{nid}"
results.append(
_entry(
_key(nid, node, field), label, None, "textarea", node["inputs"][field], False
)
)
for i, (nid, node, field, _neg) in enumerate(negatives):
role = "negative" if i == 0 else None
label = "反向提示词" if i == 0 else (_title_of(node) or f"文本 #{nid}")
results.append(
_entry(_key(nid, node, field), label, role, "textarea", node["inputs"][field], False)
)
results.extend(numbers)
results.extend(media)
return results
def _is_negative(
node_id: str, lowered_title: str, consumers: dict[str, list[tuple[str, str]]]
) -> bool:
if any(w in lowered_title for w in _NEGATIVE_WORDS):
return True
return _feeds_negative(node_id, consumers)
def parse_dynamic_outputs(workflow: dict[str, Any]) -> list[dict[str, Any]]:
results: list[dict[str, Any]] = []
for node_id, node in workflow.items():
@@ -1,5 +1,4 @@
"""Patch user values into ComfyUI API-format workflow by nodeId."""
from __future__ import annotations
import copy
@@ -7,10 +6,6 @@ from typing import Any
from calliope.comfyui.registry import 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 = "@"
def _resolve_field(field: str, inputs: dict[str, Any]) -> str:
"""Map the computed patch field onto a key that exists on this node.
@@ -31,13 +26,6 @@ def _resolve_field(field: str, inputs: dict[str, Any]) -> str:
return field
def resolve_patch_field(node: dict[str, Any]) -> str:
"""The widget a plain nodeId key writes to on this node."""
return _resolve_field(
class_to_patch_field(node.get("class_type", "")), dict(node.get("inputs") or {})
)
def patch_workflow(
base: dict[str, Any],
values_by_node_id: dict[str, Any],
@@ -47,18 +35,11 @@ def patch_workflow(
if value is None:
continue
key = str(node_id)
field: str | None = None
if key not in patched and FIELD_KEY_SEP in key:
key, field = key.rsplit(FIELD_KEY_SEP, 1)
node = patched.get(key)
if not isinstance(node, dict):
continue
inputs = dict(node.get("inputs") or {})
if field is None:
field = resolve_patch_field(node)
elif isinstance(inputs.get(field), list):
# Linked input ([src_id, slot]) — never overwrite the wiring.
continue
field = _resolve_field(class_to_patch_field(node.get("class_type", "")), inputs)
inputs[field] = value
node["inputs"] = inputs
patched[key] = node
@@ -20,7 +20,7 @@ TEXT_AREA_CLASSES = frozenset(
NUMBER_CLASSES = frozenset(
{"INT", "FLOAT", "PrimitiveInt", "PrimitiveFloat", "KSampler", "KSamplerAdvanced"}
)
IMAGE_CLASSES = frozenset({"LoadImage", "LoadImageMask", "ImageLoader", "ETN_LoadImageBase64"})
IMAGE_CLASSES = frozenset({"LoadImage", "ImageLoader", "ETN_LoadImageBase64"})
IMAGE_URL_CLASSES = frozenset({"Load Image From Url (mtb)"})
AUDIO_CLASSES = frozenset({"LoadAudio", "VHS_LoadAudio"})
# Stock LoadVideo uses the `file` widget; VHS uses `video`.
@@ -13,13 +13,6 @@ def _find_by_role(inputs: list[dict[str, Any]], *roles: str) -> dict[str, Any] |
return None
def _node_sort_key(node_id: object) -> tuple:
"""Numeric order for "12", subgraph "171:154" and field keys "3@seed"."""
return tuple(
(0, int(p)) if p.isdigit() else (1, p) for p in str(node_id).replace("@", ":").split(":")
)
def _find_all_by_role(inputs: list[dict[str, Any]], *roles: str) -> list[dict[str, Any]]:
"""All inputs matching any of the roles, sorted by numeric node id.
@@ -28,7 +21,7 @@ def _find_all_by_role(inputs: list[dict[str, Any]], *roles: str) -> list[dict[st
in this order and it defines ``<Subject N>`` numbering in the prompt.
"""
matches = [inp for inp in inputs if input_has_role(inp, *roles)]
return sorted(matches, key=lambda i: _node_sort_key(i["nodeId"]))
return sorted(matches, key=lambda i: int(i["nodeId"]))
def ref_image_slots(inputs: list[dict[str, Any]]) -> list[dict[str, Any]]:
+198 -11
View File
@@ -127,6 +127,11 @@ class Settings(BaseSettings):
# profile so LLMClient and env overrides keep working.
llm_profiles: list[dict[str, Any]] = Field(default_factory=list)
llm_active_id: str | None = None
# Providers group profiles that share one endpoint + key (HEL-624). Each
# profile is still one model and carries `provider_id`; its base_url /
# api_key always mirror the provider so profile readers stay unchanged.
# Each provider: {id, name, base_url, api_key}.
llm_providers: list[dict[str, Any]] = Field(default_factory=list)
# role (AGENT_LLM_ROLES) -> LLM profile id; None/absent = use Active LLM
agent_llm_assignments: dict[str, str | None] = Field(default_factory=dict)
@@ -199,6 +204,7 @@ class Settings(BaseSettings):
"base_url": self.llm_base_url,
"model": self.llm_model,
"api_key": self.llm_api_key,
"provider_id": None,
}
]
self.llm_active_id = pid
@@ -222,6 +228,7 @@ class Settings(BaseSettings):
"base_url": base_url or self.llm_base_url,
"model": model or "llama3.2",
"api_key": key,
"provider_id": item.get("provider_id") or None,
}
)
if not normalized:
@@ -232,9 +239,166 @@ class Settings(BaseSettings):
if self.llm_active_id not in ids:
self.llm_active_id = normalized[0]["id"]
migrated = True
if self._sync_llm_providers():
migrated = True
self.apply_active_llm()
return migrated
def _sync_llm_providers(self) -> bool:
"""Make every profile point at a provider with its exact endpoint + key.
Profiles are the source of truth here: a profile without a provider
(pre-HEL-624 config) gets its own provider, so existing ids and agent
assignments are untouched. A profile whose endpoint drifted from its
provider (legacy flat save) updates the provider when it is the only
member, otherwise splits off into a new one. Empty providers are
dropped. Returns True when anything changed.
"""
changed = False
providers: list[dict[str, Any]] = []
by_id: dict[str, dict[str, Any]] = {}
for raw in self.llm_providers if isinstance(self.llm_providers, list) else []:
if not isinstance(raw, dict) or not raw.get("id") or raw["id"] in by_id:
changed = True
continue
key = raw.get("api_key")
prov = {
"id": str(raw["id"]),
"name": str(raw.get("name") or "").strip(),
"base_url": str(raw.get("base_url") or "").strip(),
"api_key": key if isinstance(key, str) and key.strip() else None,
}
providers.append(prov)
by_id[prov["id"]] = prov
members: dict[str, int] = {}
for prof in self.llm_profiles:
pid = prof.get("provider_id")
if pid in by_id:
members[pid] = members.get(pid, 0) + 1
for prof in self.llm_profiles:
prov = by_id.get(prof.get("provider_id") or "")
if prov is not None and (
prov["base_url"] == prof["base_url"] and prov["api_key"] == prof["api_key"]
):
continue
changed = True
if prov is not None and members.get(prov["id"], 0) == 1:
prov["base_url"] = prof["base_url"]
prov["api_key"] = prof["api_key"]
continue
if prov is not None:
members[prov["id"]] -= 1
prov = {
"id": str(uuid.uuid4()),
"name": str(prof.get("name") or "").strip() or prof["base_url"],
"base_url": prof["base_url"],
"api_key": prof["api_key"],
}
providers.append(prov)
by_id[prov["id"]] = prov
members[prov["id"]] = 1
prof["provider_id"] = prov["id"]
kept = [p for p in providers if members.get(p["id"], 0) > 0]
for prov in kept:
if not prov["name"]:
prov["name"] = prov["base_url"]
changed = True
if len(kept) != len(providers):
changed = True
self.llm_providers = kept
return changed
def _after_llm_list_change(self) -> None:
ids = {p["id"] for p in self.llm_profiles}
if self.llm_active_id not in ids:
self.llm_active_id = self.llm_profiles[0]["id"]
self.agent_llm_assignments = {
role: pid
for role, pid in (self.agent_llm_assignments or {}).items()
if pid is None or pid in ids
}
self.apply_active_llm()
def replace_llm_providers(self, incoming: list[dict[str, Any]]) -> None:
"""Replace providers and their models in one go (models page save).
Each incoming provider: {id?, name, base_url, api_key?, models: [{id?,
name?, model}]}. A blank key keeps the stored one; model ids are kept
so agent assignments and the default model survive edits.
"""
old_providers = {
str(p["id"]): p
for p in (self.llm_providers or [])
if isinstance(p, dict) and p.get("id")
}
old_profiles = {
str(p["id"]): p
for p in (self.llm_profiles or [])
if isinstance(p, dict) and p.get("id")
}
providers: list[dict[str, Any]] = []
profiles: list[dict[str, Any]] = []
used_ids: set[str] = set()
for raw in incoming:
if not isinstance(raw, dict):
continue
prov_id = str(raw.get("id") or uuid.uuid4())
if prov_id in used_ids:
prov_id = str(uuid.uuid4())
used_ids.add(prov_id)
old = old_providers.get(prov_id, {})
base_url = str(raw.get("base_url") or old.get("base_url") or "").strip()
if not base_url:
raise ValueError("服务商接口地址不能为空")
api_key = old.get("api_key") if isinstance(old.get("api_key"), str) else None
incoming_key = raw.get("api_key")
if isinstance(incoming_key, str) and incoming_key.strip():
api_key = incoming_key.strip()
name = str(raw.get("name") or old.get("name") or base_url).strip()
seen_models: set[str] = set()
count = 0
for m in raw.get("models") or []:
if not isinstance(m, dict):
continue
model = str(m.get("model") or "").strip()
if not model or model in seen_models:
continue
seen_models.add(model)
mid = str(m.get("id") or uuid.uuid4())
if mid in used_ids:
mid = str(uuid.uuid4())
used_ids.add(mid)
prev_name = old_profiles.get(mid, {}).get("name")
profiles.append(
{
"id": mid,
"name": str(m.get("name") or prev_name or model).strip() or model,
"base_url": base_url,
"model": model,
"api_key": api_key,
"provider_id": prov_id,
}
)
count += 1
if count == 0:
raise ValueError(f"服务商「{name}」至少需要一个模型")
providers.append(
{"id": prov_id, "name": name, "base_url": base_url, "api_key": api_key}
)
if not profiles:
raise ValueError("At least one LLM is required")
self.llm_providers = providers
self.llm_profiles = profiles
self._after_llm_list_change()
def resolve_llm_provider(self, provider_id: str) -> dict[str, Any] | None:
"""Full provider dict (key included). Server-side use only."""
self.ensure_llm_profiles()
return next((p for p in self.llm_providers if p.get("id") == provider_id), None)
def apply_active_llm(self) -> None:
"""Copy the active profile onto llm_base_url / llm_model / llm_api_key."""
profiles = self.llm_profiles if isinstance(self.llm_profiles, list) else []
@@ -293,20 +457,14 @@ class Settings(BaseSettings):
"base_url": base_url or self.llm_base_url,
"model": model or "llama3.2",
"api_key": api_key,
"provider_id": raw.get("provider_id") or old.get("provider_id") or None,
}
)
if not new_list:
raise ValueError("At least one LLM is required")
self.llm_profiles = new_list
ids = {p["id"] for p in new_list}
if self.llm_active_id not in ids:
self.llm_active_id = new_list[0]["id"]
self.agent_llm_assignments = {
role: pid
for role, pid in (self.agent_llm_assignments or {}).items()
if pid is None or pid in ids
}
self.apply_active_llm()
self._sync_llm_providers()
self._after_llm_list_change()
def sync_legacy_llm_into_active(self) -> None:
"""Write current llm_* fields onto the active profile (legacy PATCH)."""
@@ -322,6 +480,7 @@ class Settings(BaseSettings):
if not str(profile.get("name") or "").strip():
profile["name"] = model
break
self._sync_llm_providers()
self.apply_active_llm()
# ------------------------------------------------------------------
@@ -487,6 +646,7 @@ class Settings(BaseSettings):
def _public_llm_profiles(self) -> list[dict[str, Any]]:
self.ensure_llm_profiles()
names = {p["id"]: p["name"] for p in self.llm_providers}
return [
{
"id": p["id"],
@@ -497,13 +657,37 @@ class Settings(BaseSettings):
# Last 4 characters only — enough to recognise a saved key in
# the UI without ever exposing it (GitHub/Stripe convention).
"api_key_tail": (p.get("api_key") or "")[-4:] or None,
"provider_id": p.get("provider_id"),
"provider_name": names.get(p.get("provider_id") or ""),
}
for p in self.llm_profiles
]
def _public_llm_providers(self) -> list[dict[str, Any]]:
self.ensure_llm_profiles()
out: list[dict[str, Any]] = []
for prov in self.llm_providers:
key = prov.get("api_key") if isinstance(prov.get("api_key"), str) else None
out.append(
{
"id": prov["id"],
"name": prov["name"],
"base_url": prov["base_url"],
"api_key": bool(key),
"api_key_tail": (key or "")[-4:] or None,
"models": [
{"id": p["id"], "name": p["name"], "model": p["model"]}
for p in self.llm_profiles
if p.get("provider_id") == prov["id"]
],
}
)
return out
def to_public_dict(self) -> dict[str, Any]:
"""Return settings that are safe to expose to the frontend."""
profiles = self._public_llm_profiles()
providers = self._public_llm_providers()
return {
"host": self.host,
"port": self.port,
@@ -515,6 +699,7 @@ class Settings(BaseSettings):
"llm_model": self.llm_model,
"llm_api_key": bool(self.llm_api_key),
"llm_profiles": profiles,
"llm_providers": providers,
"llm_active_id": self.llm_active_id,
"agent_llm_assignments": dict(self.agent_llm_assignments or {}),
"comfyui_base_url": self.comfyui_base_url,
@@ -579,8 +764,9 @@ class Settings(BaseSettings):
self.ensure_storage_dirs()
profiles_migrated = self.ensure_llm_profiles()
comfy_migrated = self.ensure_comfyui_endpoints()
if comfy_migrated:
# Legacy single-address config: persist the migrated endpoint list.
if comfy_migrated or (profiles_migrated and "llm_providers" not in data):
# Legacy single-address / one-model-per-profile config: persist the
# migrated lists so generated ids stay stable across restarts.
self.save_config_file()
# Auto-heal poisoned config (temp paths / quoted dirs / legacy comfy dirs) back to disk
@@ -616,6 +802,7 @@ class Settings(BaseSettings):
"llm_model": self.llm_model,
"llm_api_key": self.llm_api_key,
"llm_profiles": self.llm_profiles,
"llm_providers": self.llm_providers,
"llm_active_id": self.llm_active_id,
"agent_llm_assignments": dict(self.agent_llm_assignments or {}),
"comfyui_base_url": self.comfyui_base_url,
+3 -19
View File
@@ -22,18 +22,6 @@ from calliope.queue.manager import queue_manager
logger = logging.getLogger("calliope.worker")
def _comfy_messages(messages: list[Any]) -> str:
"""Pull the readable part out of ComfyUI's history status messages."""
parts: list[str] = []
for msg in messages:
if isinstance(msg, (list, tuple)) and len(msg) == 2 and msg[0] == "execution_error":
body = msg[1] if isinstance(msg[1], dict) else {}
node = body.get("node_type") or body.get("node_id") or "?"
reason = body.get("exception_message") or body.get("exception_type") or "未知错误"
parts.append(f"节点 {node}:{str(reason).strip()}")
return ";".join(parts) or str(messages)[:500]
class _CancelledByUser(RuntimeError):
"""The job row was flipped to 'cancelled' out-of-band (Stop button).
The row already carries the terminal state; the loop must not overwrite
@@ -179,9 +167,7 @@ class QueueWorker:
workflow_id = job.get("workflow_id") or payload.get("workflow_id")
workflow = self._load_workflow(workflow_id)
if not workflow:
raise RuntimeError(
"找不到该任务使用的工作流(可能已被删除),请重新选择工作流后再生成"
)
raise RuntimeError("No workflow found for job")
input_values = payload.get("input_values") or {}
if payload.get("continue_source") and kind == "video":
@@ -196,14 +182,12 @@ class QueueWorker:
if not history:
if queue_manager.is_cancelled(job["id"]):
raise _CancelledByUser()
raise RuntimeError(
"等待 ComfyUI 出结果超时:可在「设置 → 队列」调大超时,或到 ComfyUI 检查该任务"
)
raise RuntimeError("Timed out waiting for ComfyUI history")
status = history.get("status") or {}
if status.get("status_str") == "error" or status.get("completed") is False:
messages = status.get("messages") or []
raise RuntimeError(f"ComfyUI 执行出错:{_comfy_messages(messages)}")
raise RuntimeError(f"ComfyUI error: {messages}")
outputs_meta = client.extract_outputs(history)
dest_dir = config.settings.assets_dir / str(project_id) / kind
@@ -336,13 +336,9 @@ async def generate(payload: PlaygroundGenerate) -> dict[str, Any]:
(payload.workflow_id,),
).fetchone()
if not wf:
raise HTTPException(
status_code=404, detail="工作流不存在(可能已被删除),请刷新页面后重新选择"
)
raise HTTPException(status_code=404, detail="Workflow not found")
if not wf["is_enabled"]:
raise HTTPException(
status_code=400, detail="该工作流已停用,请到「ComfyUI 连接」页启用后再生成"
)
raise HTTPException(status_code=400, detail="Workflow is disabled")
kind = wf["kind"]
finally:
conn.close()
@@ -17,16 +17,44 @@ _LLM_TEST_TIMEOUT_SEC = 15.0
_LLM_TEST_TIMEOUT_RANGE = (5, 60)
_LLM_MODELS_MAX = 500
class LlmProfileIn(BaseModel):
id: str | None = None
name: str | None = None
base_url: str | None = None
model: str | None = None
api_key: str | None = None
provider_id: str | None = None
class LlmProviderModelIn(BaseModel):
id: str | None = None
name: str | None = None
model: str
class LlmProviderIn(BaseModel):
id: str | None = None
name: str | None = None
base_url: str | None = None
api_key: str | None = None
models: list[LlmProviderModelIn] = Field(default_factory=list)
class LlmModelsIn(BaseModel):
provider_id: str | None = None
base_url: str | None = None
api_key: str | None = None
timeout_sec: float | None = Field(
None, ge=_LLM_TEST_TIMEOUT_RANGE[0], le=_LLM_TEST_TIMEOUT_RANGE[1]
)
class LlmTestIn(BaseModel):
profile_id: str | None = None
provider_id: str | None = None
base_url: str | None = None
model: str | None = None
api_key: str | None = None
@@ -42,6 +70,7 @@ class SettingsUpdate(BaseModel):
llm_model: str | None = None
llm_api_key: str | None = None
llm_profiles: list[LlmProfileIn] | None = None
llm_providers: list[LlmProviderIn] | None = None
llm_active_id: str | None = None
agent_llm_assignments: dict[str, str | None] | None = None
comfyui_base_url: str | None = None
@@ -70,6 +99,7 @@ async def get_settings() -> dict[str, Any]:
async def update_settings(payload: SettingsUpdate) -> dict[str, Any]:
data = payload.model_dump(exclude_unset=True)
profiles_in = data.pop("llm_profiles", None)
providers_in = data.pop("llm_providers", None)
active_in = data.pop("llm_active_id", None)
assignments_in = data.pop("agent_llm_assignments", None)
legacy_llm = {k: data.pop(k) for k in list(data) if k in _LEGACY_LLM_KEYS}
@@ -96,6 +126,12 @@ async def update_settings(payload: SettingsUpdate) -> dict[str, Any]:
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
if providers_in is not None:
try:
settings.replace_llm_providers(providers_in)
except ValueError as exc:
raise HTTPException(status_code=400, detail=str(exc)) from exc
if active_in is not None:
settings.ensure_llm_profiles()
ids = {p["id"] for p in settings.llm_profiles}
@@ -162,6 +198,8 @@ async def test_llm_connection(payload: LlmTestIn) -> dict[str, Any]:
key = profile.get("api_key")
if isinstance(key, str) and key.strip():
api_key = key
elif payload.provider_id:
base_url, api_key = _provider_fallback(payload.provider_id, base_url, api_key)
if not base_url or not model:
raise HTTPException(status_code=400, detail="base_url and model are required")
@@ -213,3 +251,86 @@ async def test_llm_connection(payload: LlmTestIn) -> dict[str, Any]:
if not (isinstance(data, dict) and data.get("choices")):
return {"ok": False, "error": "http", "detail": "response has no choices"}
return {"ok": True, "elapsed_ms": elapsed_ms}
def _provider_fallback(
provider_id: str, base_url: str, api_key: str | None
) -> tuple[str, str | None]:
"""Fill a blank address / key from a saved provider (key never leaves the server)."""
provider = settings.resolve_llm_provider(provider_id)
if provider is None:
raise HTTPException(status_code=404, detail="Unknown LLM provider")
if not base_url:
base_url = str(provider.get("base_url") or "").strip()
if api_key is None:
key = provider.get("api_key")
if isinstance(key, str) and key.strip():
api_key = key
return base_url, api_key
def _parse_model_ids(data: Any) -> list[str] | None:
"""Model ids from an OpenAI `{data: [{id}]}` list (or the common
`{models: [{name}]}` / bare-list variants). None = not a model list."""
items: Any = None
if isinstance(data, dict):
for key in ("data", "models"):
if isinstance(data.get(key), list):
items = data[key]
break
elif isinstance(data, list):
items = data
if items is None:
return None
ids: list[str] = []
for item in items:
value: Any = item
if isinstance(item, dict):
value = item.get("id") or item.get("name") or item.get("model")
if isinstance(value, str) and value.strip() and value.strip() not in ids:
ids.append(value.strip())
return sorted(ids, key=str.lower)[:_LLM_MODELS_MAX]
@router.post("/llm-models")
async def list_llm_models(payload: LlmModelsIn) -> dict[str, Any]:
"""List the models an OpenAI-compatible provider offers (GET {base}/models)."""
base_url = (payload.base_url or "").strip()
api_key = (payload.api_key or "").strip() or None
if payload.provider_id:
base_url, api_key = _provider_fallback(payload.provider_id, base_url, api_key)
if not base_url:
raise HTTPException(status_code=400, detail="base_url is required")
headers = {"Accept": "application/json"}
if api_key:
headers["Authorization"] = f"Bearer {api_key}"
timeout_sec = payload.timeout_sec if payload.timeout_sec is not None else _LLM_TEST_TIMEOUT_SEC
timeout_sec = min(max(timeout_sec, _LLM_TEST_TIMEOUT_RANGE[0]), _LLM_TEST_TIMEOUT_RANGE[1])
try:
async with httpx.AsyncClient(timeout=timeout_sec) as client:
resp = await client.get(f"{base_url.rstrip('/')}/models", headers=headers)
except httpx.TimeoutException:
return {
"ok": False,
"error": "timeout",
"detail": f"no response within {timeout_sec:.0f}s",
"timeout_sec": timeout_sec,
}
except httpx.HTTPError as exc:
return {"ok": False, "error": "connect", "detail": str(exc) or exc.__class__.__name__}
if resp.status_code in (401, 403):
return {"ok": False, "error": "auth", "detail": f"HTTP {resp.status_code}"}
if resp.status_code in (404, 405, 501):
return {"ok": False, "error": "unsupported", "detail": f"HTTP {resp.status_code}"}
if resp.status_code >= 400:
text = resp.text[:200].strip().replace("\n", " ")
return {"ok": False, "error": "http", "detail": f"HTTP {resp.status_code}: {text}"}
try:
data = resp.json()
except ValueError:
return {"ok": False, "error": "format", "detail": "response is not JSON"}
ids = _parse_model_ids(data)
if ids is None:
return {"ok": False, "error": "format", "detail": "response has no model list"}
return {"ok": True, "models": ids}
@@ -18,9 +18,6 @@ def _serialize_workflow(row: Any) -> dict[str, Any]:
data = row_to_dict(row)
data["workflow_json"] = json.loads(data["workflow_json"])
data["input_schema"] = json.loads(data["input_schema"]) if data.get("input_schema") else []
if not data["input_schema"]:
# An empty stored schema is re-derived so untagged workflows still expose inputs.
data["input_schema"] = parse_dynamic_inputs(data["workflow_json"])
data["output_schema"] = json.loads(data["output_schema"]) if data.get("output_schema") else []
data["is_enabled"] = bool(data.get("is_enabled"))
return data
@@ -1,808 +0,0 @@
{
"115": {
"inputs": {
"aspect_ratio": "9:16 (Portrait Widescreen)",
"megapixels": 0.6,
"multiple": 32
},
"class_type": "ResolutionSelector",
"_meta": {
"title": "Resolution Selector"
}
},
"207": {
"inputs": {
"vae_name": "minimax-h3\\minimax_h3_video_vae_fp16.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "Load VAE"
}
},
"208": {
"inputs": {
"vae_name": "minimax-h3\\minimax_h3_audio_vae_fp32.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "Load VAE"
}
},
"209": {
"inputs": {
"samples": [
"213",
0
],
"vae": [
"208",
0
]
},
"class_type": "VAEDecodeAudio",
"_meta": {
"title": "VAE Decode Audio"
}
},
"210": {
"inputs": {
"samples": [
"213",
0
],
"vae": [
"207",
0
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAE Decode"
}
},
"211": {
"inputs": {
"sampler_name": "euler"
},
"class_type": "KSamplerSelect",
"_meta": {
"title": "KSamplerSelect"
}
},
"212": {
"inputs": {
"scheduler": "beta",
"steps": 6,
"denoise": 1,
"model": [
"6007",
0
]
},
"class_type": "BasicScheduler",
"_meta": {
"title": "BasicScheduler"
}
},
"213": {
"inputs": {
"noise": [
"217",
0
],
"guider": [
"214",
0
],
"sampler": [
"211",
0
],
"sigmas": [
"212",
0
],
"latent_image": [
"219",
1
]
},
"class_type": "SamplerCustomAdvanced",
"_meta": {
"title": "SamplerCustomAdvanced"
}
},
"214": {
"inputs": {
"model": [
"6007",
0
],
"conditioning": [
"219",
0
]
},
"class_type": "BasicGuider",
"_meta": {
"title": "Basic Guider"
}
},
"215": {
"inputs": {
"unet_name": "minimax-h3\\minimax_h3_fl2va_int8_convrot.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": {
"title": "Load Diffusion Model"
}
},
"216": {
"inputs": {
"clip_name": "minimax-h3\\qwen3vl_32b_minimax_h3_int8_convrot.comfy.safetensors",
"type": "minimax",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": {
"title": "Load CLIP"
}
},
"217": {
"inputs": {
"noise_seed": 42
},
"class_type": "RandomNoise",
"_meta": {
"title": "RandomNoise"
}
},
"219": {
"inputs": {
"prompt": [
"6005",
0
],
"width": [
"115",
0
],
"height": [
"115",
1
],
"length": [
"220",
1
],
"clip": [
"6010",
1
],
"vae": [
"207",
0
]
},
"class_type": "MiniMaxH3ImageToVideo",
"_meta": {
"title": "MiniMax H3 Image to Video"
}
},
"220": {
"inputs": {
"expression": "max(5, round(a * 24)) + (5 - (max(5, round(a * 24)) % 17)) % 17",
"values.a": [
"221",
0
]
},
"class_type": "ComfyMathExpression",
"_meta": {
"title": "Math Expression"
}
},
"221": {
"inputs": {
"value": 10
},
"class_type": "PrimitiveFloat",
"_meta": {
"title": "Seconds"
}
},
"223": {
"inputs": {
"sage_attention": "auto",
"allow_compile": false,
"model": [
"6020",
0
]
},
"class_type": "PathchSageAttentionKJ",
"_meta": {
"title": "Patch Sage Attention KJ"
}
},
"5970": {
"inputs": {
"model_name": "film_net_fp16.safetensors"
},
"class_type": "FrameInterpolationModelLoader",
"_meta": {
"title": "Load Frame Interpolation Model"
}
},
"5971": {
"inputs": {
"multiplier": 2,
"interp_model": [
"5970",
0
],
"images": [
"5976",
0
]
},
"class_type": "FrameInterpolate",
"_meta": {
"title": "Run Frame Interpolation Model"
}
},
"5974": {
"inputs": {
"expression": "a*2",
"a": [
"5986",
0
]
},
"class_type": "MathExpression|pysssss",
"_meta": {
"title": "Math Expression 🐍"
}
},
"5975": {
"inputs": {
"resize_type": "scale by multiplier",
"resize_type.scale": 1.5,
"quality": "ULTRA",
"images": [
"5971",
0
]
},
"class_type": "RTXVideoSuperResolution",
"_meta": {
"title": "RTX Video Super Resolution Pro"
}
},
"5976": {
"inputs": {
"anything": [
"5977",
0
]
},
"class_type": "easy clearCacheAll",
"_meta": {
"title": "Clear Cache All"
}
},
"5977": {
"inputs": {
"anything": [
"6063:5538",
0
]
},
"class_type": "easy cleanGpuUsed",
"_meta": {
"title": "Clean VRAM Used"
}
},
"5978": {
"inputs": {
"frame_rate": [
"5974",
1
],
"loop_count": 0,
"filename_prefix": "minimax-h3/vid-vfi",
"format": "video/h264-mp4",
"pix_fmt": "yuv420p",
"crf": 19,
"save_metadata": true,
"trim_to_audio": false,
"pingpong": false,
"save_output": true,
"images": [
"5975",
0
],
"audio": [
"6063:4848",
0
]
},
"class_type": "VHS_VideoCombine",
"_meta": {
"title": "Video Output 2"
}
},
"5986": {
"inputs": {
"value": 24
},
"class_type": "PrimitiveFloat",
"_meta": {
"title": "PrimitiveFloat"
}
},
"6005": {
"inputs": {
"value": "integrated_multimodal_description: [Shot 1] Cinematic, live-action, shot on iPhone, a vertical selfie frame from a phone held at arm's length above eye level. A young woman in her mid-twenties with sun-kissed tan skin and loose wavy chestnut brown hair, wearing a white cropped t-shirt with a gold pendant necklace, looks directly into the phone lens, her face filling the centre of frame. Warm golden hour sunlight hits the right side of her face from a low sun behind the trees, casting a soft amber glow across her skin. Behind her, a city park is blurred into soft green and gold bokeh — trees, dappled light, a hot pink sunset sky bleeding through the leaves. The camera holds static in selfie framing. The young woman's lips move as she speaks with a bright, energetic voice with a slight North American accent (S1): <d>[English] Oh my god, you guys, it is actually perfect out here right now.</d> Her mouth closes after the last word, then she breaks into a wide grin, teeth showing, the skin at the corners of her eyes crinkling. She tilts her head slightly to the right, the grin fading to a soft expression as her lips move and she speaks again, her voice warmer (S1): <d>[English] Like, I didn't want to leave.</d> Her mouth closes. She presses her lips together, then points her index finger at the camera and speaks with a playful tone, her lips forming each word (S1): <d>[English] So I'm not.</d> Her mouth closes, and the wide grin returns. With her free left hand she pushes the windblown hair behind her ear, her gold bracelet sliding down her wrist. She raises her free hand in a quick peace sign next to her cheek, her smile widening, and laughs — a short, genuine laugh, her mouth opening, shoulders shaking once, her eyes squeezing shut for a beat, then opening again. She drops the peace sign and brings the phone slightly closer, her face growing larger in frame, the grin settling into a warm smile. The camera pushes in with small amplitude at slow speed as the phone draws closer.\n\noverall_soundscape: A warm breeze carries birdsong and the distant hum of a city at golden hour. The woman's laugh is clear and close to the phone mic — short, genuine, with a slight exhale. Loose hair rustles as she tucks it behind her ear, and the gold bracelet lightly clinks against itself on her wrist.\n\nnon_diegetic_music: N/A"
},
"class_type": "PrimitiveStringMultiline",
"_meta": {
"title": "Text Prompt"
}
},
"6006": {
"inputs": {
"lora_name": "minimax-h3\\minimax_h3_fl2v_turbo_4step_v1.1_768p_comfyui_bf16.safetensors",
"strength_model": 0.6,
"model": [
"215",
0
]
},
"class_type": "LoraLoaderModelOnly",
"_meta": {
"title": "Load LoRA"
}
},
"6007": {
"inputs": {
"shift_video": 12,
"shift_audio": 3,
"model": [
"223",
0
]
},
"class_type": "MiniMaxH3SigmaShift",
"_meta": {
"title": "ModelSamplingMiniMaxH3"
}
},
"6010": {
"inputs": {
"PowerLoraLoaderHeaderWidget": {
"type": "PowerLoraLoaderHeaderWidget"
},
"lora_1": {
"on": true,
"lora": "minimax-h3\\h3-realism-people-t2v-i2v-r2v(r34l1sm).safetensors",
"strength": 1
},
"➕ Add Lora": "",
"model": [
"6006",
0
],
"clip": [
"216",
0
]
},
"class_type": "Power Lora Loader (rgthree)",
"_meta": {
"title": "Power Lora Loader (rgthree)"
}
},
"6020": {
"inputs": {
"tau": 1.2,
"start_percent": 0.2,
"end_percent": 0.9,
"min_tokens": 4096,
"int8_qk": false,
"sink_conditioning": "exact_kv",
"morton": false,
"morton_curve": "3d",
"verbose": false,
"model": [
"6010",
0
]
},
"class_type": "SolAttnPatch",
"_meta": {
"title": "Patch Sol-Attn"
}
},
"6059": {
"inputs": {
"anything": [
"6060",
0
]
},
"class_type": "easy clearCacheAll",
"_meta": {
"title": "Clear Cache All"
}
},
"6060": {
"inputs": {
"anything": [
"210",
0
]
},
"class_type": "easy cleanGpuUsed",
"_meta": {
"title": "Clean VRAM Used"
}
},
"6062:5570": {
"inputs": {
"vae_name": "ltx-2.5\\ltx-2.5-audio-vae-bf16.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "Load VAE - Audio"
}
},
"6062:5571": {
"inputs": {
"vae_name": "ltx-2.5\\ltx-2.5-video-vae-bf16.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "Load VAE - Video"
}
},
"6062:5569": {
"inputs": {
"unet_name": "ltx-2.5\\ltx-2.5-22b-distilled-transformer-comfy-int8-convrot.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": {
"title": "Load Diffusion Model"
}
},
"6062:5577": {
"inputs": {
"model_name": "ltx-2.5\\ltx-2.5-latent-spatial-upscaler-x2-bf16-1.0.safetensors"
},
"class_type": "LatentUpscaleModelLoader",
"_meta": {
"title": "Load Latent Upscale Model"
}
},
"6062:5574": {
"inputs": {
"clip_name": "gemma4-12b-with-proj-ltx-2.5-comfy-int8-convrot.safetensors",
"type": "ltxv",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": {
"title": "Load CLIP - Text Encoder"
}
},
"6065:2612": {
"inputs": {
"text": "",
"clip": [
"6062:5574",
0
]
},
"class_type": "CLIPTextEncode",
"_meta": {
"title": "CLIP Text Encode (Negative Prompt)"
}
},
"6065:2483": {
"inputs": {
"text": [
"6005",
0
],
"clip": [
"6062:5574",
0
]
},
"class_type": "CLIPTextEncode",
"_meta": {
"title": "CLIP Text Encode (Positive Prompt)"
}
},
"6065:1241": {
"inputs": {
"frame_rate": [
"5986",
0
],
"positive": [
"6065:2483",
0
],
"negative": [
"6065:2612",
0
]
},
"class_type": "LTXVConditioning",
"_meta": {
"title": "LTXVConditioning"
}
},
"6061:4985": {
"inputs": {
"sigmas": "0.85, 0.7250, 0.4219, 0.0"
},
"class_type": "ManualSigmas",
"_meta": {
"title": "ManualSigmas"
}
},
"6061:4976": {
"inputs": {
"sampler_name": "euler"
},
"class_type": "KSamplerSelect",
"_meta": {
"title": "KSamplerSelect"
}
},
"6061:4964": {
"inputs": {
"cfg": 1,
"model": [
"6062:5569",
0
],
"positive": [
"6065:1241",
0
],
"negative": [
"6065:1241",
1
]
},
"class_type": "CFGGuider",
"_meta": {
"title": "CFG Guider"
}
},
"6061:4967": {
"inputs": {
"noise_seed": 42
},
"class_type": "RandomNoise",
"_meta": {
"title": "RandomNoise"
}
},
"6061:4973": {
"inputs": {
"av_latent": [
"6061:4971",
0
]
},
"class_type": "LTXVSeparateAVLatent",
"_meta": {
"title": "LTXVSeparateAVLatent"
}
},
"6061:4971": {
"inputs": {
"noise": [
"6061:4967",
0
],
"guider": [
"6061:4964",
0
],
"sampler": [
"6061:4976",
0
],
"sigmas": [
"6061:4985",
0
],
"latent_image": [
"6061:4969",
0
]
},
"class_type": "SamplerCustomAdvanced",
"_meta": {
"title": "SamplerCustomAdvanced"
}
},
"6061:4969": {
"inputs": {
"video_latent": [
"6061:4970",
0
],
"audio_latent": [
"6061:6074",
0
]
},
"class_type": "LTXVConcatAVLatent",
"_meta": {
"title": "LTXVConcatAVLatent"
}
},
"6061:6072": {
"inputs": {
"value": 0,
"width": [
"6061:6073",
0
],
"height": [
"6061:6073",
1
]
},
"class_type": "SolidMask",
"_meta": {
"title": "Create Solid Mask"
}
},
"6061:4975": {
"inputs": {
"samples": [
"6061:6070",
0
],
"upscale_model": [
"6062:5577",
0
],
"vae": [
"6062:5571",
0
]
},
"class_type": "LTXVLatentUpsampler",
"_meta": {
"title": "LTXVLatentUpsampler"
}
},
"6061:6070": {
"inputs": {
"pixels": [
"6059",
0
],
"vae": [
"6062:5571",
0
]
},
"class_type": "VAEEncode",
"_meta": {
"title": "VAE Encode"
}
},
"6061:4970": {
"inputs": {
"strength": 1,
"bypass": true,
"vae": [
"6062:5571",
0
],
"image": [
"6059",
0
],
"latent": [
"6061:4975",
0
]
},
"class_type": "LTXVImgToVideoInplace",
"_meta": {
"title": "LTXVImgToVideoInplace"
}
},
"6061:6074": {
"inputs": {
"samples": [
"6061:6075",
0
],
"mask": [
"6061:6072",
0
]
},
"class_type": "SetLatentNoiseMask",
"_meta": {
"title": "Set Latent Noise Mask"
}
},
"6061:6073": {
"inputs": {
"image": [
"6059",
0
]
},
"class_type": "GetImageSize",
"_meta": {
"title": "Get Image Size"
}
},
"6061:6075": {
"inputs": {
"audio": [
"209",
0
],
"audio_vae": [
"6062:5570",
0
]
},
"class_type": "LTXVAudioVAEEncode",
"_meta": {
"title": "LTXV Audio VAE Encode"
}
},
"6063:5538": {
"inputs": {
"tile_size": 512,
"overlap": 64,
"temporal_size": 128,
"temporal_overlap": 32,
"samples": [
"6061:4973",
0
],
"vae": [
"6062:5571",
0
]
},
"class_type": "VAEDecodeTiled",
"_meta": {
"title": "VAE Decode (Tiled)"
}
},
"6063:4848": {
"inputs": {
"samples": [
"6061:4973",
1
],
"audio_vae": [
"6062:5570",
0
]
},
"class_type": "LTXVAudioVAEDecode",
"_meta": {
"title": "LTXV Audio VAE Decode"
}
}
}
@@ -1,126 +0,0 @@
{
"3": {
"inputs": {
"seed": 761215360232465,
"steps": 20,
"cfg": 2.5,
"sampler_name": "euler",
"scheduler": "simple",
"denoise": 1,
"model": ["75", 0],
"positive": ["76", 0],
"negative": ["77", 0],
"latent_image": ["90", 0]
},
"class_type": "KSampler",
"_meta": { "title": "KSampler" }
},
"8": {
"inputs": {
"samples": ["3", 0],
"vae": ["39", 0]
},
"class_type": "VAEDecode",
"_meta": { "title": "VAE Decode" }
},
"37": {
"inputs": {
"unet_name": "qwen_image_edit_2509_fp8_e4m3fn.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": { "title": "Load Diffusion Model" }
},
"38": {
"inputs": {
"clip_name": "qwen_2.5_vl_7b_fp8_scaled.safetensors",
"type": "qwen_image",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": { "title": "Load CLIP" }
},
"39": {
"inputs": {
"vae_name": "qwen_image_vae.safetensors"
},
"class_type": "VAELoader",
"_meta": { "title": "Load VAE" }
},
"60": {
"inputs": {
"filename_prefix": "ComfyUI",
"images": ["8", 0]
},
"class_type": "SaveImage",
"_meta": { "title": "Save Image" }
},
"75": {
"inputs": {
"shift": 3,
"model": ["37", 0]
},
"class_type": "ModelSamplingAuraFlow",
"_meta": { "title": "ModelSamplingAuraFlow" }
},
"76": {
"inputs": {
"prompt": "把背景换成夜晚的城市街道",
"clip": ["38", 0],
"vae": ["39", 0],
"image1": ["93", 0]
},
"class_type": "TextEncodeQwenImageEditPlus",
"_meta": { "title": "TextEncodeQwenImageEditPlus" }
},
"77": {
"inputs": {
"prompt": "",
"clip": ["38", 0],
"vae": ["39", 0],
"image1": ["93", 0]
},
"class_type": "TextEncodeQwenImageEditPlus",
"_meta": { "title": "TextEncodeQwenImageEditPlus" }
},
"78": {
"inputs": {
"image": "example.png"
},
"class_type": "LoadImage",
"_meta": { "title": "Load Image" }
},
"88": {
"inputs": {
"pixels": ["93", 0],
"vae": ["39", 0]
},
"class_type": "VAEEncode",
"_meta": { "title": "VAE Encode" }
},
"90": {
"inputs": {
"samples": ["88", 0],
"mask": ["95", 0]
},
"class_type": "SetLatentNoiseMask",
"_meta": { "title": "Set Latent Noise Mask" }
},
"93": {
"inputs": {
"upscale_method": "lanczos",
"megapixels": 1,
"image": ["78", 0]
},
"class_type": "ImageScaleToTotalPixels",
"_meta": { "title": "Scale Image to Total Pixels" }
},
"95": {
"inputs": {
"image": "mask.png",
"channel": "alpha"
},
"class_type": "LoadImageMask",
"_meta": { "title": "Load Image (as Mask)" }
}
}
@@ -1,91 +0,0 @@
{
"3": {
"inputs": {
"seed": 1125488487853216,
"steps": 20,
"cfg": 2.5,
"sampler_name": "euler",
"scheduler": "simple",
"denoise": 1,
"model": ["66", 0],
"positive": ["6", 0],
"negative": ["7", 0],
"latent_image": ["58", 0]
},
"class_type": "KSampler",
"_meta": { "title": "KSampler" }
},
"6": {
"inputs": {
"text": "一只橘猫坐在窗台上,午后阳光,电影感",
"clip": ["38", 0]
},
"class_type": "CLIPTextEncode",
"_meta": { "title": "CLIP Text Encode (Positive Prompt)" }
},
"7": {
"inputs": {
"text": "",
"clip": ["38", 0]
},
"class_type": "CLIPTextEncode",
"_meta": { "title": "CLIP Text Encode (Negative Prompt)" }
},
"8": {
"inputs": {
"samples": ["3", 0],
"vae": ["39", 0]
},
"class_type": "VAEDecode",
"_meta": { "title": "VAE Decode" }
},
"37": {
"inputs": {
"unet_name": "qwen_image_fp8_e4m3fn.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": { "title": "Load Diffusion Model" }
},
"38": {
"inputs": {
"clip_name": "qwen_2.5_vl_7b_fp8_scaled.safetensors",
"type": "qwen_image",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": { "title": "Load CLIP" }
},
"39": {
"inputs": {
"vae_name": "qwen_image_vae.safetensors"
},
"class_type": "VAELoader",
"_meta": { "title": "Load VAE" }
},
"58": {
"inputs": {
"width": 1328,
"height": 1328,
"batch_size": 1
},
"class_type": "EmptySD3LatentImage",
"_meta": { "title": "EmptySD3LatentImage" }
},
"60": {
"inputs": {
"filename_prefix": "ComfyUI",
"images": ["8", 0]
},
"class_type": "SaveImage",
"_meta": { "title": "Save Image" }
},
"66": {
"inputs": {
"shift": 3.1,
"model": ["37", 0]
},
"class_type": "ModelSamplingAuraFlow",
"_meta": { "title": "ModelSamplingAuraFlow" }
}
}
@@ -1,301 +0,0 @@
{
"1": {
"inputs": {
"value": "PASTE YOUR PROMPT HERE. Use the MiniMax-H3 prompt contract (integrated_multimodal_description / overall_soundscape / non_diegetic_music). The previews in this repo were made with a ten-shot subway prompt posted by a community member; it is not redistributed here."
},
"class_type": "PrimitiveStringMultiline",
"_meta": {
"title": "PROMPT (feeds every stage)"
}
},
"92": {
"inputs": {
"filename_prefix": "video/01_reference_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
]
},
"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,
"model": [
"127",
0
]
},
"class_type": "H3SLAAttention",
"_meta": {
"title": "H3 SLA Attention 0.9/64 (their graph)"
}
}
}
@@ -1,137 +0,0 @@
{
"13": {
"inputs": {
"aspect_ratio": "1:1 (Square)",
"megapixels": 1,
"multiple": 8
},
"class_type": "ResolutionSelector",
"_meta": {
"title": "分辨率选择器"
}
},
"461": {
"inputs": {
"filename_prefix": "Qwen_image_2.1",
"format": "png",
"format.bit_depth": "8-bit",
"format.input_color_space": "sRGB",
"images": [
"459:457",
0
]
},
"class_type": "SaveImageAdvanced",
"_meta": {
"title": "保存图像(高级)"
}
},
"459:451": {
"inputs": {
"unet_name": "qwen_image_2.1_int8_convrot.safetensors",
"weight_dtype": "default"
},
"class_type": "UNETLoader",
"_meta": {
"title": "UNet加载器"
}
},
"459:452": {
"inputs": {
"prompt": "Greyscale fashion editorial portrait of an avant-garde woman tilted upwards in profile, captured with striking high-contrast chiaroscuro lighting. She wears oversized, thick-rimmed circular black sunglasses with matte dark lenses, concealing her upward gaze. Her attire merges high couture with tactical abstraction: a high-necked structural dress tailored from heavyweight fabric featuring a disrupted optical camouflage pattern—interlocking oversized polka dots, pixelated stippling, and organic contour blotches in stark monochrome that mimic military disruptive patterns in a refined runway style. Around her shoulders, asymmetric pleated webbing and tailored cargo straps are integrated seamlessly into the garment’s architecture. In her gloved hand, she clutches a structured matte-leather geometric handbag accented with subtle tactical buckles, utility stitching, and dark brushed-metal hardware. Her skin texture is rendered with hyper-detailed clarity, sculpted by intense, razor-sharp studio key light and deep graphite shadows. The striking background is a vivid mixed-media graphic collage, composed of flat vibrant lime green planes, stark black and white overlapping circles, segmented semi-circles with bold zebra striping, dense micro-halftone dot matrices, and vector topographic contour lines. The clash between monochromatic disruptive camo elements on her clothing and the saturated, retro-futuristic pop-art backdrop creates an intense visual dissonance, emphasizing sharp silhouettes, paper cut-out edges, dynamic compositional balance, and clean graphic novel textures. Absolutely no text, no typography, no letters, no words, no numbers, no logos, no watermark, no captions, pure imagery only.",
"negative_prompt": "",
"resolution": 1024,
"clip": [
"459:453",
0
]
},
"class_type": "TextEncodeQwenImage21",
"_meta": {
"title": "Text Encode Qwen Image 2.1"
}
},
"459:453": {
"inputs": {
"clip_name": "qwen3vl_8b_int8_convrot.safetensors",
"type": "qwen_image",
"device": "default"
},
"class_type": "CLIPLoader",
"_meta": {
"title": "加载CLIP"
}
},
"459:454": {
"inputs": {
"vae_name": "qwen_image_2.1_vae_bf16.safetensors"
},
"class_type": "VAELoader",
"_meta": {
"title": "加载VAE"
}
},
"459:456": {
"inputs": {
"width": [
"13",
0
],
"height": [
"13",
1
],
"batch_size": 1
},
"class_type": "EmptyLatentImage",
"_meta": {
"title": "空Latent图像"
}
},
"459:457": {
"inputs": {
"samples": [
"459:458",
0
],
"vae": [
"459:454",
0
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAE解码"
}
},
"459:458": {
"inputs": {
"seed": 593103825222985,
"steps": 25,
"cfg": 1,
"sampler_name": "euler",
"scheduler": "simple",
"denoise": 1,
"model": [
"459:451",
0
],
"positive": [
"459:452",
0
],
"negative": [
"459:452",
1
],
"latent_image": [
"459:456",
0
]
},
"class_type": "KSampler",
"_meta": {
"title": "K采样器"
}
}
}
@@ -0,0 +1,366 @@
"""One provider (endpoint + key) holding several models, and model-list discovery."""
from __future__ import annotations
import json
import socket
import threading
import time
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
import pytest
import calliope.config as config_module
from calliope.config import Settings, settings
P1 = "11111111-1111-1111-1111-111111111111"
M1 = "aaaaaaaa-0000-0000-0000-000000000001"
M2 = "aaaaaaaa-0000-0000-0000-000000000002"
class _FakeModelsHandler(BaseHTTPRequestHandler):
def do_GET(self):
srv = self.server
srv.requests.append({"path": self.path, "auth": self.headers.get("Authorization") or ""})
if srv.delay:
time.sleep(srv.delay)
if srv.mode == "unsupported" or self.path != "/v1/models":
self._send(404, {"error": "not found"})
return
if srv.api_key and self.headers.get("Authorization") != f"Bearer {srv.api_key}":
self._send(401, {"error": {"message": "Incorrect API key"}})
return
if srv.mode == "garbage":
self._send(200, {"hello": "world"})
return
if srv.mode == "ollama":
self._send(200, {"models": [{"name": "qwen3:8b"}, {"name": "llama3.2"}]})
return
self._send(
200,
{
"object": "list",
"data": [
{"id": "gpt-4o-mini", "object": "model"},
{"id": "deepseek-chat", "object": "model"},
{"id": "deepseek-chat", "object": "model"},
{"id": "Qwen3-32B", "object": "model"},
],
},
)
def _send(self, status: int, payload: dict) -> None:
data = json.dumps(payload).encode("utf-8")
self.send_response(status)
self.send_header("Content-Type", "application/json")
self.send_header("Content-Length", str(len(data)))
self.end_headers()
self.wfile.write(data)
def log_message(self, format, *args):
pass
@pytest.fixture
def fake_models():
server = ThreadingHTTPServer(("127.0.0.1", 0), _FakeModelsHandler)
server.requests = []
server.api_key = ""
server.mode = "openai"
server.delay = 0.0
thread = threading.Thread(target=server.serve_forever, daemon=True)
thread.start()
try:
yield server
finally:
server.shutdown()
server.server_close()
def _url(server) -> str:
return f"http://127.0.0.1:{server.server_address[1]}/v1"
@pytest.fixture
def llm_state():
keys = (
"llm_profiles",
"llm_providers",
"llm_active_id",
"agent_llm_assignments",
"llm_base_url",
"llm_model",
"llm_api_key",
)
prev = {k: json.loads(json.dumps(getattr(settings, k))) for k in keys}
try:
yield
finally:
for k, v in prev.items():
setattr(settings, k, v)
def _provider_payload(models: list[dict], key: str | None = "sk-prov-7a9c") -> dict:
prov = {
"id": P1,
"name": "DeepSeek",
"base_url": "https://api.example.com/v1",
"models": models,
}
if key is not None:
prov["api_key"] = key
return {"llm_providers": [prov]}
def test_provider_with_many_models_round_trip(client, llm_state):
r = client.post(
"/api/settings",
json={
**_provider_payload(
[{"id": M1, "model": "deepseek-chat"}, {"id": M2, "model": "deepseek-reasoner"}]
),
"llm_active_id": M2,
"agent_llm_assignments": {"story": M1, "video": M2},
},
)
assert r.status_code == 200, r.text
body = r.json()
assert "sk-prov" not in r.text
[prov] = body["llm_providers"]
assert prov["id"] == P1
assert prov["api_key"] is True and prov["api_key_tail"] == "7a9c"
assert [m["model"] for m in prov["models"]] == ["deepseek-chat", "deepseek-reasoner"]
# Flat per-model view keeps working for every existing reader.
assert {p["id"] for p in body["llm_profiles"]} == {M1, M2}
assert all(
p["provider_id"] == P1 and p["provider_name"] == "DeepSeek" for p in body["llm_profiles"]
)
assert body["llm_model"] == "deepseek-reasoner"
assert settings.resolve_llm_for_role("story")["model"] == "deepseek-chat"
assert settings.resolve_llm_for_role("story")["api_key"] == "sk-prov-7a9c"
assert settings.resolve_llm_for_role("video")["model"] == "deepseek-reasoner"
# Re-save without a key: stored key kept for all models; remove M2 → its
# assignment is pruned and the default falls back to a surviving model.
r = client.post(
"/api/settings", json=_provider_payload([{"id": M1, "model": "deepseek-chat"}], key=None)
)
assert r.status_code == 200, r.text
body = r.json()
assert [p["id"] for p in body["llm_profiles"]] == [M1]
assert body["llm_active_id"] == M1
assert body["agent_llm_assignments"] == {"story": M1}
assert settings.llm_profiles[0]["api_key"] == "sk-prov-7a9c"
def test_provider_key_change_applies_to_all_models(client, llm_state):
client.post(
"/api/settings",
json=_provider_payload([{"id": M1, "model": "a"}, {"id": M2, "model": "b"}]),
)
r = client.post(
"/api/settings",
json=_provider_payload(
[{"id": M1, "model": "a"}, {"id": M2, "model": "b"}], key="sk-new-0001"
),
)
assert r.status_code == 200
assert {p["api_key"] for p in settings.llm_profiles} == {"sk-new-0001"}
def test_provider_validation(client, llm_state):
r = client.post("/api/settings", json=_provider_payload([]))
assert r.status_code == 400
assert "至少需要一个模型" in r.json()["detail"]
r = client.post("/api/settings", json={"llm_providers": []})
assert r.status_code == 400
# Duplicate model names inside one provider collapse to one entry.
r = client.post(
"/api/settings",
json=_provider_payload([{"id": M1, "model": "x"}, {"id": M2, "model": "x"}]),
)
assert r.status_code == 200
assert [m["id"] for m in r.json()["llm_providers"][0]["models"]] == [M1]
def test_legacy_profiles_migrate_one_provider_each(client, llm_state):
"""Pre-HEL-624 configs: ids, keys and assignments survive the upgrade."""
settings.llm_providers = []
settings.llm_profiles = [
{
"id": M1,
"name": "本地 Qwen",
"base_url": "http://127.0.0.1:11434/v1",
"model": "qwen3",
"api_key": None,
},
{
"id": M2,
"name": "云端",
"base_url": "https://api.example.com/v1",
"model": "gpt-4o",
"api_key": "sk-old-1234",
},
]
settings.llm_active_id = M2
settings.agent_llm_assignments = {"story": M1, "video": M2}
body = client.get("/api/settings").json()
assert [p["name"] for p in body["llm_providers"]] == ["本地 Qwen", "云端"]
assert [[m["id"] for m in p["models"]] for p in body["llm_providers"]] == [[M1], [M2]]
assert body["llm_providers"][1]["api_key_tail"] == "1234"
assert body["llm_active_id"] == M2
assert body["agent_llm_assignments"] == {"story": M1, "video": M2}
assert settings.resolve_llm_for_role("video")["api_key"] == "sk-old-1234"
# Provider ids are stable on the next read.
again = client.get("/api/settings").json()
assert [p["id"] for p in again["llm_providers"]] == [p["id"] for p in body["llm_providers"]]
def test_legacy_config_file_migrates_and_persists(tmp_path, monkeypatch):
cfg = tmp_path / "calliope_config.json"
cfg.write_text(
json.dumps(
{
"data_dir": str(tmp_path / "data"),
"llm_profiles": [
{
"id": M1,
"name": "A",
"base_url": "http://a/v1",
"model": "m-a",
"api_key": "k-a",
},
{
"id": M2,
"name": "B",
"base_url": "http://b/v1",
"model": "m-b",
"api_key": None,
},
],
"llm_active_id": M2,
"agent_llm_assignments": {"style": M1},
}
),
encoding="utf-8",
)
monkeypatch.setattr(config_module, "CONFIG_FILE", cfg)
monkeypatch.setattr(config_module, "is_ephemeral_path", lambda p: False)
s = Settings()
s.load_config_file()
saved = json.loads(cfg.read_text(encoding="utf-8"))
assert len(saved["llm_providers"]) == 2
assert saved["llm_active_id"] == M2
assert saved["agent_llm_assignments"] == {"style": M1}
by_model = {p["model"]: p for p in saved["llm_profiles"]}
prov_keys = {p["id"]: p["api_key"] for p in saved["llm_providers"]}
assert prov_keys[by_model["m-a"]["provider_id"]] == "k-a"
assert prov_keys[by_model["m-b"]["provider_id"]] is None
# Reload: same provider ids (no churn).
s2 = Settings()
s2.load_config_file()
assert [p["id"] for p in s2.llm_providers] == [p["id"] for p in saved["llm_providers"]]
def test_legacy_flat_save_still_supported(client, llm_state):
client.post(
"/api/settings",
json=_provider_payload([{"id": M1, "model": "a"}, {"id": M2, "model": "b"}]),
)
# Old client edits one model's address via llm_profiles → it splits off.
r = client.post(
"/api/settings",
json={
"llm_profiles": [
{"id": M1, "name": "a", "base_url": "https://api.example.com/v1", "model": "a"},
{"id": M2, "name": "b", "base_url": "http://other/v1", "model": "b"},
]
},
)
assert r.status_code == 200
provs = r.json()["llm_providers"]
assert len(provs) == 2
assert provs[0]["id"] == P1 and [m["id"] for m in provs[0]["models"]] == [M1]
assert provs[1]["base_url"] == "http://other/v1"
def test_list_models_success_dedup_sorted(client, fake_models):
fake_models.api_key = "sk-list"
r = client.post(
"/api/settings/llm-models", json={"base_url": _url(fake_models), "api_key": "sk-list"}
)
assert r.status_code == 200
body = r.json()
assert body == {"ok": True, "models": ["deepseek-chat", "gpt-4o-mini", "Qwen3-32B"]}
assert fake_models.requests[-1] == {"path": "/v1/models", "auth": "Bearer sk-list"}
def test_list_models_ollama_shape(client, fake_models):
fake_models.mode = "ollama"
body = client.post("/api/settings/llm-models", json={"base_url": _url(fake_models)}).json()
assert body == {"ok": True, "models": ["llama3.2", "qwen3:8b"]}
def test_list_models_uses_saved_provider_key(client, fake_models, llm_state):
fake_models.api_key = "sk-saved-9999"
r = client.post(
"/api/settings",
json={
"llm_providers": [
{
"id": P1,
"name": "Fake",
"base_url": _url(fake_models),
"api_key": "sk-saved-9999",
"models": [{"id": M1, "model": "gpt-4o-mini"}],
}
]
},
)
assert r.status_code == 200
body = client.post("/api/settings/llm-models", json={"provider_id": P1}).json()
assert body["ok"] is True
assert fake_models.requests[-1]["auth"] == "Bearer sk-saved-9999"
# Connection test for a not-yet-saved model on a saved provider.
r = client.post("/api/settings/llm-test", json={"provider_id": P1, "model": "new-model"})
assert r.status_code == 200
assert client.post("/api/settings/llm-models", json={"provider_id": "nope"}).status_code == 404
def test_list_models_failures(client, fake_models):
fake_models.api_key = "sk-right"
r = client.post(
"/api/settings/llm-models", json={"base_url": _url(fake_models), "api_key": "sk-wrong"}
)
assert r.json()["ok"] is False and r.json()["error"] == "auth"
fake_models.api_key = ""
fake_models.mode = "unsupported"
r = client.post("/api/settings/llm-models", json={"base_url": _url(fake_models)})
assert r.json()["error"] == "unsupported"
fake_models.mode = "garbage"
r = client.post("/api/settings/llm-models", json={"base_url": _url(fake_models)})
assert r.json()["error"] == "format"
sock = socket.socket()
sock.bind(("127.0.0.1", 0))
port = sock.getsockname()[1]
sock.close()
r = client.post("/api/settings/llm-models", json={"base_url": f"http://127.0.0.1:{port}/v1"})
assert r.json()["error"] == "connect"
assert client.post("/api/settings/llm-models", json={}).status_code == 400
def test_list_models_timeout(client, fake_models):
fake_models.delay = 6.5
started = time.perf_counter()
r = client.post(
"/api/settings/llm-models", json={"base_url": _url(fake_models), "timeout_sec": 5}
)
assert time.perf_counter() - started < 6.4
body = r.json()
assert body["ok"] is False
assert body["error"] == "timeout"
assert body["timeout_sec"] == 5
+1 -2
View File
@@ -114,8 +114,7 @@ def test_queue_prompt_surfaces_comfy_error_body(monkeypatch):
msg = asyncio.run(run())
assert "prompt_outputs_failed_validation" in msg
assert "节点 12" in msg
assert "HTTP 400" in msg
assert "node 12" in msg
assert "Invalid audio file" in msg
@@ -1,288 +0,0 @@
"""HEL-623: workflows exported straight from ComfyUI (no (Input:…) title tags)
still expose a prompt and their fillable widgets, patch back onto the right
widget, and run the full 导入→填参→生成→历史 chain against a fake ComfyUI."""
from __future__ import annotations
import json
from pathlib import Path
from calliope.comfyui.parser import parse_dynamic_inputs
from calliope.comfyui.patcher import patch_workflow
from calliope.comfyui.smart_fill import ref_image_slots
from calliope.config import settings
from calliope.db import get_db
from tests.test_studio_generation import ( # noqa: F401 — fixture re-export
_import_workflow,
_real_run,
_wait_done,
fake_comfy,
)
FIXTURES = Path(__file__).parent / "fixtures" / "comfy_native"
EXAMPLES = Path(__file__).resolve().parents[2] / "example_ComfyUI_workflows"
def _load(name: str) -> dict:
return json.loads((FIXTURES / name).read_text(encoding="utf-8"))
def _by_role(inputs: list[dict]) -> dict[str, dict]:
return {i["role"]: i for i in inputs if i.get("role")}
def test_native_qwen_t2i_exposes_prompt_and_sampler_widgets():
inputs = parse_dynamic_inputs(_load("qwen_image_t2i_API.json"))
roles = _by_role(inputs)
assert roles["prompt"]["nodeId"] == "6"
assert roles["prompt"]["required"] is True
assert roles["prompt"]["defaultValue"].startswith("一只橘猫")
assert roles["negative"]["nodeId"] == "7"
assert roles["seed"]["nodeId"] == "3@seed"
assert roles["steps"]["nodeId"] == "3@steps"
assert roles["cfg"]["nodeId"] == "3@cfg"
assert roles["width"]["nodeId"] == "58@width"
assert roles["height"]["nodeId"] == "58@height"
assert roles["batch"]["nodeId"] == "58@batch_size"
assert all(i["auto"] for i in inputs)
assert [i for i in inputs if i["required"]] == [roles["prompt"]]
def test_native_qwen_edit_detects_image_and_mask_slots():
inputs = parse_dynamic_inputs(_load("qwen_image_edit_mask_API.json"))
roles = _by_role(inputs)
# TextEncodeQwenImageEditPlus writes `prompt`, not the class-derived field
assert roles["prompt"]["nodeId"] == "76@prompt"
assert roles["negative"]["nodeId"] == "77@prompt"
media = {i["nodeId"]: i for i in inputs if i["kind"] == "image"}
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"]
def test_untagged_h3_video_detects_prompt_duration_seed():
inputs = parse_dynamic_inputs(_load("minimax_h3_t2v_untagged_API.json"))
roles = _by_role(inputs)
assert roles["prompt"]["nodeId"] == "6005"
assert roles["duration"]["nodeId"] == "221"
assert roles["seed"]["nodeId"] == "217@noise_seed"
def test_real_qwen21_t2i_splits_single_encoder_into_both_prompts():
"""白栖知的 wen-sheng-tu.json:一个 TextEncodeQwenImage21 同时喂 positive/negative."""
wf = _load("wen_sheng_tu_API.json")
inputs = parse_dynamic_inputs(wf)
roles = _by_role(inputs)
assert roles["prompt"]["nodeId"] == "459:452@prompt"
assert roles["prompt"]["label"] == "正向提示词"
assert roles["prompt"]["required"] is True
assert roles["prompt"]["defaultValue"].startswith("Greyscale fashion editorial")
assert roles["negative"]["nodeId"] == "459:452@negative_prompt"
assert roles["negative"]["label"] == "反向提示词"
assert roles["negative"]["required"] is False
assert roles["seed"]["nodeId"] == "459:458@seed"
assert roles["steps"]["nodeId"] == "459:458@steps"
assert roles["cfg"]["nodeId"] == "459:458@cfg"
assert roles["batch"]["nodeId"] == "459:456@batch_size"
# width/height are wired from the resolution selector — not exposed
assert "width" not in roles and "height" not in roles
assert [i for i in inputs if i["required"]] == [roles["prompt"]]
patched = patch_workflow(
wf, {roles["prompt"]["nodeId"]: "新正向", roles["negative"]["nodeId"]: "模糊"}
)
enc = patched["459:452"]["inputs"]
assert enc["prompt"] == "新正向"
assert enc["negative_prompt"] == "模糊"
assert enc["clip"] == ["459:453", 0]
def test_real_h3_t2v_duration_from_expression_primitive():
"""wen-sheng-shipin.json:无标题 PrimitiveFloat 经表达式换算帧数 → 时长(秒)."""
inputs = parse_dynamic_inputs(_load("wen_sheng_shipin_API.json"))
roles = _by_role(inputs)
assert roles["prompt"]["nodeId"] == "1"
assert roles["prompt"]["required"] is True
assert roles["duration"]["nodeId"] == "133"
assert roles["duration"]["label"] == "时长(秒)"
assert roles["duration"]["defaultValue"] == 10
assert roles["seed"]["nodeId"] == "129@noise_seed"
assert roles["steps"]["nodeId"] == "124@steps"
assert "negative" not in roles
def _encoder_graph(encoder: dict, positive_slot: list, negative_slot: list) -> dict:
return {
"1": encoder,
"2": {
"class_type": "KSampler",
"inputs": {"seed": 1, "steps": 20, "cfg": 4, "positive": positive_slot,
"negative": negative_slot},
},
}
def test_custom_encoder_with_text_and_negative_prompt_is_split():
wf = _encoder_graph(
{"class_type": "MyTextEncodeDual", "inputs": {"text": "猫", "negative_prompt": "糊"},
"_meta": {"title": "MyTextEncodeDual"}},
["1", 0],
["1", 1],
)
roles = _by_role(parse_dynamic_inputs(wf))
assert roles["prompt"]["nodeId"] == "1"
assert roles["prompt"]["defaultValue"] == "猫"
assert roles["negative"]["nodeId"] == "1@negative_prompt"
def test_clip_encoder_wired_to_both_positive_and_negative_stays_positive():
wf = _encoder_graph(
{"class_type": "CLIPTextEncode", "inputs": {"text": "猫"},
"_meta": {"title": "CLIP Text Encode"}},
["1", 0],
["1", 0],
)
roles = _by_role(parse_dynamic_inputs(wf))
assert roles["prompt"]["nodeId"] == "1"
assert "negative" not in roles
def test_tagged_workflows_are_unchanged():
for path in sorted(EXAMPLES.glob("*.json")):
inputs = parse_dynamic_inputs(json.loads(path.read_text(encoding="utf-8")))
assert inputs, path.name
assert not any(i.get("auto") for i in inputs), path.name
assert all("@" not in i["nodeId"] for i in inputs), path.name
def test_patch_field_keys_write_named_widget_and_keep_links():
wf = _load("qwen_image_t2i_API.json")
patched = patch_workflow(
wf,
{"6": "新的提示词", "3@seed": 7, "3@steps": 12, "58@width": 1024, "3@model": "x"},
)
assert patched["6"]["inputs"]["text"] == "新的提示词"
assert patched["3"]["inputs"]["seed"] == 7
assert patched["3"]["inputs"]["steps"] == 12
assert patched["58"]["inputs"]["width"] == 1024
# linked input stays wired; the base workflow is untouched
assert patched["3"]["inputs"]["model"] == ["66", 0]
assert wf["3"]["inputs"]["seed"] == 1125488487853216
def test_smart_fill_sort_accepts_subgraph_and_field_ids():
slots = ref_image_slots(
[
{"nodeId": "171:12", "role": "image", "kind": "image"},
{"nodeId": "9", "role": "image", "kind": "image"},
{"nodeId": "3@image", "role": "image", "kind": "image"},
]
)
assert [s["nodeId"] for s in slots] == ["3@image", "9", "171:12"]
def test_list_backfills_schema_for_workflows_imported_before_detection(client):
conn = get_db(settings.db_path)
try:
cur = conn.execute(
"INSERT INTO workflows"
" (name, kind, workflow_json, input_schema, output_schema, is_enabled)"
" VALUES (?, 'image', ?, '[]', '[]', 1)",
("旧导入·Qwen", json.dumps(_load("qwen_image_t2i_API.json"))),
)
conn.commit()
wf_id = cur.lastrowid
finally:
conn.close()
wf = client.get(f"/api/workflows/{wf_id}").json()
assert _by_role(wf["input_schema"])["prompt"]["nodeId"] == "6"
listed = next(w for w in client.get("/api/workflows").json() if w["id"] == wf_id)
assert len(listed["input_schema"]) == len(wf["input_schema"])
def test_native_workflow_full_chain(client, fake_comfy): # noqa: F811
"""导入原生 Qwen 工作流 → 填参 → 生成 → ComfyUI 收到改写后的节点 → 历史可见."""
with _real_run(client, fake_comfy):
wf_id = _import_workflow(
client, "原生·Qwen 文生图", "image", _load("qwen_image_t2i_API.json")
)
wf = client.get(f"/api/workflows/{wf_id}").json()
roles = _by_role(wf["input_schema"])
r = client.post(
"/api/playground/generate",
json={
"workflow_id": wf_id,
"input_values": {
roles["prompt"]["nodeId"]: "雨夜霓虹街道",
roles["seed"]["nodeId"]: 99,
roles["width"]["nodeId"]: 1024,
roles["height"]["nodeId"]: 768,
},
"source": "studio-image",
"endpoint_id": settings.comfyui_active_id,
},
)
assert r.status_code == 200, r.text
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "done", job.get("error")
queued = fake_comfy.prompts[-1]["prompt"]
assert queued["6"]["inputs"]["text"] == "雨夜霓虹街道"
assert queued["3"]["inputs"]["seed"] == 99
assert queued["58"]["inputs"]["width"] == 1024
assert queued["58"]["inputs"]["height"] == 768
assert queued["3"]["inputs"]["positive"] == ["6", 0]
history = client.get("/api/playground/jobs").json()
assert any(j["id"] == job["id"] and j["status"] == "done" for j in history)
def test_real_qwen21_t2i_full_chain(client, fake_comfy): # noqa: F811
with _real_run(client, fake_comfy):
wf_id = _import_workflow(
client, "真实·Qwen2.1 文生图", "image", _load("wen_sheng_tu_API.json")
)
roles = _by_role(client.get(f"/api/workflows/{wf_id}").json()["input_schema"])
r = client.post(
"/api/playground/generate",
json={
"workflow_id": wf_id,
"input_values": {
roles["prompt"]["nodeId"]: "雨夜霓虹街道",
roles["negative"]["nodeId"]: "低清晰度",
roles["seed"]["nodeId"]: 7,
},
"source": "studio-image",
"endpoint_id": settings.comfyui_active_id,
},
)
assert r.status_code == 200, r.text
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "done", job.get("error")
queued = fake_comfy.prompts[-1]["prompt"]
assert queued["459:452"]["inputs"]["prompt"] == "雨夜霓虹街道"
assert queued["459:452"]["inputs"]["negative_prompt"] == "低清晰度"
assert queued["459:458"]["inputs"]["seed"] == 7
assert queued["459:458"]["inputs"]["negative"] == ["459:452", 1]
def test_comfy_rejection_is_reported_in_chinese(client, fake_comfy): # noqa: F811
fake_comfy.fail_prompt = True
with _real_run(client, fake_comfy):
wf_id = _import_workflow(
client, "原生·Qwen(拒绝)", "image", _load("qwen_image_t2i_API.json")
)
r = client.post(
"/api/playground/generate",
json={"workflow_id": wf_id, "input_values": {"6": "x"}, "source": "studio-image"},
)
job = _wait_done(client, r.json()["job"]["id"])
assert job["status"] == "failed"
assert "ComfyUI 拒绝执行该工作流" in job["error"]
assert "HTTP 500" in job["error"]
def test_generate_unknown_workflow_has_chinese_detail(client):
r = client.post("/api/playground/generate", json={"workflow_id": 987654, "input_values": {}})
assert r.status_code == 404
assert "工作流不存在" in r.json()["detail"]
+30 -22
View File
@@ -87,6 +87,18 @@ export interface LlmProfile {
api_key: boolean;
/** Last 4 chars of the stored key, for masked display only. */
api_key_tail?: string | null;
provider_id?: string | null;
provider_name?: string | null;
}
/** One endpoint + key holding several models; each model is an LlmProfile id. */
export interface LlmProvider {
id: string;
name: string;
base_url: string;
api_key: boolean;
api_key_tail?: string | null;
models: { id: string; name: string; model: string }[];
}
export interface ComfyEndpoint {
@@ -111,6 +123,7 @@ export interface Settings {
llm_model: string;
llm_api_key: boolean;
llm_profiles: LlmProfile[];
llm_providers: LlmProvider[];
llm_active_id: string | null;
comfyui_base_url: string;
comfyui_endpoints: ComfyEndpoint[];
@@ -161,28 +174,6 @@ async function api<T>(path: string, init?: RequestInit): Promise<T> {
return res.json() as Promise<T>;
}
/** Readable text for an api() failure: FastAPI `detail`, not the raw "400: {json}". */
export function apiErrorMessage(err: unknown): string {
if (err instanceof TypeError) return t("api.networkError");
const raw = err instanceof Error ? err.message : String(err);
const m = /^(\d{3}): ([\s\S]*)$/.exec(raw);
if (!m) return raw;
try {
const detail = (JSON.parse(m[2]) as { detail?: unknown }).detail;
if (typeof detail === "string" && detail) return detail;
if (Array.isArray(detail) && detail.length) {
return detail
.map((d) =>
d && typeof d === "object" && "msg" in d ? String(d.msg) : String(d),
)
.join(";");
}
} catch {
/* non-JSON body */
}
return t("api.httpError", { status: m[1], detail: m[2].slice(0, 200) });
}
/** Multipart variant of api() — FormData sets its own Content-Type boundary. */
async function apiUpload<T>(path: string, form: FormData): Promise<T> {
const res = await fetch(`${API_BASE}${path}`, { method: "POST", body: form });
@@ -370,8 +361,25 @@ export const settings = {
method: "POST",
body: JSON.stringify(payload),
}),
listLlmModels: (payload: {
provider_id?: string;
base_url?: string;
api_key?: string;
timeout_sec?: number;
}) =>
api<{
ok: boolean;
models?: string[];
error?: string;
detail?: string;
timeout_sec?: number;
}>("/api/settings/llm-models", {
method: "POST",
body: JSON.stringify(payload),
}),
testLlm: (payload: {
profile_id?: string;
provider_id?: string;
base_url?: string;
model?: string;
api_key?: string;
+1 -1
View File
@@ -9,7 +9,7 @@ const TEXT_AREA = new Set([
'PrimitiveString',
]);
const NUMBER = new Set(['INT', 'FLOAT', 'PrimitiveInt', 'PrimitiveFloat', 'KSampler', 'KSamplerAdvanced']);
const IMAGE = new Set(['LoadImage', 'LoadImageMask', 'ImageLoader', 'ETN_LoadImageBase64']);
const IMAGE = new Set(['LoadImage', 'ImageLoader', 'ETN_LoadImageBase64']);
const IMAGE_URL = new Set(['Load Image From Url (mtb)']);
const AUDIO = new Set(['LoadAudio', 'VHS_LoadAudio']);
const VIDEO = new Set(['LoadVideo', 'VHS_LoadVideo', 'VHS_LoadVideoPath']);
-2
View File
@@ -9,8 +9,6 @@ export interface ComfyDynamicInput {
kind: ComfyInputKind;
defaultValue?: string | number;
required: boolean;
/** Inferred from node classes/wiring — the workflow carries no (Input) tags. */
auto?: boolean;
}
export interface ComfyDynamicOutput {
@@ -7,18 +7,8 @@
import ImageLightbox from '$lib/components/ImageLightbox.svelte';
import MediaSlot from '$lib/components/studio/MediaSlot.svelte';
import { toStore } from 'svelte/store';
import { tick } from 'svelte';
import AppShell from '$lib/components/shell/AppShell.svelte';
import {
apiErrorMessage,
assetUrl,
comfy,
jobsApi,
playgroundApi,
settings,
workflows,
type Job,
} from '$lib/api';
import { assetUrl, comfy, jobsApi, playgroundApi, settings, workflows, type Job } from '$lib/api';
import type { ComfyDynamicInput } from '$lib/comfy/types';
import { compactInputValues, isPromptLikeInput } from '$lib/comfy/promptInput';
import { parseDbTs } from '$lib/dbtime';
@@ -77,20 +67,10 @@
.flatMap((j) => j.output_paths.map((p) => ({ job: j, path: p, key: `${j.id}:${p}` }))),
);
// Jobs enqueued from this window — a fast failure can land before the
// jobs list refetch knows about them.
const submittedIds = new Set<number>();
// Live progress via SSE + fallback polling.
$effect(() => {
const off = connectEvents((ev) => {
handleJobEvent(ev);
if (ev.type === 'job.failed' && !ev.data.cancelled) {
const id = Number(ev.data.job_id);
if (submittedIds.has(id) || kindJobs.some((j) => j.id === id)) {
toast.error(t('studio.jobFailedToast', { detail: String(ev.data.error ?? '') }));
}
}
if (ev.type.startsWith('job.') || ev.type === 'events.resync') {
void client.invalidateQueries({ queryKey: ['playground-jobs'] });
void client.invalidateQueries({ queryKey: ['jobs'] });
@@ -370,21 +350,8 @@
// Submit
// ------------------------------------------------------------------
async function submit() {
if (submitting) return;
showErrors = true;
if (!workflowId) {
toast.error(t('studio.errNoWorkflow'));
return;
}
const blocking = Object.values(errors).find((m) => m.trim());
if (blocking) {
toast.error(t('studio.errBlocked', { reason: blocking }));
await tick();
document
.querySelector('.param-col .invalid, .param-col .f-error')
?.scrollIntoView({ block: 'center', behavior: 'smooth' });
return;
}
if (Object.keys(errors).length || !workflowId || submitting) return;
submitting = true;
try {
const res = await playgroundApi.generate({
@@ -393,13 +360,12 @@
endpoint_id: endpointId || null,
source: kind === 'image' ? 'studio-image' : 'studio-video',
});
submittedIds.add(res.job.id);
selectedKey = null;
toast.success(t('studio.queuedToast', { name: selectedEndpointName || '—' }));
await client.invalidateQueries({ queryKey: ['playground-jobs'] });
await client.invalidateQueries({ queryKey: ['jobs'] });
void res;
} catch (err) {
toast.error(t('studio.submitFailedToast', { detail: apiErrorMessage(err) }));
toast.error(err instanceof Error ? err.message : String(err));
} finally {
submitting = false;
}
@@ -749,11 +715,6 @@
<option value={wf.id}>{wf.name}</option>
{/each}
</select>
{#if currentWorkflow && !schema.length}
<p class="missing-note">{t('studio.wfNoParamsNote')}</p>
{:else if schema.some((i) => i.auto)}
<p class="missing-note">{t('studio.wfAutoParamsNote', { n: schema.length })}</p>
{/if}
</div>
{#if mediaSlots.length}
@@ -820,16 +781,6 @@
<span class="f-error">{errors[promptInp.nodeId]}</span>
{/if}
</label>
{:else if currentWorkflow}
<label class="f-field">
<span class="f-label">{t('studio.promptLabel')}</span>
<textarea
class="f-input prompt-area"
rows="3"
disabled
placeholder={t('studio.promptNotDeclared')}
></textarea>
</label>
{/if}
<div class="pair-row">
+32 -21
View File
@@ -164,8 +164,6 @@ export const de: Dict = {
// --- API errors ---
'api.unknownError': 'Etwas ist schiefgelaufen',
'api.networkError': 'Backend nicht erreichbar – prüfe, ob es läuft, und versuche es erneut',
'api.httpError': 'Anfrage fehlgeschlagen (HTTP {status}): {detail}',
'playground.openFailed': 'Playground konnte nicht geöffnet werden',
'playground.opening': 'Playground wird geöffnet…',
'agents.opening': 'Agent wird geöffnet…',
@@ -1164,7 +1162,7 @@ export const de: Dict = {
'models.title': 'Modelle',
'models.subtitle': 'Eigene LLMs für Agenten anlegen · Phase 1 nur LLMs; Bild-/Videomodelle folgen später',
'models.statusCount': '{n} Modelle · {m} verfügbar',
'models.add': 'Modell hinzufügen',
'models.add': 'Anbieter hinzufügen',
'models.tabLlm': 'Sprachmodelle',
'models.tabImage': 'Bildmodelle',
'models.tabVideo': 'Videomodelle',
@@ -1188,10 +1186,10 @@ export const de: Dict = {
'models.lastTestAt': 'letzter Test {time}',
'models.consecutiveFails': '{n} Fehlversuche in Folge',
'models.cloudPaused': 'Cloud-Aufrufe pausiert',
'models.formTitleAdd': 'Modell hinzufügen',
'models.formTitleEdit': 'Modell bearbeiten',
'models.formTitleAdd': 'Anbieter hinzufügen',
'models.formTitleEdit': 'Anbieter bearbeiten',
'models.formClose': 'Schließen',
'models.fName': 'Name',
'models.fName': 'Anbietername',
'models.fNamePh': 'Modell benennen, z. B. DeepSeek offiziell',
'models.fApiType': 'API-Typ',
'models.apiOpenai': 'OpenAI-kompatibel',
@@ -1200,7 +1198,7 @@ export const de: Dict = {
'models.apiTypeHelp': 'Phase 1 unterstützt nur OpenAI-kompatible APIs; weitere Protokolle kommen mit Bild-/Videomodellen',
'models.fBaseUrl': 'Basis-URL',
'models.baseUrlHelp': 'Mit Protokoll und Port, z. B. http://192.168.200.18:11434/v1',
'models.fModel': 'Modellname',
'models.fModel': 'Modelle',
'models.modelHelp': 'Modell-ID des Anbieters verwenden',
'models.fApiKey': 'API-Schlüssel',
'models.keyNoEcho': 'wird nie angezeigt',
@@ -1212,10 +1210,10 @@ export const de: Dict = {
'models.testFail': '✕ Test fehlgeschlagen · {reason}',
'models.needTest': 'Speichern erst nach bestandenem Test',
'models.testBtn': 'Verbindung testen',
'models.save': 'Modell speichern',
'models.save': 'Speichern',
'models.errName': 'Bitte benennen Sie das Modell',
'models.errUrl': 'Ungültige URL — Protokoll und Pfad nötig, z. B. https://api.deepseek.com/v1',
'models.errModel': 'Bitte den Modellnamen des Anbieters eingeben',
'models.errModel': 'Mindestens ein Modell hinzufügen (Modell-ID des Anbieters)',
'models.errKey': 'Bitte den API-Schlüssel eingeben',
'models.failTimeout': 'Zeitüberschreitung ({sec}s, keine Antwort): der Server erreicht diese Adresse nicht — Adresse, Port und Firewall prüfen',
'models.failAuth': 'Authentifizierung fehlgeschlagen (401): API-Schlüssel prüfen; bei Aggregatoren die Modellfreischaltung bestätigen',
@@ -1238,13 +1236,36 @@ export const de: Dict = {
'models.unavailable': '(nicht verfügbar)',
'models.noticeStrong': 'Erreichbarkeit gilt vom Workbench-Server aus:',
'models.noticeBody': 'eine im Browser öffnungsfähige Adresse ist nicht automatisch vom Server erreichbar; Verbindungs- und Dialoganfragen stellt der Server. API-Schlüssel liegen nur auf dem Server und werden nie angezeigt.',
'models.saved': 'Modell gespeichert',
'models.saved': 'Anbieter gespeichert',
'models.deleted': 'Modell gelöscht',
'models.assignSaved': 'Agentenmodelle aktualisiert',
'models.saveFailed': 'Speichern fehlgeschlagen: {detail}',
'models.loading': 'Lädt…',
'models.loadFailed': 'Einstellungen konnten nicht geladen werden',
'models.idleFormHint': '„Bearbeiten“ auf einer Karte wählen oder oben „Modell hinzufügen“ klicken',
'models.modelCount': '{n} Modelle',
'models.keyMeta': 'Schlüssel {tail}',
'models.keyNone': 'kein Schlüssel',
'models.testShort': 'Testen',
'models.addModel': 'Modell hinzufügen',
'models.fetchModels': 'Liste abrufen',
'models.fetching': 'Wird abgerufen…',
'models.fetchCount': '{n} Modelle · {k} gewählt',
'models.fetchFilterPh': 'Modelle filtern',
'models.fetchEmpty': 'Der Anbieter hat keine Modelle geliefert — Modell-IDs unten eingeben',
'models.fetchNoMatch': 'Keine passenden Modelle',
'models.fetchFail': '✕ Modellliste nicht abrufbar · {reason}',
'models.fetchUnsupported': 'Dieser Anbieter bietet keine Modellliste — Modell-IDs unten eingeben',
'models.fetchFormat': 'Die Antwort ist keine Modellliste — Modell-IDs unten eingeben',
'models.manualPh': 'Modell-ID eingeben, Enter zum Hinzufügen',
'models.manualAdd': 'Hinzufügen',
'models.removeModel': '{model} entfernen',
'models.noModels': 'Noch keine Modelle',
'models.delProviderTitle': 'Anbieter löschen',
'models.delProviderUsed': 'Modelle dieses Anbieters werden von {n} Agenten genutzt; sie wechseln zum Agent-Standard. Löschen?',
'models.delProviderFree': 'Diesen Anbieter mit {k} Modellen löschen? Nicht umkehrbar.',
'models.delProviderDefaultHint': 'Dieser Anbieter enthält das Standardmodell — zuerst einen anderen Standard wählen',
'models.delLastModelHint': 'Ein Anbieter behält mindestens ein Modell; zum Entfernen den Anbieter löschen',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': 'Film-Atelier',
@@ -1389,9 +1410,7 @@ export const de: Dict = {
'conn.wfParams': '{n} ausfüllbare Parameter',
'conn.wfImport': 'Workflow importieren',
'conn.wfImporting': 'Importiere…',
'conn.wfNodes': '{n} Knoten',
'conn.wfImportedN': 'Workflow importiert – {n} Parameter erkannt',
'conn.wfImportedNoParams': 'Workflow importiert, aber keine ausfüllbaren Parameter erkannt: er läuft mit seinen eingebauten Einstellungen',
'conn.wfImported': 'Workflow importiert',
'conn.wfImportFailed': 'Import fehlgeschlagen: {detail}',
'conn.wfImportTitle': 'ComfyUI-Workflow importieren (API-Format-JSON)',
'conn.wfImportHint': 'Einfügen oder Datei wählen; Name ist Pflicht, die Art entscheidet über Bild- oder Video-Fenster.',
@@ -1491,14 +1510,6 @@ export const de: Dict = {
'studio.retryLink': 'Erneut versuchen',
'studio.retryQueuedToast': 'Aufgabe wieder eingereiht',
'studio.retryFailedToast': 'Erneut Einreihen fehlgeschlagen: {detail}',
'studio.errNoWorkflow': 'Bitte zuerst einen Workflow wählen',
'studio.errBlocked': 'Senden nicht möglich: {reason}',
'studio.queuedToast': 'An „{name}“ gesendet, in der Warteschlange',
'studio.submitFailedToast': 'Senden fehlgeschlagen: {detail}',
'studio.jobFailedToast': 'Generierung fehlgeschlagen: {detail}',
'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.cancelToast': 'Abbruch angefordert',
'studio.deleteBtn': 'Löschen',
'studio.delTitle': 'Aufgabeneintrag löschen',
+37 -26
View File
@@ -164,8 +164,6 @@ export const en = {
// --- API errors ---
'api.unknownError': 'Something went wrong',
'api.networkError': 'Cannot reach the workbench backend — check that it is running and retry',
'api.httpError': 'Request failed (HTTP {status}): {detail}',
'playground.openFailed': 'Failed to open playground',
'playground.opening': 'Opening playground…',
'agents.opening': 'Opening agent…',
@@ -1166,12 +1164,12 @@ export const en = {
'models.title': 'Models',
'models.subtitle': 'Add custom LLMs for your agents · phase 1 covers LLMs only; image / video models come later',
'models.statusCount': '{n} models · {m} available',
'models.add': 'Add model',
'models.add': 'Add provider',
'models.tabLlm': 'Language models',
'models.tabImage': 'Image models',
'models.tabVideo': 'Video models',
'models.comingSoon': 'Coming later',
'models.empty': 'No models yet — click "Add model" in the top right to connect your first LLM',
'models.empty': 'No providers yet — click "Add provider" in the top right to connect your first LLM service',
'models.typeLocal': 'Local',
'models.typeLan': 'LAN',
'models.typeCloud': 'Cloud',
@@ -1190,11 +1188,11 @@ export const en = {
'models.lastTestAt': 'last test {time}',
'models.consecutiveFails': '{n} consecutive failures',
'models.cloudPaused': 'Cloud calls paused',
'models.formTitleAdd': 'Add model',
'models.formTitleEdit': 'Edit model',
'models.formTitleAdd': 'Add provider',
'models.formTitleEdit': 'Edit provider',
'models.formClose': 'Close',
'models.fName': 'Name',
'models.fNamePh': 'Name this model, e.g. DeepSeek official',
'models.fName': 'Provider name',
'models.fNamePh': 'e.g. DeepSeek official, local Ollama',
'models.fApiType': 'API type',
'models.apiOpenai': 'OpenAI-compatible',
'models.apiAnthropic': 'Anthropic',
@@ -1202,8 +1200,8 @@ export const en = {
'models.apiTypeHelp': 'Phase 1 supports OpenAI-compatible APIs only; other protocols arrive with image / video models',
'models.fBaseUrl': 'Base URL',
'models.baseUrlHelp': 'Include protocol and port, e.g. http://192.168.200.18:11434/v1',
'models.fModel': 'Model name',
'models.modelHelp': 'Use the model ID from your provider',
'models.fModel': 'Models',
'models.modelHelp': 'Fetch the provider\'s model list and tick models, or type model IDs; the connection test uses the first model',
'models.fApiKey': 'API key',
'models.keyNoEcho': 'never echoed',
'models.keyHelp': 'Stored on this server only; the full key is never shown in the UI',
@@ -1214,10 +1212,10 @@ export const en = {
'models.testFail': '✕ Test failed · {reason}',
'models.needTest': 'Save unlocks after a passing test',
'models.testBtn': 'Test connection',
'models.save': 'Save model',
'models.errName': 'Please name this model',
'models.save': 'Save',
'models.errName': 'Please name this provider',
'models.errUrl': 'Invalid URL — it needs protocol and path, e.g. https://api.deepseek.com/v1',
'models.errModel': 'Please enter the model name from your provider',
'models.errModel': 'Add at least one model, using the model ID from your provider',
'models.errKey': 'Please enter the API key',
'models.failTimeout': 'Timed out ({sec}s, no response): the server cannot reach this address — check the address, port and firewall',
'models.failAuth': 'Authentication failed (401): check that the API key is correct and not expired; with aggregators, confirm the model is enabled for your account',
@@ -1240,13 +1238,36 @@ export const en = {
'models.unavailable': '(unavailable)',
'models.noticeStrong': 'Connectivity is measured from the workbench server:',
'models.noticeBody': 'a URL opening in your browser does not mean the server running this workbench can reach it; connection tests and chat requests are made by the server. API keys are stored on the server only and never echoed in the UI.',
'models.saved': 'Model saved',
'models.saved': 'Provider saved',
'models.deleted': 'Model deleted',
'models.assignSaved': 'Agent models updated',
'models.saveFailed': 'Save failed: {detail}',
'models.loading': 'Loading…',
'models.loadFailed': 'Failed to load settings',
'models.idleFormHint': 'Pick "Edit" on a card, or click "Add model" above',
'models.idleFormHint': 'Pick "Edit" on a card, or click "Add provider" above',
'models.modelCount': '{n} models',
'models.keyMeta': 'key {tail}',
'models.keyNone': 'no key set',
'models.testShort': 'Test',
'models.addModel': 'Add model',
'models.fetchModels': 'Fetch list',
'models.fetching': 'Fetching…',
'models.fetchCount': '{n} models · {k} selected',
'models.fetchFilterPh': 'Filter models',
'models.fetchEmpty': 'The provider returned no models — type model IDs below',
'models.fetchNoMatch': 'No matching models',
'models.fetchFail': '✕ Could not fetch the model list · {reason}',
'models.fetchUnsupported': 'This provider does not offer a model list — type model IDs below',
'models.fetchFormat': 'The provider response is not a model list — type model IDs below',
'models.manualPh': 'Type a model ID, Enter to add',
'models.manualAdd': 'Add',
'models.removeModel': 'Remove {model}',
'models.noModels': 'No models added yet',
'models.delProviderTitle': 'Delete provider',
'models.delProviderUsed': 'Models of this provider are used by {n} agents; they will fall back to the agent default. Delete?',
'models.delProviderFree': 'Delete this provider and its {k} models? This cannot be undone.',
'models.delProviderDefaultHint': 'This provider holds the agent default model — pick another default first',
'models.delLastModelHint': 'A provider keeps at least one model; delete the provider to remove it',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': 'Film Atelier',
@@ -1389,9 +1410,7 @@ export const en = {
'conn.wfParams': '{n} fillable parameters',
'conn.wfImport': 'Import workflow',
'conn.wfImporting': 'Importing…',
'conn.wfNodes': '{n} nodes',
'conn.wfImportedN': 'Workflow imported — {n} fillable parameters detected',
'conn.wfImportedNoParams': 'Workflow imported, but no fillable parameters were detected: it will run with its built-in settings',
'conn.wfImported': 'Workflow imported',
'conn.wfImportFailed': 'Import failed: {detail}',
'conn.wfImportTitle': 'Import ComfyUI workflow (API-format JSON)',
'conn.wfImportHint': 'Paste or pick a file; name is required, the kind decides whether it shows in the image or video window.',
@@ -1490,14 +1509,6 @@ export const en = {
'studio.retryLink': 'Retry',
'studio.retryQueuedToast': 'Task re-queued',
'studio.retryFailedToast': 'Re-queue failed: {detail}',
'studio.errNoWorkflow': 'Choose a workflow first',
'studio.errBlocked': 'Cannot submit: {reason}',
'studio.queuedToast': 'Submitted to “{name}”, queued',
'studio.submitFailedToast': 'Submit failed: {detail}',
'studio.jobFailedToast': 'Generation failed: {detail}',
'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.cancelToast': 'Cancel requested',
'studio.deleteBtn': 'Delete',
'studio.delTitle': 'Delete task record',
+32 -21
View File
@@ -164,8 +164,6 @@ export const es: Dict = {
// --- API errors ---
'api.unknownError': 'Algo salió mal',
'api.networkError': 'No se puede conectar con el backend; comprueba que esté en marcha y reintenta',
'api.httpError': 'La solicitud falló (HTTP {status}): {detail}',
'playground.openFailed': 'No se pudo abrir el playground',
'playground.opening': 'Abriendo el playground…',
'agents.opening': 'Abriendo el agente…',
@@ -1164,7 +1162,7 @@ export const es: Dict = {
'models.title': 'Modelos',
'models.subtitle': 'Añade LLM personalizados para tus agentes · la fase 1 solo incluye LLM; los modelos de imagen / vídeo llegarán después',
'models.statusCount': '{n} modelos · {m} disponibles',
'models.add': 'Añadir modelo',
'models.add': 'Añadir proveedor',
'models.tabLlm': 'Modelos de lenguaje',
'models.tabImage': 'Modelos de imagen',
'models.tabVideo': 'Modelos de vídeo',
@@ -1188,10 +1186,10 @@ export const es: Dict = {
'models.lastTestAt': 'última prueba {time}',
'models.consecutiveFails': '{n} fallos consecutivos',
'models.cloudPaused': 'Llamadas en la nube en pausa',
'models.formTitleAdd': 'Añadir modelo',
'models.formTitleEdit': 'Editar modelo',
'models.formTitleAdd': 'Añadir proveedor',
'models.formTitleEdit': 'Editar proveedor',
'models.formClose': 'Cerrar',
'models.fName': 'Nombre',
'models.fName': 'Nombre del proveedor',
'models.fNamePh': 'Nombra el modelo, p. ej. DeepSeek oficial',
'models.fApiType': 'Tipo de API',
'models.apiOpenai': 'Compatible con OpenAI',
@@ -1200,7 +1198,7 @@ export const es: Dict = {
'models.apiTypeHelp': 'La fase 1 solo admite APIs compatibles con OpenAI; otros protocolos llegarán con los modelos de imagen / vídeo',
'models.fBaseUrl': 'URL base',
'models.baseUrlHelp': 'Incluye protocolo y puerto, p. ej. http://192.168.200.18:11434/v1',
'models.fModel': 'Nombre del modelo',
'models.fModel': 'Modelos',
'models.modelHelp': 'Usa el ID de modelo que indica tu proveedor',
'models.fApiKey': 'Clave API',
'models.keyNoEcho': 'nunca se muestra',
@@ -1212,10 +1210,10 @@ export const es: Dict = {
'models.testFail': '✕ Prueba fallida · {reason}',
'models.needTest': 'Guardar se habilita tras superar la prueba',
'models.testBtn': 'Test connection',
'models.save': 'Guardar modelo',
'models.save': 'Guardar',
'models.errName': 'Ponle nombre al modelo',
'models.errUrl': 'URL no válida: debe incluir protocolo y ruta, p. ej. https://api.deepseek.com/v1',
'models.errModel': 'Introduce el nombre del modelo de tu proveedor',
'models.errModel': 'Añade al menos un modelo (ID del proveedor)',
'models.errKey': 'Introduce la clave API',
'models.failTimeout': 'Tiempo de espera agotado ({sec}s sin respuesta): el servidor no llega a esta dirección; revisa dirección, puerto y cortafuegos',
'models.failAuth': 'Autenticación fallida (401): comprueba que la clave API sea correcta y no haya caducado; con agregadores, confirma que el modelo esté activado',
@@ -1238,13 +1236,36 @@ export const es: Dict = {
'models.unavailable': '(no disponible)',
'models.noticeStrong': 'La conectividad se mide desde el servidor del workbench:',
'models.noticeBody': 'que una URL abra en tu navegador no significa que el servidor pueda acceder a ella; las pruebas de conexión y las peticiones las hace el servidor. Las claves API se guardan solo en el servidor y nunca se muestran.',
'models.saved': 'Modelo guardado',
'models.saved': 'Proveedor guardado',
'models.deleted': 'Modelo eliminado',
'models.assignSaved': 'Modelos de agentes actualizados',
'models.saveFailed': 'Error al guardar: {detail}',
'models.loading': 'Cargando…',
'models.loadFailed': 'No se pudieron cargar los ajustes',
'models.idleFormHint': 'Pulsa «Editar» en una tarjeta o «Añadir modelo» arriba',
'models.modelCount': '{n} modelos',
'models.keyMeta': 'clave {tail}',
'models.keyNone': 'sin clave',
'models.testShort': 'Probar',
'models.addModel': 'Añadir modelo',
'models.fetchModels': 'Obtener lista',
'models.fetching': 'Obteniendo…',
'models.fetchCount': '{n} modelos · {k} elegidos',
'models.fetchFilterPh': 'Filtrar modelos',
'models.fetchEmpty': 'El proveedor no devolvió modelos — escribe los ID abajo',
'models.fetchNoMatch': 'Sin coincidencias',
'models.fetchFail': '✕ No se pudo obtener la lista · {reason}',
'models.fetchUnsupported': 'Este proveedor no ofrece lista de modelos — escribe los ID abajo',
'models.fetchFormat': 'La respuesta no es una lista de modelos — escribe los ID abajo',
'models.manualPh': 'Escribe un ID de modelo, Enter para añadir',
'models.manualAdd': 'Añadir',
'models.removeModel': 'Quitar {model}',
'models.noModels': 'Aún no hay modelos',
'models.delProviderTitle': 'Eliminar proveedor',
'models.delProviderUsed': '{n} agentes usan modelos de este proveedor; pasarán al predeterminado. ¿Eliminar?',
'models.delProviderFree': '¿Eliminar este proveedor y sus {k} modelos? No se puede deshacer.',
'models.delProviderDefaultHint': 'Este proveedor contiene el modelo predeterminado — elige otro antes',
'models.delLastModelHint': 'Un proveedor conserva al menos un modelo; elimina el proveedor para quitarlo',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': 'Atelier de Cine',
@@ -1389,9 +1410,7 @@ export const es: Dict = {
'conn.wfParams': '{n} parámetros rellenables',
'conn.wfImport': 'Importar flujo',
'conn.wfImporting': 'Importando…',
'conn.wfNodes': '{n} nodos',
'conn.wfImportedN': 'Flujo importado: {n} parámetros detectados',
'conn.wfImportedNoParams': 'Flujo importado, pero sin parámetros rellenables: se ejecutará con su configuración interna',
'conn.wfImported': 'Flujo importado',
'conn.wfImportFailed': 'Error al importar: {detail}',
'conn.wfImportTitle': 'Importar flujo de ComfyUI (JSON en formato API)',
'conn.wfImportHint': 'Pega o elige un archivo; el nombre es obligatorio y el tipo decide si aparece en la ventana de imagen o vídeo.',
@@ -1491,14 +1510,6 @@ export const es: Dict = {
'studio.retryLink': 'Reintentar',
'studio.retryQueuedToast': 'Tarea vuelta a la cola',
'studio.retryFailedToast': 'Error al reencolar: {detail}',
'studio.errNoWorkflow': 'Elige primero un flujo',
'studio.errBlocked': 'No se puede enviar: {reason}',
'studio.queuedToast': 'Enviado a «{name}», en cola',
'studio.submitFailedToast': 'Error al enviar: {detail}',
'studio.jobFailedToast': 'La generación falló: {detail}',
'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.cancelToast': 'Cancelación solicitada',
'studio.deleteBtn': 'Eliminar',
'studio.delTitle': 'Eliminar registro de tarea',
+32 -21
View File
@@ -164,8 +164,6 @@ export const fr: Dict = {
// --- API errors ---
'api.unknownError': "Une erreur s'est produite",
'api.networkError': 'Impossible de joindre le backend : vérifiez qu\'il tourne puis réessayez',
'api.httpError': 'Échec de la requête (HTTP {status}) : {detail}',
'playground.openFailed': "Échec de l'ouverture du bac à sable",
'playground.opening': 'Ouverture du bac à sable…',
'agents.opening': "Ouverture de l'agent…",
@@ -1164,7 +1162,7 @@ export const fr: Dict = {
'models.title': 'Modèles',
'models.subtitle': 'Ajoutez des LLM personnalisés pour vos agents · la phase 1 ne couvre que les LLM ; les modèles image / vidéo arriveront ensuite',
'models.statusCount': '{n} modèles · {m} disponibles',
'models.add': 'Ajouter un modèle',
'models.add': 'Ajouter un fournisseur',
'models.tabLlm': 'Modèles de langage',
'models.tabImage': "Modèles d'image",
'models.tabVideo': 'Modèles vidéo',
@@ -1188,10 +1186,10 @@ export const fr: Dict = {
'models.lastTestAt': 'dernier test {time}',
'models.consecutiveFails': '{n} échecs consécutifs',
'models.cloudPaused': 'Appels cloud suspendus',
'models.formTitleAdd': 'Ajouter un modèle',
'models.formTitleEdit': 'Modifier le modèle',
'models.formTitleAdd': 'Ajouter un fournisseur',
'models.formTitleEdit': 'Modifier le fournisseur',
'models.formClose': 'Fermer',
'models.fName': 'Nom',
'models.fName': 'Nom du fournisseur',
'models.fNamePh': 'Nommez le modèle, ex. DeepSeek officiel',
'models.fApiType': 'Type d’API',
'models.apiOpenai': 'Compatible OpenAI',
@@ -1200,7 +1198,7 @@ export const fr: Dict = {
'models.apiTypeHelp': 'La phase 1 ne prend en charge que les API compatibles OpenAI ; les autres protocoles arriveront avec les modèles image / vidéo',
'models.fBaseUrl': 'URL de base',
'models.baseUrlHelp': 'Avec protocole et port, ex. http://192.168.200.18:11434/v1',
'models.fModel': 'Nom du modèle',
'models.fModel': 'Modèles',
'models.modelHelp': 'Utilisez l’identifiant de modèle fourni par votre prestataire',
'models.fApiKey': 'Clé API',
'models.keyNoEcho': 'jamais affichée',
@@ -1212,10 +1210,10 @@ export const fr: Dict = {
'models.testFail': '✕ Échec du test · {reason}',
'models.needTest': 'Enregistrement possible après un test réussi',
'models.testBtn': 'Test connection',
'models.save': 'Enregistrer le modèle',
'models.save': 'Enregistrer',
'models.errName': 'Veuillez nommer le modèle',
'models.errUrl': 'URL invalide — protocole et chemin requis, ex. https://api.deepseek.com/v1',
'models.errModel': 'Saisissez le nom du modèle fourni par votre prestataire',
'models.errModel': 'Ajoutez au moins un modèle (ID du fournisseur)',
'models.errKey': 'Saisissez la clé API',
'models.failTimeout': 'Délai dépassé ({sec}s sans réponse) : le serveur n’atteint pas cette adresse — vérifiez adresse, port et pare-feu',
'models.failAuth': 'Échec d’authentification (401) : vérifiez que la clé API est correcte et non expirée ; avec les agrégateurs, confirmez que le modèle est activé',
@@ -1238,13 +1236,36 @@ export const fr: Dict = {
'models.unavailable': '(indisponible)',
'models.noticeStrong': 'La connectivité est mesurée depuis le serveur du workbench :',
'models.noticeBody': 'une URL qui s’ouvre dans votre navigateur n’est pas forcément accessible au serveur ; les tests de connexion et les requêtes sont faits par le serveur. Les clés API restent sur le serveur et ne sont jamais affichées.',
'models.saved': 'Modèle enregistré',
'models.saved': 'Fournisseur enregistré',
'models.deleted': 'Modèle supprimé',
'models.assignSaved': 'Modèles des agents mis à jour',
'models.saveFailed': 'Échec de l’enregistrement : {detail}',
'models.loading': 'Chargement…',
'models.loadFailed': 'Impossible de charger les paramètres',
'models.idleFormHint': 'Cliquez « Modifier » sur une carte ou « Ajouter un modèle » ci-dessus',
'models.modelCount': '{n} modèles',
'models.keyMeta': 'clé {tail}',
'models.keyNone': 'aucune clé',
'models.testShort': 'Tester',
'models.addModel': 'Ajouter un modèle',
'models.fetchModels': 'Récupérer la liste',
'models.fetching': 'Récupération…',
'models.fetchCount': '{n} modèles · {k} choisis',
'models.fetchFilterPh': 'Filtrer les modèles',
'models.fetchEmpty': 'Le fournisseur n’a renvoyé aucun modèle — saisissez les ID ci-dessous',
'models.fetchNoMatch': 'Aucun modèle correspondant',
'models.fetchFail': '✕ Liste des modèles indisponible · {reason}',
'models.fetchUnsupported': 'Ce fournisseur ne propose pas de liste — saisissez les ID ci-dessous',
'models.fetchFormat': 'La réponse n’est pas une liste de modèles — saisissez les ID ci-dessous',
'models.manualPh': 'Saisir un ID de modèle, Entrée pour ajouter',
'models.manualAdd': 'Ajouter',
'models.removeModel': 'Retirer {model}',
'models.noModels': 'Aucun modèle ajouté',
'models.delProviderTitle': 'Supprimer le fournisseur',
'models.delProviderUsed': '{n} agents utilisent des modèles de ce fournisseur ; ils passeront au modèle par défaut. Supprimer ?',
'models.delProviderFree': 'Supprimer ce fournisseur et ses {k} modèles ? Irréversible.',
'models.delProviderDefaultHint': 'Ce fournisseur contient le modèle par défaut — choisissez-en un autre d’abord',
'models.delLastModelHint': 'Un fournisseur garde au moins un modèle ; supprimez le fournisseur pour le retirer',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': 'Atelier Cinéma',
@@ -1389,9 +1410,7 @@ export const fr: Dict = {
'conn.wfParams': '{n} paramètres remplissables',
'conn.wfImport': 'Importer le workflow',
'conn.wfImporting': 'Import…',
'conn.wfNodes': '{n} nœuds',
'conn.wfImportedN': 'Workflow importé : {n} paramètres détectés',
'conn.wfImportedNoParams': 'Workflow importé, mais aucun paramètre détecté : il sera exécuté avec ses réglages intégrés',
'conn.wfImported': 'Workflow importé',
'conn.wfImportFailed': 'Échec de l\'import : {detail}',
'conn.wfImportTitle': 'Importer un workflow ComfyUI (JSON format API)',
'conn.wfImportHint': 'Collez ou choisissez un fichier ; le nom est requis, le type décide de la fenêtre image ou vidéo.',
@@ -1491,14 +1510,6 @@ export const fr: Dict = {
'studio.retryLink': 'Réessayer',
'studio.retryQueuedToast': 'Tâche remise en file',
'studio.retryFailedToast': 'Échec de la remise en file : {detail}',
'studio.errNoWorkflow': 'Choisissez d\'abord un workflow',
'studio.errBlocked': 'Envoi impossible : {reason}',
'studio.queuedToast': 'Envoyé à « {name} », en file',
'studio.submitFailedToast': 'Échec de l\'envoi : {detail}',
'studio.jobFailedToast': 'Échec de la génération : {detail}',
'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.cancelToast': 'Annulation demandée',
'studio.deleteBtn': 'Supprimer',
'studio.delTitle': 'Supprimer la tâche',
+32 -21
View File
@@ -164,8 +164,6 @@ export const ja: Dict = {
// --- API errors ---
'api.unknownError': '問題が発生しました',
'api.networkError': 'ワークベンチのバックエンドに接続できません。起動を確認して再試行してください',
'api.httpError': 'リクエスト失敗(HTTP {status}):{detail}',
'playground.openFailed': 'プレイグラウンドを開けませんでした',
'playground.opening': 'プレイグラウンドを開いています…',
'agents.opening': 'エージェントを開いています…',
@@ -1164,7 +1162,7 @@ export const ja: Dict = {
'models.title': 'モデル設定',
'models.subtitle': 'エージェントが使うカスタム LLM を追加 · 第一段階は LLM のみ、画像 / 動画モデルは後日',
'models.statusCount': 'モデル {n} 件 · 利用可能 {m} 件',
'models.add': 'モデルを追加',
'models.add': 'プロバイダーを追加',
'models.tabLlm': '大規模言語モデル',
'models.tabImage': '画像モデル',
'models.tabVideo': '動画モデル',
@@ -1188,10 +1186,10 @@ export const ja: Dict = {
'models.lastTestAt': '前回テスト {time}',
'models.consecutiveFails': '連続失敗 {n} 回',
'models.cloudPaused': 'クラウド呼び出しを一時停止',
'models.formTitleAdd': 'モデルを追加',
'models.formTitleEdit': 'モデルを編集',
'models.formTitleAdd': 'プロバイダーを追加',
'models.formTitleEdit': 'プロバイダーを編集',
'models.formClose': '閉じる',
'models.fName': '名前',
'models.fName': 'プロバイダー名',
'models.fNamePh': 'モデルの名前(例:DeepSeek 公式)',
'models.fApiType': 'API タイプ',
'models.apiOpenai': 'OpenAI 互換',
@@ -1200,7 +1198,7 @@ export const ja: Dict = {
'models.apiTypeHelp': '第一段階は OpenAI 互換 API のみ対応。他のプロトコルは画像 / 動画モデルと同時に提供予定',
'models.fBaseUrl': 'API アドレス',
'models.baseUrlHelp': 'プロトコルとポートを含めてください(例:http://192.168.200.18:11434/v1)',
'models.fModel': 'モデル名',
'models.fModel': 'モデル',
'models.modelHelp': 'プロバイダ提供のモデル ID を指定してください',
'models.fApiKey': 'API キー',
'models.keyNoEcho': '表示されません',
@@ -1212,10 +1210,10 @@ export const ja: Dict = {
'models.testFail': '✕ テスト失敗 · {reason}',
'models.needTest': 'テスト成功後に保存できます',
'models.testBtn': '接続テスト',
'models.save': 'モデルを保存',
'models.save': '保存',
'models.errName': 'モデルに名前を付けてください',
'models.errUrl': 'アドレス形式が不正です。プロトコルとパスを含めてください(例:https://api.deepseek.com/v1)',
'models.errModel': 'プロバイダ提供のモデル名を入力してください',
'models.errModel': 'モデルを 1 つ以上追加してください(プロバイダーのモデル ID)',
'models.errKey': 'API キーを入力してください',
'models.failTimeout': 'タイムアウト({sec} 秒無応答):サーバーからこのアドレスに届きません。アドレス・ポート・ファイアウォールを確認してください',
'models.failAuth': '認証失敗(401):API キーが正しいか・期限切れでないか確認してください。集約サービスの場合はモデル権限もご確認ください',
@@ -1238,13 +1236,36 @@ export const ja: Dict = {
'models.unavailable': '(利用不可)',
'models.noticeStrong': '接続性はワークベンチのサーバー基準です:',
'models.noticeBody': 'ブラウザで開けるアドレスでも、ワークベンチのサーバーからアクセスできるとは限りません。接続テストと対話リクエストはサーバーが行います。API キーはサーバーにのみ保存され、画面に表示されることはありません。',
'models.saved': 'モデルを保存しました',
'models.saved': 'プロバイダーを保存しました',
'models.deleted': 'モデルを削除しました',
'models.assignSaved': 'エージェントのモデルを更新しました',
'models.saveFailed': '保存に失敗しました:{detail}',
'models.loading': '読み込み中…',
'models.loadFailed': '設定の読み込みに失敗しました',
'models.idleFormHint': 'カードの「編集」を選ぶか、上の「モデルを追加」をクリックしてください',
'models.modelCount': '{n} 個のモデル',
'models.keyMeta': 'キー {tail}',
'models.keyNone': 'キー未設定',
'models.testShort': 'テスト',
'models.addModel': 'モデルを追加',
'models.fetchModels': '一覧を取得',
'models.fetching': '取得中…',
'models.fetchCount': '{n} 個 · {k} 個選択',
'models.fetchFilterPh': 'モデルを絞り込み',
'models.fetchEmpty': 'モデルが返されませんでした。下でモデル ID を入力してください',
'models.fetchNoMatch': '一致するモデルはありません',
'models.fetchFail': '✕ モデル一覧を取得できません · {reason}',
'models.fetchUnsupported': 'このプロバイダーはモデル一覧に対応していません。下でモデル ID を入力してください',
'models.fetchFormat': '応答がモデル一覧ではありません。下でモデル ID を入力してください',
'models.manualPh': 'モデル ID を入力して Enter で追加',
'models.manualAdd': '追加',
'models.removeModel': '{model} を削除',
'models.noModels': 'モデルはまだありません',
'models.delProviderTitle': 'プロバイダーを削除',
'models.delProviderUsed': 'このプロバイダーのモデルを {n} 個のエージェントが使用中です。削除後は既定モデルに切り替わります。削除しますか?',
'models.delProviderFree': 'このプロバイダーと {k} 個のモデルを削除しますか?元に戻せません。',
'models.delProviderDefaultHint': '既定モデルを含むため削除できません。先に別の既定モデルを指定してください',
'models.delLastModelHint': 'プロバイダーには最低 1 つのモデルが必要です。削除するにはプロバイダーごと削除してください',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': '映画工房',
@@ -1389,9 +1410,7 @@ export const ja: Dict = {
'conn.wfParams': '記入可能パラメータ {n} 件',
'conn.wfImport': 'ワークフローを取り込む',
'conn.wfImporting': '取り込み中…',
'conn.wfNodes': '{n} ノード',
'conn.wfImportedN': 'ワークフローを取り込みました(記入可能パラメータ {n} 件)',
'conn.wfImportedNoParams': '取り込みましたが記入可能パラメータは検出されませんでした。内蔵設定のまま実行されます',
'conn.wfImported': 'ワークフローを取り込みました',
'conn.wfImportFailed': '取り込みに失敗しました:{detail}',
'conn.wfImportTitle': 'ComfyUI ワークフローを取り込む(API 形式 JSON)',
'conn.wfImportHint': '貼り付けまたはファイル選択。名前は必須で、種類が画像 / 動画ウィンドウのどちらに表示されるかを決めます。',
@@ -1491,14 +1510,6 @@ export const ja: Dict = {
'studio.retryLink': '再試行',
'studio.retryQueuedToast': 'タスクを再びキューに入れました',
'studio.retryFailedToast': '再キュー失敗:{detail}',
'studio.errNoWorkflow': '先にワークフローを選択してください',
'studio.errBlocked': '送信できません:{reason}',
'studio.queuedToast': '「{name}」に送信しました(待機中)',
'studio.submitFailedToast': '送信失敗:{detail}',
'studio.jobFailedToast': '生成失敗:{detail}',
'studio.wfNoParamsNote': 'このワークフローには記入可能なパラメータがなく、内蔵のプロンプトと設定で実行されます。ここで記入するには ComfyUI でノードタイトルに (Input:prompt) などを付けて再度取り込んでください。',
'studio.wfAutoParamsNote': '(Input:…) タグがないため、ノード種別から {n} 件のパラメータを自動検出しました。空欄はワークフローの値を使います。',
'studio.promptNotDeclared': 'このワークフローにはプロンプトノードがありません',
'studio.cancelToast': 'キャンセルを要求しました',
'studio.deleteBtn': '削除',
'studio.delTitle': 'タスク記録を削除',
+32 -21
View File
@@ -164,8 +164,6 @@ export const ko: Dict = {
// --- API errors ---
'api.unknownError': '문제가 발생했습니다',
'api.networkError': '워크벤치 백엔드에 연결할 수 없습니다. 실행 중인지 확인 후 다시 시도하세요',
'api.httpError': '요청 실패 (HTTP {status}): {detail}',
'playground.openFailed': '플레이그라운드를 열지 못했습니다',
'playground.opening': '플레이그라운드 여는 중…',
'agents.opening': '에이전트 여는 중…',
@@ -1164,7 +1162,7 @@ export const ko: Dict = {
'models.title': '모델 설정',
'models.subtitle': '에이전트가 사용할 사용자 지정 LLM을 추가합니다 · 1단계는 LLM만 지원, 이미지 / 동영상 모델은 추후 제공',
'models.statusCount': '모델 {n}개 · 사용 가능 {m}개',
'models.add': '모델 추가',
'models.add': '공급자 추가',
'models.tabLlm': '대규모 언어 모델',
'models.tabImage': '이미지 모델',
'models.tabVideo': '동영상 모델',
@@ -1188,10 +1186,10 @@ export const ko: Dict = {
'models.lastTestAt': '마지막 테스트 {time}',
'models.consecutiveFails': '{n}회 연속 실패',
'models.cloudPaused': '클라우드 호출 일시 중지',
'models.formTitleAdd': '모델 추가',
'models.formTitleEdit': '모델 편집',
'models.formTitleAdd': '공급자 추가',
'models.formTitleEdit': '공급자 편집',
'models.formClose': '닫기',
'models.fName': '이름',
'models.fName': '공급자 이름',
'models.fNamePh': '모델 이름, 예: DeepSeek 공식',
'models.fApiType': 'API 유형',
'models.apiOpenai': 'OpenAI 호환',
@@ -1200,7 +1198,7 @@ export const ko: Dict = {
'models.apiTypeHelp': '1단계는 OpenAI 호환 API만 지원하며, 다른 프로토콜은 이미지 / 동영상 모델과 함께 제공됩니다',
'models.fBaseUrl': 'API 주소',
'models.baseUrlHelp': '프로토콜과 포트를 포함하세요, 예: http://192.168.200.18:11434/v1',
'models.fModel': '모델 이름',
'models.fModel': '모델',
'models.modelHelp': '공급자가 제공하는 모델 ID를 사용하세요',
'models.fApiKey': 'API 키',
'models.keyNoEcho': '표시되지 않음',
@@ -1212,10 +1210,10 @@ export const ko: Dict = {
'models.testFail': '✕ 테스트 실패 · {reason}',
'models.needTest': '테스트 통과 후 저장할 수 있습니다',
'models.testBtn': '연결 테스트',
'models.save': '모델 저장',
'models.save': '저장',
'models.errName': '모델 이름을 입력하세요',
'models.errUrl': '주소 형식이 올바르지 않습니다. 프로토콜과 경로를 포함하세요, 예: https://api.deepseek.com/v1',
'models.errModel': '공급자가 제공하는 모델 이름을 입력하세요',
'models.errModel': '모델을 하나 이상 추가하세요 (공급자 모델 ID)',
'models.errKey': 'API 키를 입력하세요',
'models.failTimeout': '시간 초과({sec}초 무응답): 서버가 이 주소에 접근할 수 없습니다. 주소·포트·방화벽을 확인하세요',
'models.failAuth': '인증 실패(401): API 키가 올바르고 만료되지 않았는지 확인하세요. 통합 서비스라면 모델 권한도 확인하세요',
@@ -1238,13 +1236,36 @@ export const ko: Dict = {
'models.unavailable': '(사용 불가)',
'models.noticeStrong': '연결성은 워크벤치 서버 기준입니다:',
'models.noticeBody': '브라우저에서 열리는 주소라도 워크벤치 서버가 접근 가능한 것은 아닙니다. 연결 테스트와 대화 요청은 서버가 수행합니다. API 키는 서버에만 저장되며 화면에 표시되지 않습니다.',
'models.saved': '모델을 저장했습니다',
'models.saved': '공급자를 저장했습니다',
'models.deleted': '모델을 삭제했습니다',
'models.assignSaved': '에이전트 모델을 업데이트했습니다',
'models.saveFailed': '저장 실패: {detail}',
'models.loading': '불러오는 중…',
'models.loadFailed': '설정을 불러오지 못했습니다',
'models.idleFormHint': '카드의 «편집»을 누르거나 위의 «모델 추가»를 클릭하세요',
'models.modelCount': '모델 {n}개',
'models.keyMeta': '키 {tail}',
'models.keyNone': '키 없음',
'models.testShort': '테스트',
'models.addModel': '모델 추가',
'models.fetchModels': '목록 가져오기',
'models.fetching': '가져오는 중…',
'models.fetchCount': '모델 {n}개 · {k}개 선택',
'models.fetchFilterPh': '모델 필터',
'models.fetchEmpty': '공급자가 모델을 반환하지 않았습니다. 아래에 모델 ID를 입력하세요',
'models.fetchNoMatch': '일치하는 모델 없음',
'models.fetchFail': '✕ 모델 목록을 가져오지 못했습니다 · {reason}',
'models.fetchUnsupported': '이 공급자는 모델 목록을 지원하지 않습니다. 아래에 모델 ID를 입력하세요',
'models.fetchFormat': '응답이 모델 목록이 아닙니다. 아래에 모델 ID를 입력하세요',
'models.manualPh': '모델 ID 입력 후 Enter로 추가',
'models.manualAdd': '추가',
'models.removeModel': '{model} 제거',
'models.noModels': '아직 모델이 없습니다',
'models.delProviderTitle': '공급자 삭제',
'models.delProviderUsed': '이 공급자의 모델을 에이전트 {n}개가 사용 중입니다. 삭제하면 기본 모델로 전환됩니다. 삭제할까요?',
'models.delProviderFree': '이 공급자와 모델 {k}개를 삭제할까요? 되돌릴 수 없습니다.',
'models.delProviderDefaultHint': '기본 모델이 포함되어 있습니다. 먼저 다른 기본 모델을 지정하세요',
'models.delLastModelHint': '공급자에는 모델이 하나 이상 필요합니다. 제거하려면 공급자를 삭제하세요',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': '영화 공작소',
@@ -1389,9 +1410,7 @@ export const ko: Dict = {
'conn.wfParams': '채울 수 있는 매개변수 {n}개',
'conn.wfImport': '워크플로 가져오기',
'conn.wfImporting': '가져오는 중…',
'conn.wfNodes': '노드 {n}개',
'conn.wfImportedN': '워크플로를 가져왔습니다 — 매개변수 {n}개 감지',
'conn.wfImportedNoParams': '가져왔지만 채울 수 있는 매개변수가 없습니다. 내장 설정으로 실행됩니다',
'conn.wfImported': '워크플로를 가져왔습니다',
'conn.wfImportFailed': '가져오기 실패: {detail}',
'conn.wfImportTitle': 'ComfyUI 워크플로 가져오기(API 형식 JSON)',
'conn.wfImportHint': '붙여넣기 또는 파일 선택. 이름은 필수이며 종류가 이미지/동영상 창 표시를 결정합니다.',
@@ -1491,14 +1510,6 @@ export const ko: Dict = {
'studio.retryLink': '재시도',
'studio.retryQueuedToast': '작업이 다시 대기열에 들어갔습니다',
'studio.retryFailedToast': '재대기열 실패: {detail}',
'studio.errNoWorkflow': '먼저 워크플로를 선택하세요',
'studio.errBlocked': '제출할 수 없음: {reason}',
'studio.queuedToast': '“{name}”에 제출됨, 대기 중',
'studio.submitFailedToast': '제출 실패: {detail}',
'studio.jobFailedToast': '생성 실패: {detail}',
'studio.wfNoParamsNote': '이 워크플로에는 채울 매개변수가 없어 내장 프롬프트와 설정으로 실행됩니다. 여기서 입력하려면 ComfyUI에서 노드 제목에 (Input:prompt) 등을 붙인 뒤 다시 가져오세요.',
'studio.wfAutoParamsNote': '(Input:…) 제목 태그가 없어 노드 유형으로 매개변수 {n}개를 자동 감지했습니다. 빈 칸은 워크플로 값을 유지합니다.',
'studio.promptNotDeclared': '이 워크플로에는 프롬프트 노드가 없습니다',
'studio.cancelToast': '취소를 요청했습니다',
'studio.deleteBtn': '삭제',
'studio.delTitle': '작업 기록 삭제',
+37 -26
View File
@@ -164,8 +164,6 @@ export const zh: Dict = {
// --- API errors ---
'api.unknownError': '出错了',
'api.networkError': '无法连接到工作台后端,请确认服务在运行、网络正常后重试',
'api.httpError': '请求失败(HTTP {status}):{detail}',
'playground.openFailed': '无法打开演练场',
'playground.opening': '正在打开演练场……',
'agents.opening': '正在打开智能体……',
@@ -1166,12 +1164,12 @@ export const zh: Dict = {
'models.title': '模型设置',
'models.subtitle': '添加自定义大语言模型(LLM),供智能体选用 · 第一阶段仅开放 LLM,图片 / 视频模型后续接入',
'models.statusCount': '{n} 个模型 · {m} 个可用',
'models.add': '添加模型',
'models.add': '添加服务商',
'models.tabLlm': '大语言模型',
'models.tabImage': '图片模型',
'models.tabVideo': '视频模型',
'models.comingSoon': '后续开放',
'models.empty': '还没有配置模型,点右上角「添加模型」接入第一个大语言模型',
'models.empty': '还没有配置服务商,点右上角「添加服务商」接入第一个大语言模型服务',
'models.typeLocal': '本机',
'models.typeLan': '局域网',
'models.typeCloud': '云端',
@@ -1190,11 +1188,11 @@ export const zh: Dict = {
'models.lastTestAt': '上次测试 {time}',
'models.consecutiveFails': '已连续失败 {n} 次',
'models.cloudPaused': '云端调用已暂停',
'models.formTitleAdd': '添加模型',
'models.formTitleEdit': '编辑模型',
'models.formTitleAdd': '添加服务商',
'models.formTitleEdit': '编辑服务商',
'models.formClose': '关闭',
'models.fName': '名称',
'models.fNamePh': '给模型起个名字,如 DeepSeek 官方',
'models.fName': '服务商名称',
'models.fNamePh': '如 DeepSeek 官方、本机 Ollama',
'models.fApiType': '接口类型',
'models.apiOpenai': 'OpenAI 兼容',
'models.apiAnthropic': 'Anthropic',
@@ -1202,8 +1200,8 @@ export const zh: Dict = {
'models.apiTypeHelp': '第一阶段仅支持 OpenAI 兼容接口,其余协议随图片 / 视频模型一同开放',
'models.fBaseUrl': '接口地址',
'models.baseUrlHelp': '需含协议与端口,如 http://192.168.200.18:11434/v1',
'models.fModel': '模型名称',
'models.modelHelp': '以服务商提供的模型 ID 为准',
'models.fModel': '模型',
'models.modelHelp': '可自动获取服务商的模型列表勾选,也可手动输入模型 ID;测试连接使用列表中的第一个模型',
'models.fApiKey': 'API 密钥',
'models.keyNoEcho': '密钥不回显',
'models.keyHelp': '仅保存在本机服务器,页面永不显示完整密钥',
@@ -1214,10 +1212,10 @@ export const zh: Dict = {
'models.testFail': '✕ 测试失败 · {reason}',
'models.needTest': '未测试通过前无法保存',
'models.testBtn': '测试连接',
'models.save': '保存模型',
'models.errName': '请给模型起个名字',
'models.save': '保存',
'models.errName': '请给服务商起个名字',
'models.errUrl': '地址格式不正确,需含协议与路径,示例:https://api.deepseek.com/v1',
'models.errModel': '请填写模型名称,以服务商提供的模型 ID 为准',
'models.errModel': '请至少添加一个模型,以服务商提供的模型 ID 为准',
'models.errKey': '请填写 API 密钥',
'models.failTimeout': '连接超时({sec} 秒无响应):服务器无法访问该地址,请检查地址、端口与防火墙',
'models.failAuth': '鉴权失败(401):请检查 API 密钥是否正确或已过期;使用聚合服务时,请确认账号已开通该模型权限',
@@ -1240,13 +1238,36 @@ export const zh: Dict = {
'models.unavailable': '(不可用)',
'models.noticeStrong': '连通性以工作台服务器为准:',
'models.noticeBody': '浏览器能打开某个地址,不代表运行工作台的服务器也能访问;连接测试与对话请求均由服务器发起。API 密钥仅保存在服务器本地,任何页面不回显。',
'models.saved': '模型已保存',
'models.saved': '服务商已保存',
'models.deleted': '模型已删除',
'models.assignSaved': '智能体模型已更新',
'models.saveFailed': '保存失败:{detail}',
'models.loading': '加载中…',
'models.loadFailed': '设置加载失败',
'models.idleFormHint': '从左侧选择「编辑」,或点上方「添加模型」新增配置',
'models.idleFormHint': '从左侧选择「编辑」,或点上方「添加服务商」新增配置',
'models.modelCount': '{n} 个模型',
'models.keyMeta': '密钥 {tail}',
'models.keyNone': '未设置密钥',
'models.testShort': '测试',
'models.addModel': '添加模型',
'models.fetchModels': '自动获取',
'models.fetching': '获取中…',
'models.fetchCount': '共 {n} 个模型 · 已选 {k} 个',
'models.fetchFilterPh': '筛选模型',
'models.fetchEmpty': '服务商没有返回任何模型,请在下方手动输入模型 ID 添加',
'models.fetchNoMatch': '没有匹配的模型',
'models.fetchFail': '✕ 获取模型列表失败 · {reason}',
'models.fetchUnsupported': '该服务商不支持自动获取模型列表,请在下方手动输入模型 ID 添加',
'models.fetchFormat': '服务商返回的内容不是模型列表,请在下方手动输入模型 ID 添加',
'models.manualPh': '手动输入模型 ID,回车添加',
'models.manualAdd': '添加',
'models.removeModel': '移除 {model}',
'models.noModels': '还没有添加模型',
'models.delProviderTitle': '删除服务商',
'models.delProviderUsed': '该服务商下的模型正被 {n} 个智能体使用,删除后这些智能体将改用「智能体默认」。确定删除?',
'models.delProviderFree': '确定删除该服务商及其下 {k} 个模型?删除后不可恢复。',
'models.delProviderDefaultHint': '该服务商包含「智能体默认」模型,请先指定其他默认模型',
'models.delLastModelHint': '服务商至少保留一个模型;如需移除请删除整个服务商',
// --- A shell + projects overview (HEL-608) ---
'shell.brand': '影工坊',
@@ -1389,9 +1410,7 @@ export const zh: Dict = {
'conn.wfParams': '{n} 个可填参数',
'conn.wfImport': '导入工作流',
'conn.wfImporting': '导入中…',
'conn.wfNodes': '{n} 个节点',
'conn.wfImportedN': '工作流已导入,识别到 {n} 个可填参数',
'conn.wfImportedNoParams': '工作流已导入,但没有识别到可填参数:生成时将按工作流内置设置运行',
'conn.wfImported': '工作流已导入',
'conn.wfImportFailed': '导入失败:{detail}',
'conn.wfImportTitle': '导入 ComfyUI 工作流(API 格式 JSON)',
'conn.wfImportHint': '粘贴或选择文件;名称必填,分类决定它出现在生图还是生视频窗口。',
@@ -1490,14 +1509,6 @@ export const zh: Dict = {
'studio.retryLink': '重试',
'studio.retryQueuedToast': '任务已重新排队',
'studio.retryFailedToast': '重新排队失败:{detail}',
'studio.errNoWorkflow': '请先选择工作流',
'studio.errBlocked': '无法提交:{reason}',
'studio.queuedToast': '已提交到「{name}」,排队中',
'studio.submitFailedToast': '提交失败:{detail}',
'studio.jobFailedToast': '生成失败:{detail}',
'studio.wfNoParamsNote': '该工作流没有可填写的参数,将按工作流内置的提示词和设置直接生成。如需在这里填写,请在 ComfyUI 中把节点标题加上 (Input:prompt) 等标记后重新导入。',
'studio.wfAutoParamsNote': '工作流未使用 (Input:…) 标题标记,已按节点类型自动识别出 {n} 个参数;留空的项沿用工作流原值。',
'studio.promptNotDeclared': '该工作流没有提示词节点,无需填写',
'studio.cancelToast': '已发送取消请求',
'studio.deleteBtn': '删除',
'studio.delTitle': '删除任务记录',
+6 -2
View File
@@ -721,8 +721,12 @@
onchange={(e) => setAgentModel(s, activeAgent.llm_role, e.currentTarget.value)}
>
<option value="">{t('agentsPage.modelDefault')}</option>
{#each s.llm_profiles as p (p.id)}
<option value={p.id}>{p.name} — {p.model}</option>
{#each s.llm_providers ?? [] as prov (prov.id)}
<optgroup label={prov.name}>
{#each prov.models as m (m.id)}
<option value={m.id}>{m.model}</option>
{/each}
</optgroup>
{/each}
</select>
{/if}
@@ -372,11 +372,9 @@
...(wfImportEndpoint ? { endpoint_id: wfImportEndpoint } : {}),
});
},
onSuccess: (wf) => {
onSuccess: () => {
client.invalidateQueries({ queryKey: ['workflows'] });
const n = wf.input_schema?.length ?? 0;
if (n) toast.success(t('conn.wfImportedN', { n }));
else toast.info(t('conn.wfImportedNoParams'));
toast.success(t('conn.wfImported'));
wfImportOpen = false;
wfJsonText = '';
wfImportName = '';
@@ -726,7 +724,7 @@
<div class="form-actions">
<span class="need-test" class:passed={wfParsed.valid && wfImportName.trim() !== ''}>
{wfParsed.valid
? t('conn.wfNodes', { n: Object.keys(wfParsed.json ?? {}).length })
? t('conn.wfParams', { n: Object.keys(wfParsed.json ?? {}).length })
: 'JSON'}
</span>
<Button
File diff suppressed because it is too large Load Diff
@@ -281,7 +281,8 @@
if (!agent || !s) return null;
const pid = s.agent_llm_assignments?.[agent.llm_role];
const profile = (s.llm_profiles ?? []).find((p) => p.id === pid);
return profile?.name ?? null;
if (!profile) return null;
return profile.provider_name ? `${profile.provider_name} · ${profile.model}` : profile.name;
});
function openAgentChat() {