Update app.py

app.py

@@ -1,5 +1,10 @@
-# app.py (CPU-optimized)
+# app.py (CPU-optimized v3)
 # Neurale netwerken als tekenaars — ControlNet (scribble) demo voor CPU
+# Wijzigingen:
+# - Verwijderd: Image(..., tool="sketch") → niet ondersteund in jouw Gradio-versie
+# - Gebruikt gr.Sketchpad (retourneert RGBA-numpy), met robuuste conversie
+# - CPU optimalisaties: 512px, DPMSolver, 12 steps, attention_slicing, single-queue
+
 import os, random, numpy as np
 from typing import Optional
 from PIL import Image, ImageDraw
@@ -14,7 +19,7 @@ from diffusers import (
 MODEL_BASE = os.environ.get("SD_BASE_MODEL", "runwayml/stable-diffusion-v1-5")
 MODEL_CN   = os.environ.get("CN_SCRIBBLE_MODEL", "lllyasviel/sd-controlnet-scribble")
 
-DEVICE = "cpu"  # geforceerd CPU
+DEVICE = "cpu"   # geforceerd CPU
 DTYPE  = torch.float32
 TARGET_SIZE = 512  # lager = sneller op CPU
 
@@ -36,12 +41,15 @@ def _lazy_load_pipeline():
     return pipe
 
 def to_rgba(img):
-    if img is None: return None
+    """Accepteer numpy of PIL en geef een PIL RGBA image terug."""
+    if img is None:
+        return None
     if isinstance(img, np.ndarray):
-        if img.ndim == 2:
-            return Image.fromarray(img).convert("RGBA")
-        pil = Image.fromarray(img.astype(np.uint8))
-        return pil.convert("RGBA") if pil.mode != "RGBA" else pil
+        # Sketchpad geeft HxWx4 (RGBA) of HxWx3 terug
+        if img.dtype != np.uint8:
+            img = img.astype(np.uint8)
+        pil = Image.fromarray(img)
+        return pil.convert("RGBA")
     if isinstance(img, Image.Image):
         return img.convert("RGBA")
     try:
@@ -49,19 +57,22 @@ def to_rgba(img):
     except Exception:
         return None
 
-def rgba_to_scribble(img: Image.Image) -> Image.Image:
+def rgba_to_scribble(img) -> Image.Image:
+    """Zet RGBA schets om naar zwart-op-wit scribble, vierkant 512x512."""
     img = to_rgba(img)
-    if img is None: return None
+    if img is None:
+        return None
     # transparant → wit
     bg = Image.new("RGBA", img.size, (255,255,255,255))
     img = Image.alpha_composite(bg, img)
+    # grijs + drempel
     arr = np.array(img.convert("L"))
     thr = max(25, int(arr.mean()*0.9))
     lines = arr < thr
     out = np.full((*arr.shape,3), 255, dtype=np.uint8)
     out[lines] = (0,0,0)
     scribble = Image.fromarray(out, "RGB")
-    # vierkant + resize naar 512
+    # vierkant + resize
     m = max(scribble.width, scribble.height)
     sq = Image.new("RGB", (m,m), (255,255,255))
     sq.paste(scribble, ((m-scribble.width)//2, (m-scribble.height)//2))
@@ -75,7 +86,7 @@ def run(drawing, prompt, negative_prompt, guidance_scale=7.0,
     if cn_image is None:
         raise gr.Error("Schets niet leesbaar. Probeer opnieuw of upload PNG/JPG.")
 
-    if not prompt.strip():
+    if not prompt or not str(prompt).strip():
         prompt = "clean pencil sketch, coherent completion, subtle shading, high quality"
     if seed is None or int(seed) < 0:
         seed = random.randint(0, 2**31-1)
@@ -110,12 +121,11 @@ def make_example_scribble() -> Image.Image:
 
 CSS = ".gradio-container{max-width:1100px} #combo img{border-radius:10px}"
 
-with gr.Blocks(title="🖌️ Neurale netwerken als tekenaars (CPU)", css=CSS, theme=gr.themes.Soft()) as demo:
+with gr.Blocks(title="🖌️ Neurale netwerken als tekenaars (CPU v3)", css=CSS, theme=gr.themes.Soft()) as demo:
     gr.Markdown("## 🖌️ Neurale netwerken als tekenaars (CPU)\nTeken links of klik **Voorbeeld-schets**; AI vult aan met Stable Diffusion + ControlNet (scribble).")
     with gr.Row():
         with gr.Column():
-            canvas = gr.Image(label="Schets (penseel-tool)", sources=["upload","clipboard"],
-                              type="pil", image_mode="RGBA", tool="sketch", height=420)
+            canvas = gr.Sketchpad(label="Schets (teken in zwart op transparant/wit)", height=420)
             prompt = gr.Textbox(label="Prompt", value="realistische appel met blad, potloodschets")
             negative_prompt = gr.Textbox(label="Negative prompt (optioneel)", value="tekst, watermerk, wazig")
             with gr.Accordion("Geavanceerd", open=False):