Merge pull request #215 from CJackHwang/dev

同步Dev分支

Author: CJackHwang

.env.example

@@ -86,7 +86,7 @@ DEFAULT_TOP_P=0.95
 DEFAULT_STOP_SEQUENCES=["用户:"]
 
 # 是否在处理请求时自动打开并使用 "URL Context" 功能,此工具功能详情可参考:https://ai.google.dev/gemini-api/docs/url-context
-ENABLE_URL_CONTEXT=true
+ENABLE_URL_CONTEXT=false
 
 # 是否默认启用 "指定思考预算" 功能 (true/false),不启用时模型一般将自行决定思考预算
 # 当 API 请求中未提供 reasoning_effort 参数时将使用此值。

api_utils/utils.py

@@ -250,7 +250,8 @@ def prepare_combined_prompt(messages: List[Message], req_id: str) -> str:
     combined_parts = []
     system_prompt_content: Optional[str] = None
     processed_system_message_indices = set()
-    
+    images_list = []  # 将 image_list 的初始化移到循环外部
+
     # 处理系统消息
     for i, msg in enumerate(messages):
         if msg.role == 'system':
@@ -284,7 +285,6 @@ def prepare_combined_prompt(messages: List[Message], req_id: str) -> str:
         role = msg.role or 'unknown'
         role_prefix_ui = f"{role_map_ui.get(role, role.capitalize())}:\n"
         current_turn_parts = [role_prefix_ui]
-        images_list = []
 
         content = msg.content or ''
         content_str = ""

browser_utils/model_management.py

@@ -51,7 +51,7 @@ async def _verify_ui_state_settings(page: AsyncPage, req_id: str = "unknown") ->
             are_tools_open = prefs.get('areToolsOpen')
 
             # 检查是否需要更新
-            needs_update = (is_advanced_open is not True) or (are_tools_open is not False)
+            needs_update = (is_advanced_open is not True) or (are_tools_open is not True)
 
             result = {
                 'exists': True,
@@ -61,7 +61,7 @@ async def _verify_ui_state_settings(page: AsyncPage, req_id: str = "unknown") ->
                 'prefs': prefs
             }
 
-            logger.info(f"[{req_id}] UI状态验证结果: isAdvancedOpen={is_advanced_open}, areToolsOpen={are_tools_open}, needsUpdate={needs_update}")
+            logger.info(f"[{req_id}] UI状态验证结果: isAdvancedOpen={is_advanced_open}, areToolsOpen={are_tools_open} (期望: True), needsUpdate={needs_update}")
             return result
 
         except json.JSONDecodeError as e:
@@ -110,13 +110,13 @@ async def _force_ui_state_settings(page: AsyncPage, req_id: str = "unknown") ->
 
         # 强制设置关键配置
         prefs['isAdvancedOpen'] = True
-        prefs['areToolsOpen'] = False
+        prefs['areToolsOpen'] = True
 
         # 保存到localStorage
         prefs_str = json.dumps(prefs)
         await page.evaluate("(prefsStr) => localStorage.setItem('aiStudioUserPreference', prefsStr)", prefs_str)
 
-        logger.info(f"[{req_id}] 已强制设置: isAdvancedOpen=true, areToolsOpen=false")
+        logger.info(f"[{req_id}] 已强制设置: isAdvancedOpen=true, areToolsOpen=true")
 
         # 验证设置是否成功
         verify_state = await _verify_ui_state_settings(page, req_id)
@@ -231,7 +231,7 @@ async def switch_ai_studio_model(page: AsyncPage, model_id: str, req_id: str) ->
 
         # 为了保持兼容性，也更新当前的prefs对象
         current_prefs_for_modification["isAdvancedOpen"] = True
-        current_prefs_for_modification["areToolsOpen"] = False
+        current_prefs_for_modification["areToolsOpen"] = True
         await page.evaluate("(prefsStr) => localStorage.setItem('aiStudioUserPreference', prefsStr)", json.dumps(current_prefs_for_modification))
 
         logger.info(f"[{req_id}] localStorage 已更新，导航到 '{new_chat_url}' 应用新模型...")
@@ -362,7 +362,7 @@ async def switch_ai_studio_model(page: AsyncPage, model_id: str, req_id: str) ->
 
             # 为了保持兼容性，也更新当前的prefs对象
             base_prefs_for_final_revert["isAdvancedOpen"] = True
-            base_prefs_for_final_revert["areToolsOpen"] = False
+            base_prefs_for_final_revert["areToolsOpen"] = True
             logger.info(f"[{req_id}] 恢复：准备将 localStorage.promptModel 设置回页面实际显示的模型的路径: '{path_to_revert_to}'，并强制设置配置选项")
             await page.evaluate("(prefsStr) => localStorage.setItem('aiStudioUserPreference', prefsStr)", json.dumps(base_prefs_for_final_revert))
             logger.info(f"[{req_id}] 恢复：导航到 '{new_chat_url}' 以应用恢复到 '{model_id_to_revert_to}' 的 localStorage 设置...")
@@ -463,7 +463,7 @@ async def _handle_initial_model_state_and_storage(page: AsyncPage):
                     ui_state = await _verify_ui_state_settings(page, "initial")
                     if ui_state['needsUpdate']:
                         needs_reload_and_storage_update = True
-                        reason_for_reload = f"UI状态需要更新: isAdvancedOpen={ui_state['isAdvancedOpen']}, areToolsOpen={ui_state['areToolsOpen']}"
+                        reason_for_reload = f"UI状态需要更新: isAdvancedOpen={ui_state['isAdvancedOpen']}, areToolsOpen={ui_state['areToolsOpen']} (期望: True)"
                         logger.info(f"   判定需要刷新和存储更新: {reason_for_reload}")
                     else:
                         server.current_ai_studio_model_id = prompt_model_path.split('/')[-1]
@@ -577,12 +577,12 @@ async def _set_model_from_page_display(page: AsyncPage, set_storage: bool = Fals
             if not ui_state_success:
                 logger.warning(f"     UI状态设置失败，使用传统方法")
                 prefs_to_set["isAdvancedOpen"] = True
-                prefs_to_set["areToolsOpen"] = False
+                prefs_to_set["areToolsOpen"] = True
             else:
                 # 确保prefs_to_set也包含正确的设置
                 prefs_to_set["isAdvancedOpen"] = True
-                prefs_to_set["areToolsOpen"] = False
-            logger.info(f"     强制 isAdvancedOpen: true, areToolsOpen: false")
+                prefs_to_set["areToolsOpen"] = True
+            logger.info(f"     强制 isAdvancedOpen: true, areToolsOpen: true")
 
             if found_model_id_from_display:
                 new_prompt_model_path = f"models/{found_model_id_from_display}"
@@ -609,6 +609,6 @@ async def _set_model_from_page_display(page: AsyncPage, set_storage: bool = Fals
                     prefs_to_set[key] = val_default
 
             await page.evaluate("(prefsStr) => localStorage.setItem('aiStudioUserPreference', prefsStr)", json.dumps(prefs_to_set))
-            logger.info(f"   ✅ localStorage.aiStudioUserPreference 已更新。isAdvancedOpen: {prefs_to_set.get('isAdvancedOpen')}, areToolsOpen: {prefs_to_set.get('areToolsOpen')}, promptModel: '{prefs_to_set.get('promptModel', '未设置/保留原样')}'。")
+            logger.info(f"   ✅ localStorage.aiStudioUserPreference 已更新。isAdvancedOpen: {prefs_to_set.get('isAdvancedOpen')}, areToolsOpen: {prefs_to_set.get('areToolsOpen')} (期望: True), promptModel: '{prefs_to_set.get('promptModel', '未设置/保留原样')}'。")
     except Exception as e_set_disp:
         logger.error(f"   尝试从页面显示设置模型时出错: {e_set_disp}", exc_info=True) 

browser_utils/more_modles.js

@@ -23,44 +23,18 @@
     // 模型配置列表
     // 已按要求将 jfdksal98a 放到 blacktooth 的下面
     const MODELS_TO_INJECT = [
-        // Blacktooth 模型 (原 Toothless)
-        {
-            name: 'models/blacktooth-ab-test', // 已改为 blacktooth-ab-test
-            displayName: `🏴‍☠️ Blacktooth (脚本 ${SCRIPT_VERSION})`, // emoji 改为 🏴‍☠️，名称改为 Blacktooth
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        },
-        // --- jfdksal98a 模型已移动到此处 ---
-        {
-            name: 'models/jfdksal98a',
-            displayName: `🪐 jfdksal98a (脚本 ${SCRIPT_VERSION})`,
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        },
-        // --- 其他模型 ---
-        {
-            name: 'models/gemini-2.5-pro-preview-03-25',
-            displayName: `✨ Gemini 2.5 Pro 03-25 (脚本 ${SCRIPT_VERSION})`,
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        },
-        {
-            name: 'models/goldmane-ab-test',
-            displayName: `🦁 Goldmane (脚本 ${SCRIPT_VERSION})`,
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        },
-        {
-            name: 'models/claybrook-ab-test',
-            displayName: `💧 Claybrook (脚本 ${SCRIPT_VERSION})`,
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        },
-        {
-            name: 'models/frostwind-ab-test',
-            displayName: `❄️ Frostwind (脚本 ${SCRIPT_VERSION})`,
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        },
-        {
-            name: 'models/calmriver-ab-test',
-            displayName: `🌊 Calmriver (脚本 ${SCRIPT_VERSION})`,
-            description: `由脚本 ${SCRIPT_VERSION} 注入的模型`
-        }
+        { name: 'models/gemini-2.5-pro-preview-03-25', displayName: `✨ Gemini 2.5 Pro 03-25 (Script ${SCRIPT_VERSION})`, description: `Model injected by script ${SCRIPT_VERSION}` },
+        { name: 'models/gemini-2.5-pro-exp-03-25', displayName: `✨ Gemini 2.5 Pro 03-25 (Script ${SCRIPT_VERSION})`, description: `Model injected by script ${SCRIPT_VERSION}` },
+        { name: 'models/gemini-2.5-pro-preview-06-05', displayName: `✨ Gemini 2.5 Pro 03-25 (Script ${SCRIPT_VERSION})`, description: `Model injected by script ${SCRIPT_VERSION}` },
+
+        //下面模型已经失效，留下来怀念
+        // { name: 'models/blacktooth-ab-test', displayName: `🏴‍☠️ Blacktooth (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` },
+        // { name: 'models/jfdksal98a', displayName: `🪐 jfdksal98a (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` },
+        // { name: 'models/gemini-2.5-pro-preview-03-25', displayName: `✨ Gemini 2.5 Pro 03-25 (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` },
+        // { name: 'models/goldmane-ab-test', displayName: `🦁 Goldmane (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` },
+        // { name: 'models/claybrook-ab-test', displayName: `💧 Claybrook (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` },
+        // { name: 'models/frostwind-ab-test', displayName: `❄️ Frostwind (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` },
+        // { name: 'models/calmriver-ab-test', displayName: `🌊 Calmriver (脚本 ${SCRIPT_VERSION})`, description: `由脚本 ${SCRIPT_VERSION} 注入的模型` }
     ];
 
     // JSON 结构中的字段索引

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):
         """