Update app.py

app.py

@@ -2,35 +2,37 @@ import os
 import uuid
 import subprocess
 import requests
+from urllib.parse import urlparse
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import JSONResponse, HTMLResponse
 
 app = FastAPI()
 
-# Base directory to store task files
+# Create the base tasks directory if it doesn't exist.
 BASE_DIR = "tasks"
 os.makedirs(BASE_DIR, exist_ok=True)
 
 def add_status(log_list, message):
     log_list.append(message)
-    print(message)  # Optionally log to console
+    print(message)  # Log to console for debugging
 
 @app.post("/process")
 def process_audio(payload: dict):
     status_log = []
-    # Check for required URL parameter in the payload
+    
+    # Validate input
     if "url" not in payload:
         raise HTTPException(status_code=400, detail="Missing 'url' in payload")
     
     audio_url = payload["url"]
     add_status(status_log, "Received URL from payload.")
-
-    # Create a unique task folder
+    
+    # Create a unique task directory
     task_id = str(uuid.uuid4())
     task_dir = os.path.join(BASE_DIR, task_id)
     os.makedirs(task_dir, exist_ok=True)
     add_status(status_log, f"Created task directory: {task_dir}")
-
+    
     # Check FFmpeg version
     try:
         ffmpeg_ver = subprocess.run(
@@ -44,7 +46,7 @@ def process_audio(payload: dict):
     except Exception as e:
         add_status(status_log, f"Failed to get FFmpeg version: {e}")
         return JSONResponse(status_code=500, content={"status": status_log})
-
+    
     # Check Spleeter version
     try:
         spleeter_ver = subprocess.run(
@@ -57,8 +59,8 @@ def process_audio(payload: dict):
     except Exception as e:
         add_status(status_log, f"Failed to get Spleeter version: {e}")
         return JSONResponse(status_code=500, content={"status": status_log})
-
-    # Download the audio file from the URL
+    
+    # Download the audio file
     try:
         r = requests.get(audio_url)
         r.raise_for_status()
@@ -66,13 +68,14 @@ def process_audio(payload: dict):
     except Exception as e:
         add_status(status_log, f"Error downloading file: {e}")
         return JSONResponse(status_code=400, content={"status": status_log})
-
-    # Determine file extension (default to .mp3 if not found)
-    ext = os.path.splitext(audio_url)[1] or ".mp3"
+    
+    # Remove any query parameters from the URL for a clean filename
+    parsed = urlparse(audio_url)
+    path = parsed.path  # excludes query parameters
+    ext = os.path.splitext(path)[1] or ".mp3"
     input_filename = f"input{ext}"
     input_filepath = os.path.join(task_dir, input_filename)
-
-    # Save the downloaded file
+    
     try:
         with open(input_filepath, "wb") as f:
             f.write(r.content)
@@ -80,44 +83,41 @@ def process_audio(payload: dict):
     except Exception as e:
         add_status(status_log, f"Error saving file: {e}")
         return JSONResponse(status_code=500, content={"status": status_log})
-
-    # Verify that the file exists
+    
     if not os.path.exists(input_filepath):
         add_status(status_log, "Error: Input file does not exist after download.")
         return JSONResponse(status_code=500, content={"status": status_log})
-
-    # Run Spleeter to separate the file using the 2-stems model (vocals and accompaniment)
-    base_name = os.path.splitext(input_filename)[0]
+    
+    # Run Spleeter using the latest command syntax:
+    # spleeter separate -p spleeter:2stems -o <task_dir> <input_filepath>
     spleeter_cmd = [
         "spleeter", "separate",
-        "-i", input_filepath,
         "-p", "spleeter:2stems",
-        "-o", task_dir
+        "-o", task_dir,
+        input_filepath
     ]
     add_status(status_log, "Running Spleeter command: " + " ".join(spleeter_cmd))
+    
     try:
-        result = subprocess.run(
-            spleeter_cmd,
-            capture_output=True,
-            text=True,
-            check=True,
-        )
+        result = subprocess.run(spleeter_cmd, capture_output=True, text=True, check=True)
         add_status(status_log, "Spleeter command output: " + result.stdout)
     except subprocess.CalledProcessError as e:
         add_status(status_log, "Spleeter processing failed: " + e.stderr)
         return JSONResponse(status_code=500, content={"status": status_log})
-
-    # Define expected output files
+    
+    # Spleeter creates an output folder with the base name of the input file.
+    base_name = os.path.splitext(input_filename)[0]
     output_folder = os.path.join(task_dir, base_name)
     vocals_file = os.path.join(output_folder, "vocals.wav")
     accompaniment_file = os.path.join(output_folder, "accompaniment.wav")
+    
     if not (os.path.exists(vocals_file) and os.path.exists(accompaniment_file)):
         add_status(status_log, "Error: Output files not found after processing.")
         return JSONResponse(status_code=500, content={"status": status_log})
     
     add_status(status_log, "Spleeter processing completed successfully.")
-
-    # Return the task ID and status log to the frontend
+    
+    # Return task ID and status log (for debugging on the frontend)
     return JSONResponse(content={
         "task_id": task_id,
         "status": status_log
@@ -125,7 +125,6 @@ def process_audio(payload: dict):
 
 @app.get("/", response_class=HTMLResponse)
 def index():
-    # Simple HTML page to test the API and display status logs.
     html_content = """
     <!DOCTYPE html>
     <html>