Update app.py

app.py

@@ -589,50 +589,40 @@ def create_demo():
                 pass
             return _convert_video_for_preview(path)
         
-# Worker now returns (status_state, output_md, preview_path_state)
-def worker(url: str, prompt: str, key: str, progress=gr.Progress()):
-    try:
-        if not url:
-            return ("error", "**Error:** No URL provided.", "")
+        # Worker now returns (status_state, output_md, preview_path_state)
+        def worker(url: str, prompt: str, key: str, progress=gr.Progress()):
+            try:
+                if not url:
+                    return ("error", "**Error:** No URL provided.", "")
         
-        progress(0.01, desc="Starting processing...")  # Initial processing
-        progress(0.03, desc="Checking URL / content-type...")  # URL check
-        is_img, is_vid = determine_media_type(url, progress=progress)
-        progress(0.06, desc=f"Determined media type: image={is_img}, video={is_vid}")
+                progress(0.01, desc="Starting processing...")          # Initial processing
+                progress(0.03, desc="Checking URL / content-type...") # URL check
+                is_img, is_vid = determine_media_type(url, progress=progress)
+                progress(0.06, desc=f"Determined media type: image={is_img}, video={is_vid}")
         
-        client = get_client(key)
-        preview_local = None
+                client = get_client(key)
+                preview_local = None
+        
+                if is_vid:
+                    progress(0.08, desc="Fetching video bytes (may take a while)...")
+                    # Ensure video bytes fetching has proper error handling
+                    raw = fetch_bytes(url, timeout=120, progress=progress)
+                    if raw is None:
+                        return ("error", "Failed to fetch video bytes.", "")
+        
+                    tmp = save_bytes_to_temp(raw, suffix=ext_from_src(url) or ".mp4")
+                    progress(0.18, desc="Saved video to temp; converting for preview if needed...")
+                    preview_tmp = _convert_video_for_preview(tmp)
+                    preview_local = preview_tmp if os.path.exists(preview_tmp) else tmp
+        
+                    progress(0.25, desc="Starting video analysis...")
+                    res = analyze_video_cohesive(client, tmp, prompt or "", progress=progress)
+                    progress(0.90, desc="Finalizing results...")
         
-        if is_vid:
-            progress(0.08, desc="Fetching video bytes (may take a while)...")
-            # Ensure video bytes fetching has proper error handling
-            raw = fetch_bytes(url, timeout=120, progress=progress)
-            if raw is None:
-                return ("error", "Failed to fetch video bytes.", "")
-            
-            tmp = save_bytes_to_temp(raw, suffix=ext_from_src(url) or ".mp4")
-            progress(0.18, desc="Saved video to temp; converting for preview if needed...")
-            preview_tmp = _convert_video_for_preview(tmp)
-            preview_local = preview_tmp if os.path.exists(preview_tmp) else tmp
-            
-            progress(0.25, desc="Starting video analysis...")
-            res = analyze_video_cohesive(client, tmp, prompt or "", progress=progress)
-            progress(0.90, desc="Finalizing results...")
-
-except Exception as e:
-        return ("error", f"Unexpected worker error: {e}", "")
-
-                    try:
-                        if preview_tmp != tmp and os.path.exists(preview_tmp):
-                            pass
-                    finally:
-                        try: os.remove(tmp)
-                        except Exception: pass
-                    status = "done" if not (isinstance(res, str) and res.lower().startswith("error")) else "error"
-                    return (status, res if isinstance(res, str) else str(res), preview_local or "")
                 elif is_img:
                     progress(0.08, desc="Fetching image bytes...")
                     raw = fetch_bytes(url, progress=progress)
+        
                     try:
                         preview_fd, preview_path = tempfile.mkstemp(suffix=".jpg")
                         os.close(preview_fd)
@@ -641,23 +631,25 @@ except Exception as e:
                         preview_local = preview_path
                     except Exception:
                         preview_local = None
+        
                     progress(0.18, desc="Analyzing image...")
                     try:
                         res = analyze_image_structured(client, raw, prompt or "", progress=progress)
                     except UnidentifiedImageError:
                         return ("error", "Error: provided file is not a valid image.", preview_local or "")
+        
                     progress(0.98, desc="Finalizing result...")
-                    status = "done" if not (isinstance(res, str) and res.lower().startswith("error")) else "error"
-                    return (status, res if isinstance(res, str) else str(res), preview_local or "")
+        
                 else:
                     progress(0.07, desc="Unknown media type — fetching bytes for heuristics...")
                     raw = fetch_bytes(url, timeout=120, progress=progress)
+        
                     try:
                         progress(0.15, desc="Attempting to interpret as image...")
                         Image.open(BytesIO(raw))
-                        progress(0.2, desc="Image detected — analyzing...")
+                        progress(0.20, desc="Image detected — analyzing...")
                         res = analyze_image_structured(client, raw, prompt or "", progress=progress)
-                        status = "done" if not (isinstance(res, str) and res.lower().startswith("error")) else "error"
+        
                         try:
                             preview_fd, preview_path = tempfile.mkstemp(suffix=".jpg")
                             os.close(preview_fd)
@@ -666,29 +658,35 @@ except Exception as e:
                             preview_local = preview_path
                         except Exception:
                             preview_local = None
-                        return (status, res if isinstance(res, str) else str(res), preview_local or "")
+        
                     except Exception:
                         fd, tmp = tempfile.mkstemp(suffix=ext_from_src(url) or ".mp4")
                         os.close(fd)
                         with open(tmp, "wb") as fh:
                             fh.write(raw)
+        
                         try:
-                            progress(0.3, desc="Saved fallback video file; analyzing...")
+                            progress(0.30, desc="Saved fallback video file; analyzing...")
                             preview_tmp = _convert_video_for_preview(tmp)
                             preview_local = preview_tmp if os.path.exists(preview_tmp) else tmp
                             res = analyze_video_cohesive(client, tmp, prompt or "", progress=progress)
-                            status = "done" if not (isinstance(res, str) and res.lower().startswith("error")) else "error"
-                            return (status, res if isinstance(res, str) else str(res), preview_local or "")
                         finally:
-                            try: os.remove(tmp)
-                            except Exception: pass
+                            try:
+                                os.remove(tmp)
+                            except Exception:
+                                pass
+        
+                # Determine final status and return
+                status = "done" if not (isinstance(res, str) and res.lower().startswith("error")) else "error"
+                return (status, res if isinstance(res, str) else str(res), preview_local or "")
+        
             except Exception as e:
                 return ("error", f"Unexpected worker error: {e}", "")
-
-        # immediate UI flip to "busy" so user sees work started
+        
+        
+        # UI wiring
         submit_btn.click(fn=lambda: "busy", inputs=[], outputs=[status_state])
-
-        # Actual heavy work runs in the queue and shows progress
+        
         submit_btn.click(
             fn=worker,
             inputs=[url_input, custom_prompt, api_key],
@@ -697,8 +695,7 @@ except Exception as e:
             show_progress="full",
             show_progress_on=progress_md,
         )
-
-        # update submit button label from status
+        
         def _btn_label_for_status(s):
             labels = {
                 "idle": "Submit",
@@ -707,8 +704,7 @@ except Exception as e:
                 "error": "Retry",
             }
             return labels.get(s, "Submit")  # Default case
-
-
+        
         status_state.change(fn=lambda s: _btn_label_for_status(s), inputs=[status_state], outputs=[submit_btn])
 
         # map status to progress text