client update

pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "pillow>=10.4.0",
     "gradio-imageslider>=0.0.20",
     "pillow-heif>=0.18.0",
-    "finegrain @ git+ssh://git@github.com/finegrain-ai/finegrain-python@08e74457ec3390c1401609931941c8f80284efd6#subdirectory=finegrain",
+    "finegrain @ git+ssh://git@github.com/finegrain-ai/finegrain-python@d6ef5700816ca26100e776257e8a9363fc812394#subdirectory=finegrain",
 ]
 readme = "README.md"
 requires-python = ">= 3.12, <3.13"

requirements.lock

@@ -39,7 +39,7 @@ ffmpy==0.5.0
     # via gradio
 filelock==3.17.0
     # via huggingface-hub
-finegrain @ git+ssh://git@github.com/finegrain-ai/finegrain-python@08e74457ec3390c1401609931941c8f80284efd6#subdirectory=finegrain
+finegrain @ git+ssh://git@github.com/finegrain-ai/finegrain-python@d6ef5700816ca26100e776257e8a9363fc812394#subdirectory=finegrain
     # via eraser
 fonttools==4.55.5
     # via matplotlib

requirements.txt

@@ -3,4 +3,4 @@ gradio_imageslider>=0.0.20
 environs>=11.0.0
 pillow>=10.4.0
 pillow-heif>=0.18.0
-git+https://github.com/finegrain-ai/finegrain-python@08e74457ec3390c1401609931941c8f80284efd6#subdirectory=finegrain
+git+https://github.com/finegrain-ai/finegrain-python@d6ef5700816ca26100e776257e8a9363fc812394#subdirectory=finegrain

src/app.py

@@ -18,9 +18,9 @@ env = Env()
 env.read_env()
 
 with env.prefixed("ERASER_"):
-    API_URL: str = str(env.str("API_URL", "https://api.finegrain.ai/editor"))
     API_USER: str | None = env.str("API_USER")
     API_PASSWORD: str | None = env.str("API_PASSWORD")
+    API_URL: str | None = env.str("API_URL", None)
     CA_BUNDLE: str | None = env.str("CA_BUNDLE", None)
 
 
@@ -28,9 +28,11 @@ with env.prefixed("ERASER_"):
 def _ctx() -> EditorAPIContext:
     assert API_USER is not None
     assert API_PASSWORD is not None
-    ctx = EditorAPIContext(uri=API_URL, user=API_USER, password=API_PASSWORD, priority="low")
+    ctx = EditorAPIContext(user=API_USER, password=API_PASSWORD, priority="low")
     if CA_BUNDLE:
         ctx.verify = CA_BUNDLE
+    if API_URL:
+        ctx.base_url = API_URL
     return ctx
 
 
@@ -49,14 +51,6 @@ 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")
@@ -68,15 +62,14 @@ async def _process(ctx: EditorAPIContext, params: ProcessParams) -> Image.Image:
         segment_params = {"bbox": list(params.bbox)}
     else:
         assert params.prompt
-        segment_input_st = await call_or_raise(
-            ctx,
+        segment_input_st = await ctx.ensure_skill(
             f"infer-bbox/{st_input}",
             {"product_name": params.prompt},
         )
         segment_params = {}
 
-    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"})
+    st_mask = await ctx.ensure_skill(f"segment/{segment_input_st}", segment_params)
+    st_erased = await ctx.ensure_skill(f"erase/{st_input}/{st_mask}", {"mode": "free"})
 
     response = await ctx.request(
         "GET",