Update app.py

app.py

@@ -17,16 +17,29 @@ DESCRIPTION = """
 **LLM: OpenAI**（環境変数 `OPENAI_API_KEY` を設定してください）
 """
 
+def _pdf_path_from_input(pdf_file):
+    """gr.File(type='filepath') は str、場合により file-like を返すことがあるので両対応"""
+    if pdf_file is None:
+        return None
+    if isinstance(pdf_file, str):
+        return pdf_file
+    return getattr(pdf_file, "name", None) or getattr(pdf_file, "path", None)
+
 def choose_source_text(source_text, url, pdf_file):
     log = ""
     text = (source_text or "").strip()
-    if pdf_file is not None:
+
+    # 1) PDF優先
+    pdf_path = _pdf_path_from_input(pdf_file)
+    if pdf_path:
         try:
-            text, lg = extract_pdf_file(pdf_file.name)
+            text, lg = extract_pdf_file(pdf_path)
             log = f"[PDF] {lg}"
             return text, log
         except Exception as e:
             log = f"[PDF] Error: {e}"
+
+    # 2) URL
     if url and url.strip():
         try:
             text, lg = fetch_url_text(url.strip())
@@ -34,8 +47,11 @@ def choose_source_text(source_text, url, pdf_file):
             return text, log
         except Exception as e:
             log = f"[URL] Error: {e}"
+
+    # 3) テキスト貼り付け
     if text:
         return text, "[TEXT] Using pasted text."
+
     raise ValueError("No valid source provided. Paste text, set a URL, or upload a PDF.")
 
 def run(company_name, brand_voice, region, language, tone, event_type, announce_date,
@@ -44,7 +60,7 @@ def run(company_name, brand_voice, region, language, tone, event_type, announce_
         goals = [g.strip() for g in (goals_text or "").split("\n") if g.strip()]
         chosen_text, ingest_log = choose_source_text(source_text, url, pdf_file)
 
-        # Cap input length for safety
+        # 入力長の安全上限
         MAX_CHARS = int(os.environ.get("MAX_SOURCE_CHARS", "20000"))
         chosen_text = chosen_text[:MAX_CHARS]
 
@@ -63,22 +79,17 @@ def run(company_name, brand_voice, region, language, tone, event_type, announce_
             include_esg=include_esg,
             include_ir=include_ir,
         )
+
         narrative = generate_narrative(seed)
         outputs = render_all(env, narrative, seed.company)
 
-        # create zip for download
         ts = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
         zip_path = os.path.join(tempfile.gettempdir(), f"onepass_outputs_{ts}.zip")
         make_zip_from_outputs(outputs, zip_path)
 
-        notion_result = None
-        gdocs_result = None
-        if do_notion:
-            notion_result = export_to_notion(outputs)
-        if do_gdocs:
-            gdocs_result = export_to_google_docs(outputs)
+        notion_result = export_to_notion(outputs) if do_notion else None
+        gdocs_result = export_to_google_docs(outputs) if do_gdocs else None
 
-        # Return individual markdowns + zip + exporter results
         press = outputs.get("press_release.md", "")
         lp = outputs.get("lp_section.md", "")
         sns = outputs.get("sns_thread.md", "")
@@ -95,8 +106,11 @@ def run(company_name, brand_voice, region, language, tone, event_type, announce_
             export_msg += f"Google Docs: {gdocs_result}\n"
 
         return press, lp, sns, pitch, esg, ir, zip_path, export_msg, chosen_text
+
     except Exception as e:
-        return (f"Error: {e}",) + ("",)*5 + (None, f"") + ("",)
+        # ここでスタックの要約を返して原因を掴みやすく
+        err = f"Error: {type(e).__name__}: {e}"
+        return (err,) + ("",)*5 + (None, err) + ("",)
 
 with gr.Blocks(title="One-Pass PR/IR Generator") as demo:
     gr.Markdown(DESCRIPTION)