upgrade gradio

README.md

@@ -4,7 +4,7 @@ emoji: 📈
 colorFrom: pink
 colorTo: pink
 sdk: gradio
-sdk_version: 3.50.2
+sdk_version: 5.49.1
 app_file: app.py
 pinned: true
 short_description: tool for making inpainting masks

app.py

@@ -3,49 +3,83 @@ from PIL import Image
 import numpy as np
 import uuid
 
-def make_mask(data, invert=False):
-    # data is a dict with keys "image" and "mask" when tool="sketch"
-    if not data or data.get("mask") is None:
+def editor_to_mask(value, invert=False):
+    """
+    Convert an ImageEditor EditorValue to a white-on-black mask.
+    value: dict with keys: 'background', 'layers', 'composite' (Gradio 4/5 ImageEditor)
+    Strategy:
+      - Create an empty (black) mask the size of the background (or composite if background is None)
+      - For each layer, use its alpha channel as painted region; OR it to the mask
+    """
+    if not value:
         return None, None
 
-    mask_img = data["mask"].convert("L")
-    arr = np.array(mask_img)
+    bg = value.get("background")
+    layers = value.get("layers") or []
+    comp = value.get("composite")
+
+    # Determine canvas size
+    ref_img = bg or comp
+    if ref_img is None:
+        return None, None
+    if not isinstance(ref_img, Image.Image):
+        ref_img = Image.fromarray(ref_img)
+
+    w, h = ref_img.size
+    mask_acc = np.zeros((h, w), dtype=np.uint8)
+
+    for layer in layers:
+        if layer is None:
+            continue
+        if not isinstance(layer, Image.Image):
+            layer = Image.fromarray(layer)
+        # Ensure RGBA to get alpha; if no alpha, treat non-black as painted
+        if layer.mode != "RGBA":
+            layer = layer.convert("RGBA")
+        la = np.array(layer)[:, :, 3]  # alpha
+        # Any non-zero alpha counts as painted
+        mask_acc = np.maximum(mask_acc, (la > 0).astype(np.uint8) * 255)
 
-    # binarize
-    bin_mask = (arr > 0).astype(np.uint8) * 255
     if invert:
-        bin_mask = 255 - bin_mask
+        mask_acc = 255 - mask_acc
 
-    out = Image.fromarray(bin_mask, mode="L")
+    out = Image.fromarray(mask_acc, mode="L")
     fname = f"mask_{uuid.uuid4().hex}.png"
     out.save(fname)
     return out, fname
 
 with gr.Blocks(css="footer {visibility:hidden}") as demo:
-    gr.Markdown("# 🖌️ Quick Mask Maker\nUpload an image, paint the mask, then export a white-on-black PNG.")
+    gr.Markdown("# 🖌️ Quick Mask Maker (Gradio 5)\nUpload an image, draw on the canvas (white brush), then export a white-on-black PNG mask.")
 
     with gr.Row():
         with gr.Column(scale=3):
-            brush = gr.Slider(5, 120, value=40, step=1, label="Brush radius")
-            img = gr.Image(
-                label="Upload image, click the brush icon, paint. Use eraser to undo.",
-                tool="sketch",         # supported in Gradio 3.50.2
+            brush_size = gr.Slider(5, 120, value=40, step=1, label="Brush radius")
+
+            editor = gr.ImageEditor(
+                label="Draw mask on its own layer (preselected).",
                 type="pil",
-                image_mode="RGB",
+                image_mode="RGBA",
                 height=520,
+                # Force a single "Mask" layer, disable adding extra layers
+                layers=gr.LayerOptions(allow_additional_layers=False, layers=["Mask"]),
+                # Force a white-only brush so painted area clearly becomes the mask
+                brush=gr.Brush(default_size=40, colors=["#FFFFFF"], default_color="#FFFFFF", color_mode="fixed"),
+                eraser=gr.Eraser(default_size=60),
             )
-            invert = gr.Checkbox(False, label="Invert mask (make background white)")
+
+            invert = gr.Checkbox(False, label="Invert mask (white background)")
             gen = gr.Button("Generate Mask", variant="primary")
+
         with gr.Column(scale=2):
             out_mask = gr.Image(label="Mask Preview (PNG)", type="pil", image_mode="L")
             file_dl = gr.File(label="Download Mask")
 
-    # Update brush radius on the fly
+    # Wire brush size slider to editor
     def _set_brush(r):
-        return gr.update(brush_radius=int(r))
-    brush.change(_set_brush, inputs=brush, outputs=img)
+        return gr.update(brush=gr.Brush(default_size=int(r), colors=["#FFFFFF"], default_color="#FFFFFF", color_mode="fixed"))
+    brush_size.change(_set_brush, inputs=brush_size, outputs=editor)
 
-    gen.click(fn=make_mask, inputs=[img, invert], outputs=[out_mask, file_dl])
+    gen.click(fn=editor_to_mask, inputs=[editor, invert], outputs=[out_mask, file_dl])
 
 if __name__ == "__main__":
     demo.launch()

requirements.txt

@@ -1,70 +1,55 @@
-aiofiles==23.2.1
-altair==5.5.0
+aiofiles==24.1.0
 annotated-doc==0.0.3
 annotated-types==0.7.0
 anyio==4.11.0
-attrs==25.4.0
+brotli==1.1.0
 certifi==2025.10.5
-charset-normalizer==3.4.4
-click==8.1.8
-contourpy==1.3.0
-cycler==0.12.1
+click==8.3.0
 exceptiongroup==1.3.0
 fastapi==0.120.4
 ffmpy==0.6.4
-filelock==3.19.1
-fonttools==4.60.1
+filelock==3.20.0
 fsspec==2025.10.0
-gradio==3.50.2
-gradio-client==0.6.1
+gradio==5.49.1
+gradio-client==1.13.3
+groovy==0.1.2
 h11==0.16.0
 hf-xet==1.2.0
 httpcore==1.0.9
 httpx==0.28.1
-huggingface-hub==0.24.7
+huggingface-hub==1.0.1
 idna==3.11
-importlib-resources==6.5.2
 jinja2==3.1.6
-jsonschema==4.25.1
-jsonschema-specifications==2025.9.1
-kiwisolver==1.4.7
-markdown-it-py==3.0.0
-markupsafe==2.1.5
-matplotlib==3.9.4
+markdown-it-py==4.0.0
+markupsafe==3.0.3
 mdurl==0.1.2
-narwhals==2.10.1
-numpy==1.26.4
+numpy==2.2.6
 orjson==3.11.4
 packaging==25.0
 pandas==2.3.3
-pillow==10.4.0
-pydantic==2.12.3
-pydantic-core==2.41.4
+pillow==11.3.0
+pydantic==2.11.10
+pydantic-core==2.33.2
 pydub==0.25.1
 pygments==2.19.2
-pyparsing==3.2.5
 python-dateutil==2.9.0.post0
 python-multipart==0.0.20
 pytz==2025.2
 pyyaml==6.0.3
-referencing==0.36.2
-requests==2.32.5
 rich==14.2.0
-rpds-py==0.27.1
 ruff==0.14.3
+safehttpx==0.1.7
 semantic-version==2.10.0
 shellingham==1.5.4
 six==1.17.0
 sniffio==1.3.1
 starlette==0.49.1
-tomlkit==0.12.0
+tomlkit==0.13.3
 tqdm==4.67.1
 typer==0.20.0
 typer-slim==0.20.0
 typing-extensions==4.15.0
 typing-inspection==0.4.2
 tzdata==2025.2
-urllib3==2.5.0
 uvicorn==0.38.0
-websockets==11.0.3
-zipp==3.23.0
+websockets==15.0.1

runtime.txt

@@ -1 +1 @@
-python-3.9
+python-3.10