feat(config): 修复思考预算功能并增强启动逻辑

本次提交包含多项修复和改进，主要解决了“Set thinking budget”功能在特定配置下被意外触发以及相关UI交互失败的问题。

主要修改如下：
- **修复启动加载顺序**: 调整了 `launch_camoufox.py` 的代码，确保 `.env` 环境配置文件在导入任何应用模块之前被加载，解决了因加载顺序不当导致配置失效的问题。
- **增强服务独立性**: 为 `server.py` 添加了 `load_dotenv()` 调用，使其在独立运行时也能正确加载环境配置，提高了程序的健壮性。
- **修正思考预算逻辑**: 修改了 `browser_utils/page_controller.py` 中的 `_handle_thinking_budget` 函数，正确处理 `reasoning_effort: 'none'` 的情况，将其视为禁用“Set thinking budget”功能。
- **改进工具面板交互**: 将展开高级设置工具面板的逻辑从特定功能的判断中独立出来，确保在需要调整任何高级设置（如思考预算、URL上下文等）前，面板都处于展开状态，避免了因面板折叠导致的元素定位失败。
- **更新选择器**: 修正了 `config/selectors.py` 中 `THINKING_BUDGET_INPUT_SELECTOR` 的 XPath，使其能够正确定位到嵌套在额外 `div` 中的思考预算输入框。

Author: liucong2013

browser_utils/page_controller.py

@@ -62,6 +62,9 @@ async def adjust_parameters(self, request_params: Dict[str, Any], page_params_ca
         await self._adjust_top_p(top_p_to_set, check_client_disconnected)
         await self._check_disconnect(check_client_disconnected, "End Parameter Adjustment")
 
+        # 确保工具面板已展开，以便调整高级设置
+        await self._ensure_tools_panel_expanded(check_client_disconnected)
+
         # 调整URL CONTEXT
         if ENABLE_URL_CONTEXT:
             await self._open_url_content(check_client_disconnected)
@@ -77,9 +80,16 @@ async def adjust_parameters(self, request_params: Dict[str, Any], page_params_ca
     async def _handle_thinking_budget(self, request_params: Dict[str, Any], check_client_disconnected: Callable):
         """处理思考预算的调整逻辑。"""
         reasoning_effort = request_params.get('reasoning_effort')
-        if reasoning_effort is not None:
-            # 用户指定了，则开启并设置
-            self.logger.info(f"[{self.req_id}] 用户指定了 reasoning_effort: {reasoning_effort}。")
+
+        # 检查用户是否明确禁用了思考预算
+        should_disable_budget = isinstance(reasoning_effort, str) and reasoning_effort.lower() == 'none'
+
+        if should_disable_budget:
+            self.logger.info(f"[{self.req_id}] 用户通过 reasoning_effort='none' 明确禁用思考预算。")
+            await self._control_thinking_budget_toggle(should_be_checked=False, check_client_disconnected=check_client_disconnected)
+        elif reasoning_effort is not None:
+            # 用户指定了非 'none' 的值，则开启并设置
+            self.logger.info(f"[{self.req_id}] 用户指定了 reasoning_effort: {reasoning_effort}，将启用并设置思考预算。")
             await self._control_thinking_budget_toggle(should_be_checked=True, check_client_disconnected=check_client_disconnected)
             await self._adjust_thinking_budget(reasoning_effort, check_client_disconnected)
         else:
@@ -209,27 +219,50 @@ async def _adjust_google_search(self, request_params: Dict[str, Any], check_clie
             if isinstance(e, ClientDisconnectedError):
                  raise
 
-    async def _open_url_content(self,check_client_disconnected: Callable):
+    async def _ensure_tools_panel_expanded(self, check_client_disconnected: Callable):
+        """确保包含高级工具（URL上下文、思考预算等）的面板是展开的。"""
+        self.logger.info(f"[{self.req_id}] 检查并确保工具面板已展开...")
         try:
             collapse_tools_locator = self.page.locator('button[aria-label="Expand or collapse tools"]')
+            await expect_async(collapse_tools_locator).to_be_visible(timeout=5000)
+            
             grandparent_locator = collapse_tools_locator.locator("xpath=../..")
+            class_string = await grandparent_locator.get_attribute("class", timeout=3000)
 
-            # 3. 获取祖父级元素的 class 属性值
-            # get_attribute 返回一个包含所有 class 的字符串，例如 "menu dropdown active"
-            class_string = await grandparent_locator.get_attribute("class")
-
-            # 4. 在 Python 中进行判断
-            # 确保 class_string 不是 None，并且 'expanded' 是一个独立的 class
             if class_string and "expanded" not in class_string.split():
+                self.logger.info(f"[{self.req_id}] 工具面板未展开，正在点击以展开...")
                 await collapse_tools_locator.click(timeout=CLICK_TIMEOUT_MS)
-                await asyncio.sleep(0.5)
+                await self._check_disconnect(check_client_disconnected, "展开工具面板后")
+                # 等待展开动画完成
+                await expect_async(grandparent_locator).to_have_class(re.compile(r'.*expanded.*'), timeout=5000)
+                self.logger.info(f"[{self.req_id}] ✅ 工具面板已成功展开。")
+            else:
+                self.logger.info(f"[{self.req_id}] 工具面板已处于展开状态。")
+        except Exception as e:
+            self.logger.error(f"[{self.req_id}] ❌ 展开工具面板时发生错误: {e}")
+            # 即使出错，也继续尝试执行后续操作，但记录错误
+            if isinstance(e, ClientDisconnectedError):
+                raise
+
+    async def _open_url_content(self,check_client_disconnected: Callable):
+        """仅负责打开 URL Context 开关，前提是面板已展开。"""
+        try:
+            self.logger.info(f"[{self.req_id}] 检查并启用 URL Context 开关...")
             use_url_content_selector = self.page.locator(USE_URL_CONTEXT_SELECTOR)
+            await expect_async(use_url_content_selector).to_be_visible(timeout=5000)
+            
             is_checked = await use_url_content_selector.get_attribute("aria-checked")
             if "false" == is_checked:
+                self.logger.info(f"[{self.req_id}] URL Context 开关未开启，正在点击以开启...")
                 await use_url_content_selector.click(timeout=CLICK_TIMEOUT_MS)
-                await self._check_disconnect(check_client_disconnected, "点击URLCONTEXT")
+                await self._check_disconnect(check_client_disconnected, "点击URLCONTEXT后")
+                self.logger.info(f"[{self.req_id}] ✅ URL Context 开关已点击。")
+            else:
+                self.logger.info(f"[{self.req_id}] URL Context 开关已处于开启状态。")
         except Exception as e:
-            self.logger.error(f"[{self.req_id}] ❌ 操作USE_URL_CONTEXT_SELECTOR时发生错误:{e}。")
+            self.logger.error(f"[{self.req_id}] ❌ 操作 USE_URL_CONTEXT_SELECTOR 时发生错误:{e}。")
+            if isinstance(e, ClientDisconnectedError):
+                raise
 
     async def _control_thinking_budget_toggle(self, should_be_checked: bool, check_client_disconnected: Callable):
         """

config/selectors.py

@@ -1,49 +1,49 @@
-"""
-CSS选择器配置模块
-包含所有用于页面元素定位的CSS选择器
-"""
-
-# --- 输入相关选择器 ---
-PROMPT_TEXTAREA_SELECTOR = 'ms-prompt-input-wrapper ms-autosize-textarea textarea'
-INPUT_SELECTOR = PROMPT_TEXTAREA_SELECTOR
-INPUT_SELECTOR2 = PROMPT_TEXTAREA_SELECTOR
-
-# --- 按钮选择器 ---
-SUBMIT_BUTTON_SELECTOR = 'button[aria-label="Run"].run-button'
-CLEAR_CHAT_BUTTON_SELECTOR = 'button[data-test-clear="outside"][aria-label="Clear chat"]'
-CLEAR_CHAT_CONFIRM_BUTTON_SELECTOR = 'button.mdc-button:has-text("Continue")'
-UPLOAD_BUTTON_SELECTOR = 'button[aria-label="Upload File"]'
-
-# --- 响应相关选择器 ---
-RESPONSE_CONTAINER_SELECTOR = 'ms-chat-turn .chat-turn-container.model'
-RESPONSE_TEXT_SELECTOR = 'ms-cmark-node.cmark-node'
-
-# --- 加载和状态选择器 ---
-LOADING_SPINNER_SELECTOR = 'button[aria-label="Run"].run-button svg .stoppable-spinner'
-OVERLAY_SELECTOR = 'div.cdk-overlay-backdrop'
-
-# --- 错误提示选择器 ---
-ERROR_TOAST_SELECTOR = 'div.toast.warning, div.toast.error'
-
-# --- 编辑相关选择器 ---
-EDIT_MESSAGE_BUTTON_SELECTOR = 'ms-chat-turn:last-child .actions-container button.toggle-edit-button'
-MESSAGE_TEXTAREA_SELECTOR = 'ms-chat-turn:last-child ms-text-chunk ms-autosize-textarea'
-FINISH_EDIT_BUTTON_SELECTOR = 'ms-chat-turn:last-child .actions-container button.toggle-edit-button[aria-label="Stop editing"]'
-
-# --- 菜单和复制相关选择器 ---
-MORE_OPTIONS_BUTTON_SELECTOR = 'div.actions-container div ms-chat-turn-options div > button'
-COPY_MARKDOWN_BUTTON_SELECTOR = 'button.mat-mdc-menu-item:nth-child(4)'
-COPY_MARKDOWN_BUTTON_SELECTOR_ALT = 'div[role="menu"] button:has-text("Copy Markdown")'
-
-# --- 设置相关选择器 ---
-MAX_OUTPUT_TOKENS_SELECTOR = 'input[aria-label="Maximum output tokens"]'
-STOP_SEQUENCE_INPUT_SELECTOR = 'input[aria-label="Add stop token"]'
-MAT_CHIP_REMOVE_BUTTON_SELECTOR = 'mat-chip-set mat-chip-row button[aria-label*="Remove"]'
-TOP_P_INPUT_SELECTOR = 'div.settings-item-column:has(h3:text-is("Top P")) input[type="number"].slider-input'
-TEMPERATURE_INPUT_SELECTOR = 'div[data-test-id="temperatureSliderContainer"] input[type="number"].slider-input'
-USE_URL_CONTEXT_SELECTOR = 'button[aria-label="Browse the url context"]'
-SET_THINKING_BUDGET_TOGGLE_SELECTOR = 'button[aria-label="Toggle thinking budget between auto and manual"]'
-# Thinking budget slider input
-THINKING_BUDGET_INPUT_SELECTOR = 'xpath=//div[contains(@class, "settings-item") and .//p[normalize-space()="Set thinking budget"]]/following-sibling::div[contains(@class, "item-input")]//input[@type="number"]'
-# --- Google Search Grounding ---
+"""
+CSS选择器配置模块
+包含所有用于页面元素定位的CSS选择器
+"""
+
+# --- 输入相关选择器 ---
+PROMPT_TEXTAREA_SELECTOR = 'ms-prompt-input-wrapper ms-autosize-textarea textarea'
+INPUT_SELECTOR = PROMPT_TEXTAREA_SELECTOR
+INPUT_SELECTOR2 = PROMPT_TEXTAREA_SELECTOR
+
+# --- 按钮选择器 ---
+SUBMIT_BUTTON_SELECTOR = 'button[aria-label="Run"].run-button'
+CLEAR_CHAT_BUTTON_SELECTOR = 'button[data-test-clear="outside"][aria-label="Clear chat"]'
+CLEAR_CHAT_CONFIRM_BUTTON_SELECTOR = 'button.mdc-button:has-text("Continue")'
+UPLOAD_BUTTON_SELECTOR = 'button[aria-label="Upload File"]'
+
+# --- 响应相关选择器 ---
+RESPONSE_CONTAINER_SELECTOR = 'ms-chat-turn .chat-turn-container.model'
+RESPONSE_TEXT_SELECTOR = 'ms-cmark-node.cmark-node'
+
+# --- 加载和状态选择器 ---
+LOADING_SPINNER_SELECTOR = 'button[aria-label="Run"].run-button svg .stoppable-spinner'
+OVERLAY_SELECTOR = 'div.cdk-overlay-backdrop'
+
+# --- 错误提示选择器 ---
+ERROR_TOAST_SELECTOR = 'div.toast.warning, div.toast.error'
+
+# --- 编辑相关选择器 ---
+EDIT_MESSAGE_BUTTON_SELECTOR = 'ms-chat-turn:last-child .actions-container button.toggle-edit-button'
+MESSAGE_TEXTAREA_SELECTOR = 'ms-chat-turn:last-child ms-text-chunk ms-autosize-textarea'
+FINISH_EDIT_BUTTON_SELECTOR = 'ms-chat-turn:last-child .actions-container button.toggle-edit-button[aria-label="Stop editing"]'
+
+# --- 菜单和复制相关选择器 ---
+MORE_OPTIONS_BUTTON_SELECTOR = 'div.actions-container div ms-chat-turn-options div > button'
+COPY_MARKDOWN_BUTTON_SELECTOR = 'button.mat-mdc-menu-item:nth-child(4)'
+COPY_MARKDOWN_BUTTON_SELECTOR_ALT = 'div[role="menu"] button:has-text("Copy Markdown")'
+
+# --- 设置相关选择器 ---
+MAX_OUTPUT_TOKENS_SELECTOR = 'input[aria-label="Maximum output tokens"]'
+STOP_SEQUENCE_INPUT_SELECTOR = 'input[aria-label="Add stop token"]'
+MAT_CHIP_REMOVE_BUTTON_SELECTOR = 'mat-chip-set mat-chip-row button[aria-label*="Remove"]'
+TOP_P_INPUT_SELECTOR = 'div.settings-item-column:has(h3:text-is("Top P")) input[type="number"].slider-input'
+TEMPERATURE_INPUT_SELECTOR = 'div[data-test-id="temperatureSliderContainer"] input[type="number"].slider-input'
+USE_URL_CONTEXT_SELECTOR = 'button[aria-label="Browse the url context"]'
+SET_THINKING_BUDGET_TOGGLE_SELECTOR = 'button[aria-label="Toggle thinking budget between auto and manual"]'
+# Thinking budget slider input
+THINKING_BUDGET_INPUT_SELECTOR = '//div[contains(@class, "settings-item") and .//p[normalize-space()="Set thinking budget"]]/following-sibling::div//input[@type="number"]'
+# --- Google Search Grounding ---
 GROUNDING_WITH_GOOGLE_SEARCH_TOGGLE_SELECTOR = 'div[data-test-id="searchAsAToolTooltip"] mat-slide-toggle button'

launch_camoufox.py

@@ -20,12 +20,13 @@
 import shutil
 
 # --- 新的导入 ---
-import uvicorn
-from server import app # 从 server.py 导入 FastAPI app 对象
 from dotenv import load_dotenv
 
-# 加载 .env 文件
+# 提前加载 .env 文件，以确保后续导入的模块能获取到正确的环境变量
 load_dotenv()
+
+import uvicorn
+from server import app # 从 server.py 导入 FastAPI app 对象
 # -----------------
 
 # 尝试导入 launch_server (用于内部启动模式，模拟 Camoufox 行为)