Update irpr/main.py

irpr/main.py

@@ -1,3 +1,4 @@
+# irpr/main.py
 from fastapi import FastAPI, UploadFile, File, Request
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
@@ -8,7 +9,7 @@ import os, traceback
 from irpr.models import IngestRequest, GenerateRequest
 from irpr.config import settings
 
-app = FastAPI(title="IR/PR Co-Pilot Pro", version="0.3.3")
+app = FastAPI(title="IR/PR Co-Pilot Pro", version="0.4.0 (OpenAI)")
 
 app.add_middleware(
     CORSMiddleware, allow_origins=["*"], allow_credentials=True,
@@ -16,43 +17,33 @@ app.add_middleware(
 )
 
 def _pick_writable_dir() -> str:
-    """
-    書き込み可能なディレクトリを候補から選ぶ。
-    優先: DATA_DIR(env) -> /data -> ./var -> /tmp/irpr
-    """
-    candidates = []
-    if settings.DATA_DIR: candidates.append(settings.DATA_DIR)
-    candidates += ["/data", "./var", "/tmp/irpr"]
+    candidates = [settings.DATA_DIR, "/data", "./var", "/tmp/irpr", "."]
     for base in candidates:
         try:
+            if not base: continue
             os.makedirs(base, exist_ok=True)
-            testfile = os.path.join(base, ".write_test")
-            with open(testfile, "w") as f:
-                f.write("ok")
-            os.remove(testfile)
+            p = os.path.join(base, ".write_test")
+            with open(p, "w") as w: w.write("ok")
+            os.remove(p)
             return base
         except Exception:
             continue
-    # 万一すべて失敗したらカレントディレクトリにフォールバック
     return "."
 
 BASE_DIR = _pick_writable_dir()
 UPLOAD_DIR = os.path.join(BASE_DIR, "uploads")
 os.makedirs(UPLOAD_DIR, exist_ok=True)
 
-# 画面用の静的ディレクトリ
+# 静的
 os.makedirs("static", exist_ok=True)
 os.makedirs("templates", exist_ok=True)
-
-# /files は BASE_DIR を公開（ここにPPT/CSVやアップロードPDFが置かれる）
 app.mount("/static", StaticFiles(directory="static"), name="static")
-app.mount("/files", StaticFiles(directory=BASE_DIR), name="files")
+app.mount("/files",  StaticFiles(directory=BASE_DIR), name="files")
 
 templates = Jinja2Templates(directory="templates")
 
 @app.get("/", response_class=HTMLResponse)
 def ui(request: Request):
-    # データ保存場所をUIに渡しておくと調査に便利
     return templates.TemplateResponse("index.html", {"request": request, "base_dir": BASE_DIR})
 
 @app.get("/api/health")
@@ -82,11 +73,7 @@ async def ingest_upload(files: list[UploadFile] = File(...)):
             with open(save_path, "wb") as w:
                 w.write(blob)
             source_url = f"/files/uploads/{f.filename}"
-            total += ingest_pdf_bytes(
-                title=f.filename,
-                source_url=source_url,
-                pdf_bytes=blob
-            )
+            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}
     except Exception as e: