Jarvis-Brain 0.1.12.3__py3-none-any.whl → 0.1.13.2__py3-none-any.whl

{jarvis_brain-0.1.12.3.dist-info → jarvis_brain-0.1.13.2.dist-info}/METADATA

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

{jarvis_brain-0.1.12.3.dist-info → jarvis_brain-0.1.13.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mcp_tools/__init__.py,sha256=_ZzedxbxmVkdRH00ONOjQR31pZW-B8WPn5P2qE6T-Iw,3012
-mcp_tools/dp_tools.py,sha256=o593XYWlIlNE9FjjFwOcZQyVE0uKeGKrP9HWtfp8FDI,20834
-mcp_tools/main.py,sha256=U405cGk_4nasBHiR4vrXsgZaTwQSZmo74vckfNH9hKg,1214
+mcp_tools/dp_tools.py,sha256=KcgH0lkPOT_OZtdb3g1wBAEW7lB8qdigtGu1__7ifak,25572
+mcp_tools/main.py,sha256=hIiYV7QVT8XDEDihhTQTUmL7Ftlsd0DlfhKMHEqj244,1262
 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.12.3.dist-info/METADATA,sha256=XXs_Dgv-SiMMs74RPk1GkMldaJz4hvQT7fKm6voWuog,264
-jarvis_brain-0.1.12.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.12.3.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.12.3.dist-info/RECORD,,
+jarvis_brain-0.1.13.2.dist-info/METADATA,sha256=0VYhUIoMkg6vKzFjH1uRH3tfW0lKpml8ytTTPGeu0B4,264
+jarvis_brain-0.1.13.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.13.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.13.2.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -248,22 +248,17 @@ def register_click_action(mcp: FastMCP, browser_manager):
         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[target_element_index]
         element_clickable = target_element.states.is_clickable
         try:
-            target_element.click()
-            click_success = True
+            click_success = 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}】 {'成功' 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,
@@ -352,6 +347,69 @@ def register_mouse_hover(mcp: FastMCP, browser_manager):
         )
 
 
+def register_get_ele_info(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="get_ele_info", description="返回元素有关一系列的信息。"
+                                                   "参数说明："
+                                                   "browser_port：浏览器端口号。"
+                                                   "tab_id：tab页的id。"
+                                                   "css_selector：目标选择器"
+                                                   "element_index：如果选择器定位到的是一个列表【或者可以定位到多个元素】，则该值用于定位这个列表中具体元素，默认值为0【列表中的第一个元素】"
+                                                   "返回值说明："
+                                                   "element_tag：此属性返回元素的标签名。"
+                                                   "element_attrs_key：此属性以list的形式返回元素所有属性的key。"
+                                                   "element_child_count：此属性返回元素内第一级子元素个数。"
+                                                   "element_rect_size：此属性以元组形式返回元素的大小。"
+                                                   "is_in_viewport：此属性以布尔值方式返回元素是否在视口中，以元素可以接受点击的点为判断。"
+                                                   "is_whole_in_viewport：此属性以布尔值方式返回元素是否整个在视口中。"
+                                                   "is_alive：此属性以布尔值形式返回当前元素是否仍可用。用于判断是否因页面刷新而导致元素失效。"
+                                                   "is_checked：此属性以布尔值返回表单单选或多选元素是否选中。"
+                                                   "is_selected：此属性以布尔值返回<select>元素中的项是否选中。"
+                                                   "is_enabled：此属性以布尔值返回元素是否可用。"
+                                                   "is_displayed：此属性以布尔值返回元素是否可见。"
+                                                   "is_covered：此属性返回元素是否被其它元素覆盖/遮挡。如被覆盖/遮挡，返回覆盖元素的 id【无障碍树的id，无法用于Selector】，否则返回False。"
+                                                   "is_clickable：此属性返回元素是否可被模拟点击，从是否有大小、是否可用、是否显示、是否响应点击判断，不判断是否被遮挡。"
+                                                   "has_rect：此属性返回元素是否拥有大小和位置信息，有则返回四个角在页面上的坐标组成的列表，没有则返回False。")
+    async def get_ele_info(browser_port: int, tab_id: str, css_selector: str, 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)
+        try:
+            target_element = target_eles[element_index]
+        except IndexError:
+            return dp_mcp_message_pack(
+                message="报错：IndexError: list index out of range。请检查Selector中是否包含了如：first-child、nth-child等字段，如果有则去掉。必须使用element_index来控制元素的选择",
+                browser_port=browser_port,
+                tab_id=tab_id,
+                css_selector=css_selector,
+                element_index=element_index,
+            )
+        return dp_mcp_message_pack(
+            message="元素可以被正常的选择到，以下是元素相关的一系列信息",
+            browser_port=browser_port,
+            tab_id=tab_id,
+            css_selector=css_selector,
+            element_index=element_index,
+            element_tag=target_element.tag,
+            element_attrs_key=list(target_element.attrs.keys()),
+            element_child_count=target_element.child_count,
+            element_rect_size=target_element.rect.size,
+            is_in_viewport=target_element.states.is_in_viewport,
+            is_whole_in_viewport=target_element.states.is_whole_in_viewport,
+            is_alive=target_element.states.is_alive,
+            is_checked=target_element.states.is_checked,
+            is_selected=target_element.states.is_selected,
+            is_enabled=target_element.states.is_enabled,
+            is_displayed=target_element.states.is_displayed,
+            is_covered=target_element.states.is_covered,
+            is_clickable=target_element.states.is_clickable,
+            has_rect=target_element.states.has_rect,
+        )
+
+
 def register_get_screenshot(mcp: FastMCP, browser_manager):
     @mcp.tool(name="get_tab_screenshot",
               description="尝试对传入tab页进行截图，并将截图压缩为1M大小png图片，会返回截图保存路径")

mcp_tools/main.py

@@ -25,6 +25,7 @@ if "TeamNode-Dp" in enabled_modules:
     register_click_action(mcp, browser_manager)
     register_scroll_action(mcp, browser_manager)
     register_mouse_hover(mcp, browser_manager)
+    register_get_ele_info(mcp, browser_manager)
 
 if "JarvisNode" in enabled_modules:
     register_assert_waf(mcp, browser_manager)