Update main.py

main.py

@@ -6,108 +6,165 @@ import uuid
 import gradio as gr
 
 from utils.logger import logger
-from utils.job_queue import create_job, jobs, start_worker
+from utils.job_queue import start_worker, create_job, get_job
 
 
+# =====================================================
+# INIT APP
+# =====================================================
+
+app = FastAPI(title="Fast Whisper Production V3")
+
 UPLOAD_DIR = "jobs"
 os.makedirs(UPLOAD_DIR, exist_ok=True)
 
-app = FastAPI(title="Fast Whisper Production V2")
 
+# Start background worker ONCE
 start_worker()
 
-# ------------------------------------------------
-# API ENDPOINTS
-# ------------------------------------------------
+
+# =====================================================
+# API: START RENDER JOB
+# =====================================================
 
 @app.post("/render")
-async def render(file: UploadFile = File(...)):
+async def render(
+    file: UploadFile = File(...),
+    webhook: str | None = None
+):
 
-    filename = f"{UPLOAD_DIR}/{uuid.uuid4()}_{file.filename}"
+    job_id = str(uuid.uuid4())
+    input_path = f"{UPLOAD_DIR}/{job_id}_{file.filename}"
 
-    with open(filename, "wb") as buffer:
+    with open(input_path, "wb") as buffer:
         shutil.copyfileobj(file.file, buffer)
 
-    job_id = create_job(filename)
+    logger.info(f"Incoming render request: {job_id}")
+
+    job_id = create_job(input_path, webhook)
 
     return {
         "job_id": job_id,
-        "status_url": f"/status/{job_id}"
+        "status_url": f"/status/{job_id}",
+        "download_url": f"/download/{job_id}"
     }
 
 
+# =====================================================
+# API: CHECK STATUS
+# =====================================================
+
 @app.get("/status/{job_id}")
 def status(job_id: str):
 
-    job = jobs.get(job_id)
+    job = get_job(job_id)
 
     if not job:
         return {"error": "Job not found"}
 
-    return job
+    return {
+        "job_id": job_id,
+        "status": job["status"],
+        "stage": job.get("stage"),
+        "progress": job.get("progress"),
+        "error": job.get("error"),
+    }
 
 
+# =====================================================
+# API: DOWNLOAD RESULT
+# =====================================================
+
 @app.get("/download/{job_id}")
 def download(job_id: str):
 
-    job = jobs.get(job_id)
+    job = get_job(job_id)
 
-    if not job or job["status"] != "completed":
-        return {"error": "Not ready"}
+    if not job:
+        return {"error": "Job not found"}
+
+    if job["status"] != "completed":
+        return {
+            "error": "Job not completed",
+            "status": job["status"]
+        }
 
-    return FileResponse(job["output"], filename="rendered.mp4")
+    return FileResponse(
+        job["output"],
+        media_type="video/mp4",
+        filename="rendered.mp4"
+    )
 
 
-# ------------------------------------------------
-# GRADIO UI
-# ------------------------------------------------
+# =====================================================
+# GRADIO BACKEND (UI)
+# =====================================================
 
-def ui_render(video):
+def ui_upload(video, webhook):
 
     if video is None:
-        return None, "Upload a video"
+        return "No video uploaded", None
+
+    job_id = str(uuid.uuid4())
+    path = f"{UPLOAD_DIR}/{job_id}.mp4"
+
+    shutil.copy(video, path)
 
-    job_id = create_job(video)
+    jid = create_job(path, webhook)
 
-    return None, f"Job Started: {job_id}"
+    return f"Job Started: {jid}", jid
 
 
 def ui_status(job_id):
 
-    job = jobs.get(job_id)
+    job = get_job(job_id)
 
     if not job:
         return "Job not found", None
 
-    if job["status"] == "completed":
+    status = job["status"]
+
+    if status == "completed":
         return "✅ Completed", job["output"]
 
-    if job["status"] == "failed":
-        return f"❌ {job['error']}", None
+    if status == "failed":
+        return f"❌ Failed: {job.get('error')}", None
+
+    return f"Processing... {job.get('progress', 0)}%", None
 
-    return f"Processing {job['progress']}%", None
 
+# =====================================================
+# GRADIO UI LAYOUT
+# =====================================================
 
-with gr.Blocks(title="Fast Whisper Renderer V2") as demo:
+with gr.Blocks(title="Fast Whisper V3 Renderer") as demo:
 
-    gr.Markdown("# 🎬 Fast Whisper Production V2")
+    gr.Markdown("# 🎬 Fast Whisper Production V3")
 
-    video = gr.Video()
-    btn = gr.Button("Start Render")
+    with gr.Row():
+        video = gr.Video(label="Upload Video")
+        webhook = gr.Textbox(label="Webhook URL (optional)")
+
+    start_btn = gr.Button("Start Render")
 
     job_id_box = gr.Textbox(label="Job ID")
-    check_btn = gr.Button("Check Status")
+    status_btn = gr.Button("Check Status")
 
-    status = gr.Textbox(label="Status")
-    output_video = gr.Video()
+    status_out = gr.Textbox(label="Status")
+    video_out = gr.Video(label="Output")
 
-    btn.click(ui_render, inputs=video, outputs=[output_video, job_id_box])
+    start_btn.click(
+        ui_upload,
+        inputs=[video, webhook],
+        outputs=[status_out, job_id_box],
+    )
 
-    check_btn.click(
+    status_btn.click(
         ui_status,
         inputs=job_id_box,
-        outputs=[status, output_video],
+        outputs=[status_out, video_out],
     )
 
 
+# Mount Gradio inside FastAPI root
 app = gr.mount_gradio_app(app, demo, path="/")