Jarvis-Brain 0.1.11.6__py3-none-any.whl → 0.1.11.8__py3-none-any.whl

{jarvis_brain-0.1.11.6.dist-info → jarvis_brain-0.1.11.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.11.6
+Version: 0.1.11.8
 Summary: Jarvis brain mcp
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4

{jarvis_brain-0.1.11.6.dist-info → jarvis_brain-0.1.11.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mcp_tools/__init__.py,sha256=_ZzedxbxmVkdRH00ONOjQR31pZW-B8WPn5P2qE6T-Iw,3012
-mcp_tools/dp_tools.py,sha256=p38nI0t5-T_jMjtHE94jL3W1IACp9-WQEmoU32XB99k,18513
+mcp_tools/dp_tools.py,sha256=Q-qfUG-TVhyFNtS0c412nGXUR9CsLQ29tPCG7N6pQRQ,18975
 mcp_tools/main.py,sha256=Fgq2PPuc7XCCwXCSVsyoADB0z1vI_gZ07lnLChcrjjg,1167
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
 tools/browser_proxy.py,sha256=VAhuVrBIoXmKyXvCmJh4eRYCWpLIhbTYmFHK8l8eoTA,6590
 tools/tools.py,sha256=KvBzefiQbgR-Qa1FsTOGMbVuwTzrK3iXXJgZuFU3UVg,10926
-jarvis_brain-0.1.11.6.dist-info/METADATA,sha256=sQwWdI8iH6YC5YVcauXwvj2I7kq3B1gLJTDDfElHjNI,264
-jarvis_brain-0.1.11.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.11.6.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.11.6.dist-info/RECORD,,
+jarvis_brain-0.1.11.8.dist-info/METADATA,sha256=qG_EZ8RHwn25krz9Hv8cgy-cAvU1JsdkA80qiloZYiQ,264
+jarvis_brain-0.1.11.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.11.8.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.11.8.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -237,27 +237,33 @@ def register_assert_waf(mcp: FastMCP, browser_manager):
 
 
 def register_click_action(mcp: FastMCP, browser_manager):
-    @mcp.tool(name="click_action", description="尝试点击tab页中的元素，返回元素是否可以被点击，以及是否点击成功。")
-    async def click_action(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
+    @mcp.tool(name="click_action",
+              description="尝试点击tab页中的元素，返回元素是否可以被点击，以及是否点击成功。"
+                          "其中target_element_index默认为0，当传入的Selector可以定位到多个元素时，需要传入target_element_index指定具体点击目标 ")
+    async def click_action(browser_port: int, tab_id: str, css_selector: str, target_element_index: int = 0) -> dict[
+        str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         target_tab = _browser.get_tab(tab_id)
         css_selector = css_selector
         if "css:" not in css_selector:
             css_selector = "css:" + css_selector
         target_eles = target_tab.eles(css_selector)
-        click_success = False
-        element_clickable = False
-        if len(target_eles) == 1:
-            target_element = target_eles[0]
-            element_clickable = target_element.states.is_clickable
-            try:
-                target_element.click()
-                click_success = True
-            except Exception as e:
-                click_success = False
-            message = f"tab页:【{tab_id}】点击【{css_selector}】 {'成功' if click_success else '失败'} 了"
+        # click_success = False
+        # element_clickable = False
+        # if len(target_eles) == 1:
+        target_element = target_eles[target_element_index]
+        element_clickable = target_element.states.is_clickable
+        try:
+            target_element.click()
+            click_success = True
+        except Exception as e:
+            click_success = False
+        if target_element_index > 0:
+            message = f"tab页:【{tab_id}】点击【{css_selector}】【index={target_element_index}】的元素 {'成功' if click_success else '失败'} 了"
         else:
-            message = f"tab页:【{tab_id}】传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
+            message = f"tab页:【{tab_id}】点击【{css_selector}】 {'成功' if click_success else '失败'} 了"
+        # else:
+        #     message = f"tab页:【{tab_id}】传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
         return dp_mcp_message_pack(
             message=message,
             browser_port=browser_port,
@@ -319,7 +325,7 @@ def register_get_screenshot(mcp: FastMCP, browser_manager):
             os.makedirs(html_source_code_local_save_path)
         timestamp = int(time.time() * 1000)
         # time.sleep(1)
-        origin_png = target_tab.get_screenshot(as_bytes="png")
+        origin_png = target_tab.get_screenshot(as_bytes="png", full_page=True)
         compress_png = compress_image_bytes(origin_png)
         image_path = os.path.join(html_source_code_local_save_path, f"{browser_port}_{tab_id}_{timestamp}.png")
         with open(image_path, "wb") as f: