Update app.py

app.py

@@ -1,49 +1,119 @@
-def download_prebuilt_binary():
-    """Try to download pre-built sd-cli (faster than compiling)"""
-    print("\n🔄 Trying pre-built binary...")
-    
-    # GitHub releases often have pre-built binaries
-    url = "https://github.com/leejet/stable-diffusion/releases/latest/download/sd-cli-linux-x64"
-    
-    try:
-        Path("stable-diffusion.cpp/bin").mkdir(parents=True, exist_ok=True)
-        dest = "stable-diffusion.cpp/bin/sd-cli"
-        urllib.request.urlretrieve(url, dest)
-        
-        # Make executable
-        os.chmod(dest, 0o755)
-        
-        print("✅ Pre-built binary downloaded!")
-        return dest
-    except:
-        print("⚠️  Pre-built not available, will compile from source")
-        return None
-
 """
 Flux Text-to-Image Generator (CPU Only)
-Auto-setup included - downloads models on first run
+Auto-builds stable-diffusion.cpp on first run
 """
 
 # ============================================================
-# PART 1: AUTO SETUP - Download models if missing
+# PART 1: AUTO SETUP - Build & Download Everything
 # ============================================================
 import os
 import sys
+import subprocess
 import urllib.request
 from pathlib import Path
 
-def auto_setup():
-    """Ensure all required files exist"""
+def run_cmd(cmd, description=""):
+    """Run shell command and show output"""
+    print(f"\n🔧 {description}")
+    print(f"   Command: {' '.join(cmd) if isinstance(cmd, list) else cmd}")
+    
+    try:
+        result = subprocess.run(
+            cmd if isinstance(cmd, list) else cmd.split(),
+            capture_output=True,
+            text=True,
+            shell=not isinstance(cmd, list)
+        )
+        
+        if result.returncode != 0:
+            print(f"   ❌ Error:\n{result.stderr}")
+            return False
+        
+        print(f"   ✅ Success")
+        return True
+    except Exception as e:
+        print(f"   ❌ Exception: {e}")
+        return False
+
+def build_sd_cpp():
+    """Build stable-diffusion.cpp from source"""
     print("\n" + "="*60)
-    print("🔧 RUNNING AUTO-SETUP...")
+    print("🏗️  BUILDING STABLE DIFFUSION.CPP")
     print("="*60 + "\n")
     
-    # Create directories
-    Path("models").mkdir(exist_ok=True)
-    Path("outputs").mkdir(exist_ok=True)
-    print("✅ Created directories: models/, outputs/")
+    # Check if already built
+    sd_cli = Path("./stable-diffusion.cpp/build/bin/sd-cli")
+    if sd_cli.exists():
+        print("✅ stable-diffusion.cpp already built!")
+        return str(sd_cli.absolute())
+    
+    # Clone repository
+    if not Path("stable-diffusion.cpp").exists():
+        print("📥 Cloning stable-diffusion.cpp repository...")
+        
+        # Try git clone, fallback to download
+        if not run_cmd([
+            "git", "clone", 
+            "--depth", "1",  # Shallow clone for speed
+            "https://github.com/leejet/stable-diffusion.git",
+            "stable-diffusion.cpp"
+        ], "Clone repo"):
+            
+            print("⚠️  Git failed, trying alternative...")
+            return None
+    
+    os.chdir("stable-diffusion.cpp")
+    
+    # Install cmake if needed (for HF Spaces)
+    print("\n📦 Ensuring build dependencies...")
+    subprocess.run(["apt-get", "update"], capture_output=True)
+    subprocess.run(["apt-get", "install", "-y", "cmake", "build-essential"], 
+                   capture_output=True)
+    
+    # Create build directory
+    Path("build").mkdir(exist_ok=True)
+    os.chdir("build")
+    
+    # Configure with CMake (CPU only!)
+    print("\n⚙️  Configuring build (CPU mode)...")
+    if not run_cmd([
+        "cmake", "..",
+        "-DSD_CPU=ON",           # CPU backend only
+        "-DSD_CUDA=OFF",         # Disable CUDA
+        "-DCMAKE_BUILD_TYPE=Release"
+    ], "CMake configure"):
+        os.chdir("../..")
+        return None
+    
+    # Build
+    print("\n🔨 Compiling... (this may take 5-10 minutes)")
+    if not run_cmd([
+        "cmake", "--build", ".", 
+        "--config", "Release",
+        f"-j{os.cpu_count() or 2}"
+    ], "Build"):
+        os.chdir("../..")
+        return None
+    
+    os.chdir("../..")
+    
+    # Verify
+    if sd_cli.exists():
+        print(f"\n✅ Build complete! Binary at: {sd_cli}")
+        return str(sd_cli.absolute())
+    else:
+        print("\n❌ Build failed - binary not found")
+        return None
+
+def download_models():
+    """Download required model files"""
+    print("\n" + "="*60)
+    print("📥 DOWNLOADING MODELS")
+    print("="*60 + "\n")
+    
+    models_dir = Path("models")
+    models_dir.mkdir(exist_ok=True)
     
-    # Define models
     models = {
         "bonsai-flux2-klein-ternary-q2_k.gguf": 
             "https://huggingface.co/bonsai-models/flux.1-klein-gguf/resolve/main/bonsai-flux2-klein-ternary-q2_k.gguf",
@@ -53,39 +123,61 @@ def auto_setup():
             "https://huggingface.co/Qwen/Qwen2.5-1.5B-Instruct-GGUF/resolve/main/qwen2.5-1.5b-instruct-q2_k.gguf",
     }
     
-    # Download missing models
     for filename, url in models.items():
-        filepath = Path("models") / filename
+        filepath = models_dir / filename
         
         if filepath.exists():
             size_mb = filepath.stat().st_size / (1024*1024)
-            print(f"✅ Found: {filename} ({size_mb:.1f} MB)")
+            print(f"✅ {filename} ({size_mb:.1f} MB) - already exists")
         else:
-            print(f"📥 Downloading: {filename}")
+            print(f"📥 Downloading {filename}...")
             try:
                 urllib.request.urlretrieve(url, filepath)
                 size_mb = filepath.stat().st_size / (1024*1024)
                 print(f"   ✅ Saved ({size_mb:.1f} MB)")
             except Exception as e:
-                print(f"   ❌ Error: {e}")
-                print(f"   ⚠️  Manual download needed from:")
-                print(f"      {url}")
+                print(f"   ❌ Failed: {e}")
+
+def main_setup():
+    """Run all setup steps"""
+    print("\n" + "#"*60)
+    print("#"*60)
+    print("#  🎨 FLUX TEXT-TO-IMAGE SETUP")
+    print("#"*60)
+    print("#"*60)
+    
+    # Step 1: Build stable-diffusion.cpp
+    global SD_CLI_PATH
+    SD_CLI_PATH = build_sd_cpp()
+    
+    if not SD_CLI_PATH:
+        print("\n⚠️  WARNING: Could not build stable-diffusion.cpp")
+        print("   You may need to install it manually.")
+        SD_CLI_PATH = "./stable-diffusion.cpp/build/bin/sd-cli"
+    
+    # Step 2: Download models
+    download_models()
+    
+    # Step 3: Create outputs dir
+    Path("outputs").mkdir(exist_ok=True)
     
     print("\n" + "="*60)
     print("✅ SETUP COMPLETE")
+    print("="*60)
+    print(f"\nSD CLI Path: {SD_CLI_PATH}")
+    print("Models: ./models/")
     print("="*60 + "\n")
 
 # Run setup
-auto_setup()
+SD_CLI_PATH = None
+main_setup()
 
 # ============================================================
 # PART 2: IMPORTS & CONFIGURATION
 # ============================================================
 import gradio as gr
-import subprocess
 from datetime import datetime
 
-# Paths
 MODELS_DIR = "./models"
 OUTPUTS_DIR = "./outputs"
 
@@ -93,7 +185,8 @@ DIFFUSION_MODEL = os.path.join(MODELS_DIR, "bonsai-flux2-klein-ternary-q2_k.gguf
 VAE_MODEL = os.path.join(MODELS_DIR, "flux2-vae.safetensors")
 LLM_MODEL = os.path.join(MODELS_DIR, "qwen_3_4b.gguf")
 
-SD_CLI = "./stable-diffusion.cpp/bin/sd-cli"  # Adjust if needed
+# Use the built path or fallback
+SD_CLI = SD_CLI_PATH or "./stable-diffusion.cpp/build/bin/sd-cli"
 
 
 # ============================================================
@@ -111,288 +204,17 @@ def generate_image(
 ):
     """Generate image using stable diffusion.cpp"""
     
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    output_filename = f"generated_{timestamp}.png"
-    output_path = os.path.join(OUTPUTS_DIR, output_filename)
-    
-    cmd = [
-        SD_CLI,
-        "--diffusion-model", DIFFUSION_MODEL,
-        "--vae", VAE_MODEL,
-        "--llm", LLM_MODEL,
-        "-p", prompt,
-        "--cfg-scale", str(cfg_scale),
-        "--steps", str(steps),
-        "-W", str(width),
-        "-H", str(height),
-        "-o", output_path,
-        "--offload-to-cpu",
-        "--diffusion-fa",
-        "--vae-tiling",
-    ]
-    
-    if seed > 0:
-        cmd.extend(["--seed", str(seed)])
-    if negative_prompt:
-        cmd.extend(["-n", negative_prompt])
-    
-    progress(0.1, desc="Starting generation...")
-    
-    try:
-        result = subprocess.run(cmd, capture_output=True, text=True, timeout=300)
-        progress(0.9, desc="Processing output...")
-        
-        if result.returncode != 0:
-            return None, f"Error: {result.stderr}"
-        
-        if os.path.exists(output_path):
-            progress(1.0, desc="Complete!")
-            return output_path, "✅ Image generated successfully!"
-        else:
-            return None, "Output file not found"
-            
-    except subprocess.TimeoutExpired:
-        return None, "⏰ Generation timed out (5 min limit)"
-    except Exception as e:
-        return None, f"❌ Error: {str(e)}"
+    # Verify CLI exists
+    if not os.path.exists(SD_CLI):
+        return None, f"""❌ Error: sd-cli not found at: {SD_CLI}
 
+Please ensure stable-diffusion.cpp is installed:
 
-# ============================================================
-# PART 4: GRADIO INTERFACE
-# ============================================================
-with gr.Blocks(title="Flux Text-to-Image (CPU)", theme=gr.themes.Soft()) as demo:
-    
-    gr.Markdown("""
-    # 🎨 Flux Text-to-Image Generator  
-    ### CPU-Powered | stable diffusion.cpp | No GPU Required ⚡
-    """)
-    
-    with gr.Row():
-        with gr.Column(scale=2):
-            prompt_input = gr.Textbox(
-                label="✍️ Prompt",
-                placeholder="A red fox in snow, detailed, 8k...",
-                lines=3,
-                value="a red fox in snow, detailed, 8k"
-            )
-            
-            neg_prompt = gr.Textbox(
-                label="🚫 Negative Prompt (optional)",
-                placeholder="blurry, low quality...",
-                lines=2
-            )
-            
-        with gr.Column(scale=1):
-            cfg_slider = gr.Slider(1.0, 7.0, value=1.0, step=0.5, label="⚙️ CFG Scale")
-            steps_slider = gr.Slider(1, 20, value=4, step=1, label="🔄 Steps")
-            seed_input = gr.Number(label="🎲 Seed (-1=random)", value=-1, precision=0)
-    
-    with gr.Row():
-        gen_btn = gr.Button("🚀 Generate Image", variant="primary", size="lg")
-        clear_btn = gr.Button("🗑️ Clear", size="lg")
-    
-    with gr.Row():
-        output_image = gr.Image(label="🖼️ Generated Image", type="filepath", height=400)
-        status_output = gr.Textbox(label="📊 Status", interactive=False)
-    
-    gen_btn.click(
-        fn=generate_image,
-        inputs=[prompt_input, neg_prompt, cfg_slider, steps_slider, seed_input],
-        outputs=[output_image, status_output]
-    )
-    
-    clear_btn.click(
-        fn=lambda: (None, "", "", 1.0, 4, -1, None, ""),
-        outputs=[prompt_input, neg_prompt, cfg_slider, steps_slider, seed_input, 
-                 output_image, status_output]
-    )
-
-
-# ============================================================
-# PART 5: LAUNCH
-# ============================================================
-if __name__ == "__main__":
-    demo.launch(server_name="0.0.0.0", server_port=7860, share=False)
-import gradio as gr
-import os
-import subprocess
-import tempfile
-from pathlib import Path
-from datetime import datetime
-
-# Configuration
-MODELS_DIR = os.path.getenv("MODELS_DIR", "./models")
-OUTPUTS_DIR = os.path.getenv("OUTPUTS_DIR", "./outputs")
-
-DIFFUSION_MODEL = os.path.join(MODELS_DIR, "bonsai-flux2-klein-ternary-q2_k.gguf")
-VAE_MODEL = os.path.join(MODELS_DIR, "flux2-vae.safetensors")
-LLM_MODEL = os.path.join(MODELS_DIR, "qwen_3_4b.gguf")
-
-SD_CPP_PATH = os.path.getenv("SD_CPP_PATH", "./stable-diffusion.cpp")
-SD_CLI = os.path.join(SD_CPP_PATH, "bin"/"sd-cli")  # or ./build/bin/sd-cli
-
-def generate_image(
-    prompt: str,
-    negative_prompt: str = "",
-    cfg_scale: float = 1.0,
-    steps: int = 4,
-    width: int = 1024,
-    height: int = 1024,
-    seed: int = -1,
-    progress=gr.Progress()
-):
-    """
-    Generate image using stable diffusion.cpp CLI
-    """
-    
-    # Create output filename
-    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    output_filename = f"generated_{timestamp}.png"
-    output_path = os.path.join(OUTPUTS_DIR, output_filename)
-    
-    # Ensure directories exist 
-    Path(OUTPUTS_DIR).mkdir(parents=True, exist_ok=True)
-    
-    # Build command
-    cmd = [
-        SD_CLI,
-        "--diffusion-model", DIFFUSION_MODEL,
-        "--vae", VAE_MODEL,
-        "--llm", LLM_MODEL,
-        "-p", prompt,
-        "--cfg-scale", str(cfg_scale),
-        "--steps", str(steps),
-        "-W", str(width),
-        "-H", str(height),
-        "-o", output_path,
-        "--offload-to-cpu",
-        "--diffusion-fa",
-        "--vae-tiling",
-    ]
-    
-    if seed > 0:
-        cmd.extend(["--seed", str(seed)])
-    
-    if negative_prompt:
-        cmd.extend(["-n", negative_prompt])
-    
-    progress(0.1, desc="Starting generation...")
-    
-    try:
-        # Run stable diffusion.cpp
-        result = subprocess.run(
-            cmd,
-            capture_output=True,
-            text=True,
-            timeout=300  # 5 minute timeout
-        )
-        
-        progress(0.9, desc="Processing output...")
-        
-        if result.returncode != 0:
-            return None, f"Error: {result.stderr}"
-        
-        if os.path.path.exists(output_path):
-            progress(1.0, desc="Complete!")
-            return output_path, "✅ Image generated successfully!"
-        else:
-            return None, "Output file not found"
-            
-    except subprocess.TimeoutExpired:
-        return None, "⏰ Generation timed out (5 min limit)"
-    except Exception as e:
-        return None, f"❌ Error: {str(e)}"
-
-
-# Create Gradio Interface
-with gr.Blocks(
-    title="Flux Text-to-Image (CPU)",
-    theme=gr.themes.Soft(),
-    css="""
-    .gradio-container {max-width: 900px !important;}
-    """
-) as demo:
-    
-    gr.Markdown("""
-    # 🎨 Flux Text-to-Image Generator
-    ### CPU-Powered | stable diffusion.cpp | No GPU Required ⚡
-    """)
-    
-    with gr.Row():
-        with gr.Column(scale=2):
-            prompt_input = gr.Textbox(
-                label="✍️ Prompt",
-                placeholder="A red fox in snow, detailed, 8k...",
-                lines=3,
-                value="a red fox in snow, detailed, 8k"
-            )
-            
-            neg_prompt = gr.Textbox(
-                label="🚫 Negative Prompt (optional)",
-                placeholder="blurry, low quality...",
-                lines=2
-            )
-            
-        with gr.Column(scale=1):
-            cfg_slider = gr.Slider(
-                minimum=1.0,
-                maximum=7.0,
-                value=1.0,
-                step=0.5,
-                label="⚙️ CFG Scale",
-                info="Lower=faster, Higher=prompt adherence"
-            )
-            
-            steps_slider = gr.Slider(
-                minimum=1,
-                maximum=20,
-                value=4,
-                step=1,
-                label="🔄 Inference Steps",
-                info="4 recommended for speed"
-            )
-            
-            seed_input = gr.Number(
-                label="🎲 Seed (-1=random)",
-                value=-1,
-                precision=0
-            )
-    
-    with gr.Row():
-        gen_btn = gr.Button("🚀 Generate Image", variant="primary", size="lg")
-        clear_btn = gr.Button("🗑️ Clear", size="lg")
-    
-    with gr.Row():
-        with gr.Column():
-            output_image = gr.Image(
-                label="🖼️ Generated Image",
-                type="filepath",
-                height=400
-            )
-            
-        with gr.Column():
-            status_output = gr.Textbox(
-                label="📊 Status",
-                interactive=False
-            )
-    
-    # Event handlers
-    gen_btn.click(
-        fn=generate_image,
-        inputs=[prompt_input, neg_prompt, cfg_slider, steps_slider, seed_input],
-        outputs=[output_image, status_output]
-    )
-    
-    clear_btn.click(
-        fn=lambda: (None, "", "", 1.0, 4, -1, None, ""),
-        outputs=[prompt_input, neg_prompt, cfg_slider, steps_slider, seed_input, 
-                 output_image, status_output]
-    )
+Option A: Let this app auto-build it (restart the Space)
 
-# Launch
-if __name__ == "__main__":
-    demo.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        share=False
-    )
+Option B: Manual installation:
+```bash
+git clone --depth 1 https://github.com/leejet/stable-diffusion.git
+cd stable-diffusion
+cmake -B build -DSD_CPU=ON
+cmake --build build --config Release -j$(nproc)