Skip to content

Generate clean 2D game sprites & animation atlases — component-row pipeline: state rows, alpha cleanup, frame extraction, runtime atlases. Codex/Claude skill.

refactor(serve): the replies on the curator's /api/interpolate and /api/reroll provider lines write Wire.ERROR and read Wire.OK, like every other handler, and the wire-key test no longer leaves them as text

Soohong Kim2242732aebd4
diff --git a/sprite_gen/serve/serve_curation.py b/sprite_gen/serve/serve_curation.py
index b124432..8567e11 100644
--- a/sprite_gen/serve/serve_curation.py
+++ b/sprite_gen/serve/serve_curation.py
@@ -1652,22 +1652,22 @@ class CurationHandler(BaseHTTPRequestHandler):
return
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)
+ self._send_json({Wire.ERROR: f"unknown provider: {provider}"}, 400)
return
result = run_interpolate(self.run_dir, state, index_a, index_b,
t_value, payload.get("label") or None, provider)
- self._send_json(result, 200 if result["ok"] else 500)
+ self._send_json(result, 200 if result[Wire.OK] else 500)
return
if path == "/api/reroll":
payload = self._read_body()
state = str(payload.get("state") or "")
request = load_request(self.run_dir)
if state not in request.get("states", {}):
- self._send_json({"error": f"unknown state: {state}"}, 400)
+ self._send_json({Wire.ERROR: f"unknown state: {state}"}, 400)
return
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)
+ self._send_json({Wire.ERROR: f"unknown provider: {provider}"}, 400)
return
result = run_reroll(self.run_dir, state, provider)
self._send_json(result, 200 if result[Wire.OK] else 500)
diff --git a/tests/serve/test_curator_wire_keys.py b/tests/serve/test_curator_wire_keys.py
index 3d8c3a6..4945ca1 100644
--- a/tests/serve/test_curator_wire_keys.py
+++ b/tests/serve/test_curator_wire_keys.py
@@ -208,12 +208,6 @@ CURATOR_OTHER_STORES = {
("tnorm", "dy"),
("request", "fps"), # sprite-request.json
}
-# Left as text in this change: the replies on the curator's provider lines, which another
-# change in the same plan rewrites; they move to `Wire.ERROR` with it.
-CURATOR_LEFT_AS_TEXT = Counter({
- '{"error": f"unknown provider: {provider}"}': 2,
- '{"error": f"unknown state: {state}"}': 1,
-})
def _owner(stack: list[ast.AST]) -> str:
@@ -294,12 +288,9 @@ def test_every_curator_key_is_read_or_listed_as_unread():
def test_serve_curation_writes_no_wire_key_as_text():
source = Path(serve_curation.__file__).read_text(encoding="utf-8")
raw = _raw_keys(source, CURATOR_OTHER_DICTS, CURATOR_OTHER_STORES)
- left = Counter(text for _, _, text in raw if text in CURATOR_LEFT_AS_TEXT)
- raw = [site for site in raw if site[2] not in CURATOR_LEFT_AS_TEXT]
assert not raw, (f"{len(raw)} keys written as text in serve_curation.py — name them in `Wire` "
"(or, if not on the wire, list them above):\n"
+ "\n".join(f" {line}: {key!r}" for line, key, _ in raw))
- assert left == CURATOR_LEFT_AS_TEXT, f"the text left for the provider change moved: {dict(left)}"
def test_every_wire_name_the_servers_use_is_declared():