Jarvis-Brain 0.1.7.15__tar.gz → 0.1.8.1__tar.gz

{jarvis_brain-0.1.7.15 → jarvis_brain-0.1.8.1}/PKG-INFO

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

{jarvis_brain-0.1.7.15 → jarvis_brain-0.1.8.1}/mcp_tools/dp_tools.py

@@ -37,7 +37,38 @@ def register_visit_url(mcp: FastMCP, browser_manager: BrowserManager, client_man
         )
 
 
-def register_get_html(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+def register_get_new_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+    @mcp.tool(name="get_new_tab",
+              description="使用Drissionpage创建一个新的tab页，在新的tab页中打开url，并开始监听新的tab页的所有XHR请求")
+    async def get_new_tab(browser_port: int, url: str) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        tab = _browser.new_tab()
+        client_manager.create_client(tab)
+        tab.get(url)
+        _browser.activate_tab(tab)
+        tab_id = tab.tab_id
+        return dp_mcp_message_pack(f"已创建新的tab页，并打开链接：{url}", tab_id=tab_id)
+
+
+def register_pop_first_packet(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+    @mcp.tool(name="pop_first_packet",
+              description="每调用一次就会弹出传入的tab页所监听到的数据包中的第一个packet_message，当一个packet_message的response body过长时会被切分成多个包，具体一个请求是否还有下一个包，可以参考body_completed字段")
+    async def pop_first_packet(browser_port: int, tab_id: str) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        client = client_manager.get_client(tab_id)
+        packet_message = client.pop_first_packet()
+        message = f"tab页:【{tab_id}】，暂时没有监听到XHR数据包"
+        if packet_message:
+            message = f"tab页:【{tab_id}】，监听到XHR数据包",
+        return dp_mcp_message_pack(
+            message,
+            browser_port=browser_port,
+            tab_id=tab_id,
+            packet_message=packet_message
+        )
+
+
+def register_get_html(mcp: FastMCP, browser_manager):
     @mcp.tool(name="get_html", description="使用Drissionpage获取某一个tab页的html")
     async def get_html(browser_port: int, tab_id: str) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
@@ -58,20 +89,7 @@ def register_get_html(mcp: FastMCP, browser_manager, client_manager: DPProxyClie
         return dp_mcp_message_pack(message, tab_id=tab_id, htmls_local_path=html_file_list)
 
 
-def register_get_new_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
-    @mcp.tool(name="get_new_tab",
-              description="使用Drissionpage创建一个新的tab页，在新的tab页中打开url，并开始监听新的tab页的所有XHR请求")
-    async def get_new_tab(browser_port: int, url: str) -> dict[str, Any]:
-        _browser = browser_manager.get_browser(browser_port)
-        tab = _browser.new_tab()
-        client_manager.create_client(tab)
-        tab.get(url)
-        _browser.activate_tab(tab)
-        tab_id = tab.tab_id
-        return dp_mcp_message_pack(f"已创建新的tab页，并打开链接：{url}", tab_id=tab_id)
-
-
-def register_switch_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+def register_switch_tab(mcp: FastMCP, browser_manager):
     @mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
     async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
@@ -79,7 +97,7 @@ def register_switch_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyCl
         return dp_mcp_message_pack(f"已将tab页:【{tab_id}】切换至最前端")
 
 
-def register_close_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+def register_close_tab(mcp: FastMCP, browser_manager):
     @mcp.tool(name="close_tab", description="根据传入的tab_id关闭tab页", )
     async def close_tab(browser_port, tab_id) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
@@ -87,7 +105,7 @@ def register_close_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyCli
         return dp_mcp_message_pack(f"已将tab页:【{tab_id}】关闭")
 
 
-def register_check_selector(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+def register_check_selector(mcp: FastMCP, browser_manager):
     @mcp.tool(name="check_selector",
               description="查找tab页中是否包含元素，并返回元素attr_name所对应的值。"
                           "当要选择的元素包含过多元素时，需要传入offset和page_size来分批查看元素，一般不建议调整page_size，更推荐你调整offset"
@@ -130,7 +148,7 @@ def register_check_selector(mcp: FastMCP, browser_manager, client_manager: DPPro
         )
 
 
-def register_quit_browser(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+def register_quit_browser(mcp: FastMCP, browser_manager):
     @mcp.tool(name="quit_browser", description="退出浏览器会话，关闭浏览器")
     async def quit_browser(browser_port: int) -> dict[str, Any]:
         flag, _browser = browser_manager.remove_page(browser_port)
@@ -143,25 +161,7 @@ def register_quit_browser(mcp: FastMCP, browser_manager, client_manager: DPProxy
         )
 
 
-def register_pop_first_packet(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
-    @mcp.tool(name="pop_first_packet",
-              description="每调用一次就会弹出传入的tab页所监听到的数据包中的第一个packet_message，当一个packet_message的response body过长时会被切分成多个包，具体一个请求是否还有下一个包，可以参考body_completed字段")
-    async def pop_first_packet(browser_port: int, tab_id: str) -> dict[str, Any]:
-        _browser = browser_manager.get_browser(browser_port)
-        client = client_manager.get_client(tab_id)
-        packet_message = client.pop_first_packet()
-        message = f"tab页:【{tab_id}】，暂时没有监听到XHR数据包"
-        if packet_message:
-            message = f"tab页:【{tab_id}】，监听到XHR数据包",
-        return dp_mcp_message_pack(
-            message,
-            browser_port=browser_port,
-            tab_id=tab_id,
-            packet_message=packet_message
-        )
-
-
-def register_assert_waf(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
+def register_assert_waf(mcp: FastMCP, browser_manager):
     @mcp.tool(name="assert_waf",
               description="通过对比requests、有头浏览器、无头浏览器获取到的html，判断网页是否使用了waf以及是否为动态渲染的网页")
     async def assert_waf(browser_port: int, tab_id: str) -> dict[str, Any]:
@@ -209,3 +209,32 @@ def register_assert_waf(mcp: FastMCP, browser_manager, client_manager: DPProxyCl
             raw_headless_rate_difference=h_hless_rate_diff,
             head_headless_rate_difference=h_hless_rate_diff
         )
+
+
+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]:
+        _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
+            click_success = target_element.click()
+            message = f"点击【{css_selector}】 {'成功' if click_success else '失败'}"
+        else:
+            message = f"传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
+        return dp_mcp_message_pack(
+            message=message,
+            browser_port=browser_port,
+            tab_id=tab_id,
+            css_selector=css_selector,
+            element_clickable=element_clickable,
+            click_success=click_success,
+            extra_message="点击成功，页面可能有更新，请重新获取页面html，并重新分析页面Selector" if click_success else ""
+        )

{jarvis_brain-0.1.7.15 → jarvis_brain-0.1.8.1}/mcp_tools/main.py

@@ -12,17 +12,19 @@ base_cwd = os.getenv("BASE_CWD", os.path.expanduser('~'))
 
 if "TeamNode-Dp" in enabled_modules:
     # 页面管理
-    register_close_tab(mcp, browser_manager, client_manager)
-    register_switch_tab(mcp, browser_manager, client_manager)
+    register_close_tab(mcp, browser_manager)
+    register_switch_tab(mcp, browser_manager)
     register_get_new_tab(mcp, browser_manager, client_manager)
-    # 功能
+    # 基础功能
     register_visit_url(mcp, browser_manager, client_manager)
-    register_get_html(mcp, browser_manager, client_manager)
-    register_check_selector(mcp, browser_manager, client_manager)
+    register_get_html(mcp, browser_manager)
+    register_check_selector(mcp, browser_manager)
     register_pop_first_packet(mcp, browser_manager, client_manager)
+    # 页面交互
+    register_click_action(mcp, browser_manager)
 
 if "JarvisNode" in enabled_modules:
-    register_assert_waf(mcp, browser_manager, client_manager)
+    register_assert_waf(mcp, browser_manager)
 
 
 def main():

{jarvis_brain-0.1.7.15 → jarvis_brain-0.1.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Jarvis_Brain"  # 别人下载时用的名字，必须在 PyPI 上唯一
-version = "0.1.7.15"
+version = "0.1.8.1"
 description = "Jarvis brain mcp"
 dependencies = [
     "fastmcp",