Update app.py

app.py

@@ -1,4 +1,4 @@
-import os, time, base64, mimetypes, requests, traceback, json
+import os, time, base64, mimetypes, requests, traceback, glob
 from dataclasses import dataclass
 from typing import Optional, Dict, Any, Generator, List
 
@@ -20,6 +20,8 @@ ENV_FALLBACK_KEY = (os.getenv("OPENAI_API_KEY") or "").strip()
 ALLOWED_MODELS = ["sora-2", "sora-2-pro", "sora"]
 ALLOWED_SIZES  = ["1280x720","720x1280","1792x1024","1024x1792","1920x1080","1080x1920"]
 
+TMP_PATH = "/tmp/sora_output.mp4"
+
 @dataclass
 class JobStatus:
     status: str
@@ -27,10 +29,23 @@ class JobStatus:
     output_url: Optional[str] = None
     output_b64: Optional[str] = None
 
-# -------- Utilities --------
-def _safe_video_path() -> str:
-    return "/tmp/sora_output.mp4"
+# -------- Minimal housekeeping to keep disk usage tiny --------
+def _startup_cleanup_tmp():
+    try:
+        # remove stray mp4s in /tmp older than ~1 hour
+        now = time.time()
+        for p in glob.glob("/tmp/*.mp4"):
+            try:
+                if now - os.path.getmtime(p) > 3600:
+                    os.remove(p)
+            except Exception:
+                pass
+    except Exception:
+        pass
+
+_startup_cleanup_tmp()
 
+# -------- Utilities --------
 def _file_to_b64(path: str) -> str:
     with open(path, "rb") as f:
         return base64.b64encode(f.read()).decode("utf-8")
@@ -67,22 +82,8 @@ 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 (only used for optional URL probe; no downloads) --------
 from requests import RequestException as ReqErr
-@retry(
-    retry=retry_if_exception_type((ReqErr,)),
-    wait=wait_exponential(multiplier=1, min=1, max=10),
-    stop=stop_after_attempt(5),
-    reraise=True,
-)
-def _download_stream(url: str, out_path: str) -> str:
-    with requests.get(url, stream=True, timeout=60) as r:
-        r.raise_for_status()
-        with open(out_path, "wb") as f:
-            for chunk in r.iter_content(1024 * 256):
-                if chunk:
-                    f.write(chunk)
-    return out_path
 
 # Normalize OpenAI exceptions across versions
 _OAI_EXC = tuple(e for e in [RateLimitError, APIConnectionError, APIStatusError] if isinstance(e, type)) or (Exception,)
@@ -95,26 +96,22 @@ _OAI_EXC = tuple(e for e in [RateLimitError, APIConnectionError, APIStatusError]
     reraise=True,
 )
 def _videos_generate(client: OpenAI, **kwargs) -> Any:
-    """
-    Try the new Videos API; fallback to Jobs API. Surface both errors if they fail.
-    """
-    # Path A
+    # Try new Videos API
     if hasattr(client, "videos") and hasattr(client.videos, "generate"):
         try:
             return client.videos.generate(**kwargs)
         except Exception as e_a:
-            # fall through to jobs
             last_a = e_a
     else:
         last_a = "client.videos.generate not found"
 
-    # Path B
+    # Try Jobs API
     if hasattr(client, "videos") and hasattr(client.videos, "jobs") and hasattr(client.videos.jobs, "create"):
         try:
             return client.videos.jobs.create(**kwargs)
         except Exception as e_b:
             raise RuntimeError(f"videos.generate failed/absent: {last_a}\njobs.create failed: {e_b}")
-    raise RuntimeError(f"Your OpenAI SDK doesn't expose videos endpoints on this key/org. Seen attributes: {dir_safe(client)}")
+    raise RuntimeError("No videos endpoints on this SDK/account. Update openai package or check org access.")
 
 @retry(
     retry=retry_if_exception_type(_OAI_EXC),
@@ -127,10 +124,10 @@ def _videos_retrieve(client: OpenAI, job_id: str) -> Any:
         try:
             return client.videos.retrieve(job_id)
         except Exception:
-            pass  # try jobs next
+            pass
     if hasattr(client, "videos") and hasattr(client.videos, "jobs") and hasattr(client.videos.jobs, "retrieve"):
         return client.videos.jobs.retrieve(job_id)
-    raise RuntimeError("No videos.retrieve or videos.jobs.retrieve on this SDK. Upgrade openai python.")
+    raise RuntimeError("No videos.retrieve or videos.jobs.retrieve on this SDK/account.")
 
 def _extract_status(resp: Any) -> JobStatus:
     status = getattr(resp, "status", None) or getattr(resp, "state", None) or "unknown"
@@ -152,13 +149,7 @@ def _extract_status(resp: Any) -> JobStatus:
 
     return JobStatus(status=status, error=err, output_url=out_url, output_b64=out_b64)
 
-def dir_safe(obj) -> Dict[str, Any]:
-    try:
-        return sorted([a for a in dir(obj) if not a.startswith("_")])
-    except Exception:
-        return {"inspect_error": "dir() failed"}
-
-# -------- Core (STREAMING; yields LISTS matching outputs) --------
+# -------- Core (STREAMING; yields LISTS matching [video, status]) --------
 def generate_video_stream(
     api_key: str,
     prompt: str,
@@ -170,33 +161,17 @@ def generate_video_stream(
     guidance: float,
     init_image: Optional[str],
 ) -> Generator[List[Any], None, None]:
-    """
-    Generator that ALWAYS yields a list [video_value_or_update, status_text].
-    Many Gradio builds ignore tuple yields; lists are safest.
-    """
-
     # First visible tick so UI never blanks:
     yield [gr.update(), "Starting…"]
 
-    # 0) Setup
+    # Setup
     try:
         client = _make_client(api_key)
     except Exception as e_init:
         yield [gr.update(), f"Setup error: {e_init}"]
         return
 
-    # 0.1) Preflight SDK visibility (prints once so we know what exists)
-    try:
-        vids = hasattr(client, "videos")
-        methods = []
-        if vids:
-            methods = [m for m in dir(client.videos) if not m.startswith("_")]
-        msg = f"SDK preflight → videos: {vids}, methods: {methods}"
-        yield [gr.update(), msg]
-    except Exception as e_pref:
-        yield [gr.update(), f"SDK preflight error: {e_pref}"]
-
-    # 1) Validate inputs
+    # Validate
     try:
         prompt = _sanitize_prompt(prompt)
         model  = _validate_model(model)
@@ -227,7 +202,7 @@ def generate_video_stream(
         yield [gr.update(), f"Validation error: {e_val}"]
         return
 
-    # 2) Submit job
+    # Submit
     try:
         yield [gr.update(), "Submitting job…"]
         job = _videos_generate(client, **req)
@@ -243,9 +218,8 @@ def generate_video_stream(
         yield [gr.update(), f"Submit error: {e_submit}\n{traceback.format_exc(limit=2)}"]
         return
 
-    # 3) Poll job
-    start = time.time()
-    last_emit = 0
+    # Poll
+    start = time.time(); last_emit = 0
     while True:
         try:
             status_obj = _videos_retrieve(client, job_id)
@@ -263,22 +237,20 @@ def generate_video_stream(
             yield [gr.update(), f"Rendering… status={js.status}"]
 
         if js.status in ("succeeded", "completed", "complete"):
-            out_path = _safe_video_path()
+            # 🔑 DISK-SAFE RETURNS:
+            # 1) Prefer URL → zero disk usage (Gradio Video can play URLs)
+            if js.output_url:
+                yield [js.output_url, f"Ready (URL). Done with {model} ({size}, {duration}s)."]
+                return
+            # 2) If the API returns only b64, write to a single temp file (overwritten every run)
             if js.output_b64:
                 try:
-                    with open(out_path, "wb") as f:
+                    with open(TMP_PATH, "wb") as f:
                         f.write(base64.b64decode(js.output_b64))
-                    yield [out_path, f"Done with {model} ({size}, {duration}s)."]
+                    yield [TMP_PATH, f"Done with {model} ({size}, {duration}s)."]
                 except Exception as werr:
                     yield [gr.update(), f"Write error: {werr}"]
                 return
-            if js.output_url:
-                try:
-                    _download_stream(js.output_url, out_path)
-                    yield [out_path, f"Downloaded from URL. Done with {model}."]
-                except Exception as dl_err:
-                    yield [js.output_url, f"Ready (URL) — local download failed: {dl_err}"]
-                return
             yield [gr.update(), "Job succeeded but no video payload was returned."]
             return
 
@@ -289,7 +261,7 @@ def generate_video_stream(
             yield [gr.update(), detail]
             return
 
-        if now - start > 1800:  # 30 min timeout
+        if now - start > 1800:
             yield [gr.update(), "Timed out waiting for the video. Try shorter duration."]
             return
 
@@ -301,7 +273,7 @@ def build_ui():
         gr.Markdown("## ZEN — Sora / Sora-2 / Sora-2-Pro (OpenAI Videos API)")
         gr.Markdown(
             "Paste an OpenAI API key (not stored). Provide a detailed prompt. "
-            "Streaming logs ensure you always see progress or readable errors."
+            "This build avoids local downloads to keep disk usage near zero."
         )
 
         with gr.Row():
@@ -326,7 +298,6 @@ def build_ui():
         video = gr.Video(label="Result", autoplay=True)
         status = gr.Textbox(label="Status / Logs", interactive=False)
 
-        # IMPORTANT: outputs must be exactly two and we yield LISTS [video, status]
         go.click(
             fn=generate_video_stream,
             inputs=[api_key, prompt, model, duration, size, seed, audio, guidance, init_image],