Upload 6 files

app.py

@@ -397,19 +397,30 @@ def _post_uvr_multipart(worker_url: str, path: str, input_path: Path, model: str
         raise RuntimeError(f"UVR worker {path} returned HTTP {exc.code}: {detail}") from exc
 
 
+def _extract_uvr_job_id(value) -> str:
+    if not isinstance(value, dict):
+        return ""
+    for key in ("id", "jobId", "job_id"):
+        if value.get(key):
+            return str(value.get(key))
+    nested = value.get("job")
+    if isinstance(nested, dict):
+        return _extract_uvr_job_id(nested)
+    return ""
+
+
+def _post_uvr_job_payload(worker_url: str, input_path: Path, model: str, mode: str) -> bytes:
+    return _post_uvr_multipart(worker_url, "/jobs", input_path, model, mode)
+
+
 def _post_uvr_job(worker_url: str, input_path: Path, model: str, mode: str) -> dict:
-    payload = _post_uvr_multipart(worker_url, "/jobs", input_path, model, mode)
-    return json.loads(payload.decode("utf-8", errors="replace"))
+    return json.loads(_post_uvr_job_payload(worker_url, input_path, model, mode).decode("utf-8", errors="replace"))
 
 
-def _try_uvr_separate(worker_url: str, input_path: Path, work_dir: Path, model: str, mode: str) -> dict | None:
-    try:
-        payload = _post_uvr_multipart(worker_url, "/separate", input_path, model, mode)
-    except RuntimeError as exc:
-        if "HTTP 404" in str(exc) or "HTTP 405" in str(exc):
-            return None
-        raise
+def _prepare_uvr_zip_payload(payload: bytes, work_dir: Path, name: str = "uvr-worker-stems.zip") -> dict:
     zip_path = work_dir / "uvr-worker-direct-stems.zip"
+    if name:
+        zip_path = work_dir / name
     zip_path.write_bytes(payload)
     output_dir = work_dir / "uvr-worker-direct-separated"
     output_dir.mkdir(parents=True, exist_ok=True)
@@ -426,12 +437,26 @@ def _try_uvr_separate(worker_url: str, input_path: Path, work_dir: Path, model:
     }
 
 
+def _try_uvr_separate(worker_url: str, input_path: Path, work_dir: Path, model: str, mode: str) -> dict | None:
+    try:
+        payload = _post_uvr_multipart(worker_url, "/separate", input_path, model, mode)
+    except RuntimeError as exc:
+        if "HTTP 404" in str(exc) or "HTTP 405" in str(exc):
+            return None
+        raise
+    return _prepare_uvr_zip_payload(payload, work_dir)
+
+
 def _try_neuralis_uvr_worker(input_path: Path, work_dir: Path, model: str, mode: str, worker_url: str) -> dict | None:
     try:
-        job = _post_uvr_job(worker_url, input_path, model, mode)
-        job_id = job.get("id")
+        payload = _post_uvr_job_payload(worker_url, input_path, model, mode)
+        try:
+            job = json.loads(payload.decode("utf-8", errors="replace"))
+        except json.JSONDecodeError:
+            return _prepare_uvr_zip_payload(payload, work_dir, "uvr-worker-jobs-response.zip")
+        job_id = _extract_uvr_job_id(job)
         if not job_id:
-            return None
+            raise RuntimeError(f"UVR worker /jobs returned no id: {json.dumps(job, ensure_ascii=True)[:700]}")
         deadline = time.time() + 60 * 30
         status = job
         while time.time() < deadline: