Upload app.py

app.py

@@ -181,7 +181,9 @@ def process_pdf(
         # プリセット選択時もテキストボックスを編集可能にする
         system_instruction = instruction_text or SYSTEM_PROMPTS[preset_name]
 
-    progress(0.1, desc="PDFを読み込み中...")
+    progress_cb = progress if callable(progress) else (lambda *args, **kwargs: None)
+
+    log_progress(progress_cb, 0.1, "PDFを読み込み中...")
 
     with tempfile.TemporaryDirectory() as temp_dir:
         # PDFファイルパス
@@ -193,11 +195,11 @@ def process_pdf(
             )
 
         # PDFを分割
-        progress(0.2, desc="PDFを分割中...")
+        log_progress(progress_cb, 0.2, "PDFを分割中...")
         split_pdf_paths = split_pdf(temp_pdf_path, temp_dir, pages_per_chunk)
 
         total_chunks = len(split_pdf_paths)
-        progress(0.3, desc=f"{total_chunks}個のチャンクに分割完了")
+        log_progress(progress_cb, 0.3, f"{total_chunks}個のチャンクに分割完了")
 
         # 各チャンクを最大3並列で処理
         markdown_results = {}
@@ -205,7 +207,7 @@ def process_pdf(
 
         with ThreadPoolExecutor(max_workers=max_workers) as executor:
             future_map = {}
-            for order_index, (start_page, pdf_path) in enumerate(split_pdf_paths, start=1):
+            for start_page, pdf_path in split_pdf_paths:
                 future = executor.submit(
                     process_pdf_chunk,
                     pdf_path=pdf_path,
@@ -228,19 +230,20 @@ def process_pdf(
                 markdown_results[start_page] = result
                 completed += 1
                 progress_value = 0.3 + 0.6 * (completed / total_chunks)
-                progress(
+                log_progress(
+                    progress_cb,
                     progress_value,
-                    desc=f"チャンク {completed}/{total_chunks} を処理中..."
+                    f"チャンク {completed}/{total_chunks} を処理中...",
                 )
 
         # 結果を結合
-        progress(0.9, desc="結果を結合中...")
+        log_progress(progress_cb, 0.9, "結果を結合中...")
 
         combined_markdown = "\n\n".join(
             markdown_results[page] for page in sorted(markdown_results.keys())
         )
 
-        progress(1.0, desc="完了！")
+        log_progress(progress_cb, 1.0, "完了！")
 
         return combined_markdown
 
@@ -254,6 +257,17 @@ def update_instruction_text(preset_name: str):
     return gr.update(value=SYSTEM_PROMPTS[preset_name])
 
 
+def log_progress(progress_cb, value: float, desc: str) -> None:
+    """進捗バー更新と同時にログへも出力"""
+
+    try:
+        progress_cb(value, desc=desc)
+    except TypeError:
+        progress_cb(value)
+
+    print(f"[Progress] {value * 100:.0f}% - {desc}", flush=True)
+
+
 def resolve_pdf_path(uploaded_pdf) -> str:
     """
     GradioのFileコンポーネントから渡される値を安全にファイルパスへ変換