Remove dead _ensure_dir; finalize SFTP upload path logic

backend/worker/sftp_store.py

@@ -18,6 +18,31 @@ from typing import Optional, Tuple
 
 import paramiko
 
+def _pick_base_dir(sftp, preferred: str) -> str:
+    """
+    Try preferred base dir; if not writable/usable, fallback to /pdfs.
+    """
+    candidates = []
+    if preferred and str(preferred).strip():
+        candidates.append(str(preferred).strip())
+    candidates.append("/pdfs")  # known-good on your server
+    # last resort: root
+    candidates.append("/")
+
+    for base in candidates:
+        base = "/" + base.strip("/")
+        test = base + "/.sftp_write_test"
+        try:
+                        # write+delete tiny file to validate permissions
+            with sftp.file(test, "wb") as f:
+                f.write(b"ok")
+            sftp.remove(test)
+            return base
+        except Exception:
+            continue
+
+    raise RuntimeError("No writable SFTP base dir found (tried preferred, /pdfs, /)")
+
 
 def _sftp_client() -> Tuple[paramiko.SFTPClient, paramiko.Transport]:
     host = (os.environ.get("SFTP_HOST") or "").strip()
@@ -63,22 +88,36 @@ def _mkdir_p(sftp: paramiko.SFTPClient, remote_dir: str) -> None:
 
 
 def store_to_sftp(pdf_id: str, template_id: str, cfg_json_bytes: bytes, pdf_bytes: bytes, pdf_name: str) -> str:
-    base = (os.environ.get("SFTP_BASE_DIR") or "/").rstrip("/")
-    remote_dir = f"{base}/{template_id}/{pdf_id}"
-    remote_cfg = f"{remote_dir}/trainer_config_{pdf_id}__{template_id}.json"
-    remote_pdf = f"{remote_dir}/{pdf_name or (pdf_id + '.pdf')}"
-
+    """
+    Upload trainer outputs to SFTP.
+    Remote layout:
+      <base>/<template_id>/<pdf_id>/
+        trainer_config_<pdf_id>__<template_id>.json
+        <pdf_name or <pdf_id>.pdf>
+    """
+    base = (os.environ.get("SFTP_BASE_DIR") or "/").strip()
+    if not base.startswith("/"):
+        base = "/" + base
+    base = base.rstrip("/") or "/"
+
+    # connect first
     sftp, transport = _sftp_client()
     try:
+        remote_dir = f"{base}/{template_id}/{pdf_id}".replace("//", "/")
         _mkdir_p(sftp, remote_dir)
+
+        remote_cfg = f"{remote_dir}/trainer_config_{pdf_id}__{template_id}.json"
+        remote_pdf_name = (pdf_name or f"{pdf_id}.pdf").lstrip("/")
+        remote_pdf = f"{remote_dir}/{remote_pdf_name}"
+
         with sftp.open(remote_cfg, "wb") as f:
             f.write(cfg_json_bytes)
         with sftp.open(remote_pdf, "wb") as f:
             f.write(pdf_bytes)
+
+        return remote_dir
     finally:
         try:
             sftp.close()
         finally:
             transport.close()
-
-    return remote_dir