Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py — HF Space launcher (Option B) with runtime downloads & WebUI ready link
+# app.py - HF Space launcher (Option B, HF tree aware, auto-open WebUI)
 import os
 import subprocess
 import threading
@@ -6,9 +6,10 @@ import shlex
 import time
 import requests
 import gradio as gr
+import webbrowser
 
 # -----------------------------
-# Configuration
+# Configuration (edit if needed)
 # -----------------------------
 DOWNLOADS = {
     "lora": {
@@ -30,13 +31,13 @@ DOWNLOADS = {
 }
 
 WEBUI_ARGS = "--listen --xformers --enable-insecure-extension-access --medvram"
-LAUNCH_PY = "launch.py"  # relative to repo root
+LAUNCH_PY = "launch.py"  # relative to repo root (per HF tree)
 
 # -----------------------------
 # Utilities
 # -----------------------------
 def ensure_persistent_folders():
-    """Ensure HF tree persistent folders exist."""
+    """Make sure HF tree persistent folders exist (safe no-op if present)."""
     folders = [
         "stable-diffusion-webui/deforum/input",
         "stable-diffusion-webui/deforum/output_committed/frames",
@@ -49,8 +50,9 @@ def ensure_persistent_folders():
         os.makedirs(f, exist_ok=True)
     print("✅ Persistent folders ensured.")
 
+
 def download_file_with_retries(url, dest, max_retries=3, backoff=5):
-    """Download a file with retries, skip if exists."""
+    """Download a file with simple retry/backoff. Skips if dest exists."""
     if os.path.exists(dest):
         print(f"✅ Already exists: {dest}")
         return True
@@ -66,6 +68,7 @@ def download_file_with_retries(url, dest, max_retries=3, backoff=5):
                     for chunk in r.iter_content(chunk_size=8192):
                         if chunk:
                             f.write(chunk)
+            # atomically move into place
             os.replace(dest + ".part", dest)
             print(f"✅ Downloaded: {dest}")
             return True
@@ -74,40 +77,102 @@ def download_file_with_retries(url, dest, max_retries=3, backoff=5):
             attempt += 1
             time.sleep(backoff * attempt)
     print(f"❌ Failed to download after {max_retries} attempts: {url}")
-    if os.path.exists(dest + ".part"):
-        os.remove(dest + ".part")
+    # ensure partial file removed
+    try:
+        if os.path.exists(dest + ".part"):
+            os.remove(dest + ".part")
+    except Exception:
+        pass
     return False
 
+
 def fetch_models():
-    """Download all configured models into HF tree persistent paths."""
+    """Download all configured models into the HF tree persistent paths."""
     print("🔽 Starting runtime model downloads (if missing)...")
     success_all = True
     for name, info in DOWNLOADS.items():
-        ok = download_file_with_retries(info["url"], info["dest"])
+        url = info["url"]
+        dest = info["dest"]
+        ok = download_file_with_retries(url, dest)
         success_all = success_all and ok
     if success_all:
         print("✅ All runtime downloads done (or already present).")
     else:
-        print("⚠️ Some runtime downloads failed. Check logs.")
+        print("⚠️ Some runtime downloads failed. Check logs for details.")
+
 
 # -----------------------------
-# Start WebUI routine (Option B)
+# Start WebUI routine (clean + auto open)
 # -----------------------------
-WEBUI_LINK = None
-
 def start_webui():
-    """Launch WebUI in background and detect ready URL."""
-    global WEBUI_LINK
-    ensure_persistent_folders()
-    fetch_models()
+    """
+    Option B — background WebUI launcher aware of HF tree and persistent folders.
+    1) Ensure persistent folders exist.
+    2) Download missing runtime models.
+    3) Launch Automatic1111 WebUI (launch.py) with correct PORT binding.
+    4) Automatically open WebUI URL when ready.
+    """
+    try:
+        ensure_persistent_folders()
+        fetch_models()
+
+        port = int(os.environ.get("PORT", 7860))
+        cmd = ["python", LAUNCH_PY] + shlex.split(WEBUI_ARGS) + [f"--port {port}"]
+        print("▶️ Launching WebUI with:", " ".join(cmd))
+
+        # Launch launch.py and capture stdout
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+
+        for line in iter(proc.stdout.readline, ""):
+            print(line, end="")  # Show logs in HF Space logs
+
+            # Detect URL line
+            if "Running on local URL:" in line or "Running on" in line:
+                url_start = line.find("http")
+                if url_start != -1:
+                    url = line[url_start:].strip()
+                    print(f"🌐 WebUI ready: {url} — opening automatically")
+                    webbrowser.open(url)
+
+        proc.wait()
+        print("ℹ️ launch.py exited normally.")
+    except subprocess.CalledProcessError as cpe:
+        print(f"❌ launch.py exited with non-zero status: {cpe.returncode}")
+    except Exception as e:
+        print("❌ Exception in start_webui():", e)
+
+
+# -----------------------------
+# Kick off WebUI in background thread
+# -----------------------------
+threading.Thread(target=start_webui, daemon=True).start()
+print("🧵 WebUI thread started (background).")
+
+# -----------------------------
+# Minimal Gradio UI to keep Space alive + quick controls
+# -----------------------------
+def show_status():
+    msg_lines = ["✅ HF Space running (Option B launcher)."]
+    # quick presence checks
+    if os.path.exists(LAUNCH_PY):
+        msg_lines.append(f"launch.py: found")
+    else:
+        msg_lines.append(f"launch.py: MISSING at root!")
+    # list basic model presence
+    for key, info in DOWNLOADS.items():
+        present = "yes" if os.path.exists(info["dest"]) else "no"
+        msg_lines.append(f"{key}: {present}")
+    return "\n".join(msg_lines)
 
-    args = ["python", LAUNCH_PY] + shlex.split(WEBUI_ARGS)
-    print("▶️ Launching WebUI with:", " ".join(args))
 
-    proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+with gr.Blocks() as demo:
+    gr.Markdown("## Automatic1111 WebUI — HF Space launcher (Option B)")
+    gr.Markdown(
+        "This Space launches Automatic1111 in a background thread and keeps a small Gradio UI alive "
+        "so Hugging Face marks the app as initialized."
+    )
+    status_btn = gr.Button("Check status")
+    status_out = gr.Textbox(lines=10)
+    status_btn.click(fn=show_status, inputs=None, outputs=status_out)
 
-    # Monitor output for "Running on" URL
-    for line in iter(proc.stdout.readline, ""):
-        print(line, end="")
-        if "Running on local URL:" in line or "Running on" in line:
-            parts = line.split("http")
+demo.launch(server_name="0.0.0.0", server_port=int(os.environ.get("PORT", 7860)))