Update app.py

app.py

@@ -1,12 +1,11 @@
 import os
-from typing import List
+from typing import List, Optional
 
 import gradio as gr
 from dotenv import load_dotenv
 
+# UI & services
 from ui.components import build_ui
-from rag.ingest import build_corpus
-from rag.retriever import RagStore
 from services.weather import get_weather_summary
 from services.geocoding import geocode_city
 from services.planner import generate_plan
@@ -16,17 +15,71 @@ load_dotenv()
 INDEX_DIR = "data/index"
 CORPUS_DIRS = {"blogs": "data/blogs", "reviews": "data/reviews", "events": "data/events"}
 
+# ------------------------------
+# Optional RAG imports (fallback)
+# ------------------------------
+RAG_IMPORT_ERROR: Optional[str] = None
+
+try:
+    from rag.ingest import build_corpus as _build_corpus
+    from rag.retriever import RagStore as _RagStore
+
+    class _SafeRagStore(_RagStore):
+        def available(self) -> bool:
+            try:
+                return super().available()
+            except Exception:
+                return False
+
+    build_corpus = _build_corpus        # type: ignore
+    RagStore = _SafeRagStore            # type: ignore
+except Exception as e:
+    # RAG が存在しない／壊れている場合でも起動できるよう、ダミーにフォールバック
+    RAG_IMPORT_ERROR = f"{type(e).__name__}: {e}"
+
+    def build_corpus(*args, **kwargs):
+        return []
+
+    class RagStore:  # type: ignore
+        def __init__(self, *args, **kwargs):
+            pass
+        def available(self) -> bool:
+            return False
+        def build(self, docs):
+            return None
+        def search(self, q, k=10):
+            return []
+
 rag_store = RagStore(index_dir=INDEX_DIR)
 
+# ------------------------------
+# Handlers
+# ------------------------------
+
 def seed_sample_data() -> str:
-    from sample_data_seed import seed
-    n = seed()
-    return f"Seeded sample data: {n} files."
+    # サンプルデータは任意。存在しない場合でも壊れないようにする
+    try:
+        from sample_data_seed import seed
+    except Exception:
+        return "Seed script not found. Skipped."
+    try:
+        n = seed()
+        return f"Seeded sample data: {n} files."
+    except Exception as e:
+        return f"Seeding failed: {e}"
 
 def handle_build_index(progress=gr.Progress(track_tqdm=True)) -> str:
-    docs = build_corpus(CORPUS_DIRS)
-    rag_store.build(docs)
-    return f"Built index with {len(docs)} documents."
+    if RAG_IMPORT_ERROR:
+        return (
+            "RAG modules are not available "
+            f"(running without local index). Details: {RAG_IMPORT_ERROR}"
+        )
+    try:
+        docs = build_corpus(CORPUS_DIRS)
+        rag_store.build(docs)
+        return f"Built index with {len(docs)} documents."
+    except Exception as e:
+        return f"Index build failed: {e}"
 
 def handle_generate_plan(
     city: str,
@@ -37,13 +90,19 @@ def handle_generate_plan(
     pace: str,
     date: str,
     start_time: str,
-    force_weather: str | None,
+    force_weather: Optional[str],
     mode_pref: str,
     show_costs: bool,
     data_source: str,
 ):
-    if not rag_store.available() and data_source in ("Hybrid", "Local only"):
-        return None, None, "Index not built yet. Click 'Build/Update RAG Index' or switch Data source."
+    # RAG未利用モードの案内
+    if data_source in ("Hybrid", "Local only") and not rag_store.available():
+        tip = (
+            "Local RAG index is not available. "
+            "Click 'Build/Update RAG Index' or switch Data source to 'Web only'."
+        )
+        # Web only で進めたい場合は UI から切替可能
+        return None, None, tip
 
     loc = geocode_city(city)
     if not loc:
@@ -70,26 +129,29 @@ def handle_generate_plan(
 
     return plan["map_html"], plan["table"], plan["narrative"]
 
+# ------------------------------
+# UI wiring
+# ------------------------------
 with gr.Blocks(css=".small {font-size: 12px}") as demo:
     (
-        city_in,
-        hours_in,
-        traveler_in,
-        interests_in,
-        budget_in,
-        pace_in,
-        date_in,
-        start_time_in,
-        weather_in,
-        mode_in,
-        show_costs_in,
-        data_source_in,
-        build_btn,
-        seed_btn,
-        gen_btn,
-        map_out,
-        table_out,
-        text_out,
+        city_in,            # 0
+        hours_in,           # 1
+        traveler_in,        # 2
+        interests_in,       # 3
+        budget_in,          # 4
+        pace_in,            # 5
+        date_in,            # 6
+        start_time_in,      # 7
+        weather_in,         # 8
+        mode_in,            # 9
+        show_costs_in,      # 10
+        data_source_in,     # 11
+        build_btn,          # 12
+        seed_btn,           # 13
+        gen_btn,            # 14
+        map_out,            # 15
+        table_out,          # 16
+        text_out,           # 17
     ) = build_ui()
 
     seed_btn.click(fn=seed_sample_data, outputs=[text_out])
@@ -98,7 +160,7 @@ with gr.Blocks(css=".small {font-size: 12px}") as demo:
         fn=handle_generate_plan,
         inputs=[
             city_in, hours_in, traveler_in, interests_in, budget_in, pace_in,
-            date_in, start_time_in, weather_in, mode_in, show_costs_in, data_source_in
+            date_in, start_time_in, weather_in, mode_in, show_costs_in, data_source_in,
         ],
         outputs=[map_out, table_out, text_out],
     )