Update utils/render.py

utils/render.py

@@ -1,132 +1,73 @@
-import subprocess
 import os
+import subprocess
 import uuid
+from utils.logger import logger
 
+OUTPUT_DIR = "jobs"
+os.makedirs(OUTPUT_DIR, exist_ok=True)
 
-# =====================================================
-# PUBLIC API (USED BY MAIN.PY)
-# =====================================================
 
-def render_subtitles(video_path: str, srt_data: str) -> str:
+def render_subtitles(
+    video_path: str,
+    srt_text: str,
+    output_path: str | None = None,
+):
     """
-    Universal subtitle renderer for all pipeline versions (V1–V7)
+    Universal subtitle renderer for V7.
 
     Supports:
-    - Raw SRT string input (from generate_srt)
-    - Temporary SRT file generation
-    - FFmpeg subtitle burn-in
-
-    Returns:
-        Output video path (mp4)
+    - API render
+    - UI render
+    - Batch jobs
+    - Worker queue
     """
 
-    if not video_path or not os.path.exists(video_path):
-        raise ValueError("Invalid video path provided")
-
-    # -------------------------------------------------
-    # CREATE OUTPUT PATH
-    # -------------------------------------------------
-    output_path = _build_output_path(video_path)
-
-    # -------------------------------------------------
-    # CREATE TEMP SRT FILE
-    # -------------------------------------------------
-    srt_path = _write_srt_file(video_path, srt_data)
-
-    # -------------------------------------------------
-    # RUN FFmpeg RENDER
-    # -------------------------------------------------
-    success = _run_ffmpeg(video_path, srt_path, output_path)
-
-    # -------------------------------------------------
-    # FALLBACK SAFETY
-    # -------------------------------------------------
-    if not success or not os.path.exists(output_path):
-        return video_path  # safe fallback (prevents pipeline crash)
-
-    return output_path
-
-
-# =====================================================
-# OUTPUT PATH BUILDER
-# =====================================================
-
-def _build_output_path(video_path: str) -> str:
-    base, ext = os.path.splitext(video_path)
-    return f"{base}_rendered_{uuid.uuid4().hex[:6]}.mp4"
-
-
-# =====================================================
-# SRT FILE WRITER
-# =====================================================
-
-def _write_srt_file(video_path: str, srt_data: str) -> str:
-    """
-    Writes SRT string into temporary file
-    """
+    if output_path is None:
+        output_path = os.path.join(
+            OUTPUT_DIR,
+            f"{uuid.uuid4()}_render.mp4"
+        )
 
-    if not srt_data:
-        srt_data = ""
+    # --------------------------------------------------
+    # Write SRT file
+    # --------------------------------------------------
 
-    srt_path = video_path.replace(".mp4", ".srt")
+    srt_path = output_path.replace(".mp4", ".srt")
 
     with open(srt_path, "w", encoding="utf-8") as f:
-        f.write(srt_data)
-
-    return srt_path
-
+        f.write(srt_text)
 
-# =====================================================
-# FFmpeg EXECUTION CORE
-# =====================================================
+    logger.info(f"[RENDER] SRT saved → {srt_path}")
 
-def _run_ffmpeg(video_path: str, srt_path: str, output_path: str) -> bool:
-    """
-    Executes subtitle burn-in using FFmpeg
-    """
+    # --------------------------------------------------
+    # FFmpeg Subtitle Burn
+    # --------------------------------------------------
 
-    try:
+    cmd = [
+        "ffmpeg",
+        "-y",
+        "-i", video_path,
+        "-vf", f"subtitles={srt_path}",
+        "-c:a", "copy",
+        output_path,
+    ]
 
-        cmd = [
-            "ffmpeg",
-            "-y",
+    logger.info("[RENDER] Running ffmpeg render")
 
-            # INPUT
-            "-i", video_path,
+    process = subprocess.run(
+        cmd,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True
+    )
 
-            # SUBTITLES FILTER
-            "-vf", f"subtitles={srt_path}",
+    if process.returncode != 0:
+        logger.error(process.stderr)
+        raise Exception("FFmpeg render failed")
 
-            # AUDIO COPY (faster, avoids re-encode issues)
-            "-c:a", "copy",
+    if not os.path.exists(output_path):
+        raise Exception("Rendered file missing")
 
-            # OUTPUT
-            output_path
-        ]
-
-        process = subprocess.run(
-            cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
-        )
-
-        # FFmpeg success check
-        return process.returncode == 0
-
-    except Exception:
-        return False
-
-
-# =====================================================
-# OPTIONAL: SAFE RENDER (NO CRASH VERSION)
-# =====================================================
-
-def safe_render_subtitles(video_path: str, srt_data: str) -> str:
-    """
-    Crash-proof version for unstable environments (HF Spaces safe)
-    """
+    logger.info(f"[RENDER] Output → {output_path}")
 
-    try:
-        return render_subtitles(video_path, srt_data)
-    except Exception:
-        return video_path
+    return output_path