Update app.py

app.py

@@ -1,4 +1,4 @@
-import os, json, traceback
+import os, json, traceback, io
 from typing import List
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
@@ -8,13 +8,20 @@ from dotenv import load_dotenv
 
 load_dotenv()
 
-# --- 例外を画面にも表示（デバッグ用。不要になれば削除OK） ---
-async def _exception_printer(request, exc: Exception):
+# ========= 内部ログ用バッファ（画面で見られるようにする） =========
+_APP_LOG = io.StringIO()
+
+def _log(msg: str):
+    print(msg, flush=True)
+    _APP_LOG.write(msg + "\n")
+
+# ========= 例外は必ず画面にも表示（Internal Server Error対策） =========
+async def _exception_printer(request: Request, exc: Exception):
     tb = "".join(traceback.format_exception(type(exc), exc, exc.__traceback__))
-    print("=== Unhandled Exception ===\n", tb, flush=True)
+    _log("=== Unhandled Exception ===\n" + tb)
     return PlainTextResponse(f"Internal error\n\n{tb}", status_code=500)
 
-# --- 遅延 import（重い依存はボタン押下時にだけ読み込む） ---
+# ========= 重い依存は遅延インポート =========
 def _lazy_imports_for_main():
     from modules.utils import ensure_dirs
     ensure_dirs()
@@ -23,7 +30,7 @@ def _lazy_imports_for_main():
     from modules.emailer import build_tracking_url
     return index_files_and_urls, run_full_workflow, build_tracking_url
 
-# --- Gradio コールバック ---
+# ========= Gradio コールバック =========
 def ui_company_score_and_proposal(company_name: str,
                                   company_website: str,
                                   lead_email: str,
@@ -33,8 +40,11 @@ def ui_company_score_and_proposal(company_name: str,
                                   temperature: float = 0.4):
     try:
         index_files_and_urls, run_full_workflow, build_tracking_url = _lazy_imports_for_main()
+        _log("[init] lazy imports loaded")
     except Exception:
-        return "### ❌ 初期化エラー\n```\n" + traceback.format_exc() + "\n```"
+        tb = traceback.format_exc()
+        _log("[error] init failed\n" + tb)
+        return "### ❌ 初期化エラー\n```\n" + tb + "\n```"
 
     urls = [u.strip() for u in (urls_text or "").splitlines() if u.strip()]
     file_paths = [f.name for f in (files or [])]
@@ -42,8 +52,11 @@ def ui_company_score_and_proposal(company_name: str,
     # 1) インデックス
     try:
         index_report = index_files_and_urls(file_paths=file_paths, urls=urls)
+        _log(f"[index] {index_report}")
     except Exception:
-        index_report = "Index error:\n```\n" + traceback.format_exc() + "\n```"
+        tb = traceback.format_exc()
+        _log("[error] index failed\n" + tb)
+        index_report = "Index error:\n```\n" + tb + "\n```"
 
     # 2) ワークフロー
     try:
@@ -54,62 +67,89 @@ def ui_company_score_and_proposal(company_name: str,
             objective=custom_objective,
             temperature=temperature
         )
+        _log("[workflow] finished")
     except Exception:
-        return "### ❌ ワークフロー実行エラー\n```\n" + traceback.format_exc() + "\n```"
+        tb = traceback.format_exc()
+        _log("[error] workflow failed\n" + tb)
+        return "### ❌ ワークフロー実行エラー\n```\n" + tb + "\n```"
 
     # 3) 表示
     outputs = []
-    outputs.append("### ✅ 企業スコア\n" + json.dumps(result.get("score", {}), ensure_ascii=False, indent=2))
-    ctxs = result.get("top_contexts", [])
-    outputs.append("### 🧠 抽出コンテキスト（上位）\n" + "\n\n".join([f"- {c[:300]}..." for c in ctxs]))
-    outputs.append("### ✍️ 提案ドラフト\n" + result.get("proposal_markdown", ""))
-
-    ex = result.get("exports", {})
-    outputs.append("### 📎 エクスポート\n" + "\n".join([
-        f"- DOCX: {ex.get('docx_path','')}",
-        f"- PPTX: {ex.get('pptx_path','')}"
-    ]))
-
-    if lead_email:
-        email = result.get("email", {})
-        outputs.append("### ✉️ メール準備\n" + f"To: {lead_email}\nSubject: {email.get('subject','')}\n\n{email.get('body','')}")
-        try:
-            outputs.append(f"（本文内の計測リンク例）\n{build_tracking_url('preview-only', {'company':company_name})}")
-        except Exception:
-            pass
-
-    outputs.append("### 🤖 次アクション提案\n" + result.get("next_actions", ""))
-    outputs.append("### 🧩 インデックス更新ログ\n" + index_report)
+    try:
+        outputs.append("### ✅ 企業スコア\n" + json.dumps(result.get("score", {}), ensure_ascii=False, indent=2))
+        ctxs = result.get("top_contexts", [])
+        outputs.append("### 🧠 抽出コンテキスト（上位）\n" + "\n\n".join([f"- {c[:300]}..." for c in ctxs]))
+        outputs.append("### ✍️ 提案ドラフト\n" + result.get("proposal_markdown", ""))
+
+        ex = result.get("exports", {})
+        outputs.append("### 📎 エクスポート\n" + "\n".join([
+            f"- DOCX: {ex.get('docx_path','')}",
+            f"- PPTX: {ex.get('pptx_path','')}"
+        ]))
+
+        if lead_email:
+            email = result.get("email", {})
+            outputs.append("### ✉️ メール準備\n" + f"To: {lead_email}\nSubject: {email.get('subject','')}\n\n{email.get('body','')}")
+            try:
+                outputs.append(f"（本文内の計測リンク例）\n{build_tracking_url('preview-only', {'company':company_name})}")
+            except Exception:
+                pass
+
+        outputs.append("### 🤖 次アクション提案\n" + result.get("next_actions", ""))
+        outputs.append("### 🧩 インデックス更新ログ\n" + index_report)
+    except Exception:
+        tb = traceback.format_exc()
+        _log("[error] render failed\n" + tb)
+        outputs.append("### ⚠️ 出力整形エラー\n```\n" + tb + "\n```")
+
     return "\n\n".join(outputs)
 
-# --- Gradio UI（ルート / に設置） ---
+def get_health_text():
+    return "OK"
+
+def get_runtime_log():
+    try:
+        return "```\n" + _APP_LOG.getvalue() + "\n```"
+    except Exception:
+        return "（ログを取得できませんでした）"
+
+# ========= Gradio UI（ルート / に表示） =========
 with gr.Blocks(title="営業自動化 Agent Studio") as demo:
-    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="提案の目的/狙い（任意）", 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="生成温度")
-            run_btn = gr.Button("ワークフロー実行", variant="primary")
-        with gr.Column():
-            out = gr.Markdown()
-
-    # 疎通確認
-    ping_btn = gr.Button("Ping")
-    ping_out = gr.Markdown()
-    ping_btn.click(lambda: "pong 🎯", None, ping_out)
-
-    run_btn.click(
-        fn=ui_company_score_and_proposal,
-        inputs=[company_name, company_website, lead_email, urls_text, files, custom_objective, temperature],
-        outputs=[out]
-    )
-
-# --- FastAPI（/ = UI、/ui も / へ転送、/t と /health はAPI） ---
+    gr.Markdown("## 営業自動化 Agent Studio（Space内で完結）")
+
+    with gr.Tab("アプリ"):
+        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="提案の目的/狙い（任意）", 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="生成温度")
+                run_btn = gr.Button("ワークフロー実行", variant="primary")
+                ping_btn = gr.Button("Ping（疎通）")
+            with gr.Column():
+                out = gr.Markdown()
+                ping_out = gr.Markdown()
+
+        run_btn.click(
+            fn=ui_company_score_and_proposal,
+            inputs=[company_name, company_website, lead_email, urls_text, files, custom_objective, temperature],
+            outputs=[out]
+        )
+        ping_btn.click(lambda: "pong 🎯", None, ping_out)
+
+    with gr.Tab("ステータス / ログ"):
+        health_btn = gr.Button("ヘルスチェック")
+        health_out = gr.Markdown()
+        log_btn = gr.Button("アプリログを表示")
+        log_out = gr.Markdown(value="（ここに実行ログが表示されます）")
+
+        health_btn.click(fn=get_health_text, inputs=None, outputs=health_out)
+        log_btn.click(fn=get_runtime_log, inputs=None, outputs=log_out)
+
+# ========= FastAPI（/ はUI、/t と /health はAPI。/ui に来た人は / へ転送） =========
 app = FastAPI(title="Agent Studio - Docker (root UI)")
 app.add_middleware(
     CORSMiddleware,
@@ -121,12 +161,11 @@ app.add_exception_handler(Exception, _exception_printer)
 def health():
     return {"ok": True}
 
-# /ui に来た人も UI（/）へ転送しておく
 @app.get("/ui")
 def old_ui():
+    # 旧リンクで来た場合も Space 内で完結して同じページを表示
     return RedirectResponse(url="/")
 
-# クリック計測
 @app.get("/t/{token}")
 def track_click(token: str, request: Request):
     try:
@@ -141,7 +180,8 @@ def track_click(token: str, request: Request):
         return RedirectResponse(url=redirect_to)
     except Exception as e:
         tb = "".join(traceback.format_exception(type(e), e, e.__traceback__))
+        _log("[error] tracking failed\n" + tb)
         return PlainTextResponse(f"tracking error\n\n{tb}", status_code=500)
 
-# ルート（/）で Gradio を表示
+# ルート（/）で Gradio を表示（Space内完結）
 app = gr.mount_gradio_app(app, demo, path="/")