Update app.py

app.py

@@ -581,132 +581,132 @@ def create_demo():
                 return False
         
         # --- Convert only if not browser-playable
-def _convert_video_for_preview_if_needed(path: str) -> str:
-    """
-    Return a path that the Gradio video component can play.
-    If the original file is already MP4 with H.264 (or another browser‑compatible codec),
-    the original path is returned unchanged.
-    Otherwise the file is re‑encoded to MP4 (H.264 + AAC) and the new path is returned.
-    """
-    if not FFMPEG_BIN or not os.path.exists(path):
-        return path
-
-    # Quick check: extension + ffprobe for codecs
-    if path.lower().endswith((".mp4", ".m4v", ".mov")):
-        info = _ffprobe_streams(path)
-        if info:
-            codecs = {s.get("codec_name") for s in info.get("streams", []) if s.get("codec_type") == "video"}
-            if "h264" in codecs or "h265" in codecs:
-                return path   # already playable
-
-    # Need conversion → write to a new temp MP4
-    out_fd, out_path = tempfile.mkstemp(suffix=".mp4")
-    os.close(out_fd)
-    cmd = [
-        FFMPEG_BIN, "-y", "-i", path,
-        "-c:v", "libx264", "-preset", "veryfast", "-crf", "28",
-        "-c:a", "aac", "-movflags", "+faststart", out_path,
-    ]
-    try:
-        subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=60)
-        return out_path
-    except Exception:
-        # If conversion fails, fall back to the original (Gradio will show its own warning)
-        try: os.remove(out_path)
-        except Exception: pass
-        return path
+        def _convert_video_for_preview_if_needed(path: str) -> str:
+            """
+            Return a path that the Gradio video component can play.
+            If the original file is already MP4 with H.264 (or another browser‑compatible codec),
+            the original path is returned unchanged.
+            Otherwise the file is re‑encoded to MP4 (H.264 + AAC) and the new path is returned.
+            """
+            if not FFMPEG_BIN or not os.path.exists(path):
+                return path
         
-def worker(url: str, prompt: str, key: str, progress=gr.Progress()):
-    """Return (status, markdown_output, preview_path)."""
-    try:
-        if not url:
-            return "error", "**Error:** No URL provided.", ""
-
-        # ------------------------------------------------------------------
-        # 1️⃣  Determine media type – use a *single* call to avoid duplicate work
-        # ------------------------------------------------------------------
-        progress(0.02, desc="Checking URL / content‑type")
-        is_img, is_vid = determine_media_type(url, progress=progress)
-
-        client = get_client(key)
-        preview_path = ""
-
-        # ------------------------------------------------------------------
-        # 2️⃣  Helper to write a temp file with a *correct* suffix
-        # ------------------------------------------------------------------
-        def _temp_file(data: bytes, suffix: str) -> str:
-            fd, p = tempfile.mkstemp(suffix=suffix)
-            os.close(fd)
-            with open(p, "wb") as f:
-                f.write(data)
-            return p
-
-        # ------------------------------------------------------------------
-        # 3️⃣  VIDEO PATH
-        # ------------------------------------------------------------------
-        if is_vid:
-            progress(0.05, desc="Downloading video")
-            raw = fetch_bytes(url, timeout=120, progress=progress)
-            if not raw:
-                return "error", "Failed to download video bytes.", ""
-
-            # write with a proper video extension
-            tmp_video = _temp_file(raw, suffix=ext_from_src(url) or ".mp4")
-            progress(0.15, desc="Preparing preview")
-            preview_path = _convert_video_for_preview_if_needed(tmp_video)
-
-            progress(0.25, desc="Running full‑video analysis")
-            result = analyze_video_cohesive(client, tmp_video, prompt, progress=progress)
-
-            # clean‑up the *raw* temp file (preview may be a different file)
-            try: os.remove(tmp_video)
-            except Exception: pass
-
-        # ------------------------------------------------------------------
-        # 4️⃣  IMAGE PATH
-        # ------------------------------------------------------------------
-        elif is_img:
-            progress(0.05, desc="Downloading image")
-            raw = fetch_bytes(url, progress=progress)
-
-            # preview image (always JPEG for consistency)
-            preview_path = _temp_file(convert_to_jpeg_bytes(raw, base_h=1024), suffix=".jpg")
-
-            progress(0.20, desc="Running image analysis")
-            result = analyze_image_structured(client, raw, prompt, progress=progress)
-
-        # ------------------------------------------------------------------
-        # 5️⃣  FALLBACK – try image first, then video
-        # ------------------------------------------------------------------
-        else:
-            progress(0.07, desc="Downloading unknown media")
-            raw = fetch_bytes(url, timeout=120, progress=progress)
-
-            # try to open as image
+            # Quick check: extension + ffprobe for codecs
+            if path.lower().endswith((".mp4", ".m4v", ".mov")):
+                info = _ffprobe_streams(path)
+                if info:
+                    codecs = {s.get("codec_name") for s in info.get("streams", []) if s.get("codec_type") == "video"}
+                    if "h264" in codecs or "h265" in codecs:
+                        return path   # already playable
+        
+            # Need conversion → write to a new temp MP4
+            out_fd, out_path = tempfile.mkstemp(suffix=".mp4")
+            os.close(out_fd)
+            cmd = [
+                FFMPEG_BIN, "-y", "-i", path,
+                "-c:v", "libx264", "-preset", "veryfast", "-crf", "28",
+                "-c:a", "aac", "-movflags", "+faststart", out_path,
+            ]
             try:
-                Image.open(BytesIO(raw)).verify()
-                is_img = True
+                subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=60)
+                return out_path
             except Exception:
-                is_img = False
-
-            if is_img:
-                preview_path = _temp_file(convert_to_jpeg_bytes(raw, base_h=1024), suffix=".jpg")
-                result = analyze_image_structured(client, raw, prompt, progress=progress)
-            else:
-                tmp_vid = _temp_file(raw, suffix=ext_from_src(url) or ".mp4")
-                preview_path = _convert_video_for_preview_if_needed(tmp_vid)
-                result = analyze_video_cohesive(client, tmp_vid, prompt, progress=progress)
-                try: os.remove(tmp_vid)
+                # If conversion fails, fall back to the original (Gradio will show its own warning)
+                try: os.remove(out_path)
                 except Exception: pass
-
-        # ------------------------------------------------------------------
-        # 6️⃣  Final status
-        # ------------------------------------------------------------------
-        status = "done" if not (isinstance(result, str) and result.lower().startswith("error")) else "error"
-        return status, result if isinstance(result, str) else str(result), preview_path or ""
-
-    except Exception as exc:
-        return "error", f"Unexpected worker error: {exc}", ""
+                return path
+                
+        def worker(url: str, prompt: str, key: str, progress=gr.Progress()):
+            """Return (status, markdown_output, preview_path)."""
+            try:
+                if not url:
+                    return "error", "**Error:** No URL provided.", ""
+        
+                # ------------------------------------------------------------------
+                # 1️⃣  Determine media type – use a *single* call to avoid duplicate work
+                # ------------------------------------------------------------------
+                progress(0.02, desc="Checking URL / content‑type")
+                is_img, is_vid = determine_media_type(url, progress=progress)
+        
+                client = get_client(key)
+                preview_path = ""
+        
+                # ------------------------------------------------------------------
+                # 2️⃣  Helper to write a temp file with a *correct* suffix
+                # ------------------------------------------------------------------
+                def _temp_file(data: bytes, suffix: str) -> str:
+                    fd, p = tempfile.mkstemp(suffix=suffix)
+                    os.close(fd)
+                    with open(p, "wb") as f:
+                        f.write(data)
+                    return p
+        
+                # ------------------------------------------------------------------
+                # 3️⃣  VIDEO PATH
+                # ------------------------------------------------------------------
+                if is_vid:
+                    progress(0.05, desc="Downloading video")
+                    raw = fetch_bytes(url, timeout=120, progress=progress)
+                    if not raw:
+                        return "error", "Failed to download video bytes.", ""
+        
+                    # write with a proper video extension
+                    tmp_video = _temp_file(raw, suffix=ext_from_src(url) or ".mp4")
+                    progress(0.15, desc="Preparing preview")
+                    preview_path = _convert_video_for_preview_if_needed(tmp_video)
+        
+                    progress(0.25, desc="Running full‑video analysis")
+                    result = analyze_video_cohesive(client, tmp_video, prompt, progress=progress)
+        
+                    # clean‑up the *raw* temp file (preview may be a different file)
+                    try: os.remove(tmp_video)
+                    except Exception: pass
+        
+                # ------------------------------------------------------------------
+                # 4️⃣  IMAGE PATH
+                # ------------------------------------------------------------------
+                elif is_img:
+                    progress(0.05, desc="Downloading image")
+                    raw = fetch_bytes(url, progress=progress)
+        
+                    # preview image (always JPEG for consistency)
+                    preview_path = _temp_file(convert_to_jpeg_bytes(raw, base_h=1024), suffix=".jpg")
+        
+                    progress(0.20, desc="Running image analysis")
+                    result = analyze_image_structured(client, raw, prompt, progress=progress)
+        
+                # ------------------------------------------------------------------
+                # 5️⃣  FALLBACK – try image first, then video
+                # ------------------------------------------------------------------
+                else:
+                    progress(0.07, desc="Downloading unknown media")
+                    raw = fetch_bytes(url, timeout=120, progress=progress)
+        
+                    # try to open as image
+                    try:
+                        Image.open(BytesIO(raw)).verify()
+                        is_img = True
+                    except Exception:
+                        is_img = False
+        
+                    if is_img:
+                        preview_path = _temp_file(convert_to_jpeg_bytes(raw, base_h=1024), suffix=".jpg")
+                        result = analyze_image_structured(client, raw, prompt, progress=progress)
+                    else:
+                        tmp_vid = _temp_file(raw, suffix=ext_from_src(url) or ".mp4")
+                        preview_path = _convert_video_for_preview_if_needed(tmp_vid)
+                        result = analyze_video_cohesive(client, tmp_vid, prompt, progress=progress)
+                        try: os.remove(tmp_vid)
+                        except Exception: pass
+        
+                # ------------------------------------------------------------------
+                # 6️⃣  Final status
+                # ------------------------------------------------------------------
+                status = "done" if not (isinstance(result, str) and result.lower().startswith("error")) else "error"
+                return status, result if isinstance(result, str) else str(result), preview_path or ""
+        
+            except Exception as exc:
+                return "error", f"Unexpected worker error: {exc}", ""
 
         def _start_processing(url, prompt, key):
             # set state to busy and launch the worker in the same call
@@ -770,8 +770,7 @@ def worker(url: str, prompt: str, key: str, progress=gr.Progress()):
 
         preview_path_state.change(fn=apply_preview, inputs=[preview_path_state], outputs=[preview_image, preview_video, preview_status])
 
-    # ensure global queue behavior
-    demo.queue()
+        demo.queue()
     return demo
 
 if __name__ == "__main__":