update client and use high-level interface

pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "pillow>=10.4.0",
     "gradio-imageslider>=0.0.20",
     "pillow-heif>=0.18.0",
-    "finegrain @ git+ssh://[email protected]/finegrain-ai/finegrain-python@570e3deb369e9e7b0f9d16809f6fa29ff2f60f61#subdirectory=finegrain",
+    "finegrain @ git+ssh://[email protected]/finegrain-ai/finegrain-python@7f397f68d6a1bf7d5a567500dfdaf02ed462649d#subdirectory=finegrain",
 ]
 readme = "README.md"
 requires-python = ">= 3.12, <3.13"

requirements.lock

@@ -37,9 +37,9 @@ fastapi==0.115.11
     # via gradio
 ffmpy==0.5.0
     # via gradio
-filelock==3.17.0
+filelock==3.18.0
     # via huggingface-hub
-finegrain @ git+ssh://[email protected]/finegrain-ai/finegrain-python@570e3deb369e9e7b0f9d16809f6fa29ff2f60f61#subdirectory=finegrain
+finegrain @ git+ssh://[email protected]/finegrain-ai/finegrain-python@7f397f68d6a1bf7d5a567500dfdaf02ed462649d#subdirectory=finegrain
     # via eraser
 fonttools==4.56.0
     # via matplotlib
@@ -141,7 +141,7 @@ requests==2.32.3
     # via huggingface-hub
 rich==13.9.4
     # via typer
-ruff==0.9.10
+ruff==0.11.0
     # via gradio
 semantic-version==2.10.0
     # via gradio

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@570e3deb369e9e7b0f9d16809f6fa29ff2f60f61#subdirectory=finegrain
+git+https://github.com/finegrain-ai/finegrain-python@7f397f68d6a1bf7d5a567500dfdaf02ed462649d#subdirectory=finegrain

src/app.py

@@ -6,10 +6,11 @@ from typing import Any
 import gradio as gr
 import pillow_heif
 from environs import Env
-from finegrain import EditorAPIContext
+from finegrain import BoundingBox, EditorAPIContext, EraseResultWithImage, ErrorResult
 from gradio_image_annotation import image_annotator
 from gradio_imageslider import ImageSlider
 from PIL import Image
+from typing_extensions import TypeIs
 
 pillow_heif.register_heif_opener()
 pillow_heif.register_avif_opener()
@@ -41,6 +42,12 @@ def _ctx() -> EditorAPIContext:
     return ctx
 
 
+def is_error(result: Any) -> TypeIs[ErrorResult]:
+    if isinstance(result, ErrorResult):
+        raise RuntimeError(result.error)
+    return False
+
+
 def resize(image: Image.Image, shortest_side: int = 768) -> Image.Image:
     if image.width <= shortest_side and image.height <= shortest_side:
         return image
@@ -53,36 +60,31 @@ def resize(image: Image.Image, shortest_side: int = 768) -> Image.Image:
 class ProcessParams:
     image: Image.Image
     prompt: str | None = None
-    bbox: tuple[int, int, int, int] | None = None
+    bbox: BoundingBox | None = None
 
 
 async def _process(ctx: EditorAPIContext, params: ProcessParams) -> Image.Image:
     with io.BytesIO() as f:
         params.image.save(f, format="JPEG")
-        response = await ctx.request("POST", "state/upload", files={"file": f})
-    st_input = response.json()["state"]
+        st_input = await ctx.call_async.upload_image(f)
 
     if params.bbox:
-        segment_input_st = st_input
-        segment_params = {"bbox": list(params.bbox)}
+        segment_input_st, segment_bbox = st_input, params.bbox
     else:
         assert params.prompt
-        segment_input_st = await ctx.ensure_skill(
-            f"infer-bbox/{st_input}",
-            {"product_name": params.prompt},
-        )
-        segment_params = {}
+        bbox_r = await ctx.call_async.infer_bbox(st_input, params.prompt)
+        assert not is_error(bbox_r)
+        segment_input_st, segment_bbox = bbox_r.state_id, None
 
-    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"})
+    mask_r = await ctx.call_async.segment(segment_input_st, bbox=segment_bbox)
+    assert not is_error(mask_r)
+
+    erased_r = await ctx.call_async.erase(st_input, mask_r.state_id, mode="express", with_image=True)
+    assert not is_error(erased_r)
+    assert isinstance(erased_r, EraseResultWithImage)
 
-    response = await ctx.request(
-        "GET",
-        f"state/image/{st_erased}",
-        params={"format": "JPEG", "resolution": "DISPLAY"},
-    )
     f = io.BytesIO()
-    f.write(response.content)
+    f.write(erased_r.image)
     f.seek(0)
     return Image.open(f)