Update irpr/main.py

irpr/main.py

@@ -9,30 +9,52 @@ import os, traceback
 from irpr.models import IngestRequest, GenerateRequest
 from irpr.config import settings
 
-app = FastAPI(title="IR/PR Co-Pilot Pro", version="0.4.0 (OpenAI)")
+app = FastAPI(title="IR/PR Co-Pilot Pro", version="0.4.1 (OpenAI)")
 
 app.add_middleware(
     CORSMiddleware, allow_origins=["*"], allow_credentials=True,
     allow_methods=["*"], allow_headers=["*"],
 )
 
-def _pick_writable_dir() -> str:
-    candidates = [settings.DATA_DIR, "/data", "./var", "/tmp/irpr", "."]
-    for base in candidates:
+def _ensure_dir_writable(path: str) -> bool:
+    try:
+        os.makedirs(path, exist_ok=True)
+        # 可能なら権限を広めに
         try:
-            if not base: continue
-            os.makedirs(base, exist_ok=True)
-            p = os.path.join(base, ".write_test")
-            with open(p, "w") as w: w.write("ok")
-            os.remove(p)
-            return base
+            os.chmod(path, 0o777)
         except Exception:
+            pass
+        testfile = os.path.join(path, ".write_test")
+        with open(testfile, "wb") as f:
+            f.write(b"ok")
+        os.remove(testfile)
+        return True
+    except Exception:
+        return False
+
+def _pick_writable_dir() -> str:
+    """
+    優先順位:
+    1) DATA_DIR (env で指示)
+    2) /mnt/data （この環境では最も安全）
+    3) /data
+    4) ./var
+    5) /tmp/irpr
+    6) カレント
+    """
+    candidates = []
+    if settings.DATA_DIR: candidates.append(settings.DATA_DIR)
+    candidates += ["/mnt/data", "/data", "./var", "/tmp/irpr", "."]
+    for base in candidates:
+        if not base: 
             continue
+        if _ensure_dir_writable(base):
+            return base
     return "."
 
 BASE_DIR = _pick_writable_dir()
 UPLOAD_DIR = os.path.join(BASE_DIR, "uploads")
-os.makedirs(UPLOAD_DIR, exist_ok=True)
+_ensure_dir_writable(UPLOAD_DIR)
 
 # 静的
 os.makedirs("static", exist_ok=True)
@@ -65,19 +87,26 @@ async def ingest_upload(files: list[UploadFile] = File(...)):
     from rag.ingest import ingest_pdf_bytes
     total = 0; saved = []
     try:
+        # 念のため再確認
+        if not _ensure_dir_writable(UPLOAD_DIR):
+            raise PermissionError(f"UPLOAD_DIR not writable: {UPLOAD_DIR}")
         for f in files:
             if not f.filename.lower().endswith(".pdf"):
                 continue
             blob = await f.read()
             save_path = os.path.join(UPLOAD_DIR, f.filename)
-            with open(save_path, "wb") as w:
-                w.write(blob)
+            try:
+                with open(save_path, "wb") as w:
+                    w.write(blob)
+            except Exception as e:
+                # 失敗したパスも返す
+                return {"ok": False, "error": f"{repr(e)} at path={save_path}", "base_dir": BASE_DIR}
             source_url = f"/files/uploads/{f.filename}"
             total += ingest_pdf_bytes(title=f.filename, source_url=source_url, pdf_bytes=blob)
             saved.append(source_url)
-        return {"ok": True, "ingested_chunks": total, "saved": saved}
+        return {"ok": True, "ingested_chunks": total, "saved": saved, "base_dir": BASE_DIR}
     except Exception as e:
-        return {"ok": False, "error": repr(e), "ingested_chunks": total, "saved": saved}
+        return {"ok": False, "error": repr(e), "ingested_chunks": total, "saved": saved, "base_dir": BASE_DIR}
 
 # ---- generate ----
 @app.post("/generate/all")