Improve Gradio UI and add small-town friendly presets

app.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 from pathlib import Path
 import gradio as gr
@@ -7,26 +6,56 @@ ROOT = Path(__file__).resolve().parent
 THEMES_DIR = ROOT / "themes"
 POSTERS_DIR = ROOT / "posters"
 
+
 def list_themes():
     if THEMES_DIR.exists():
         return sorted([p.stem for p in THEMES_DIR.glob("*.json")])
     return []
 
+
 THEMES = list_themes()
 
-def _latest_png():
-    pngs = sorted(POSTERS_DIR.glob("*.png"), key=lambda p: p.stat().st_mtime)
-    return str(pngs[-1]) if pngs else None
 
-def generate(city, country, theme, distance_m, fast_mode):
+def list_pngs():
+    if not POSTERS_DIR.exists():
+        return []
+    return sorted(POSTERS_DIR.glob("*.png"), key=lambda p: p.stat().st_mtime)
+
+
+def latest_new_png(before_paths):
+    """Return the newest PNG created after starting the generation."""
+    after = list_pngs()
+    before_set = set(before_paths)
+    new_files = [p for p in after if str(p) not in before_set]
+    if new_files:
+        return str(sorted(new_files, key=lambda p: p.stat().st_mtime)[-1])
+    return str(after[-1]) if after else None
+
+
+def preset_to_distance(preset):
+    """Map presets to a distance value (meters). Custom returns None."""
+    return {
+        "Village / Small town": 4000,
+        "City / Downtown": 10000,
+        "Metro / Large area": 16000,
+        "Custom": None,
+    }.get(preset, None)
+
+
+def generate(city, country, theme, preset, distance_m, fast_mode):
     """
-    Génération avec logs streamés dans l'UI.
-    Note: la barre tqdm du script peut rester à 0% jusqu’à la fin de l’étape,
-    puis sauter à 33% / 66% / 100%. (normal)   [oai_citation:2‡Hacker News](https://news.ycombinator.com/item?id=46656834&utm_source=chatgpt.com)
+    Run the poster script and stream logs into the UI.
+
+    Note: tqdm progress can sit at 0% for a while, then jump to 33%/66%/100% (normal).
     """
     POSTERS_DIR.mkdir(parents=True, exist_ok=True)
 
-    # Mode rapide = distance réduite (gros impact)
+    # Apply preset if selected (except Custom)
+    preset_dist = preset_to_distance(preset)
+    if preset_dist is not None:
+        distance_m = preset_dist
+
+    # Fast mode: cap distance (biggest perf win on shared Spaces)
     if fast_mode:
         distance_m = min(int(distance_m), 12000)
 
@@ -38,13 +67,14 @@ def generate(city, country, theme, distance_m, fast_mode):
         "--distance", str(int(distance_m)),
     ]
 
+    before = [str(p) for p in list_pngs()]
+
     status_lines = []
-    status_lines.append("🚀 Lancement… (le téléchargement OSM peut être lent sur Spaces)")
-    status_lines.append(f"Commande: {' '.join(cmd)}")
-    status_lines.append("Astuce: si tu vois '0%|0/3' longtemps, ça peut sauter à 33% d’un coup.")
+    status_lines.append("🚀 Starting… (OSM downloads can be slow on shared Spaces)")
+    status_lines.append(f"Command: {' '.join(cmd)}")
+    status_lines.append("Tip: if you see '0%|0/3' for a while, it may jump to 33% all at once.")
     yield "\n".join(status_lines), None
 
-    # Stream stdout/stderr
     proc = subprocess.Popen(
         cmd,
         stdout=subprocess.PIPE,
@@ -53,65 +83,74 @@ def generate(city, country, theme, distance_m, fast_mode):
         bufsize=1,
     )
 
-    for line in proc.stdout:
-        line = line.rstrip()
-        if not line:
-            continue
-        status_lines.append(line)
+    try:
+        for line in proc.stdout:
+            line = line.rstrip()
+            if not line:
+                continue
+            status_lines.append(line)
 
-        # garde le texte lisible (évite un textbox infini)
-        if len(status_lines) > 200:
-            status_lines = status_lines[-200:]
+            # Keep the log box readable
+            if len(status_lines) > 250:
+                status_lines = status_lines[-250:]
 
-        yield "\n".join(status_lines), None
+            yield "\n".join(status_lines), None
+    finally:
+        rc = proc.wait()
 
-    rc = proc.wait()
     if rc != 0:
-        status_lines.append(f"\n❌ Erreur (code {rc}). Regarde les logs ci-dessus.")
+        status_lines.append(f"\n❌ Generation failed (exit code {rc}). See logs above.")
         yield "\n".join(status_lines), None
         return
 
-    out_png = _latest_png()
+    out_png = latest_new_png(before)
     if not out_png:
-        status_lines.append("\n❌ Aucun PNG trouvé dans /posters.")
+        status_lines.append("\n❌ No PNG found in /posters.")
         yield "\n".join(status_lines), None
         return
 
-    status_lines.append("\n✅ Terminé.")
+    status_lines.append("\n✅ Done.")
     yield "\n".join(status_lines), out_png
 
 
 with gr.Blocks() as demo:
-    gr.Markdown("# MapToPoster – Test sur Hugging Face")
+    gr.Markdown("# MapToPoster – Hugging Face Demo")
 
     with gr.Row():
-        city = gr.Textbox(label="Ville", value="Paris")
-        country = gr.Textbox(label="Pays", value="France")
+        city = gr.Textbox(label="City", value="Paris")
+        country = gr.Textbox(label="Country", value="France")
 
     with gr.Row():
         theme = gr.Dropdown(
-            label="Thème",
+            label="Theme",
             choices=THEMES,
             value=(THEMES[0] if THEMES else None),
         )
-        # valeurs adaptées aux Spaces (le repo dit que >20km devient lourd)  [oai_citation:3‡GitHub](https://github.com/originalankur/maptoposter?utm_source=chatgpt.com)
-        distance = gr.Slider(
-            label="Distance (m)",
-            minimum=4000,
-            maximum=20000,
-            step=500,
-            value=10000,
+
+        preset = gr.Dropdown(
+            label="Preset",
+            choices=["Village / Small town", "City / Downtown", "Metro / Large area", "Custom"],
+            value="City / Downtown",
         )
 
-    fast_mode = gr.Checkbox(label="Mode rapide (cap à ~12 km)", value=True)
+    # Allow < 4000m for small towns/villages
+    distance = gr.Slider(
+        label="Distance (m) (used when Preset=Custom)",
+        minimum=1000,
+        maximum=20000,
+        step=250,
+        value=4000,
+    )
+
+    fast_mode = gr.Checkbox(label="Fast mode (cap ~12km)", value=True)
 
-    btn = gr.Button("Générer")
-    status = gr.Textbox(label="Logs / Statut", lines=18)
-    out = gr.Image(label="Poster généré", type="filepath")
+    btn = gr.Button("Generate")
+    status = gr.Textbox(label="Logs / Status", lines=18)
+    out = gr.Image(label="Poster", type="filepath")
 
     btn.click(
         generate,
-        inputs=[city, country, theme, distance, fast_mode],
+        inputs=[city, country, theme, preset, distance, fast_mode],
         outputs=[status, out],
     )