Jarvis-Brain 0.1.7.12__tar.gz → 0.1.9.15__tar.gz

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/PKG-INFO

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

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/README.md

@@ -5,7 +5,7 @@
 一个基于 FastMCP 和 DrissionPage 的浏览器自动化 MCP 服务器
 
 [![Python Version](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
-[![Version](https://img.shields.io/badge/version-0.1.5.7-green.svg)](https://github.com/yourusername/jarvis-mcp)
+[![Version](https://img.shields.io/badge/version-0.1.9.12-green.svg)](https://github.com/yourusername/jarvis-mcp)
 
 ## 📖 简介
 

jarvis_brain-0.1.9.15/mcp_tools/__init__.py

@@ -0,0 +1,5 @@
+test_str="""
+ \\"X-XSS-Protection\\": \\"1; mode=block\\", \\"Server\\": \\"-\\"}, \\"response_body_segment\\": \\"pename\\\\\\": \\\\\\"SpuItemAttribute\\\\\\"}, {\\\\\\"code\\\\\\": \\\\\\"imageVersion\\\\\\", \\\\\\"name\\\\\\": \\\\\\"imageVersion\\\\\\", \\\\\\"subAttrList\\\\\\": [{\\\\\\"attrName\\\\\\": \\\\\\"1\\\\\\", \\\\\\"attrValue\\\\\\": \\\\\\"1\\\\\\", \\\\\\"__typename\\\\\\": \\\\\\"SubAttribute\\\\\\"}], \\\\\\"__typename\\\\\\": \\\\\\"SpuItemAttribute\\\\\\"}, {\\\\\\"code\\\\\\": \\\\\\"PLPhover\\\\\\", \\\\\\"name\\\\\\": \\\\\\"PLPhover\\\\\\", \\\\\\"subAttrList\\\\\\": [{\\\\\\"attrName\\\\\\": \\\\\\"2\\\\\\", \\\\\\"attrValue\\\\\\": \\\\\\"2\\\\\\", \\\\\\"__typename\\\\\\": \\\\\\"SubAttribute\\\\\\"}], \\\\\\"__typename\\\\\\": \\\\\\"SpuItemAttribute\\\\\\"}, {\\\\\\"code\\\\\\": \\\\\\"官网\\\\\\", \\\\\\"name\\\\\\": \\\\\\"官网\\\\\\", \\\\\\"subAttrList\\\\\\": [{\\\\\\"attrName\\\\\\": \\\\\\"是\\\\\\", \\\\\\"attrValue\\\\\\": \\\\\\"true\\\\\\", \\\\\\"__typename\\\\\\": \\\\\\"SubAttribute\\\\\\"}], \\\\\\"__typename\\\\\\": \\\\\\"SpuItemAttribute\\\\\\"}, {\\\\\\"code\\\\\\": \\\\\\"小程序\\\\\\", \\\\\\"name\\\\\\": \\\\\\"小程序\\\\\\", \\\\\\"subAttrList\\\\\\": [{\\\\\\"attrName\\\\\\": \\\\\\"是\\\\\\", \\\\\\"attrValue\\\\\\": \\\\\\"true\\\\\\", \\\\\\"__typename\\\\\\": \\\\\\"SubAttribute\\\\\\"}], \\\\\\"__typename\\\\\\": \\\\\\"SpuItemAttribute\\\\\\"}], \\\\\\"__typename\\\\\\": \\\\\\"SpuAttribute\\\\\\"}, \\\\\\"labelList\\\\\\": [{\\\\\\"name\\\\\\": \\\\\\"new\\\\\\", \\\\\\"value\\\\\\": \\\\\\"新品\\\\\\", \\\\\\"excludeValue\\\\\\": null, \\\\\\"__typename\\\\\\": \\\\\\"BaseLabel\\\\\\"}], \\\\\\"__typename\\\\\\": \\\\\\"Product2\\\\\\"}, {\\\\\\"baseInfo\\\\\\": {\\\\\\"spuCode\\\\\\": \\\\\\"864428CVE0G1000\\\\\\", \\\\\\"title\\\\\\": \\\\\\"互扣式双G带扣窄版腰带\\\\\\", \\\\\\"salePrice\\\\\\": 4300.0, \\\\\\"style\\\\\\": \\\\\\"864428\\\\\\", \\\\\\"categorys\\\\\\": [{\\\\\\"navFrontName\\\\\\": \\\\\\"女士风尚-手工plp\\\\\\", \\\\\\"frontName\\\\\\": null, \\\\\\"code\\\\\\": \\\\\\"67d7d4c5eb9d2100016b4fe5\\\\\\", \\\\\\"parentCode\\\\\\": null, \\\\\\"businessCode\\\\\\": \\\\\\"women-fashion手工plp\\\\\\", \\\\\\"__typename\\\\\\": \\\\\\"Category\\\\\\"}, {\\\\\\"navFrontName\\\\\\": \\\\\\"女士-women>女士配饰-women-accessories>女士腰带-women-accessories-belts\\\\\\", \\\\\\"frontName\\\\\\": null, \\\\\\"code\\\\\\": \\\\\\"642670bf0ae2090001133cbe\\\\\\", \\\\\\"parentCode\\\\\\": null, \\\\\\"businessCode\\\\\\": \\\\\\"women-accessories-belts\\\\\\", \\\\\\"__typename\\\\\\": \\\\\\"Category\\\\\\"}, {\\\\\\"navFrontName\\\\\\": \\\\\\"女士-women>女士配饰-women-accessories\\\\\\", \\\\\\"frontName\\\\\\": null, \\\\\\"code\\\\\\": \\\\\\"642670bf0ae2090001133cbd\\\\\\", \\\\\\"parentCode\\\\\\": null, \\\\\\"businessCode\\\\\\": \\\\\\"women-accessories\\\\\\",
+"""
+decoded = test_str.encode().decode('unicode_escape')
+print(decoded)

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/mcp_tools/dp_tools.py

@@ -15,19 +15,27 @@ waf_status_code_dict = {
     521: "加速乐"
 }
 # 一轮最大输入，以免单个html最大长度超过ai最大输入
-one_turn_max_token = 20000
+one_turn_max_token = 8000
 
 
 def register_visit_url(mcp: FastMCP, browser_manager: BrowserManager, client_manager: DPProxyClientManager):
     @mcp.tool(name="visit_url",
-              description="使用Drissionpage打开url访问某个网站，并开始监听初始tab页的所有的XHR请求，当需要使用手机版浏览器Ua时use_mobile_user_agent为True")
-    async def visit_url(url: str, use_mobile_user_agent=False) -> dict[str, Any]:
+              description="使用Drissionpage打开url访问某个网站，并开始监听初始tab页的所有的XHR请求"
+                          "当需要使用手机版浏览器Ua时use_mobile_user_agent为True"
+                          "如果想要以域名对packet进行过滤，可以传入想要过滤的域名列表。默认是：None。"
+                          "如果想要以method对packet进行过滤，可以传入想要过滤的method列表，默认是：['GET', 'POST']")
+    async def visit_url(url: str, domain_filter: list = None, method_filter: list = ["GET", "POST"],
+                        use_mobile_user_agent: bool = False) -> dict[str, Any]:
         mobile_user_agent = None
         if use_mobile_user_agent:
             mobile_user_agent = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Mobile Safari/537.36"
         port, _browser = browser_manager.create_browser(mobile_user_agent)
         tab = _browser.get_tab()
-        client_manager.create_client(tab)
+        packet_filter = {
+            "domain_filter": domain_filter,
+            "method_filter": method_filter,
+        }
+        client_manager.create_client(tab, packet_filter)
         tab.get(url)
         tab_id = tab.tab_id
         return dp_mcp_message_pack(
@@ -37,7 +45,48 @@ 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请求"
+                          "如果想要以域名对packet进行过滤，可以传入想要过滤的域名列表。默认是：None。"
+                          "如果想要以method对packet进行过滤，可以传入想要过滤的method列表，默认是：['GET', 'POST']")
+    async def get_new_tab(browser_port: int, url: str, domain_filter: list = None,
+                          method_filter: list = ["GET", "POST"]) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        tab = _browser.new_tab()
+        packet_filter = {
+            "domain_filter": domain_filter,
+            "method_filter": method_filter,
+        }
+        client_manager.create_client(tab, packet_filter)
+        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)
+        current_queue_size, packet_message = client.pop_first_packet()
+        message = f"tab页:【{tab_id}】，暂时没有监听到XHR数据包"
+        if packet_message:
+            message = f"tab页:【{tab_id}】，监听到XHR数据包，当前数据包队列中还剩 {current_queue_size} 条数据，如果还剩数据为0，可以暂时稍后再次调用该方法"
+        if (packet_message is None) and current_queue_size:
+            message = f"tab页:【{tab_id}】，当前弹出的第一个数据包不符合过滤条件，当前数据包队列中还剩 {current_queue_size} 条数据，请不要改变条件，继续弹出下一个数据包"
+        return dp_mcp_message_pack(
+            message,
+            browser_port=browser_port,
+            tab_id=tab_id,
+            packet_message=packet_message,
+            current_queue_size=current_queue_size,
+        )
+
+
+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 +107,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,15 +115,15 @@ 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]:
+    async def close_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         _browser.close_tabs(tab_id)
         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"
@@ -106,14 +142,19 @@ def register_check_selector(mcp: FastMCP, browser_manager, client_manager: DPPro
             exist_flag = True
         if len(target_eles) > page_size:
             target_eles = target_eles[offset:offset + page_size]
+        slice_seg = max(300, one_turn_max_token // (page_size + 6))
         if attr_name == "text":
-            ele_text_list = [i.text.replace("\n", "") for i in target_eles]
-            attr_output = "\n".join(ele_text_list)
+            ele_attr_list = [i.text.replace("\n", "") for i in target_eles]
+            ele_attr_list = [attr_str[:slice_seg] for attr_str in ele_attr_list]
+            # 如果经过截断遍历后的字符串长度与截断长度相等，则默认截断了
+            ele_attr_list = [attr_str + "..." if len(attr_str) == slice_seg else attr_str for attr_str in ele_attr_list]
+            attr_output = "\n".join(ele_attr_list)
         else:
-            attr_output = json.dumps([i.attr(attr_name) for i in target_eles])
+            ele_attr_list = [i.attr(attr_name) for i in target_eles]
+            ele_attr_list = [attr_str[:slice_seg] for attr_str in ele_attr_list if attr_str]
+            ele_attr_list = [attr_str + "..." if len(attr_str) == slice_seg else attr_str for attr_str in ele_attr_list]
+            attr_output = json.dumps(ele_attr_list, ensure_ascii=False)
         # 对attr_output逐个截断，截断的长度为：一轮最大token除以元素个数+3个点+两个引号和逗号
-        slice_seg = max(300, one_turn_max_token // (page_size + 6))
-        attr_output = [attr_str[:slice_seg] + "..." for attr_str in attr_output]
         return dp_mcp_message_pack(
             f"已完成tab页:【{tab_id}】对：【{css_selector}】的检查",
             tab_id=tab_id,
@@ -125,7 +166,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)
@@ -138,25 +179,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]:
@@ -204,3 +227,75 @@ 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
+            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 '失败'} 了"
+        else:
+            message = f"tab页:【{tab_id}】传入的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 ""
+        )
+
+
+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.7.12 → jarvis_brain-0.1.9.15}/mcp_tools/main.py

@@ -12,21 +12,24 @@ 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)
+    register_scroll_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():
-    mcp.run(transport="stdio")
+    mcp.run(transport="stdio",show_banner=False)
 
 
 if __name__ == '__main__':

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/pyproject.toml

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

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/tools/browser_manager.py

@@ -4,6 +4,9 @@ from typing import Optional, Tuple
 import os
 from DrissionPage import ChromiumPage, ChromiumOptions
 import platform
+from DrissionPage.common import Settings
+
+Settings.set_raise_when_click_failed(True)
 
 
 class BrowserManager:

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/tools/browser_proxy.py

@@ -6,17 +6,18 @@ from DrissionPage._pages.chromium_tab import ChromiumTab
 from DrissionPage._units.listener import DataPacket
 from typing import Tuple, Optional
 import json
+from urllib.parse import urlparse, urlunparse
 
-one_turn_max_token = 20000
+one_turn_max_token = 16000
 
 
 class DPProxyClient:
-    def __init__(self, driver: ChromiumTab, self_kill=False):
+    def __init__(self, driver: ChromiumTab, packet_filter: dict, self_kill=False):
         self.tab_id = driver.tab_id
         self.driver = ChromePageProxy(driver, self)
         self.thread = None
         self.self_kill = self_kill
-        # self.packet_list = []
+        self.packet_filter = packet_filter
         self.packet_queue = deque()
 
     def get_driver(self, start_listen, count=None, timeout=10) -> ChromiumTab:
@@ -28,7 +29,7 @@ class DPProxyClient:
         :return:
         """
         if start_listen:
-            self.driver.listen.set_targets(res_type="XHR")
+            self.driver.listen.set_targets(res_type=('xhr', 'fetch'))
             self.driver.listen.start()
             self.thread = threading.Thread(target=self.start_listen, args=(count, timeout,))
             self.thread.start()
@@ -42,9 +43,10 @@ class DPProxyClient:
     def pop_first_packet(self):
         if self.packet_queue:
             result = self.packet_queue.popleft()
-            return json.dumps(result, ensure_ascii=False)
+            current_queue_size = len(self.packet_queue)
+            return current_queue_size, json.dumps(result, ensure_ascii=False, separators=(',', ':')).replace("\\", "")
         else:
-            return None
+            return 0, None
 
 
 class DPProxyClientManager:
@@ -57,10 +59,11 @@ class DPProxyClientManager:
             cls._instance.tab_pool = {}
         return cls._instance
 
-    def create_client(self, tab: ChromiumTab, self_kill=False) -> Tuple[str, DPProxyClient, ChromiumTab]:
+    def create_client(self, tab: ChromiumTab, packet_filter: dict, self_kill=False) -> Tuple[
+        str, DPProxyClient, ChromiumTab]:
         """创建新的tab页面代理实例"""
-        client = DPProxyClient(tab, self_kill=self_kill)
-        tab = client.get_driver(True)
+        client = DPProxyClient(tab, packet_filter, self_kill=self_kill)
+        tab = client.get_driver(True, timeout=60 * 10)
         tab_id = tab.tab_id
         self.tab_pool[tab_id] = {"client": client, "driver": tab}
         return tab_id, client, tab
@@ -135,11 +138,21 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
     data = None
     if packet.request.hasPostData:
         data = packet.request.postData
+    domain = urlparse(url).netloc
     body = packet.response.body
-    body_str = json.dumps(body, ensure_ascii=False)
+    body_str = json.dumps(body, ensure_ascii=False, separators=(',', ':'))
     body_str_list = [body_str[i:i + one_turn_max_token] for i in range(0, len(body_str), one_turn_max_token)]
     body_completed = True
+    packet_filter = client.packet_filter
+    domain_filter = packet_filter.get("domain_filter", None)
+    method_filter = packet_filter.get("method_filter", ["GET", "POST"])
     for index, body_str in enumerate(body_str_list):
+        # 如果给了domain_filter并且domain没有在domain_filter中时跳过该数据包
+        if domain_filter and domain not in domain_filter:
+            continue
+        # 如果method没有在method_filter中，则跳过该数据包
+        if method not in method_filter:
+            continue
         if (index + 1) != len(body_str_list):
             body_completed = False
         temp_dict = {
@@ -149,7 +162,7 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
             "request_data": data,
             "request_headers": dict(packet.request.headers),
             "response_headers": dict(packet.response.headers),
-            "response_body_segment": body_str,
+            "response_body_segment": body_str.replace("\\", ""),
         }
         client.packet_queue.append(temp_dict)
 

{jarvis_brain-0.1.7.12 → jarvis_brain-0.1.9.15}/tools/tools.py

@@ -53,6 +53,15 @@ def compress_html(content, only_text=False):
     for meta in doc.xpath('//meta'):
         meta.getparent().remove(meta)
 
+    for svg in doc.xpath('//svg'):
+        # 获取 SVG 内的文本内容
+        text_content = svg.text_content()
+        # 创建一个新的文本节点替换 SVG
+        parent = svg.getparent()
+        if parent is not None:
+            parent.text = (parent.text or '') + text_content
+            parent.remove(svg)
+
     # 删除 style 属性
     for element in doc.xpath('//*[@style]'):
         element.attrib.pop('style')