Merge branch 'main' into dev

NikkeTryHard · NikkeTryHard · commit f881fbb679ce · 2025-09-08T09:34:05.000-05:00
diff --git a/api_utils/app.py b/api_utils/app.py
@@ -30,7 +30,8 @@
     _initialize_page_logic,
     _close_page_logic,
     load_excluded_models,
-    _handle_initial_model_state_and_storage
+    _handle_initial_model_state_and_storage,
+    enable_temporary_chat_mode
 )
 
 import stream
@@ -141,6 +142,7 @@ async def _initialize_browser_and_page():
         server.page_instance, server.is_page_ready = await _initialize_page_logic(server.browser_instance)
         if server.is_page_ready:
             await _handle_initial_model_state_and_storage(server.page_instance)
+            await enable_temporary_chat_mode(server.page_instance)
             server.logger.info("Page initialized successfully.")
         else:
             server.logger.error("Page initialization failed.")
diff --git a/api_utils/auth_utils.py b/api_utils/auth_utils.py
@@ -2,7 +2,7 @@
 from typing import Set
 
 API_KEYS: Set[str] = set()
-KEY_FILE_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "key.txt")
+KEY_FILE_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "auth_profiles", "key.txt")
 
 def load_api_keys():
     """Loads API keys from the key file into the API_KEYS set."""
diff --git a/api_utils/routes.py b/api_utils/routes.py
@@ -327,7 +327,9 @@ async def add_api_key(request: ApiKeyRequest, logger: logging.Logger = Depends(g
         raise HTTPException(status_code=400, detail="该API密钥已存在。")
 
     try:
-        key_file_path = os.path.join(os.path.dirname(__file__), "..", "key.txt")
+        # --- MODIFIED LINE ---
+        # Use the centralized path from auth_utils
+        key_file_path = auth_utils.KEY_FILE_PATH
         with open(key_file_path, 'a+', encoding='utf-8') as f:
             f.seek(0)
             if f.read(): f.write("\n")
@@ -366,7 +368,9 @@ async def delete_api_key(request: ApiKeyRequest, logger: logging.Logger = Depend
         raise HTTPException(status_code=404, detail="API密钥不存在。")
 
     try:
-        key_file_path = os.path.join(os.path.dirname(__file__), "..", "key.txt")
+        # --- MODIFIED LINE ---
+        # Use the centralized path from auth_utils
+        key_file_path = auth_utils.KEY_FILE_PATH
         with open(key_file_path, 'r', encoding='utf-8') as f:
             lines = f.readlines()
         
diff --git a/browser_utils/__init__.py b/browser_utils/__init__.py
@@ -1,6 +1,6 @@
 # --- browser_utils/__init__.py ---
 # 浏览器操作工具模块
-from .initialization import _initialize_page_logic, _close_page_logic, signal_camoufox_shutdown
+from .initialization import _initialize_page_logic, _close_page_logic, signal_camoufox_shutdown, enable_temporary_chat_mode
 from .operations import (
     _handle_model_list_response,
     detect_and_extract_page_error,
@@ -28,6 +28,7 @@
     '_initialize_page_logic',
     '_close_page_logic', 
     'signal_camoufox_shutdown',
+    'enable_temporary_chat_mode',
     
     # 页面操作相关
     '_handle_model_list_response',
diff --git a/browser_utils/initialization.py b/browser_utils/initialization.py
@@ -422,8 +422,8 @@ async def _initialize_page_logic(browser: AsyncBrowser):
             await expect_async(input_wrapper_locator).to_be_visible(timeout=35000)
             await expect_async(found_page.locator(INPUT_SELECTOR)).to_be_visible(timeout=10000)
             logger.info("-> ✅ 核心输入区域可见。")
-
-            model_name_locator = found_page.locator('mat-select[data-test-ms-model-selector] div.model-option-content span.gmat-body-medium')
+            
+            model_name_locator = found_page.locator('[data-test-id="model-name"]')
             try:
                 model_name_on_page = await model_name_locator.first.inner_text(timeout=5000)
                 logger.info(f"-> 🤖 页面检测到的当前模型: {model_name_on_page}")
@@ -635,5 +635,35 @@ async def _handle_auth_file_save_auto(temp_context):
         logger.info(f"   认证状态已成功保存到: {auth_save_path}")
         print(f"   ✅ 认证状态已成功保存到: {auth_save_path}", flush=True)
     except Exception as save_state_err:
-        logger.error(f"   ❌ 保存认证状态失败: {save_state_err}", exc_info=True)
-        print(f"   ❌ 保存认证状态失败: {save_state_err}", flush=True)
+        logger.error(f"   ❌ 自动保存认证状态失败: {save_state_err}", exc_info=True)
+        print(f"   ❌ 自动保存认证状态失败: {save_state_err}", flush=True)
+
+async def enable_temporary_chat_mode(page: AsyncPage):
+    """
+    检查并启用 AI Studio 界面的“临时聊天”模式。
+    这是一个独立的UI操作，应该在页面完全稳定后调用。
+    """
+    try:
+        logger.info("-> (UI Op) 正在检查并启用 '临时聊天' 模式...")
+        
+        incognito_button_locator = page.locator('button[aria-label="Temporary chat toggle"]')
+        
+        await incognito_button_locator.wait_for(state="visible", timeout=10000)
+        
+        button_classes = await incognito_button_locator.get_attribute("class")
+        
+        if button_classes and 'ms-button-active' in button_classes:
+            logger.info("-> (UI Op) '临时聊天' 模式已激活。")
+        else:
+            logger.info("-> (UI Op) '临时聊天' 模式未激活，正在点击...")
+            await incognito_button_locator.click(timeout=5000, force=True)
+            await asyncio.sleep(1)
+            
+            updated_classes = await incognito_button_locator.get_attribute("class")
+            if updated_classes and 'ms-button-active' in updated_classes:
+                logger.info("✅ (UI Op) '临时聊天' 模式已成功启用。")
+            else:
+                logger.warning("⚠️ (UI Op) 点击后 '临时聊天' 模式状态验证失败。")
+
+    except Exception as e:
+        logger.warning(f"⚠️ (UI Op) 启用 '临时聊天' 模式时出错: {e}")
diff --git a/browser_utils/model_management.py b/browser_utils/model_management.py
@@ -274,27 +274,49 @@ async def switch_ai_studio_model(page: AsyncPage, model_id: str, req_id: str) ->
                     if m_obj.get("id") == model_id:
                         expected_display_name_for_target_id = m_obj.get("display_name")
                         break
+
+            try:
+                model_name_locator = page.locator('[data-test-id="model-name"]')
+                actual_displayed_model_id_on_page_raw = await model_name_locator.first.inner_text(timeout=5000)
+                actual_displayed_model_id_on_page = actual_displayed_model_id_on_page_raw.strip()
+                
+                target_model_id = model_id
+
+                if actual_displayed_model_id_on_page == target_model_id:
+                    page_display_match = True
+                    logger.info(f"[{req_id}] ✅ 页面显示模型ID ('{actual_displayed_model_id_on_page}') 与期望ID ('{target_model_id}') 一致。")
+                else:
+                    page_display_match = False
+                    logger.error(f"[{req_id}] ❌ 页面显示模型ID ('{actual_displayed_model_id_on_page}') 与期望ID ('{target_model_id}') 不一致。")
             
-            if not expected_display_name_for_target_id:
-                logger.warning(f"[{req_id}] 无法在parsed_model_list中找到目标ID '{model_id}' 的显示名称，跳过页面显示名称验证。这可能不准确。")
-                page_display_match = True
-            else:
+            except Exception as e_disp:
+                page_display_match = False # 读取失败则认为不匹配
+                logger.warning(f"[{req_id}] 读取页面显示的当前模型ID时出错: {e_disp}。将无法验证页面显示。")
+
+            if page_display_match:
                 try:
-                    model_name_locator = page.locator('mat-select[data-test-ms-model-selector] div.model-option-content span.gmat-body-medium')
-                    actual_displayed_model_name_on_page_raw = await model_name_locator.first.inner_text(timeout=5000)
-                    actual_displayed_model_name_on_page = actual_displayed_model_name_on_page_raw.strip()
-                    normalized_actual_display = actual_displayed_model_name_on_page.lower()
-                    normalized_expected_display = expected_display_name_for_target_id.strip().lower()
+                    logger.info(f"[{req_id}] 模型切换成功，重新启用 '临时聊天' 模式...")
+                    incognito_button_locator = page.locator('button[aria-label="Temporary chat toggle"]')
                     
-                    if normalized_actual_display == normalized_expected_display:
-                        page_display_match = True
-                        logger.info(f"[{req_id}] ✅ 页面显示模型 ('{actual_displayed_model_name_on_page}') 与期望 ('{expected_display_name_for_target_id}') 一致。")
+                    await incognito_button_locator.wait_for(state="visible", timeout=5000)
+                    
+                    button_classes = await incognito_button_locator.get_attribute("class")
+                    
+                    if button_classes and 'ms-button-active' in button_classes:
+                        logger.info(f"[{req_id}] '临时聊天' 模式已处于激活状态。")
                     else:
-                        logger.error(f"[{req_id}] ❌ 页面显示模型 ('{actual_displayed_model_name_on_page}') 与期望 ('{expected_display_name_for_target_id}') 不一致。(Raw page: '{actual_displayed_model_name_on_page_raw}')")
-                except Exception as e_disp:
-                    logger.warning(f"[{req_id}] 读取页面显示的当前模型名称时出错: {e_disp}。将无法验证页面显示。")
-            
-            if page_display_match:
+                        logger.info(f"[{req_id}] '临时聊天' 模式未激活，正在点击以开启...")
+                        await incognito_button_locator.click(timeout=3000)
+                        await asyncio.sleep(0.5)
+                        
+                        updated_classes = await incognito_button_locator.get_attribute("class")
+                        if updated_classes and 'ms-button-active' in updated_classes:
+                             logger.info(f"[{req_id}] ✅ '临时聊天' 模式已成功重新启用。")
+                        else:
+                             logger.warning(f"[{req_id}] ⚠️ 点击后 '临时聊天' 模式状态验证失败，可能未成功重新开启。")
+                
+                except Exception as e:
+                    logger.warning(f"[{req_id}] ⚠️ 模型切换后重新启用 '临时聊天' 模式失败: {e}")
                 return True
             else:
                 logger.error(f"[{req_id}] ❌ 模型切换失败，因为页面显示的模型与期望不符 (即使localStorage可能已更改)。")
@@ -306,7 +328,7 @@ async def switch_ai_studio_model(page: AsyncPage, model_id: str, req_id: str) ->
         current_displayed_name_for_revert_stripped = "无法读取"
         
         try:
-            model_name_locator_revert = page.locator('mat-select[data-test-ms-model-selector] div.model-option-content span.gmat-body-medium')
+            model_name_locator_revert = page.locator('[data-test-id="model-name"]')
             current_displayed_name_for_revert_raw = await model_name_locator_revert.first.inner_text(timeout=5000)
             current_displayed_name_for_revert_stripped = current_displayed_name_for_revert_raw.strip()
             logger.info(f"[{req_id}] 恢复：页面当前显示的模型名称 (原始: '{current_displayed_name_for_revert_raw}', 清理后: '{current_displayed_name_for_revert_stripped}')")
@@ -324,17 +346,9 @@ async def switch_ai_studio_model(page: AsyncPage, model_id: str, req_id: str) ->
             return False
         
         model_id_to_revert_to = None
-        if parsed_model_list and current_displayed_name_for_revert_stripped != "无法读取":
-            normalized_current_display_for_revert = current_displayed_name_for_revert_stripped.lower()
-            for m_obj in parsed_model_list:
-                parsed_list_display_name = m_obj.get("display_name", "").strip().lower()
-                if parsed_list_display_name == normalized_current_display_for_revert:
-                    model_id_to_revert_to = m_obj.get("id")
-                    logger.info(f"[{req_id}] 恢复：页面显示名称 '{current_displayed_name_for_revert_stripped}' 对应模型ID: {model_id_to_revert_to}")
-                    break
-            
-            if not model_id_to_revert_to:
-                logger.warning(f"[{req_id}] 恢复：无法在 parsed_model_list 中找到与页面显示名称 '{current_displayed_name_for_revert_stripped}' 匹配的模型ID。")
+        if current_displayed_name_for_revert_stripped != "无法读取":
+            model_id_to_revert_to = current_displayed_name_for_revert_stripped
+            logger.info(f"[{req_id}] 恢复：页面当前显示的ID是 '{model_id_to_revert_to}'，将直接用于恢复。")
         else:
             if current_displayed_name_for_revert_stripped == "无法读取":
                  logger.warning(f"[{req_id}] 恢复：因无法读取页面显示名称，故不能从 parsed_model_list 转换ID。")
@@ -529,7 +543,7 @@ async def _set_model_from_page_display(page: AsyncPage, set_storage: bool = Fals
     
     try:
         logger.info("   尝试从页面显示元素读取当前模型名称...")
-        model_name_locator = page.locator('mat-select[data-test-ms-model-selector] div.model-option-content span.gmat-body-medium')
+        model_name_locator = page.locator('[data-test-id="model-name"]')
         displayed_model_name_from_page_raw = await model_name_locator.first.inner_text(timeout=7000)
         displayed_model_name = displayed_model_name_from_page_raw.strip()
         logger.info(f"   页面当前显示模型名称 (原始: '{displayed_model_name_from_page_raw}', 清理后: '{displayed_model_name}')")
@@ -542,19 +556,10 @@ async def _set_model_from_page_display(page: AsyncPage, set_storage: bool = Fals
             except asyncio.TimeoutError: 
                 logger.warning("   等待模型列表超时，可能无法准确转换显示名称为ID。")
         
-        if parsed_model_list:
-            for model_obj in parsed_model_list:
-                if model_obj.get("display_name") and model_obj.get("display_name").strip() == displayed_model_name:
-                    found_model_id_from_display = model_obj.get("id")
-                    logger.info(f"   显示名称 '{displayed_model_name}' 对应模型 ID: {found_model_id_from_display}")
-                    break
-            
-            if not found_model_id_from_display:
-                 logger.warning(f"   未在已知模型列表中找到与显示名称 '{displayed_model_name}' 匹配的 ID。")
-        else:
-            logger.warning("   模型列表尚不可用，无法将显示名称转换为ID。")
+        found_model_id_from_display = displayed_model_name
+        logger.info(f"   页面显示的直接是模型ID: '{found_model_id_from_display}'")
         
-        new_model_value = found_model_id_from_display if found_model_id_from_display else displayed_model_name
+        new_model_value = found_model_id_from_display
         if server.current_ai_studio_model_id != new_model_value:
             server.current_ai_studio_model_id = new_model_value
             logger.info(f"   全局 current_ai_studio_model_id 已更新为: {server.current_ai_studio_model_id}")
diff --git a/browser_utils/page_controller.py b/browser_utils/page_controller.py
@@ -23,6 +23,7 @@
 )
 from models import ClientDisconnectedError
 from .operations import save_error_snapshot, _wait_for_response_completion, _get_final_response_content
+from .initialization import enable_temporary_chat_mode
 
 class PageController:
     """封装了与AI Studio页面交互的所有操作。"""
@@ -572,6 +573,8 @@ async def clear_chat_history(self, check_client_disconnected: Callable):
             if can_attempt_clear:
                 await self._execute_chat_clear(clear_chat_button_locator, confirm_button_locator, overlay_locator, check_client_disconnected)
                 await self._verify_chat_cleared(check_client_disconnected)
+                self.logger.info(f"[{self.req_id}] 聊天已清空，重新启用 '临时聊天' 模式...")
+                await enable_temporary_chat_mode(self.page)
 
         except Exception as e_clear:
             self.logger.error(f"[{self.req_id}] 清空聊天过程中发生错误: {e_clear}")
diff --git a/config/selectors.py b/config/selectors.py
@@ -10,17 +10,17 @@
 
 # --- 按钮选择器 ---
 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"]'
+CLEAR_CHAT_BUTTON_SELECTOR = 'button[data-test-clear="outside"][aria-label="New chat"]'
+CLEAR_CHAT_CONFIRM_BUTTON_SELECTOR = 'button.ms-button-primary:has-text("Discard and continue")'
+UPLOAD_BUTTON_SELECTOR = 'button[aria-label^="Insert assets"]'
 
 # --- 响应相关选择器 ---
 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'
+OVERLAY_SELECTOR = '.mat-mdc-dialog-inner-container'
 
 # --- 错误提示选择器 ---
 ERROR_TOAST_SELECTOR = 'div.toast.warning, div.toast.error'
@@ -39,11 +39,11 @@
 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'
+TOP_P_INPUT_SELECTOR = 'ms-slider input[type="number"][max="1"]'
+TEMPERATURE_INPUT_SELECTOR = 'ms-slider input[type="number"][max="2"]'
 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'
+GROUNDING_WITH_GOOGLE_SEARCH_TOGGLE_SELECTOR = 'div[data-test-id="searchAsAToolTooltip"] mat-slide-toggle button'
diff --git a/deprecated_javascript_version/server.cjs b/deprecated_javascript_version/server.cjs
