better errors

src/app.py

@@ -50,6 +50,14 @@ class ProcessParams:
     bbox: tuple[int, int, int, int] | None = None
 
 
+async def call_or_raise(ctx: EditorAPIContext, uri: str, params: dict[str, Any]) -> str:
+    st, ok = await ctx.call_skill(uri, params)
+    if ok:
+        return st
+    meta = await ctx.get_meta(st)
+    raise RuntimeError(f"skill {uri} failed with {st}: {meta}")
+
+
 async def _process(ctx: EditorAPIContext, params: ProcessParams) -> Image.Image:
     with io.BytesIO() as f:
         params.image.save(f, format="JPEG")
@@ -61,14 +69,15 @@ async def _process(ctx: EditorAPIContext, params: ProcessParams) -> Image.Image:
         segment_params = {"bbox": list(params.bbox)}
     else:
         assert params.prompt
-        segment_input_st = await ctx.call_skill(
+        segment_input_st = await call_or_raise(
+            ctx,
             f"infer-bbox/{st_input}",
             {"product_name": params.prompt},
         )
         segment_params = {}
 
-    st_mask = await ctx.call_skill(f"segment/{segment_input_st}", segment_params)
-    st_erased = await ctx.call_skill(f"erase/{st_input}/{st_mask}", {"mode": "free"})
+    st_mask = await call_or_raise(ctx, f"segment/{segment_input_st}", segment_params)
+    st_erased = await call_or_raise(ctx, f"erase/{st_input}/{st_mask}", {"mode": "free"})
 
     response = await ctx.request(
         "GET",

src/fg.py

@@ -172,7 +172,7 @@ class EditorAPIContext:
         self._sse_last_event_id = ""
         self._sse_retry_ms = 0
         self._sse_task = asyncio.create_task(self._sse_loop())
-        await self.sse_await("_sse_loop")
+        assert await self.sse_await("_sse_loop")
         self._sse_failures = 0
 
     async def sse_recover(self) -> bool:
@@ -181,7 +181,7 @@ class EditorAPIContext:
                 return False
             self._sse_task = asyncio.create_task(self._sse_loop())
             try:
-                await self.sse_await("_sse_loop")
+                assert await self.sse_await("_sse_loop")
                 return True
             except SSELoopStopped:
                 pass
@@ -192,7 +192,7 @@ class EditorAPIContext:
         await self._sse_task
         self._sse_task = None
 
-    async def sse_await(self, state_id: str, timeout: float | None = None) -> None:
+    async def sse_await(self, state_id: str, timeout: float | None = None) -> bool:
         assert self._sse_task
         future = self._sse_futures[state_id]
 
@@ -217,7 +217,7 @@ class EditorAPIContext:
 
         jdata = future.result()
         del self._sse_futures[state_id]
-        assert jdata["status"] == "ok", f"state {state_id} is {jdata['status']}"
+        return jdata["status"] == "ok"
 
     async def get_meta(self, state_id: str) -> dict[str, Any]:
         response = await self.request("GET", f"state/meta/{state_id}")
@@ -257,9 +257,9 @@ class EditorAPIContext:
         uri: str,
         params: dict[str, Any] | None,
         timeout: float | None = None,
-    ) -> str:
+    ) -> tuple[str, bool]:
         params = {"priority": self.priority} | (params or {})
         response = await self.request("POST", f"skills/{uri}", json=params)
         state_id = response.json()["state"]
-        await self.sse_await(state_id, timeout=timeout)
-        return state_id
+        status = await self.sse_await(state_id, timeout=timeout)
+        return state_id, status