Jarvis-Brain 0.1.8.4__tar.gz → 0.1.9.1__tar.gz

{jarvis_brain-0.1.8.4 → jarvis_brain-0.1.9.1}/PKG-INFO

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

{jarvis_brain-0.1.8.4 → jarvis_brain-0.1.9.1}/mcp_tools/dp_tools.py

@@ -231,9 +231,9 @@ def register_click_action(mcp: FastMCP, browser_manager):
                 click_success = True
             except Exception as e:
                 click_success = False
-            message = f"点击【{css_selector}】 {'成功' if click_success else '失败'}"
+            message = f"tab页:【{tab_id}】点击【{css_selector}】 {'成功' if click_success else '失败'} 了"
         else:
-            message = f"传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
+            message = f"tab页:【{tab_id}】传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
         return dp_mcp_message_pack(
             message=message,
             browser_port=browser_port,
@@ -243,3 +243,42 @@ def register_click_action(mcp: FastMCP, browser_manager):
             click_success=click_success,
             extra_message="点击成功，页面可能有更新，请重新获取页面html，并重新分析页面Selector" if click_success else ""
         )
+
+
+def register_scroll_action(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="scroll_action", description="尝试滚动tab页"
+                                                "forward参数是滚动的方向：down、up、left、right"
+                                                "pixel参数是滚动的像素值，默认为None。"
+                                                "当forward为down且pixel为None，则将页面滚动到垂直中间位置，水平位置不变"
+                                                "当forward为up且pixel为None，则将页面滚动到顶部，水平位置不变"
+                                                "当forward为left且pixel为None，则将页面滚动到最左边，垂直位置不变"
+                                                "当forward为right且pixel为None，则将页面滚动到最右边，垂直位置不变")
+    async def scroll_action(browser_port: int, tab_id: str, forward: str = "down", pixel: int = None) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        target_tab = _browser.get_tab(tab_id)
+        if forward == "down":
+            if pixel is None:
+                target_tab.scroll.to_half()
+            target_tab.scroll.down(pixel)
+        elif forward == "up":
+            if pixel is None:
+                target_tab.scroll.to_top()
+            target_tab.scroll.up(pixel)
+        elif forward == "left":
+            if pixel is None:
+                target_tab.scroll.to_leftmost()
+            target_tab.scroll.left(pixel)
+        elif forward == "right":
+            if pixel is None:
+                target_tab.scroll.to_rightmost()
+            target_tab.scroll.right(pixel)
+        else:
+            if pixel is None:
+                target_tab.scroll.to_half()
+            target_tab.scroll.down()
+        message = f"已完成对tab页:【{tab_id}】forward={forward} 的滑动"
+        return dp_mcp_message_pack(
+            message=message,
+            browser_port=browser_port,
+            tab_id=tab_id,
+        )

{jarvis_brain-0.1.8.4 → jarvis_brain-0.1.9.1}/mcp_tools/main.py

@@ -22,6 +22,7 @@ if "TeamNode-Dp" in enabled_modules:
     register_pop_first_packet(mcp, browser_manager, client_manager)
     # 页面交互
     register_click_action(mcp, browser_manager)
+    register_scroll_action(mcp, browser_manager)
 
 if "JarvisNode" in enabled_modules:
     register_assert_waf(mcp, browser_manager)

{jarvis_brain-0.1.8.4 → jarvis_brain-0.1.9.1}/pyproject.toml

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

{jarvis_brain-0.1.8.4 → jarvis_brain-0.1.9.1}/tools/browser_proxy.py

@@ -29,7 +29,7 @@ class DPProxyClient:
         :return:
         """
         if start_listen:
-            self.driver.listen.set_targets(res_type="XHR")
+            self.driver.listen.set_targets(targets="api|jsonp|callback", is_regex=True, res_type=('xhr', 'fetch'))
             self.driver.listen.start()
             self.thread = threading.Thread(target=self.start_listen, args=(count, timeout,))
             self.thread.start()