Update app.py

app.py

@@ -1,32 +1,18 @@
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, UploadFile, File
 from fastapi.responses import FileResponse, JSONResponse
-import uuid, os, subprocess, requests
-from threading import Thread
-import logging
-
-logging.basicConfig(level=logging.INFO)
+import os, subprocess, logging
 
 app = FastAPI()
 
 JOBS_DIR = "/tmp/jobs"
 os.makedirs(JOBS_DIR, exist_ok=True)
-jobs = {}  # job_id: {"status": "processing/completed/failed", "output_file": ..., "error": ...}
-
 
-def download_file(url, filename):
-    try:
-        logging.info(f"Downloading file from: {url}")
-        headers = {"User-Agent": "Mozilla/5.0"}  # Pretend to be a browser
-        r = requests.get(url, headers=headers, stream=True)
-        r.raise_for_status()
-        with open(filename, 'wb') as f:
-            for chunk in r.iter_content(chunk_size=8192):
-                f.write(chunk)
-        logging.info(f"Downloaded: {filename}")
-    except Exception as e:
-        logging.error(f"Failed to download: {url} - {e}")
-        raise
+logging.basicConfig(level=logging.INFO)
 
+job_status = {
+    "status": "idle",
+    "error": None,
+}
 
 
 def run_ffmpeg(base_file, overlay_file, output_file):
@@ -42,72 +28,47 @@ def run_ffmpeg(base_file, overlay_file, output_file):
     return result.returncode == 0
 
 
-def background_process(job_id, base_url, overlay_url):
-    base_file = os.path.join(JOBS_DIR, f"{job_id}_base.mp4")
-    overlay_file = os.path.join(JOBS_DIR, f"{job_id}_overlay.mp4")
-    output_file = os.path.join(JOBS_DIR, f"{job_id}_output.mp4")
+@app.post("/generate-video/")
+async def generate_video(video: UploadFile = File(...), overlay: UploadFile = File(...)):
+    base_file = os.path.join(JOBS_DIR, "current_base.mp4")
+    overlay_file = os.path.join(JOBS_DIR, "current_overlay.mp4")
+    output_file = os.path.join(JOBS_DIR, "current_output.mp4")
 
-    try:
-        download_file(base_url, base_file)
-        download_file(overlay_url, overlay_file)
+    # Clear old files
+    for f in [base_file, overlay_file, output_file]:
+        if os.path.exists(f):
+            os.remove(f)
 
-        success = run_ffmpeg(base_file, overlay_file, output_file)
+    with open(base_file, "wb") as f:
+        f.write(await video.read())
+    with open(overlay_file, "wb") as f:
+        f.write(await overlay.read())
 
+    job_status["status"] = "processing"
+    job_status["error"] = None
+
+    try:
+        success = run_ffmpeg(base_file, overlay_file, output_file)
         if success and os.path.exists(output_file):
-            jobs[job_id]["status"] = "completed"
-            jobs[job_id]["output_file"] = output_file
-            logging.info(f"Job {job_id} completed successfully. Output: {output_file}")
+            job_status["status"] = "completed"
         else:
-            jobs[job_id]["status"] = "failed"
-            jobs[job_id]["error"] = "FFmpeg failed or output file missing."
-            logging.error(f"Job {job_id} failed. No output file created.")
+            job_status["status"] = "failed"
+            job_status["error"] = "FFmpeg failed or output missing."
     except Exception as e:
-        jobs[job_id]["status"] = "failed"
-        jobs[job_id]["error"] = str(e)
-        logging.error(f"Job {job_id} failed with exception: {e}")
-
-
-@app.post("/generate-video/")
-async def generate_video(request: Request):
-    data = await request.json()
-    base_url = data.get("video_url")
-    overlay_url = data.get("overlay_url")
-
-    if not base_url or not overlay_url:
-        return JSONResponse({"error": "Missing video_url or overlay_url"}, status_code=400)
-
-    job_id = str(uuid.uuid4())
-    jobs[job_id] = {"status": "processing"}
-
-    Thread(target=background_process, args=(job_id, base_url, overlay_url)).start()
-
-    return JSONResponse({"job_id": job_id, "status": "processing"})
-
-
-@app.get("/status/{job_id}")
-async def check_status(job_id: str):
-    job_info = jobs.get(job_id)
-    if not job_info:
-        return JSONResponse({"error": "Invalid job_id"}, status_code=404)
-
-    response = {"status": job_info["status"]}
-    if "error" in job_info:
-        response["error"] = job_info["error"]
-    if job_info["status"] == "completed":
-        response["download_url"] = f"/download/{job_id}"
-    return JSONResponse(response)
+        job_status["status"] = "failed"
+        job_status["error"] = str(e)
 
+    return {"status": job_status["status"]}
 
-@app.get("/download/{job_id}")
-async def download_video(job_id: str):
-    job_info = jobs.get(job_id)
-    if not job_info or job_info["status"] != "completed":
-        return JSONResponse({"error": "Invalid job_id or not completed"}, status_code=404)
 
-    output_file = job_info["output_file"]
+@app.get("/status/")
+async def check_status():
+    return JSONResponse(job_status)
 
-    if not os.path.exists(output_file):
-        logging.error(f"Download failed: output file for job {job_id} not found.")
-        return JSONResponse({"error": "Output file not found."}, status_code=404)
 
-    return FileResponse(output_file, media_type="video/mp4", filename=f"{job_id}.mp4")
+@app.get("/download/")
+async def download_video():
+    output_file = os.path.join(JOBS_DIR, "current_output.mp4")
+    if job_status["status"] != "completed" or not os.path.exists(output_file):
+        return JSONResponse({"error": "No completed video to download."}, status_code=404)
+    return FileResponse(output_file, media_type="video/mp4", filename="output.mp4")