Update irpr/main.py

irpr/main.py

@@ -1,4 +1,5 @@
 # irpr/main.py
+from __future__ import annotations
 from fastapi import FastAPI, UploadFile, File, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
@@ -9,13 +10,15 @@ 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.3 (OpenAI)")
+app = FastAPI(title="IR/PR Co-Pilot Pro", version="0.4.4 (OpenAI)")
 
 app.add_middleware(
     CORSMiddleware, allow_origins=["*"], allow_credentials=True,
     allow_methods=["*"], allow_headers=["*"],
 )
 
+# ===== ディレクトリ選定（deps と同じ戦略） =====
+
 def _ensure_dir_writable(path: str) -> bool:
     try:
         os.makedirs(path, exist_ok=True)
@@ -31,15 +34,22 @@ def _ensure_dir_writable(path: str) -> bool:
     except Exception:
         return False
 
+def _ensure_dir_tree(base: str, sub: str = "simple_index") -> bool:
+    if not _ensure_dir_writable(base):
+        return False
+    return _ensure_dir_writable(os.path.join(base, sub))
+
 def _pick_writable_dir() -> str:
     candidates = []
     if settings.DATA_DIR:
         candidates.append(settings.DATA_DIR)
-    candidates += ["/mnt/data", "/data", "./var", "/tmp/irpr", "."]
+    candidates += ["/tmp/irpr", "/mnt/data", os.path.join(os.getcwd(), "data")]
     for base in candidates:
-        if _ensure_dir_writable(base):
+        if _ensure_dir_tree(base, "simple_index"):
             return base
-    return "."
+    fallback = "/tmp/irpr"
+    _ensure_dir_tree(fallback, "simple_index")
+    return fallback
 
 BASE_DIR = _pick_writable_dir()
 UPLOAD_DIR = os.path.join(BASE_DIR, "uploads")
@@ -47,22 +57,35 @@ INDEX_DIR  = os.path.join(BASE_DIR, "simple_index")
 _ensure_dir_writable(UPLOAD_DIR)
 _ensure_dir_writable(INDEX_DIR)
 
+# 静的配信
 os.makedirs("static", exist_ok=True)
 os.makedirs("templates", exist_ok=True)
 app.mount("/static", StaticFiles(directory="static"), name="static")
 app.mount("/files",  StaticFiles(directory=BASE_DIR), name="files")
-
 templates = Jinja2Templates(directory="templates")
 
+# ===== UI / Health =====
+
 @app.get("/", response_class=HTMLResponse)
 def ui(request: Request):
     return templates.TemplateResponse("index.html", {"request": request, "base_dir": BASE_DIR})
 
 @app.get("/api/health")
 def health():
-    return {"ok": True, "service": "IR/PR Co-Pilot Pro", "base_dir": BASE_DIR, "index_dir": INDEX_DIR}
+    return {
+        "ok": True,
+        "service": "IR/PR Co-Pilot Pro",
+        "base_dir": BASE_DIR,
+        "upload_dir": UPLOAD_DIR,
+        "index_dir": INDEX_DIR,
+        "data_dir_env": settings.DATA_DIR,
+        "index_dir_env": settings.INDEX_DIR,
+        "upload_writable": _ensure_dir_writable(UPLOAD_DIR),
+        "index_writable": _ensure_dir_writable(INDEX_DIR),
+    }
+
+# ===== ingest =====
 
-# ---- ingest ----
 @app.post("/ingest/edinet")
 def ingest_edinet(req: IngestRequest):
     from rag.ingest import ingest_edinet_for_company
@@ -126,7 +149,8 @@ async def ingest_upload(files: list[UploadFile] = File(...)):
         tb = "".join(traceback.format_exception(type(e), e, e.__traceback__))[-2000:]
         return {"ok": False, "error": repr(e), "trace": tb, "ingested_chunks": total, "saved": saved, "base_dir": BASE_DIR}
 
-# ---- generate ----
+# ===== generate =====
+
 @app.post("/generate/all")
 def generate_all(req: GenerateRequest):
     try: