Merge pull request #280 from NikkeTryHard/main

fix: Update selectors for Google AI Studio UI changes and fix test mocks (#278)

Author: NikkeTryHard

browser_utils/initialization/core.py

@@ -293,7 +293,11 @@ async def initialize_page_logic(
         await found_page.bring_to_front()
 
         try:
-            input_wrapper_locator = found_page.locator("ms-prompt-input-wrapper")
+            input_wrapper_locator = found_page.locator(
+                "ms-prompt-box .prompt-box-container"
+            )
+            if await input_wrapper_locator.count() == 0:
+                input_wrapper_locator = found_page.locator("ms-prompt-box")
             await expect_async(input_wrapper_locator).to_be_visible(timeout=35000)
             await expect_async(found_page.locator(INPUT_SELECTOR)).to_be_visible(
                 timeout=10000

browser_utils/operations_modules/interactions.py

@@ -83,7 +83,7 @@ async def get_response_via_edit_button(
     edit_button = last_message_container.get_by_label("Edit")
     finish_edit_button = last_message_container.get_by_label("Stop editing")
     autosize_textarea_locator = last_message_container.locator("ms-autosize-textarea")
-    actual_textarea_locator = autosize_textarea_locator.locator("textarea")
+    actual_textarea_locator = last_message_container.locator("textarea")
 
     try:
         logger.info("   - 尝试悬停最后一条消息以显示 'Edit' 按钮...")
@@ -128,30 +128,38 @@ async def get_response_via_edit_button(
         textarea_failed = False
 
         try:
-            await expect_async(autosize_textarea_locator).to_be_visible(
-                timeout=CLICK_TIMEOUT_MS
-            )
-            check_client_disconnected("编辑响应 - autosize-textarea 可见后: ")
+            target_locator = autosize_textarea_locator
+            if await target_locator.count() == 0:
+                target_locator = actual_textarea_locator
 
-            try:
-                data_value_content = await autosize_textarea_locator.get_attribute(
-                    "data-value"
-                )
-                check_client_disconnected("编辑响应 - get_attribute data-value 后: ")
-                if data_value_content is not None:
-                    response_content = str(data_value_content)
-                    logger.info("   - 从 data-value 获取内容成功。")
-            except asyncio.CancelledError:
-                raise
-            except Exception as data_val_err:
-                logger.warning(f"   - 获取 data-value 失败: {data_val_err}")
-                check_client_disconnected(
-                    "编辑响应 - get_attribute data-value 错误后: "
-                )
+            if await target_locator.count() == 0:
+                raise RuntimeError("未找到可编辑的文本区域")
+
+            await expect_async(target_locator).to_be_visible(timeout=CLICK_TIMEOUT_MS)
+            check_client_disconnected("编辑响应 - 文本区域可见后: ")
+
+            if await autosize_textarea_locator.count() > 0 and response_content is None:
+                try:
+                    data_value_content = await autosize_textarea_locator.get_attribute(
+                        "data-value"
+                    )
+                    check_client_disconnected(
+                        "编辑响应 - get_attribute data-value 后: "
+                    )
+                    if data_value_content is not None:
+                        response_content = str(data_value_content)
+                        logger.info("   - 从 data-value 获取内容成功。")
+                except asyncio.CancelledError:
+                    raise
+                except Exception as data_val_err:
+                    logger.warning(f"   - 获取 data-value 失败: {data_val_err}")
+                    check_client_disconnected(
+                        "编辑响应 - get_attribute data-value 错误后: "
+                    )
 
-            if response_content is None:
+            if response_content is None and await actual_textarea_locator.count() > 0:
                 logger.info(
-                    "   - data-value 获取失败或为None，尝试从内部 textarea 获取 input_value..."
+                    "   - data-value 获取失败或不存在，尝试从 textarea 获取 input_value..."
                 )
                 try:
                     await expect_async(actual_textarea_locator).to_be_visible(

browser_utils/page_controller_modules/input.py

@@ -11,6 +11,7 @@
     PROMPT_TEXTAREA_SELECTOR,
     RESPONSE_CONTAINER_SELECTOR,
     SUBMIT_BUTTON_SELECTOR,
+    UPLOAD_BUTTON_SELECTOR,
 )
 from logging_utils import set_request_id
 from models import ClientDisconnectedError
@@ -28,8 +29,9 @@ async def submit_prompt(
         set_request_id(self.req_id)
         self.logger.info(f"填充并提交提示 ({len(prompt)} chars)...")
         prompt_textarea_locator = self.page.locator(PROMPT_TEXTAREA_SELECTOR)
-        autosize_wrapper_locator = self.page.locator(
-            "ms-prompt-input-wrapper ms-autosize-textarea"
+        autosize_wrapper_locator = self.page.locator("ms-prompt-box .text-wrapper")
+        legacy_autosize_wrapper = self.page.locator(
+            "ms-prompt-box ms-autosize-textarea"
         )
         submit_button_locator = self.page.locator(SUBMIT_BUTTON_SELECTOR)
 
@@ -50,10 +52,19 @@ async def submit_prompt(
                 """,
                 prompt,
             )
-            await autosize_wrapper_locator.evaluate(
-                '(element, text) => { element.setAttribute("data-value", text); }',
-                prompt,
-            )
+            autosize_target = autosize_wrapper_locator
+            if await autosize_target.count() == 0:
+                autosize_target = legacy_autosize_wrapper
+            if await autosize_target.count() > 0:
+                try:
+                    await autosize_target.first.evaluate(
+                        '(element, text) => { element.setAttribute("data-value", text); }',
+                        prompt,
+                    )
+                except Exception as autosize_err:
+                    self.logger.debug(
+                        f" autosize wrapper update skipped: {autosize_err}"
+                    )
             await self._check_disconnect(check_client_disconnected, "After Input Fill")
 
             # 上传（仅使用菜单 + 隐藏 input 设置文件；处理可能的授权弹窗）
@@ -162,9 +173,8 @@ async def _open_upload_menu_and_choose_file(self, files_list: List[str]) -> bool
             except Exception:
                 pass
 
-            trigger = self.page.locator(
-                'button[aria-label="Insert assets such as images, videos, files, or audio"]'
-            )
+            trigger = self.page.locator(UPLOAD_BUTTON_SELECTOR).first
+            await expect_async(trigger).to_be_visible(timeout=3000)
             await trigger.click()
             menu_container = self.page.locator("div.cdk-overlay-container")
             # 等待菜单显示
@@ -373,9 +383,9 @@ async def _simulate_drag_drop_files(
 
         candidates = [
             target_locator,
-            self.page.locator("ms-prompt-input-wrapper ms-autosize-textarea textarea"),
-            self.page.locator("ms-prompt-input-wrapper ms-autosize-textarea"),
-            self.page.locator("ms-prompt-input-wrapper"),
+            self.page.locator(PROMPT_TEXTAREA_SELECTOR),
+            self.page.locator("ms-prompt-box .text-wrapper"),
+            self.page.locator("ms-prompt-box"),
         ]
 
         last_err = None

config/selectors.py

@@ -4,18 +4,32 @@
 """
 
 # --- 输入相关选择器 ---
-PROMPT_TEXTAREA_SELECTOR = "ms-prompt-input-wrapper ms-autosize-textarea textarea"
+# 主输入 textarea 同时兼容 aria-label 及普通 textarea，防止结构再调整
+PROMPT_TEXTAREA_SELECTOR = (
+    "ms-prompt-box ms-autosize-textarea textarea, "
+    'ms-prompt-box textarea[aria-label="Enter a prompt"], '
+    "ms-prompt-box textarea"
+)
 INPUT_SELECTOR = PROMPT_TEXTAREA_SELECTOR
 INPUT_SELECTOR2 = PROMPT_TEXTAREA_SELECTOR
 
 # --- 按钮选择器 ---
-# 发送按钮：优先匹配 aria-label="Run" 的按钮；如页面结构变更，可退化到容器内的提交按钮。
-SUBMIT_BUTTON_SELECTOR = 'button[aria-label="Run"].run-button, ms-run-button button[type="submit"].run-button'
+# 发送按钮：优先匹配 prompt 区域内 aria-label="Run" 的提交按钮
+SUBMIT_BUTTON_SELECTOR = (
+    'ms-prompt-box ms-run-button button[aria-label="Run"], '
+    'ms-prompt-box button[aria-label="Run"][type="submit"], '
+    'button[aria-label="Run"].run-button, '
+    'ms-run-button button[type="submit"].run-button'
+)
 CLEAR_CHAT_BUTTON_SELECTOR = 'button[data-test-clear="outside"][aria-label="New chat"], button[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"]'
+UPLOAD_BUTTON_SELECTOR = (
+    'button[data-test-id="add-media-button"], '
+    'button[aria-label^="Insert assets"], '
+    'button[aria-label^="Insert images"]'
+)
 
 # --- 响应相关选择器 ---
 RESPONSE_CONTAINER_SELECTOR = "ms-chat-turn .chat-turn-container.model"
@@ -32,7 +46,9 @@
 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"
+MESSAGE_TEXTAREA_SELECTOR = (
+    "ms-chat-turn:last-child textarea, ms-chat-turn:last-child ms-text-chunk textarea"
+)
 FINISH_EDIT_BUTTON_SELECTOR = 'ms-chat-turn:last-child .actions-container button.toggle-edit-button[aria-label="Stop editing"]'
 
 # --- 菜单和复制相关选择器 ---