Generate clean 2D game sprites & animation atlases — component-row pipeline: state rows, alpha cleanup, frame extraction, runtime atlases. Codex/Claude skill.
refactor(gen): the image providers' names codex, grok and openai written once in gen.base and read by name everywhere a provider is named, the curator's two buttons gated by one curator-owned set the JS select is bound to, and each provider default read from its declaration
Soohong Kim2f8b5a92a4b6
diff --git a/sprite_gen/effects/interpolate.py b/sprite_gen/effects/interpolate.pyindex dec7cf0..87e68dd 100644--- a/sprite_gen/effects/interpolate.py+++ b/sprite_gen/effects/interpolate.py@@ -46,17 +46,20 @@ from PIL import Imagefrom sprite_gen.frames.extract import (extract_component_images, register_row_frames,remove_chroma_background_ycbcr, tighten_components)+from sprite_gen.gen.base import PROVIDER_CODEX, PROVIDER_GROKfrom sprite_gen.spec.layout import raw_rel, take_raw_relfrom sprite_gen.spec.runio import load_request, write_requestfrom sprite_gen.util.console import utf8_streams-PROVIDERS = ("codex", "grok")+PROVIDERS = (PROVIDER_CODEX, PROVIDER_GROK)+# 보간 자기 기본값 — 3-way 실측 비교 승자 (docs/frame-interpolation.md). gen 의 HARD_DEFAULT_PROVIDER 와 따로 정한다.+DEFAULT_PROVIDER = PROVIDER_CODEX# interpolator 시그니처: (img0 RGB, img1 RGB, t, prompt) -> mid RGB. 테스트는 스텁을 주입한다.Interpolator = Callable[[Image.Image, Image.Image, float, str], Image.Image]-def gen_interpolator(provider: str = "codex") -> Interpolator:+def gen_interpolator(provider: str = DEFAULT_PROVIDER) -> Interpolator:"""생성형 in-between interpolator — 두 정합 프레임을 ref 로 물려 중간 포즈를 그리게 한다."""if provider not in PROVIDERS:raise SystemExit(f"unknown interpolation provider: {provider} (choose from {PROVIDERS})")@@ -206,7 +209,7 @@ def write_take(run_dir: Path, request: dict[str, Any], state: str, label: str,def interpolate_between(run_dir: Path | str, state: str, index_a: int, index_b: int,t: float = 0.5, label: str | None = None,- provider: str = "codex",+ provider: str = DEFAULT_PROVIDER,interpolator: Interpolator | None = None) -> Path:"""두 프레임 사이 중간 프레임을 만들어 테이크로 기록한다. 반환 = 테이크 raw 경로."""run_dir = Path(run_dir)@@ -242,7 +245,7 @@ def _build_parser() -> argparse.ArgumentParser:parser.add_argument("--state", required=True)parser.add_argument("--between", nargs=2, type=int, required=True,metavar=("FROM", "TO"), help="primary 스트립의 프레임 인덱스 두 개")- parser.add_argument("--provider", choices=PROVIDERS, default="codex",+ parser.add_argument("--provider", choices=PROVIDERS, default=DEFAULT_PROVIDER,help="생성 백엔드 (기본 codex — 3-way 실측 비교 승자)")parser.add_argument("--t", type=float, default=0.5, help="보간 시점 (0..1, 기본 0.5)")parser.add_argument("--label", default=None, help="테이크 라벨 (기본 tween_<A>_<B>_t<t>)")diff --git a/sprite_gen/effects/reroll.py b/sprite_gen/effects/reroll.pyindex 4ef72f9..a7393a3 100644--- a/sprite_gen/effects/reroll.py+++ b/sprite_gen/effects/reroll.py@@ -26,7 +26,7 @@ from typing import Anyfrom sprite_gen.curate.anchor import identity_reffrom sprite_gen.spec.runio import load_request, write_request-from sprite_gen.gen import PROVIDERS, generate_image+from sprite_gen.gen import HARD_DEFAULT_PROVIDER, PROVIDERS, generate_imagefrom sprite_gen.spec.layout import guide_rel, prompt_rel, take_raw_relfrom sprite_gen.util.console import utf8_streams@@ -67,7 +67,7 @@ def record_take(run_dir: Path, state: str, label: str, frames: int) -> None:write_request(run_dir, fresh)-def reroll_state(run_dir: Path | str, state: str, provider: str = "codex",+def reroll_state(run_dir: Path | str, state: str, provider: str = HARD_DEFAULT_PROVIDER,label: str | None = None) -> Path:"""행 리롤 한 번: 테이크 raw 생성 + request takes 기록. 반환 = 테이크 raw 경로."""run_dir = Path(run_dir)@@ -108,7 +108,7 @@ def _build_parser() -> argparse.ArgumentParser:parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])parser.add_argument("--run-dir", required=True)parser.add_argument("--state", required=True)- parser.add_argument("--provider", choices=PROVIDERS, default="codex",+ parser.add_argument("--provider", choices=PROVIDERS, default=HARD_DEFAULT_PROVIDER,help="생성 백엔드 (기본 codex)")parser.add_argument("--label", default=None, help="테이크 라벨 (기본 rerollN 자동 증가)")parser.add_argument("--extract", action="store_true",diff --git a/sprite_gen/gen/__init__.py b/sprite_gen/gen/__init__.pyindex b09db74..1a866fd 100644--- a/sprite_gen/gen/__init__.py+++ b/sprite_gen/gen/__init__.py@@ -60,6 +60,9 @@ from . import handedness as handed_modfrom . import prompt_partsfrom .base import (CODEX_UNAVAILABLE_EXIT,+ PROVIDER_CODEX,+ PROVIDER_GROK,+ PROVIDER_OPENAI,QUALITIES,RESOLUTIONS,TRANSPARENCY_CHROMA,@@ -79,7 +82,7 @@ from .grok_provider import GrokProviderfrom .openai_provider import OpenAIProviderfrom sprite_gen.util.console import utf8_streams-PROVIDERS = ("codex", "grok", "openai")+PROVIDERS = (PROVIDER_CODEX, PROVIDER_GROK, PROVIDER_OPENAI)# `--alpha-mode`: `auto` reads the provider's declared strategy (the SSoT);# `native` / `chroma` force one. Forcing `native` on a chroma-only provider fails# loud — a strategy the backend cannot execute is not a fallback candidate.@@ -91,11 +94,11 @@ ALPHA_MODES = (ALPHA_MODE_AUTO, *TRANSPARENCY_STRATEGIES)# An EXPLICIT `--provider` is always honored exactly — an explicitly named provider# that is down fails loud at generation time.DEFAULT_PROVIDER_ENV = "SPRITE_GEN_DEFAULT_PROVIDER"-HARD_DEFAULT_PROVIDER = "codex"+HARD_DEFAULT_PROVIDER = PROVIDER_CODEX# A per-call API-billed backend is never a default: only a choice the user made# reaches it, so nothing routes a subscription user onto metered credit unasked# (구독 우선 불변식 1-2).-EXPLICIT_ONLY_PROVIDERS = ("openai",)+EXPLICIT_ONLY_PROVIDERS = (PROVIDER_OPENAI,)# What a default codex that cannot run here turns into (수홍 2026-10-16, docs/gen.md "When codex cannot run"):# codex is not signed in (`codex_provider.codex_login`), or `codex exec` said its usage is used up# (`codex_provider.CodexUsageLimit`). `ask` (the default) ends the call with one question and nothing generated@@ -104,7 +107,7 @@ EXPLICIT_ONLY_PROVIDERS = ("openai",)# key CODEX_UNAVAILABLE_SETTING), else `ask`. Until 2.44.0 it went to grok unasked.CODEX_UNAVAILABLE_ENV = "SPRITE_GEN_CODEX_UNAVAILABLE"CODEX_UNAVAILABLE_SETTING = "codex_unavailable"-CODEX_UNAVAILABLE_CHOICES = ("ask", "grok", "openai")+CODEX_UNAVAILABLE_CHOICES = ("ask", PROVIDER_GROK, PROVIDER_OPENAI)CODEX_UNAVAILABLE_DEFAULT = "ask"# `--layout-guide`: the one-slot form of the guide `prepare` draws for every row@@ -228,11 +231,11 @@ def ui_kit_guide_size(aspect_ratio: str | None) -> tuple[int, int]:def _make_provider(name: str, *, keep_session: bool):- if name == "codex":+ if name == PROVIDER_CODEX:return CodexProvider(keep_session=keep_session)- if name == "grok":+ if name == PROVIDER_GROK:return GrokProvider()- if name == "openai":+ if name == PROVIDER_OPENAI:return OpenAIProvider()raise SystemExit(f"gen: unknown provider {name!r}; expected one of {', '.join(PROVIDERS)}")@@ -327,7 +330,7 @@ def resolve_default_provider() -> tuple[str, dict[str, str] | None]:# Only a codex default turns into the user's choice. A grok default that is down# fails loud at generation time rather than reverse-falling back to codex.- if default == "codex":+ if default == PROVIDER_CODEX:ok, reason = _codex_available()if not ok:return codex_unavailable("login", reason, default_source=source)@@ -363,7 +366,7 @@ def codex_unavailable(cause: str, reason: str, *, default_source: str) -> tuple[choice, chosen_by = codex_unavailable_choice()if choice == "ask":raise ask_codex_unavailable(codex_unavailable_question(cause, reason))- return choice, {"from": "codex", "to": choice, "cause": cause, "reason": reason,+ return choice, {"from": PROVIDER_CODEX, "to": choice, "cause": cause, "reason": reason,"default_source": default_source, "chosen_by": chosen_by}diff --git a/sprite_gen/gen/base.py b/sprite_gen/gen/base.pyindex c88ea1d..7435c77 100644--- a/sprite_gen/gen/base.py+++ b/sprite_gen/gen/base.py@@ -26,6 +26,13 @@ from PIL import Image, UnidentifiedImageErrorPNG_MAGIC = b"\x89PNG\r\n\x1a\n"+# The image providers' names, each written once. The sets of them (`gen.PROVIDERS`, its hard default, the+# explicit-only ones) are `sprite_gen.gen`'s; the names are here because the adapters name themselves with them and+# `gen` imports the adapters before it declares its sets. The HTTP hosts behind them are `address`'s, another name set.+PROVIDER_CODEX = "codex"+PROVIDER_GROK = "grok"+PROVIDER_OPENAI = "openai"+# Transparency strategy — a capability each provider declares exactly once# (`Provider.transparency`). The orchestrator reads it; nothing else decides.# native — the model returns a genuinely transparent PNG (alpha channel) when@@ -170,7 +177,7 @@ def codex_unavailable_question(cause: str, reason: str, *, flag: str = "--provid"reason": reason,"question": f"codex cannot run here ({reason}). Generate with the OpenAI API (billed per call), ""with Grok, or stop?",- "choices": {"openai": f"{flag} openai", "grok": f"{flag} grok", "stop": None},+ "choices": {PROVIDER_OPENAI: f"{flag} {PROVIDER_OPENAI}", PROVIDER_GROK: f"{flag} {PROVIDER_GROK}", "stop": None},}diff --git a/sprite_gen/gen/codex_provider.py b/sprite_gen/gen/codex_provider.pyindex 42c8a42..5e3032a 100644--- a/sprite_gen/gen/codex_provider.py+++ b/sprite_gen/gen/codex_provider.py@@ -37,6 +37,7 @@ from pathlib import Pathfrom .base import (GEN_TIMEOUT_SECONDS,LOGINS_OFF,+ PROVIDER_CODEX,TRANSPARENCY_NATIVE,announce_api_billing,GenRequest,@@ -378,7 +379,7 @@ def _no_image_records_message(rollout: Path, codex_home: Path) -> str:class CodexProvider:"""Generate one image through codex `image_gen`."""- name = "codex"+ name = PROVIDER_CODEXtransparency = TRANSPARENCY_NATIVEdef __init__(self, *, keep_session: bool = False) -> None:diff --git a/sprite_gen/gen/grok_provider.py b/sprite_gen/gen/grok_provider.pyindex f49f1da..9bf45c2 100644--- a/sprite_gen/gen/grok_provider.py+++ b/sprite_gen/gen/grok_provider.py@@ -20,6 +20,7 @@ from PIL import Image, UnidentifiedImageErrorfrom . import address, refusal, retry, xaifrom .base import (GEN_TIMEOUT_SECONDS,+ PROVIDER_GROK,RESOLUTIONS,TRANSPARENCY_CHROMA,GenRequest,@@ -118,7 +119,7 @@ def _publish_image(item: dict, path: Path) -> None:class GrokProvider:- name = "grok"+ name = PROVIDER_GROKtransparency = TRANSPARENCY_CHROMAdef inspect_facing(self, path: Path, workdir: Path) -> tuple[str, dict]:diff --git a/sprite_gen/gen/openai_provider.py b/sprite_gen/gen/openai_provider.pyindex 9c81468..332b929 100644--- a/sprite_gen/gen/openai_provider.py+++ b/sprite_gen/gen/openai_provider.py@@ -45,6 +45,7 @@ from . import address, refusal, retryfrom .xai import NO_ANSWER, error_body, read_whole, time_leftfrom .base import (GEN_TIMEOUT_SECONDS,+ PROVIDER_OPENAI,QUALITIES,TRANSPARENCY_NATIVE,GenRequest,@@ -264,7 +265,7 @@ def _refusal(reply: Any) -> refusal.Refusal:moderation = error.get("moderation_details") if isinstance(error, dict) else Nonestage = moderation.get("moderation_stage") if isinstance(moderation, dict) else Nonedetails = (("moderation_stage", stage),) if stage in MODERATION_STAGES else ()- return refusal.read("openai", reply, details)+ return refusal.read(PROVIDER_OPENAI, reply, details)def _publish_image(item: dict, path: Path) -> None:@@ -281,7 +282,7 @@ def _publish_image(item: dict, path: Path) -> None:class OpenAIProvider:- name = "openai"+ name = PROVIDER_OPENAI# `background: transparent` returns a real alpha channel on gpt-image-2.5.transparency = TRANSPARENCY_NATIVEdiff --git a/sprite_gen/gen/refusal.py b/sprite_gen/gen/refusal.pyindex aa1f2a6..0af7a7f 100644--- a/sprite_gen/gen/refusal.py+++ b/sprite_gen/gen/refusal.py@@ -30,6 +30,8 @@ import refrom dataclasses import dataclassfrom typing import Any+from .base import PROVIDER_GROK, PROVIDER_OPENAI+CODE_PATTERN = re.compile(r"[A-Za-z0-9_.:-]{1,64}")CONTENT_POLICY = "refused by the provider's content policy"@@ -53,8 +55,8 @@ REDACTED = "[redacted]"# content. An xAI clip blocked by moderation is recognised by# `video.respect_moderation: false` instead (sprite_gen.gen.video).POLICY_CODES: dict[str, frozenset[str]] = {- "openai": frozenset({"moderation_blocked"}),- "grok": frozenset(),+ PROVIDER_OPENAI: frozenset({"moderation_blocked"}),+ PROVIDER_GROK: frozenset(),}diff --git a/sprite_gen/gen/video.py b/sprite_gen/gen/video.pyindex a78dca5..73a28c8 100644--- a/sprite_gen/gen/video.py+++ b/sprite_gen/gen/video.py@@ -61,7 +61,7 @@ from typing import Any, Callablefrom sprite_gen.spec.runio import atomic_write_text, refuse_overlapfrom sprite_gen.util.cli_kwargs import namespace_from_kwargsfrom . import address, prompt_parts, refusal, retry-from .base import announce_api_billing, print_json+from .base import PROVIDER_GROK, announce_api_billing, print_jsonfrom .facing import FACINGS, validate as validate_facingfrom sprite_gen.video import facing as facing_modfrom .xai import (@@ -540,7 +540,7 @@ def _submit_poll_publish()request_id = reply.get("request_id") if isinstance(reply, dict) else Noneif status not in (200, 202) or not request_id:- refused = refusal.read("grok", reply)+ refused = refusal.read(PROVIDER_GROK, reply)raise SystemExit(f"{verb}: {refused.reason('generation request refused')} (HTTP {status}){refused.suffix()}: {_error_detail(reply, credential.token)}")@@ -637,7 +637,7 @@ def _poll_publish()elif http not in (200, 202) or poll_status in _FAILED_STATUSES:# A failed poll carries `error` as an object `{code, message}`.- refused = refusal.read("grok", poll)+ refused = refusal.read(PROVIDER_GROK, poll)raise SystemExit(f"{verb}: generation {request_id} {refused.reason(f'ended with status={poll_status!r}')} "f"(HTTP {http}){refused.suffix()}: {_error_detail(poll, credential.token)}"diff --git a/sprite_gen/serve/curator/src/gen-trigger.js b/sprite_gen/serve/curator/src/gen-trigger.jsindex c373834..87fe03d 100644--- a/sprite_gen/serve/curator/src/gen-trigger.js+++ b/sprite_gen/serve/curator/src/gen-trigger.js@@ -9,6 +9,7 @@// 다른 제스처(Alt클릭 모델 선택 등)를 만들지 않는다 — 회귀 2026-07-19 maintainer// "보간은 클릭하면 모델선택이고 리롤은 alt클릭이고 다 지멋대로".+// 값과 순서는 서버의 serve_curation.CURATOR_PROVIDERS 미러 — tests/serve/test_curation_view_contract.py 가 node 로 묶는다.const GEN_PROVIDERS = [{ value: "codex", label: "GPT" },{ value: "grok", label: "Grok" },diff --git a/sprite_gen/serve/serve_curation.py b/sprite_gen/serve/serve_curation.pyindex 128d5b6..efe8c5b 100644--- a/sprite_gen/serve/serve_curation.py+++ b/sprite_gen/serve/serve_curation.py@@ -55,6 +55,9 @@ from urllib.parse import parse_qs, quote, unquote, urlparsefrom sprite_gen.effects.breathe import (DEFAULT_DEPTH, DEFAULT_LAG, freeze_anatomy,reference_key)+from sprite_gen.effects import interpolate as interpolate_mod+from sprite_gen import gen as gen_mod+from sprite_gen.gen.base import PROVIDER_CODEX, PROVIDER_GROKfrom sprite_gen.curate.curation import (CURATION_FILENAME, SCHEMA_VERSION, effective_logical_height,empty_curation, frame_variant, imported_ref_role,load_curation, load_curation_report, pixel_snap_scale,@@ -914,8 +917,14 @@ def run_compose(run_dir: Path) -> dict:return _run_module("compose_atlas", run_dir)+# The providers the curator's reroll and in-between buttons run, in the order its select offers them+# (gen-trigger.js GEN_PROVIDERS mirrors it). The curator's own set: the reroll CLI takes every gen provider,+# and capabilities.PROVIDER_CALLS["curation"] counts on openai not being here.+CURATOR_PROVIDERS = (PROVIDER_CODEX, PROVIDER_GROK)++def run_interpolate(run_dir: Path, state: str, index_a: int, index_b: int,- t: float, label: str | None, provider: str = "codex") -> dict:+ t: float, label: str | None, provider: str = interpolate_mod.DEFAULT_PROVIDER) -> dict:"""AI in-between (`sprite_gen.effects.interpolate`): 테이크 기록 + 전체 배치 재추출.생성은 서버 머신의 provider CLI(codex/grok, 머신 로컬 OAuth)가 수행한다 —@@ -929,7 +938,7 @@ def run_interpolate(run_dir: Path, state: str, index_a: int, index_b: int,return _run_module("interpolate", run_dir, *extra)-def run_reroll(run_dir: Path, state: str, provider: str = "codex") -> dict:+def run_reroll(run_dir: Path, state: str, provider: str = gen_mod.HARD_DEFAULT_PROVIDER) -> dict:"""행 리롤 (`sprite_gen.effects.reroll`): 새 테이크 생성 + 전체 배치 재추출.primary 를 덮지 않는다 — 후보군 병기(테이크)가 계약이다 (maintainer 2026-07-19@@ -1499,8 +1508,8 @@ class CurationHandler(BaseHTTPRequestHandler):if not 0.0 < t_value < 1.0:self._send_json({"error": f"t must be inside (0, 1): {t_value}"}, 400)return- provider = str(payload.get("provider") or "codex")- if provider not in ("codex", "grok"):+ provider = str(payload.get("provider") or interpolate_mod.DEFAULT_PROVIDER)+ if provider not in CURATOR_PROVIDERS:self._send_json({"error": f"unknown provider: {provider}"}, 400)returnresult = run_interpolate(self.run_dir, state, index_a, index_b,@@ -1514,8 +1523,8 @@ class CurationHandler(BaseHTTPRequestHandler):if state not in request.get("states", {}):self._send_json({"error": f"unknown state: {state}"}, 400)return- provider = str(payload.get("provider") or "codex")- if provider not in ("codex", "grok"):+ provider = str(payload.get("provider") or gen_mod.HARD_DEFAULT_PROVIDER)+ if provider not in CURATOR_PROVIDERS:self._send_json({"error": f"unknown provider: {provider}"}, 400)returnresult = run_reroll(self.run_dir, state, provider)diff --git a/sprite_gen/workflow/access.py b/sprite_gen/workflow/access.pyindex 64d83bc..c25ac57 100644--- a/sprite_gen/workflow/access.py+++ b/sprite_gen/workflow/access.py@@ -3,6 +3,7 @@from __future__ import annotationsfrom sprite_gen.gen import codex_provider+from sprite_gen.gen.base import PROVIDER_CODEX, PROVIDER_GROK, PROVIDER_OPENAIfrom sprite_gen.gen.openai_provider import AUTH_ENV as OPENAI_AUTH_ENVfrom sprite_gen.gen.openai_provider import resolve_credential as resolve_openai_credentialfrom sprite_gen.gen.xai import AUTH_SOURCE_API_KEY, resolve_credential@@ -12,7 +13,7 @@ def probe_access(provider: str) -> dict:"""One probe per provider: images and videos of a provider share its credential precedence."""result = {"provider": provider, "login": "unknown", "subscription": "unknown", "quota": "unknown","billing": "subscription", "reason": "Subscription and media access need user confirmation when not independently known."}- if provider == "codex":+ if provider == PROVIDER_CODEX:# The one reading of how codex is signed in; it never repeats what the CLI said.login = codex_provider.codex_login()if login.source is None:@@ -22,7 +23,7 @@ def probe_access(provider: str) -> dict:"reason": "codex is signed in with an API key and bills it per call; confirm this billing choice ""or sign in with ChatGPT (`codex login`)."}return {**result, "login": "ready"}- if provider == "openai":+ if provider == PROVIDER_OPENAI:# An API key is the whole credential: there is no login to inspect and no# subscription route to prefer, so readiness is the key's presence and the# billing route is always metered API credit.@@ -33,7 +34,7 @@ def probe_access(provider: str) -> dict:"reason": f"{OPENAI_AUTH_ENV} is not set; export the key or choose another provider"}return {**result, "login": "ready", "billing": "api-credit","reason": f"OpenAI images will use {OPENAI_AUTH_ENV} and separate API credit; confirm this billing choice."}- if provider != "grok":+ if provider != PROVIDER_GROK:raise ValueError(f"unknown provider: {provider}")try:# Images and videos use the same direct API credential precedence.diff --git a/sprite_gen/workflow/catalog.py b/sprite_gen/workflow/catalog.pyindex 186e3fc..8a0ad8e 100644--- a/sprite_gen/workflow/catalog.py+++ b/sprite_gen/workflow/catalog.py@@ -1,26 +1,27 @@# SPDX-License-Identifier: Apache-2.0"""The two user journeys and their selectable fields, declared once."""from sprite_gen.gen import CODEX_UNAVAILABLE_CHOICES, CODEX_UNAVAILABLE_SETTING, PROVIDERS+from sprite_gen.gen.base import PROVIDER_CODEX, PROVIDER_GROK, PROVIDER_OPENAIMOTION_METHODS = {- "gpt-rows": {"label": "지피티 이미지 스프라이트", "provider": "codex", "doc": "docs/atlas-workflow.md",+ "gpt-rows": {"label": "지피티 이미지 스프라이트", "provider": PROVIDER_CODEX, "doc": "docs/atlas-workflow.md","steps": ["prepare", "gen-set", "extract", "compose-atlas", "compose-gif"]},- "grok-video": {"label": "그록 영상", "provider": "grok", "doc": "docs/video-pipeline.md",+ "grok-video": {"label": "그록 영상", "provider": PROVIDER_GROK, "doc": "docs/video-pipeline.md","steps": ["video-set"]},}# One label per registered provider. A provider with no label here is a bug, not# a row to drop quietly: the mapping is checked rather than zipped positionally,# so registering a backend in `gen.PROVIDERS` without naming it fails at import.PROVIDER_LABELS = {- "codex": "지피티",- "grok": "그록",- "openai": "지피티 API (서버·SaaS 용, 호출당 과금)",+ PROVIDER_CODEX: "지피티",+ PROVIDER_GROK: "그록",+ PROVIDER_OPENAI: "지피티 API (서버·SaaS 용, 호출당 과금)",}# Subscription-first (수홍 2026-09-20): the guided flow offers only the routes# that run on a subscription the user already pays for as the image provider.# `openai` spends metered API credit per call, so it is never offered there; the# one place it is a choice is the answer for a codex that cannot run (below).-GUIDED_PROVIDERS = ("codex", "grok")+GUIDED_PROVIDERS = (PROVIDER_CODEX, PROVIDER_GROK)_unlabelled = [provider for provider in PROVIDERS if provider not in PROVIDER_LABELS]if _unlabelled:raise RuntimeError(f"workflow catalog: no label for provider(s) {', '.join(_unlabelled)}")@@ -41,7 +42,8 @@ FIELDS = {# `gen.codex_unavailable_choice` reads it, docs/gen.md "When codex cannot run" owns the rule.GENERAL_FIELDS = {CODEX_UNAVAILABLE_SETTING: {- "options": {"ask": "멈추고 묻기 (기본)", "grok": "그록으로 만들기", "openai": "OpenAI API 로 만들기 (호출당 과금)"},+ "options": {"ask": "멈추고 묻기 (기본)", PROVIDER_GROK: "그록으로 만들기",+ PROVIDER_OPENAI: "OpenAI API 로 만들기 (호출당 과금)"},"question": "지피티(codex)를 쓸 수 없을 때 — 로그인이 없거나 사용량을 다 썼을 때 — 어떻게 할까요?",},}diff --git a/tests/gen/test_codex_unavailable.py b/tests/gen/test_codex_unavailable.pyindex 8a48169..6796d5a 100644--- a/tests/gen/test_codex_unavailable.py+++ b/tests/gen/test_codex_unavailable.py@@ -152,6 +152,7 @@ def test_no_codex_login_and_nothing_chosen_ends_with_the_question_and_draws_nothquestion = base.asked_codex_unavailable(run.stderr)assert question["cause"] == "login" and question["reason"] == "codex CLI not found on PATH"assert question["choices"] == {"openai": "--provider openai", "grok": "--provider grok", "stop": None}+ assert list(question["choices"]) == ["openai", "grok", "stop"] # the line's order: dict == does not see itassert "OpenAI API" in question["question"] and "Grok" in question["question"] and "stop" in question["question"]assert not out.exists() and not report.exists()@@ -344,6 +345,7 @@ def test_video_set_whose_mid_step_redraw_asked_stops_with_the_same_question(tmp_question = asked.value.questionassert asked.value.code == base.CODEX_UNAVAILABLE_EXIT and question["cause"] == "login"assert question["choices"] == {"openai": "--still-provider openai", "grok": "--still-provider grok", "stop": None}+ assert list(question["choices"]) == ["openai", "grok", "stop"]payload = json.loads((root / "set.report.json").read_text(encoding="utf-8"))assert payload["asked"] == question and payload["items"][0]["asked"]["cause"] == "login"diff --git a/tests/gen/test_openai_provider.py b/tests/gen/test_openai_provider.pyindex 2d7a7a5..bcee911 100644--- a/tests/gen/test_openai_provider.py+++ b/tests/gen/test_openai_provider.py@@ -22,7 +22,7 @@ from http_answer import Answerfrom sprite_gen import genfrom sprite_gen.gen import grok_provider as grokfrom sprite_gen.gen import openai_provider as openai-from sprite_gen.gen import base, retry, xai+from sprite_gen.gen import base, codex_provider, retry, xaifrom sprite_gen.gen.base import GenRequestfrom sprite_gen.workflow import accessfrom sprite_gen.workflow.catalog import FIELDS, GUIDED_PROVIDERS, PROVIDER_LABELS, validate_choices@@ -330,6 +330,8 @@ def test_native_alpha_is_a_declared_capability(tmp_path, api):def test_provider_is_registered_everywhere_a_provider_must_be(api):assert "openai" in gen.PROVIDERSassert isinstance(gen._make_provider("openai", keep_session=False), openai.OpenAIProvider)+ # Each adapter's name is its registered name, in the registry's order: a run's report says `provider` by it.+ assert [codex_provider.CodexProvider.name, grok.GrokProvider.name, openai.OpenAIProvider.name] == list(gen.PROVIDERS)# Every registered backend is labelled, so a new one can never be dropped from# the workflow surface by a silent positional zip.assert set(PROVIDER_LABELS) == set(gen.PROVIDERS)diff --git a/tests/serve/test_curation_view_contract.py b/tests/serve/test_curation_view_contract.pyindex b7c296b..e9e613d 100644--- a/tests/serve/test_curation_view_contract.py+++ b/tests/serve/test_curation_view_contract.py@@ -660,3 +660,100 @@ def test_autosave_preserves_pixel_perfect_the_view_does_not_author(tmp_path, fieassert after == before, (f"{field} 선언이 autosave 에 사라져 굽기 변종이 {before} -> {after} 로 바뀌었다\n"f" 저장된 사이드카: {saved}")+++# --- the reroll and in-between buttons: the providers they run, and the one a request without a provider runs ------++BUTTONS = {"/api/reroll": {"state": "items"}, "/api/interpolate": {"state": "items", "from": 0, "to": 1}}+++def _post_json(port: int, path: str, body: dict) -> tuple[int, dict]:+ import urllib.error++ req = urllib.request.Request(f"http://127.0.0.1:{port}{path}", data=json.dumps(body).encode(), method="POST")+ try:+ with urllib.request.urlopen(req) as answer:+ return answer.status, json.loads(answer.read())+ except urllib.error.HTTPError as exc:+ return exc.code, json.loads(exc.read())+++def button_server(tmp_path, monkeypatch):+ """A curator server on an imported run whose generating steps are stubs keeping (button, provider)."""+ from sprite_gen.serve import serve_curation++ run = _build_import(tmp_path, [], with_base=False)+ asked = []+ monkeypatch.setattr(serve_curation, "run_reroll",+ lambda run_dir, state, provider: asked.append(("/api/reroll", provider)) or {"ok": True})+ monkeypatch.setattr(serve_curation, "run_interpolate",+ lambda run_dir, state, a, b, t, label, provider:+ asked.append(("/api/interpolate", provider)) or {"ok": True})+ CurationHandler.run_dir = run+ CurationHandler.lang = "en"+ srv = ThreadingHTTPServer(("127.0.0.1", 0), partial(CurationHandler))+ threading.Thread(target=srv.serve_forever, daemon=True).start()+ try:+ yield srv.server_address[1], asked+ finally:+ srv.shutdown()++[email protected]("path", list(BUTTONS))+def test_the_buttons_run_only_the_curator_providers(button_server, monkeypatch, path):+ """Both buttons run the curator's providers (`serve_curation.CURATOR_PROVIDERS`, what the select offers) and+ refuse any other, read when the request comes: a copy of the set in the handler would not follow it."""+ from sprite_gen.gen.base import PROVIDER_CODEX, PROVIDER_GROK++ port, asked = button_server+ monkeypatch.setattr("sprite_gen.serve.serve_curation.CURATOR_PROVIDERS", (PROVIDER_GROK,))+ assert _post_json(port, path, {**BUTTONS[path], "provider": PROVIDER_CODEX}) == (+ 400, {"error": f"unknown provider: {PROVIDER_CODEX}"})+ assert _post_json(port, path, {**BUTTONS[path], "provider": PROVIDER_GROK})[0] == 200+ assert asked == [(path, PROVIDER_GROK)]++[email protected]("path,default", [+ ("/api/reroll", "sprite_gen.gen.HARD_DEFAULT_PROVIDER"), # a reroll is gen drawing the row again+ ("/api/interpolate", "sprite_gen.effects.interpolate.DEFAULT_PROVIDER"), # an in-between has its own default+])+def test_a_button_request_naming_no_provider_runs_the_declared_default(button_server, monkeypatch, path, default):+ """A request with no provider runs its step's declared default, read when the request comes."""+ from sprite_gen.gen.base import PROVIDER_GROK++ port, asked = button_server+ monkeypatch.setattr(default, PROVIDER_GROK)+ assert _post_json(port, path, BUTTONS[path])[0] == 200+ assert asked == [(path, PROVIDER_GROK)]+++# gen-trigger.js is a classic script: its select is built by `makeProviderSelect` from a top-level const, so node runs+# the file with the two DOM calls it makes and prints the options' values.+SELECT_HARNESS = r"""+const fs = require("fs");+const vm = require("vm");+const element = () => ({ children: [], appendChild(child) { this.children.push(child); } });+const sandbox = { document: { createElement: element }, console };+sandbox.globalThis = sandbox;+vm.createContext(sandbox);+vm.runInContext(fs.readFileSync(process.argv[2], "utf8"), sandbox);+console.log(JSON.stringify(sandbox.makeProviderSelect().children.map((option) => option.value)));+"""++[email protected](shutil.which("node") is None, reason="node 가 없어 gen-trigger.js 를 실행할 수 없다")+def test_the_provider_select_offers_the_curator_providers_in_order(tmp_path):+ """The select both buttons share is the JS side of `CURATOR_PROVIDERS`: the same values in the same order, and+ its first option, the one a button runs unless changed, is codex."""+ from sprite_gen.gen.base import PROVIDER_CODEX+ from sprite_gen.serve import serve_curation++ harness = tmp_path / "harness.cjs"+ harness.write_text(SELECT_HARNESS, encoding="utf-8")+ script = serve_curation.CURATOR_DIR / "src" / "gen-trigger.js"+ proc = subprocess.run([shutil.which("node"), str(harness), str(script)], capture_output=True, encoding="utf-8")+ assert proc.returncode == 0, proc.stderr+ values = json.loads(proc.stdout)+ assert values == list(serve_curation.CURATOR_PROVIDERS)+ assert values[0] == PROVIDER_CODEX