Update app.py

app.py

@@ -1,25 +1,20 @@
 import os, json, traceback
 from typing import List
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, Request, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import JSONResponse, PlainTextResponse, RedirectResponse
+from fastapi.responses import RedirectResponse, PlainTextResponse
 import gradio as gr
 from dotenv import load_dotenv
 
 load_dotenv()
 
-# ========= 例外を必ず可視化するハンドラ =========
-async def _exception_printer(request: Request, exc: Exception):
+# --- 例外を画面にも出す（復旧後に不要なら削除可） ---
+async def _exception_printer(request, exc: Exception):
     tb = "".join(traceback.format_exception(type(exc), exc, exc.__traceback__))
     print("=== Unhandled Exception ===\n", tb, flush=True)
-    # 画面にも出す（暫定）
     return PlainTextResponse(f"Internal error\n\n{tb}", status_code=500)
 
-# ========= 疎通テスト用の最小関数 =========
-def ping():
-    return "pong 🎯"
-
-# ========= 重い依存はボタン押下まで遅延 =========
+# --- 起動安定化のため重い依存は遅延 import ---
 def _lazy_imports_for_main():
     from modules.utils import ensure_dirs
     ensure_dirs()
@@ -28,13 +23,14 @@ def _lazy_imports_for_main():
     from modules.emailer import build_tracking_url
     return index_files_and_urls, run_full_workflow, build_tracking_url
 
-def ui_main(company_name: str,
-            company_website: str,
-            lead_email: str,
-            urls_text: str,
-            files: List[gr.File] | None,
-            custom_objective: str,
-            temperature: float = 0.4):
+# --- Gradio ハンドラ ---
+def ui_company_score_and_proposal(company_name: str,
+                                  company_website: str,
+                                  lead_email: str,
+                                  urls_text: str,
+                                  files: List[gr.File] | None,
+                                  custom_objective: str,
+                                  temperature: float = 0.4):
     try:
         index_files_and_urls, run_full_workflow, build_tracking_url = _lazy_imports_for_main()
     except Exception:
@@ -43,11 +39,13 @@ def ui_main(company_name: str,
     urls = [u.strip() for u in (urls_text or "").splitlines() if u.strip()]
     file_paths = [f.name for f in (files or [])]
 
+    # 1) インデックス
     try:
-        idx = index_files_and_urls(file_paths=file_paths, urls=urls)
+        index_report = index_files_and_urls(file_paths=file_paths, urls=urls)
     except Exception:
-        idx = "Index error:\n```\n" + traceback.format_exc() + "\n```"
+        index_report = "Index error:\n```\n" + traceback.format_exc() + "\n```"
 
+    # 2) ワークフロー
     try:
         result = run_full_workflow(
             company_name=company_name,
@@ -59,40 +57,40 @@ def ui_main(company_name: str,
     except Exception:
         return "### ❌ ワークフロー実行エラー\n```\n" + traceback.format_exc() + "\n```"
 
-    out = []
-    out.append("### ✅ 企業スコア\n" + json.dumps(result.get("score", {}), ensure_ascii=False, indent=2))
+    # 3) 表示
+    outputs = []
+    outputs.append("### ✅ 企業スコア\n" + json.dumps(result.get("score", {}), ensure_ascii=False, indent=2))
     ctxs = result.get("top_contexts", [])
-    out.append("### 🧠 抽出コンテキスト（上位）\n" + "\n\n".join([f"- {c[:300]}..." for c in ctxs]))
-    out.append("### ✍️ 提案ドラフト\n" + result.get("proposal_markdown", ""))
+    outputs.append("### 🧠 抽出コンテキスト（上位）\n" + "\n\n".join([f"- {c[:300]}..." for c in ctxs]))
+    outputs.append("### ✍️ 提案ドラフト\n" + result.get("proposal_markdown", ""))
 
     ex = result.get("exports", {})
-    out.append("### 📎 エクスポート\n" + "\n".join([
+    outputs.append("### 📎 エクスポート\n" + "\n".join([
         f"- DOCX: {ex.get('docx_path','')}",
         f"- PPTX: {ex.get('pptx_path','')}"
     ]))
 
     if lead_email:
         email = result.get("email", {})
-        out.append("### ✉️ メール準備\n" + f"To: {lead_email}\nSubject: {email.get('subject','')}\n\n{email.get('body','')}")
+        outputs.append("### ✉️ メール準備\n" + f"To: {lead_email}\nSubject: {email.get('subject','')}\n\n{email.get('body','')}")
         try:
-            from modules.emailer import build_tracking_url
-            out.append(f"（本文内の計測リンク例）\n{build_tracking_url('preview-only', {'company':company_name})}")
+            outputs.append(f"（本文内の計測リンク例）\n{build_tracking_url('preview-only', {'company':company_name})}")
         except Exception:
             pass
 
-    out.append("### 🤖 次アクション提案\n" + result.get("next_actions", ""))
-    out.append("### 🧩 インデックス更新ログ\n" + idx)
-    return "\n\n".join(out)
+    outputs.append("### 🤖 次アクション提案\n" + result.get("next_actions", ""))
+    outputs.append("### 🧩 インデックス更新ログ\n" + index_report)
+    return "\n\n".join(outputs)
 
-# ========= Gradio（/ui にマウント） =========
+# --- Gradio UI（ルート / に出す） ---
 with gr.Blocks(title="営業自動化 Agent Studio") as demo:
-    gr.Markdown("# 営業自動化 Agent Studio")
+    gr.Markdown("# 営業自動化 Agent Studio（Hugging Face 完結）")
     with gr.Row():
         with gr.Column():
             company_name = gr.Textbox(label="企業名")
             company_website = gr.Textbox(label="企業サイトURL")
             lead_email = gr.Textbox(label="送信先メール（任意）")
-            custom_objective = gr.Textbox(label="提案の目的/狙い（任意）")
+            custom_objective = gr.Textbox(label="提案の目的/狙い（任意）", placeholder="例）SaaS導入の無料PoC打診")
             urls_text = gr.Textbox(label="RAG用URL（複数は改行）", lines=4)
             files = gr.File(label="RAG用ファイル（複数可）", file_count="multiple")
             temperature = gr.Slider(0.0, 1.0, value=0.4, step=0.05, label="生成温度")
@@ -100,51 +98,44 @@ with gr.Blocks(title="営業自動化 Agent Studio") as demo:
         with gr.Column():
             out = gr.Markdown()
 
+    # 疎通確認
     ping_btn = gr.Button("Ping")
-    ping_out = gr.Markdown("Click Ping")
-    ping_btn.click(fn=ping, inputs=None, outputs=ping_out)
+    ping_out = gr.Markdown()
+    ping_btn.click(lambda: "pong 🎯", None, ping_out)
 
     run_btn.click(
-        fn=ui_main,
+        fn=ui_company_score_and_proposal,
         inputs=[company_name, company_website, lead_email, urls_text, files, custom_objective, temperature],
         outputs=[out]
     )
 
-# ========= FastAPI（/ と /health は軽量、/ui はGradio） =========
-app = FastAPI(title="Agent Studio - Docker (safe)")
+# --- FastAPI（/health と /t/{token}）+ ルートに Gradio をマウント ---
+app = FastAPI(title="Agent Studio - Docker")
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"],
 )
-
-# 全例外をキャッチして本文にトレースを返す（暫定）
 app.add_exception_handler(Exception, _exception_printer)
 
 @app.get("/health")
 def health():
     return {"ok": True}
 
-@app.get("/")
-def root():
-    # まずは JSON を返し、UI は /ui に配置
-    return {"status": "running", "ui": "/ui", "health": "/health"}
-
-# クリック計測（例外も可視化）
 @app.get("/t/{token}")
 def track_click(token: str, request: Request):
     try:
         from modules.utils import verify_tracking_token, log_event
         payload = verify_tracking_token(token)
-        if not payload:
-            return JSONResponse({"error": "invalid token"}, status_code=400)
+        if payload is None:
+            raise HTTPException(status_code=400, detail="invalid token")
         ip = request.client.host if request.client else "unknown"
         ua = request.headers.get("User-Agent", "") if request.headers else ""
         log_event("click", payload, {"ip": ip, "ua": ua})
-        redirect_to = payload.get("redirect") or os.getenv("PUBLIC_BASE_URL", "/ui")
+        redirect_to = payload.get("redirect") or os.getenv("PUBLIC_BASE_URL", "/")
         return RedirectResponse(url=redirect_to)
     except Exception as e:
         tb = "".join(traceback.format_exception(type(e), e, e.__traceback__))
         return PlainTextResponse(f"tracking error\n\n{tb}", status_code=500)
 
-# /ui に Gradio をマウント
-app = gr.mount_gradio_app(app, demo, path="/ui")
+# ルート（/）で Gradio を表示
+app = gr.mount_gradio_app(app, demo, path="/")