Update app.py

app.py

@@ -27,14 +27,11 @@ load_dotenv()
 class NotebookLMTool:
     def __init__(self):
         self.api_key = os.getenv("GEMINI_API_KEY")
-        self.client = None
-        if self.api_key:
-            self.client = genai.Client(api_key=self.api_key)
+        # 移除全域 client，改為動態建立以確保執行緒安全
 
     def set_key(self, user_key):
         if user_key and user_key.strip():
             self.api_key = user_key.strip()
-            self.client = genai.Client(api_key=self.api_key)
             return "✅ API Key 已更新！"
         return "⚠️ Key 無效"
 
@@ -49,15 +46,21 @@ class NotebookLMTool:
         except:
             return []
 
-    def _call_gemini_with_retry(self, model_name, contents, config=None, retries=5):
+    def _create_client(self):
+        """為每個執行緒建立獨立的 Client"""
+        if not self.api_key:
+            raise ValueError("API Key 未設定")
+        return genai.Client(api_key=self.api_key)
+
+    def _call_gemini_with_retry(self, client, model_name, contents, config=None, retries=5):
         """
-        封裝 Gemini 呼叫，加入指數退避重試機制 (Exponential Backoff)
+        封裝 Gemini 呼叫，加入指數退避重試機制
         """
         delay = 5 # 初始等待秒數
         
         for attempt in range(retries):
             try:
-                response = self.client.models.generate_content(
+                response = client.models.generate_content(
                     model=model_name,
                     contents=contents,
                     config=config
@@ -65,14 +68,14 @@ class NotebookLMTool:
                 return response
             except Exception as e:
                 error_str = str(e)
-                # 檢查是否為 Rate Limit 相關錯誤 (429, 503, Resource Exhausted)
+                # 檢查是否為 Rate Limit 相關錯誤
                 if "429" in error_str or "RESOURCE_EXHAUSTED" in error_str or "503" in error_str:
                     wait_time = delay + random.uniform(0, 3) 
                     print(f"⚠️ API 忙碌 (Attempt {attempt+1}/{retries})，休息 {wait_time:.1f} 秒...", flush=True)
                     time.sleep(wait_time)
-                    delay *= 1.5 # 遞增等待時間
+                    delay *= 1.5 
                 else:
-                    raise e # 其他錯誤 (如 400) 直接拋出
+                    raise e 
         
         raise Exception("API 重試多次失敗，請檢查配額。")
 
@@ -81,6 +84,13 @@ class NotebookLMTool:
         """處理單一頁面的：去字(背景) + 文字分析(Layout)"""
         print(f"🚀 [Page {page_index+1}] 啟動處理...", flush=True)
         
+        # 關鍵修改：在此處建立獨立的 Client，避免執行緒衝突
+        try:
+            local_client = self._create_client()
+        except Exception as e:
+            print(f"❌ [Page {page_index+1}] Client Init Error: {e}")
+            return None
+
         result = {
             "index": page_index,
             "bg_path": None,
@@ -107,8 +117,9 @@ class NotebookLMTool:
             3. Output ONLY the image.
             """
             
-            # ✅ 修正點 2: 使用 _call_gemini_with_retry 確保 429 時會重試
+            # 使用 gemini-2.5-flash-image (支援繪圖)
             resp_img = self._call_gemini_with_retry(
+                client=local_client,
                 model_name="gemini-2.5-flash-image", 
                 contents=[clean_prompt, img],
                 config=types.GenerateContentConfig(response_modalities=["IMAGE"])
@@ -139,7 +150,7 @@ class NotebookLMTool:
         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 
@@ -155,8 +166,9 @@ class NotebookLMTool:
             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
+            # 使用一般的 flash 模型做文字分析
             resp_layout = self._call_gemini_with_retry(
+                client=local_client,
                 model_name="gemini-2.5-flash", 
                 contents=[layout_prompt, img],
                 config=types.GenerateContentConfig(response_mime_type="application/json")
@@ -177,7 +189,7 @@ class NotebookLMTool:
         return result
 
     def process_pdf(self, pdf_file, progress=gr.Progress()):
-        if not self.client:
+        if not self.api_key:
             raise ValueError("請先輸入 Google API Key！")
         
         if pdf_file is None:
@@ -206,8 +218,7 @@ class NotebookLMTool:
         except Exception as e:
             raise ValueError(f"PDF 轉換失敗: {str(e)}")
 
-        # 3. 平行處理 (Parallel Execution with Safety)
-        # 降低併發數以適應免費版 API
+        # 3. 平行處理 (Parallel Execution)
         max_workers = 2 
         results_map = {} 
 
@@ -216,16 +227,17 @@ class NotebookLMTool:
         with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
             future_to_page = {}
             for i, img in enumerate(images):
-                time.sleep(1.5) # 稍微加大間隔，避免同時撞牆
+                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()
-                    results_map[res["index"]] = res
-                    total_input_tokens += res["tokens_in"]
-                    total_output_tokens += res["tokens_out"]
+                    if res:
+                        results_map[res["index"]] = res
+                        total_input_tokens += res["tokens_in"]
+                        total_output_tokens += res["tokens_out"]
                 except Exception as exc:
                     print(f"Page processing generated an exception: {exc}")
 
@@ -331,7 +343,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="📦 下載完整包")