Upload 7 files

app.py

@@ -15,7 +15,7 @@ DEFAULT_CFG = {
     "chunk": {"target_chars": 1400, "overlap_chars": 180},
     "retrieval": {"top_k": 6, "score_threshold": 0.15, "mmr_lambda": 0.3},
     "llm": {
-        "model": "gpt-4o-mini",
+        "model": "gpt-4o-mini",  # 必要に応じて利用可能なモデルに変更
         "max_output_tokens": 700,
         "temperature": 0.2,
         "system_prompt": (
@@ -65,10 +65,10 @@ PDF_DIR   = DATA_DIR / "pdf"
 INDEX_PATH = INDEX_DIR / "faiss.index"
 META_PATH  = INDEX_DIR / "meta.jsonl"
 
-# ensure dirs
 PDF_DIR.mkdir(parents=True, exist_ok=True)
 INDEX_DIR.mkdir(parents=True, exist_ok=True)
 
+# ===== lazy imports =====
 def _lazy_imports():
     global faiss, np, embed_texts, chat, detect_out_of_scope, sanitize, compliance_block, SCOPE_HINT
     import faiss, numpy as np
@@ -79,14 +79,16 @@ def _lazy_imports():
 def _index_exists(): return INDEX_PATH.exists() and META_PATH.exists()
 def _check_api_key(): return bool(os.getenv("OPENAI_API_KEY"))
 
-# ===== retrieval =====
+# ===== retrieval helpers =====
 _INDEX = None
 _METAS = None
 
 def _ensure_index_loaded():
     global _INDEX, _METAS
-    if _INDEX is not None and _METAS is not None: return
-    if not _index_exists(): raise RuntimeError("index_not_ready")
+    if _INDEX is not None and _METAS is not None:
+        return
+    if not _index_exists():
+        raise RuntimeError("index_not_ready")
     faiss, *_ = _lazy_imports()
     _INDEX = faiss.read_index(str(INDEX_PATH))
     _METAS = [json.loads(l) for l in open(META_PATH, encoding="utf-8")]
@@ -135,7 +137,8 @@ _LANG_INSTRUCTIONS = {
 
 def generate_answer(q: str, lang: str = "ja"):
     q = (q or "").strip()
-    if not q: return "質問を入力してください。", {}
+    if not q:
+        return "質問を入力してください。", {}
     try:
         _, _, _, chat, detect_out_of_scope, sanitize, compliance_block, SCOPE_HINT = _lazy_imports()
         if detect_out_of_scope(q):
@@ -167,7 +170,7 @@ def generate_answer(q: str, lang: str = "ja"):
     except Exception as e:
         return "❌ 実行時エラー: " + str(e) + "\n" + traceback.format_exc()[-1200:], {}
 
-# ===== Upload & Rebuild =====
+# ===== Upload & Rebuild (helpers) =====
 SAFE_RE = re.compile(r"[^A-Za-z0-9._-]+")
 
 def _safe_name(name: str) -> str:
@@ -178,14 +181,9 @@ def _safe_name(name: str) -> str:
     return base
 
 def save_uploaded_pdfs(file_paths: Optional[Iterable[str]]) -> Tuple[int, List[str], List[str]]:
-    """
-    gr.Files(type='filepath') からの一時ファイル群を data/pdf/ に保存
-    return: (保存数, 保存先, スキップ/エラー)
-    """
     saved, skipped = [], []
     if not file_paths:
         return 0, saved, ["アップロードされたPDFがありません。"]
-
     try:
         PDF_DIR.mkdir(parents=True, exist_ok=True)
     except Exception as e:
@@ -203,10 +201,10 @@ def save_uploaded_pdfs(file_paths: Optional[Iterable[str]]) -> Tuple[int, List[s
             continue
         dst = PDF_DIR / _safe_name(src.name)
         try:
-            # 権限問題を避けるため copyfile（メタデータを引き継がない）
+            # メタデータを持ち越さない（権限エラー回避）
             shutil.copyfile(src, dst)
             saved.append(str(dst))
-        except PermissionError as e:
+        except PermissionError:
             skipped.append(f"{src.name}: Permission denied（{dst}）。Dockerfileの所有権設定を確認してください。")
         except Exception as e:
             skipped.append(f"{src.name}: コピー失敗 ({e})")
@@ -221,7 +219,6 @@ def upload_and_rebuild(file_paths: Optional[List[str]]) -> str:
     if skipped:
         msg.append("⚠️ スキップ/エラー:")
         msg.extend([f"- {s}" for s in skipped[:10]])
-    # 自動でインデックス再構築
     msg.append("\n🔧 インデックス再構築を開始します…")
     msg.append(rebuild_index())
     return "\n".join(msg)
@@ -232,8 +229,8 @@ def rebuild_index() -> str:
     if not list(PDF_DIR.glob("*.pdf")):
         return f"{PDF_DIR} にPDFがありません。PDFをアップロードして再実行してください。"
     try:
-        out = subprocess.run([sys.executable, str(BASE_DIR / "ingest.py")], capture_output=True, text=True, check=True)
-        # キャッシュ破棄
+        out = subprocess.run([sys.executable, str(BASE_DIR / "ingest.py")],
+                             capture_output=True, text=True, check=True)
         global _INDEX, _METAS
         _INDEX = None
         _METAS = None
@@ -243,7 +240,7 @@ def rebuild_index() -> str:
     except Exception as e:
         return "❌ 予期せぬエラー: " + str(e) + "\n" + traceback.format_exc()[-1200:]
 
-# ===== File-system diagnose (optional) =====
+# ===== File-system diagnose =====
 def fs_diagnose() -> str:
     lines = []
     lines.append(f"User: {getpass.getuser()}")
@@ -255,7 +252,6 @@ def fs_diagnose() -> str:
             lines.append(f"{p}  exists={p.exists()}  owner={st.st_uid}:{st.st_gid}  mode={mode}")
         except Exception as e:
             lines.append(f"{p}  stat error: {e}")
-    # 書き込みテスト
     try:
         test = PDF_DIR / "_write_test.tmp"
         with open(test, "wb") as f:
@@ -286,7 +282,6 @@ def api_rebuild():
 
 # ===== Gradio UI mounted at "/" =====
 LANGS  = CFG["languages"]["preferred"]
-LABELS = CFG["languages"].get("labels", {l: l for l in LANGS})
 
 with gr.Blocks(fill_height=True, title=CFG.get("app_name", "RAG Bot")) as demo:
     gr.Markdown("# IR・ESG開示RAG（OpenAI API）— 8言語対応")
@@ -309,16 +304,30 @@ with gr.Blocks(fill_height=True, title=CFG.get("app_name", "RAG Bot")) as demo:
     ask.click(fn=generate_answer, inputs=[q, lang], outputs=[ans, cites])
     rebuild_btn.click(fn=rebuild_index, outputs=[log])
 
-    # --- Upload & Rebuild ---
+    # --- Upload & Rebuild（Stateで安定化） ---
     gr.Markdown("## 📄 PDFアップロード")
     with gr.Row():
-        uploads = gr.Files(label="PDFをドラッグ＆ドロップ（複数可）", file_types=[".pdf"], type="filepath")
+        uploaded_files = gr.State([])  # 一時パス保持
+        uploads = gr.Files(
+            label="PDFをドラッグ＆ドロップ（複数可）",
+            file_types=[".pdf"],
+            type="filepath",
+            file_count="multiple",
+        )
+
+    def _capture_files(fs: Optional[List[str]]) -> List[str]:
+        return fs or []
+
+    uploads.change(fn=_capture_files, inputs=[uploads], outputs=[uploaded_files])
+
     with gr.Row():
-        up_btn = gr.Button("アップロード → インデックス再構築", variant="secondary")
+        up_btn  = gr.Button("アップロード → インデックス再構築", variant="secondary")
         diag_btn = gr.Button("📋 ストレージ診断")
-    up_log = gr.Markdown()
+    up_log  = gr.Markdown()
     diag_log = gr.Markdown()
-    up_btn.click(fn=upload_and_rebuild, inputs=[uploads], outputs=[up_log])
+
+    # ボタンは State を入力にする
+    up_btn.click(fn=upload_and_rebuild, inputs=[uploaded_files], outputs=[up_log])
     diag_btn.click(fn=fs_diagnose, outputs=[diag_log])
 
 from gradio.routes import mount_gradio_app