Update app.py

app.py

@@ -1,15 +1,14 @@
-import os, io, time, base64, random, subprocess
+import os, io, time, base64, random, requests
 from typing import Optional
 from urllib.parse import quote
-
-import requests
 from PIL import Image
 import gradio as gr
+from moviepy.editor import VideoFileClip, concatenate_videoclips
 
 # -------- Modal inference endpoint --------
 INFERENCE_URL = "https://moonmath-ai-dev--moonmath-i2v-backend-moonmathinference-run.modal.run"
 
-# -------- Helpers --------
+# -------- small helpers --------
 def _save_video_bytes(data: bytes, tag: str) -> str:
     os.makedirs("/tmp", exist_ok=True)
     path = f"/tmp/{tag}_{int(time.time())}.mp4"
@@ -46,28 +45,26 @@ def stitch_call(start_img: Image.Image, end_img: Image.Image, prompt: str, seed:
         resp = requests.post(url, files=files, headers=headers, timeout=600)
         ctype = (resp.headers.get("content-type") or "").lower()
 
-        # Raw video bytes
         if "application/json" not in ctype:
             resp.raise_for_status()
             return _save_video_bytes(resp.content, "stitch")
 
-        # JSON with url or base64
         data = resp.json()
         video_url = data.get("video_url") or data.get("url") or data.get("result") or data.get("output")
-        if isinstance(video_url, str) and (video_url.startswith("http://") or video_url.startswith("https://")):
+        if isinstance(video_url, str) and video_url.startswith(("http://", "https://")):
             b = _download_to_bytes(video_url)
             return _save_video_bytes(b, "stitch")
 
         video_b64 = data.get("video_b64") or data.get("videoBase64")
         if isinstance(video_b64, str):
             pad = (-len(video_b64)) % 4
-            if pad: 
+            if pad:
                 video_b64 += "=" * pad
             b = base64.b64decode(video_b64)
             return _save_video_bytes(b, "stitch")
 
     except Exception as e:
-        print("Stitch call failed:", e)
+        print("stitch_call failed:", e)
 
     return None
 
@@ -78,7 +75,7 @@ def stitch_12(prompt12, seed, img1, img2):
         return None
     path = stitch_call(img1, img2, prompt12 or "", int(seed or 0))
     if path is None:
-        gr.Warning("Stitch 1&2 failed. Try again or adjust the prompt.")
+        gr.Warning("Stitch 1→2 failed.")
     return path
 
 def stitch_23(prompt23, seed, img2, img3):
@@ -87,31 +84,23 @@ def stitch_23(prompt23, seed, img2, img3):
         return None
     path = stitch_call(img2, img3, prompt23 or "", int(seed or 0))
     if path is None:
-        gr.Warning("Stitch 2&3 failed. Try again or adjust the prompt.")
+        gr.Warning("Stitch 2→3 failed.")
     return path
 
 def stitch_all(video12, video23):
-    if not video12 or not video23:
-        gr.Warning("Please generate both stitched videos first.")
+    if video12 is None or video23 is None:
+        gr.Warning("Need both videos to stitch all.")
         return None
-
     try:
-        # Final output path
+        clip1 = VideoFileClip(video12)
+        clip2 = VideoFileClip(video23)
+        final = concatenate_videoclips([clip1, clip2])
         out_path = f"/tmp/stitch_all_{int(time.time())}.mp4"
-
-        # Concatenate with ffmpeg
-        txt_file = f"/tmp/concat_{int(time.time())}.txt"
-        with open(txt_file, "w") as f:
-            f.write(f"file '{video12}'\n")
-            f.write(f"file '{video23}'\n")
-
-        cmd = ["ffmpeg", "-y", "-f", "concat", "-safe", "0", "-i", txt_file, "-c", "copy", out_path]
-        subprocess.run(cmd, check=True)
-
+        final.write_videofile(out_path, codec="libx264", audio=False, verbose=False, logger=None)
         return out_path
     except Exception as e:
-        print("Stitch all failed:", e)
-        gr.Warning("Failed to stitch all videos together.")
+        print("stitch_all failed:", e)
+        gr.Warning("Stitch All failed.")
         return None
 
 # -------- UI --------
@@ -121,29 +110,32 @@ CSS = """
 .rounded textarea { border-radius: 16px !important; }
 """
 
-with gr.Blocks(css=CSS, title="Stitch — 3 uploads, 2 stitches, concat") as demo:
+with gr.Blocks(css=CSS, title="Stitch Master") as demo:
     gr.Markdown("## Stitch — Upload 3 images, generate videos between 1→2 and 2→3, then merge them.")
 
+    # --- Uploads row ---
     with gr.Row():
-        with gr.Column(scale=1, min_width=320):
-            img1 = gr.Image(label="Image 1 upload", type="pil")
-            img2 = gr.Image(label="Image 2 upload", type="pil")
-            img3 = gr.Image(label="Image 3 upload", type="pil")
+        img1 = gr.Image(label="Image 1 upload", type="pil")
+        img2 = gr.Image(label="Image 2 upload", type="pil")
+        img3 = gr.Image(label="Image 3 upload", type="pil")
+
+    seed = gr.Number(value=0, precision=0, label="Seed (0 = random)")
 
-        with gr.Column(scale=1, min_width=320):
-            seed = gr.Number(value=0, precision=0, label="Seed (0 = random)")
-            prompt12 = gr.Textbox(placeholder="Prompt for stitching 1→2", lines=2, label="Prompt (1→2)", elem_classes=["rounded"])
-            btn12 = gr.Button("Stitch 1&2", elem_classes=["pill"])
-            vid12 = gr.Video(label="Video (image 1+2) output")
+    # --- First stitch ---
+    prompt12 = gr.Textbox(placeholder="Prompt for stitching 1→2", lines=2, label="Prompt (1→2)", elem_classes=["rounded"])
+    btn12 = gr.Button("Stitch 1→2", elem_classes=["pill"])
+    vid12 = gr.Video(label="Video (image 1+2) output", interactive=False)
 
-            prompt23 = gr.Textbox(placeholder="Prompt for stitching 2→3", lines=2, label="Prompt (2→3)", elem_classes=["rounded"])
-            btn23 = gr.Button("Stitch 2&3", elem_classes=["pill"])
-            vid23 = gr.Video(label="Video (image 2+3) output")
+    # --- Second stitch ---
+    prompt23 = gr.Textbox(placeholder="Prompt for stitching 2→3", lines=2, label="Prompt (2→3)", elem_classes=["rounded"])
+    btn23 = gr.Button("Stitch 2→3", elem_classes=["pill"])
+    vid23 = gr.Video(label="Video (image 2+3) output", interactive=False)
 
-            btn_all = gr.Button("Stitch All", elem_classes=["pill"])
-            vid_all = gr.Video(label="Final concatenated video")
+    # --- Final merge ---
+    btn_all = gr.Button("Stitch All", elem_classes=["pill"])
+    vid_all = gr.Video(label="Final concatenated video", interactive=False)
 
-    # Wire buttons
+    # --- Wire buttons ---
     btn12.click(stitch_12, inputs=[prompt12, seed, img1, img2], outputs=[vid12])
     btn23.click(stitch_23, inputs=[prompt23, seed, img2, img3], outputs=[vid23])
     btn_all.click(stitch_all, inputs=[vid12, vid23], outputs=[vid_all])