Update app.py

app.py

@@ -6,11 +6,11 @@ import gradio as gr
 from dotenv import load_dotenv
 from tenacity import retry, stop_after_attempt, wait_exponential, retry_if_exception_type
 
-# OpenAI SDK imports guarded for environments missing pieces
+# -------- OpenAI SDK (guarded import) --------
 try:
     from openai import OpenAI
     from openai import RateLimitError, APIConnectionError, APIStatusError
-except Exception:  # pragma: no cover
+except Exception:
     OpenAI = None
     RateLimitError = APIConnectionError = APIStatusError = Exception  # fallback
 
@@ -27,7 +27,7 @@ class JobStatus:
     output_url: Optional[str] = None
     output_b64: Optional[str] = None
 
-# ---------- utilities ----------
+# -------- Utilities --------
 def _safe_video_path() -> str:
     return "/tmp/sora_output.mp4"
 
@@ -67,7 +67,7 @@ def _make_client(user_key: Optional[str]) -> OpenAI:
         raise ValueError("Missing API key. Paste a valid OpenAI API key.")
     return OpenAI(api_key=key)
 
-# ---------- networking ----------
+# -------- Networking --------
 from requests import RequestException as ReqErr
 @retry(
     retry=retry_if_exception_type((ReqErr,)),
@@ -98,10 +98,8 @@ def _videos_generate(client: OpenAI, **kwargs) -> Any:
     Dual-path: try Videos API; fallback to Jobs API.
     """
     try:
-        # Newer path
         return client.videos.generate(**kwargs)
     except Exception as e_a:
-        # Fallback path
         try:
             return client.videos.jobs.create(**kwargs)
         except Exception as e_b:
@@ -139,7 +137,7 @@ def _extract_status(resp: Any) -> JobStatus:
 
     return JobStatus(status=status, error=err, output_url=out_url, output_b64=out_b64)
 
-# ---------- core (STREAMING) ----------
+# -------- Core (STREAMING with gr.update) --------
 def generate_video_stream(
     api_key: str,
     prompt: str,
@@ -150,16 +148,16 @@ def generate_video_stream(
     audio: str,
     guidance: float,
     init_image: Optional[str],
-) -> Generator[Tuple[Optional[str], str], None, None]:
+) -> Generator[Tuple[Any, str], None, None]:
     """
-    Generator that yields (video_or_url, status_text) messages as it works.
-    This prevents UI "blink" and guarantees visible feedback even on errors.
+    Generator that yields (video_component_value, status_text).
+    Uses gr.update() to keep Gradio happy even when no video is ready yet.
     """
     # 0) Setup
     try:
         client = _make_client(api_key)
     except Exception as e_init:
-        yield None, f"Setup error: {e_init}"
+        yield gr.update(), f"Setup error: {e_init}"
         return
 
     # 1) Validate inputs
@@ -174,7 +172,7 @@ def generate_video_stream(
         if init_image:
             mt, _ = mimetypes.guess_type(init_image)
             if not (mt and mt.startswith("image/")):
-                yield None, "Provided conditioning file isn’t an image."
+                yield gr.update(), "Provided conditioning file isn’t an image."
                 return
 
         req: Dict[str, Any] = {
@@ -190,22 +188,22 @@ def generate_video_stream(
         if init_image:
             req["image"] = {"b64": _file_to_b64(init_image)}
     except Exception as e_val:
-        yield None, f"Validation error: {e_val}"
+        yield gr.update(), f"Validation error: {e_val}"
         return
 
     # 2) Submit job
     try:
-        yield None, "Submitting job…"
+        yield gr.update(), "Submitting job…"
         job = _videos_generate(client, **req)
         job_id = getattr(job, "id", None) or getattr(job, "job_id", None)
         if not job_id:
-            yield None, "Could not get a job id from the API response."
+            yield gr.update(), "Could not get a job id from the API response."
             return
     except _OAI_EXC as oe:
-        yield None, f"OpenAI API issue on submit: {oe}"
+        yield gr.update(), f"OpenAI API issue on submit: {oe}"
         return
     except Exception as e_submit:
-        yield None, f"Submit error: {e_submit}\n{traceback.format_exc(limit=2)}"
+        yield gr.update(), f"Submit error: {e_submit}\n{traceback.format_exc(limit=2)}"
         return
 
     # 3) Poll job
@@ -216,17 +214,16 @@ def generate_video_stream(
             status_obj = _videos_retrieve(client, job_id)
             js = _extract_status(status_obj)
         except _OAI_EXC as oe:
-            yield None, f"OpenAI API issue on poll: {oe}"
+            yield gr.update(), f"OpenAI API issue on poll: {oe}"
             return
         except Exception as e_poll:
-            yield None, f"Polling error: {e_poll}\n{traceback.format_exc(limit=2)}"
+            yield gr.update(), f"Polling error: {e_poll}\n{traceback.format_exc(limit=2)}"
             return
 
-        # Emit a heartbeat log every ~5s so UI stays alive
         now = time.time()
         if now - last_emit > 5:
             last_emit = now
-            yield None, f"Rendering… status={js.status}"
+            yield gr.update(), f"Rendering… status={js.status}"
 
         if js.status in ("succeeded", "completed", "complete"):
             out_path = _safe_video_path()
@@ -236,33 +233,33 @@ def generate_video_stream(
                         f.write(base64.b64decode(js.output_b64))
                     yield out_path, f"Done with {model} ({size}, {duration}s)."
                 except Exception as werr:
-                    yield None, f"Write error: {werr}"
+                    yield gr.update(), f"Write error: {werr}"
                 return
             if js.output_url:
-                # Try download; if it fails, return URL anyway (Gradio Video can play URLs)
                 try:
                     _download_stream(js.output_url, out_path)
                     yield out_path, f"Downloaded from URL. Done with {model}."
                 except Exception as dl_err:
+                    # Gradio Video can play URLs if local download fails
                     yield js.output_url, f"Ready (URL) — local download failed: {dl_err}"
                 return
-            yield None, "Job succeeded but no video payload was returned."
+            yield gr.update(), "Job succeeded but no video payload was returned."
             return
 
         if js.status in ("failed", "error", "canceled", "cancelled"):
             detail = f"Status: {js.status}."
             if js.error:
                 detail += f" Error: {js.error}"
-            yield None, detail
+            yield gr.update(), detail
             return
 
         if now - start > 1800:  # 30 min timeout
-            yield None, "Timed out waiting for the video. Try shorter duration."
+            yield gr.update(), "Timed out waiting for the video. Try shorter duration."
             return
 
         time.sleep(2)
 
-# ---------- UI ----------
+# -------- UI --------
 def build_ui():
     with gr.Blocks(title="ZEN — Sora / Sora-2 / Sora-2-Pro", theme=gr.themes.Soft()) as demo:
         gr.Markdown("## ZEN — Sora / Sora-2 / Sora-2-Pro (OpenAI Videos API)")
@@ -293,17 +290,15 @@ def build_ui():
         video = gr.Video(label="Result", autoplay=True)
         status = gr.Textbox(label="Status / Logs", interactive=False)
 
-        # Use generator function so UI always gets visible updates
+        # Generator → always yields something visible
         go.click(
             fn=generate_video_stream,
             inputs=[api_key, prompt, model, duration, size, seed, audio, guidance, init_image],
-            outputs=[video, status],
-            queue=True
+            outputs=[video, status]
         )
     return demo
 
 demo = build_ui()
-demo.queue()  # Compatible across 4.x/5.x
 
 if __name__ == "__main__":
     demo.launch()