Update app.py

app.py

@@ -52,9 +52,8 @@ class NotebookLMTool:
     def _call_gemini_with_retry(self, model_name, contents, config=None, retries=5):
         """
         封裝 Gemini 呼叫，加入指數退避重試機制 (Exponential Backoff)
-        專門處理 429 Resource Exhausted 錯誤
         """
-        delay = 10 # 初始等待秒數
+        delay = 5 # 初始等待秒數
         
         for attempt in range(retries):
             try:
@@ -65,22 +64,22 @@ class NotebookLMTool:
                 )
                 return response
             except Exception as e:
-                # 檢查是否為 Rate Limit 相關錯誤 (包含 429 或 Service Unavailable)
                 error_str = str(e)
+                # 檢查是否為 Rate Limit 相關錯誤 (429, 503, Resource Exhausted)
                 if "429" in error_str or "RESOURCE_EXHAUSTED" in error_str or "503" in error_str:
-                    wait_time = delay + random.uniform(0, 5) # 加入隨機抖動避免同時重試
-                    print(f"⚠️ 觸發 API 限制，暫停 {wait_time:.1f} 秒後重試 ({attempt+1}/{retries})...", flush=True)
+                    wait_time = delay + random.uniform(0, 3) 
+                    print(f"⚠️ API 忙碌 (Attempt {attempt+1}/{retries})，休息 {wait_time:.1f} 秒...", flush=True)
                     time.sleep(wait_time)
-                    delay *= 2 # 等待時間加倍 (10s -> 20s -> 40s...)
+                    delay *= 1.5 # 遞增等待時間
                 else:
-                    raise e # 其他錯誤直接拋出
+                    raise e # 其他錯誤 (如 400) 直接拋出
         
-        raise Exception("API 重試次數過多，請稍後再試。")
+        raise Exception("API 重試多次失敗，請檢查配額。")
 
     # --- 單頁處理邏輯 ---
     def process_single_page(self, page_index, img, img_output_dir):
         """處理單一頁面的：去字(背景) + 文字分析(Layout)"""
-        print(f"🚀 [Page {page_index+1}] 開始處理...", flush=True)
+        print(f"🚀 [Page {page_index+1}] 啟動處理...", flush=True)
         
         result = {
             "index": page_index,
@@ -96,7 +95,9 @@ class NotebookLMTool:
         final_bg_path = os.path.join(img_output_dir, save_name)
         bg_success = False
 
+        # ==========================================
         # 1. 背景去字 (Image Cleaning)
+        # ==========================================
         try:
             clean_prompt = """
             Strictly remove all text, titles, text-boxes, and bullet points from this slide image.
@@ -106,9 +107,9 @@ class NotebookLMTool:
             3. Output ONLY the image.
             """
             
-            # 使用帶重試機制的呼叫
+            # ✅ 修正點 2: 使用 _call_gemini_with_retry 確保 429 時會重試
             resp_img = self._call_gemini_with_retry(
-                model_name="gemini-2.0-flash-exp", 
+                model_name="gemini-2.5-flash-image", 
                 contents=[clean_prompt, img],
                 config=types.GenerateContentConfig(response_modalities=["IMAGE"])
             )
@@ -133,28 +134,30 @@ class NotebookLMTool:
                 result["bg_path"] = final_bg_path
                 result["preview"] = (final_bg_path, f"Page {page_index+1} Cleaned")
             else:
-                print(f"⚠️ [Page {page_index+1}] 去字失敗: 未回傳圖片", flush=True)
+                print(f"⚠️ [Page {page_index+1}] 去字失敗: 模型未回傳圖片", flush=True)
 
         except Exception as e:
             print(f"❌ [Page {page_index+1}] Clean Error: {e}", flush=True)
 
-        # 失敗回退原圖
+        # 失敗回退原圖 (但標記為失敗)
         if not bg_success:
             img.save(final_bg_path)
             result["bg_path"] = final_bg_path 
             result["preview"] = (final_bg_path, f"Page {page_index+1} (Original)")
-            result["log"] += f"[P{page_index+1}] Warning: Background cleaning failed (Rate Limit or Error).\n"
+            result["log"] += f"[P{page_index+1}] Warning: Background cleaning failed. Used original image.\n"
 
+        # ==========================================
         # 2. 文字與佈局分析 (Layout Analysis)
+        # ==========================================
         try:
             layout_prompt = """
             Analyze this slide. Return a JSON list of all text blocks.
             Each item: {"text": string, "box_2d": [ymin, xmin, ymax, xmax] (0-1000), "font_size": int, "color": hex, "is_bold": bool}
             """
             
-            # 使用帶重試機制的呼叫
+            # ✅ 修正點 3: 使用 _call_gemini_with_retry
             resp_layout = self._call_gemini_with_retry(
-                model_name="gemini-2.0-flash", 
+                model_name="gemini-2.5-flash", 
                 contents=[layout_prompt, img],
                 config=types.GenerateContentConfig(response_mime_type="application/json")
             )
@@ -211,14 +214,12 @@ class NotebookLMTool:
         progress(0.2, desc="🚀 AI 處理中 (已啟用速率保護)...")
         
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-            # 提交任務，但加入微小延遲避免瞬間併發過高
             future_to_page = {}
             for i, img in enumerate(images):
-                time.sleep(1) # 讓請求稍微錯開
+                time.sleep(1.5) # 稍微加大間隔，避免同時撞牆
                 future = executor.submit(self.process_single_page, i, img, img_output_dir)
                 future_to_page[future] = i
             
-            # 等待完成
             for future in concurrent.futures.as_completed(future_to_page):
                 try:
                     res = future.result()
@@ -234,8 +235,7 @@ class NotebookLMTool:
         cleaned_images_paths = [] 
         
         for i in range(len(images)):
-            if i not in results_map:
-                continue
+            if i not in results_map: continue
             res = results_map[i]
             
             full_text_log += res["log"]
@@ -331,7 +331,7 @@ with gr.Blocks(title="NotebookLM Slide Restorer，PPT.404", theme=gr.themes.Soft
             
             gr.Markdown("---")
             pdf_input = gr.File(label="上傳 PDF")
-            btn_process = gr.Button("🚀 開始還原 PPTX (平行加速版)", variant="primary")
+            btn_process = gr.Button("🚀 開始還原 PPTX (穩定修復版)", variant="primary")
         
         with gr.Column():
             out_zip = gr.File(label="📦 下載完整包")