From c2761927adf1a51016500cf53078f7f09596e825 Mon Sep 17 00:00:00 2001 From: z060142 Date: Sun, 27 Apr 2025 23:14:21 +0800 Subject: [PATCH] Enhance Setup.py: persist window after saving and add script control buttons --- ClaudeCode.md | 12 +++++++ Setup.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 100 insertions(+), 9 deletions(-) diff --git a/ClaudeCode.md b/ClaudeCode.md index 92be772..7c8ff7f 100644 --- a/ClaudeCode.md +++ b/ClaudeCode.md @@ -424,6 +424,18 @@ Wolf Chat 是一個基於 MCP (Modular Capability Provider) 框架的聊天機 3. 恢復 UI 監控並重置狀態（清除 `recent_texts` 和 `last_processed_bubble_info`）。 - **效果**：將暫停/恢復 UI 監控的時序控制權移至 `ui_interaction.py` 內部，減少了模塊間的直接依賴和潛在干擾，依賴持續監控來確保最終視窗狀態。 +## 最近改進（2025-04-27） + +### Setup.py 功能增強 + +- **目的**：增強 `Setup.py` 設定工具的功能，使其在保存設定後保持開啟，並提供直接啟動和終止 Chat Bot 及 Test 腳本的按鈕。 +- **修改內容**： + - 修改 `save_settings` 方法，移除關閉視窗的邏輯，僅顯示保存成功的提示訊息。 + - 在 GUI 底部新增 "Run Chat Bot" 和 "Run Test" 按鈕，分別用於啟動 `main.py` 和 `test/llm_debug_script.py`。 + - 新增 "Stop Process" 按鈕，用於終止由上述兩個按鈕啟動的腳本。 + - 實現進程追蹤和按鈕狀態管理，確保在有腳本運行時禁用運行按鈕，啟用停止按鈕。 +- **效果**：提高了 `Setup.py` 的易用性，方便使用者在調整設定後直接啟動腳本進行測試，並提供了便捷的終止方式。 + ## 開發建議 ### 優化方向 diff --git a/Setup.py b/Setup.py index 197f773..2f4d80d 100644 --- a/Setup.py +++ b/Setup.py @@ -389,6 +389,9 @@ class WolfChatSetup(tk.Tk): # Create bottom buttons self.create_bottom_buttons() + # Initialize running process tracker + self.running_process = None + # Set initial states based on loaded data self.update_ui_from_data() @@ -844,17 +847,27 @@ class WolfChatSetup(tk.Tk): version_label = ttk.Label(btn_frame, text=f"v{VERSION}") version_label.pack(side=tk.LEFT, padx=5) - # Install dependencies button - install_deps_btn = ttk.Button(btn_frame, text="Install Dependencies", command=self.install_dependencies) - install_deps_btn.pack(side=tk.RIGHT, padx=5) + # Action buttons on right (order matters for packing) + cancel_btn = ttk.Button(btn_frame, text="Cancel", command=self.quit) + cancel_btn.pack(side=tk.RIGHT, padx=5) - # Action buttons on right save_btn = ttk.Button(btn_frame, text="Save Settings", command=self.save_settings) save_btn.pack(side=tk.RIGHT, padx=5) - cancel_btn = ttk.Button(btn_frame, text="Cancel", command=self.quit) - cancel_btn.pack(side=tk.RIGHT, padx=5) - + install_deps_btn = ttk.Button(btn_frame, text="Install Dependencies", command=self.install_dependencies) + install_deps_btn.pack(side=tk.RIGHT, padx=5) + + # Run buttons + self.run_test_btn = ttk.Button(btn_frame, text="Run Test", command=self.run_test_script) + self.run_test_btn.pack(side=tk.RIGHT, padx=5) + + self.run_bot_btn = ttk.Button(btn_frame, text="Run Chat Bot", command=self.run_chat_bot) + self.run_bot_btn.pack(side=tk.RIGHT, padx=5) + + # Stop button + self.stop_btn = ttk.Button(btn_frame, text="Stop Process", command=self.stop_process, state=tk.DISABLED) + self.stop_btn.pack(side=tk.RIGHT, padx=5) + def install_dependencies(self): """Run the installation script for dependencies""" try: @@ -872,6 +885,72 @@ class WolfChatSetup(tk.Tk): except Exception as e: messagebox.showerror("Error", f"Failed to launch installer: {str(e)}") + def run_chat_bot(self): + """Run the main chat bot script""" + try: + import subprocess + import sys + if not os.path.exists("main.py"): + messagebox.showerror("Error", "Could not find main.py script") + return + + if self.running_process is not None: + messagebox.showwarning("Already Running", "Another process is already running. Please stop it first.") + return + + self.running_process = subprocess.Popen([sys.executable, "main.py"]) + print("Attempting to start main.py...") + self.update_run_button_states(False) # Disable run buttons, enable stop + except Exception as e: + messagebox.showerror("Error", f"Failed to launch main.py: {str(e)}") + self.update_run_button_states(True) # Re-enable buttons on failure + + def run_test_script(self): + """Run the LLM debug script""" + try: + import subprocess + import sys + test_script_path = os.path.join("test", "llm_debug_script.py") + if not os.path.exists(test_script_path): + messagebox.showerror("Error", f"Could not find {test_script_path}") + return + + if self.running_process is not None: + messagebox.showwarning("Already Running", "Another process is already running. Please stop it first.") + return + + self.running_process = subprocess.Popen([sys.executable, test_script_path]) + print(f"Attempting to start {test_script_path}...") + self.update_run_button_states(False) # Disable run buttons, enable stop + except Exception as e: + messagebox.showerror("Error", f"Failed to launch {test_script_path}: {str(e)}") + self.update_run_button_states(True) # Re-enable buttons on failure + + def stop_process(self): + """Stop the currently running process""" + if hasattr(self, 'running_process') and self.running_process is not None: + try: + print("Attempting to terminate running process...") + self.running_process.terminate() # Or .kill() for a more forceful stop + self.running_process = None + messagebox.showinfo("Process Stopped", "The running process has been terminated.") + except Exception as e: + messagebox.showerror("Error", f"Failed to terminate process: {str(e)}") + finally: + # Re-enable run buttons and disable stop button + self.update_run_button_states(True) + else: + messagebox.showinfo("No Process", "No process is currently running.") + + def update_run_button_states(self, enable): + """Enable or disable the run buttons and update stop button state""" + # Assuming run_bot_btn and run_test_btn exist and are class attributes + if hasattr(self, 'run_bot_btn'): + self.run_bot_btn.config(state=tk.NORMAL if enable else tk.DISABLED) + if hasattr(self, 'run_test_btn'): + self.run_test_btn.config(state=tk.NORMAL if enable else tk.DISABLED) + if hasattr(self, 'stop_btn'): + self.stop_btn.config(state=tk.DISABLED if enable else tk.NORMAL) def update_ui_from_data(self): """Update UI controls from loaded data""" @@ -1190,7 +1269,7 @@ class WolfChatSetup(tk.Tk): generate_config_file(self.config_data, self.env_data) messagebox.showinfo("Success", "Settings saved successfully.\nRestart Wolf Chat for changes to take effect.") - self.destroy() + # self.destroy() # Removed to keep the window open after saving except Exception as e: messagebox.showerror("Error", f"An error occurred while saving settings:\n{str(e)}") @@ -1202,4 +1281,4 @@ class WolfChatSetup(tk.Tk): # =============================================================== if __name__ == "__main__": app = WolfChatSetup() - app.mainloop() \ No newline at end of file + app.mainloop()