Jarvis-Brain 0.1.9.2__py3-none-any.whl → 0.1.9.3__py3-none-any.whl

{jarvis_brain-0.1.9.2.dist-info → jarvis_brain-0.1.9.3.dist-info}/METADATA

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

{jarvis_brain-0.1.9.2.dist-info → jarvis_brain-0.1.9.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=BNpFOhHNhJ-CePzMf_RaUzbRVmZg21ihrUi4nwaAU1M,16241
+mcp_tools/dp_tools.py,sha256=78InuO5W28va6I0VkQdDAYpywiLHmYKDqM8DkArwqK8,16914
 mcp_tools/main.py,sha256=84sv39oOw9vqr2MPxKy9pFVrevJ9nQJWFffpfg0s6iA,1098
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
-tools/browser_proxy.py,sha256=dXNG9g0wqyiLE-t8mSe_uLxZDxIl_HY8tY9znSj_k64,7718
+tools/browser_proxy.py,sha256=j4I8qaSxKp2GRnbbr8gVO2BhWvvAUO3pd4IjPj2TAhg,7569
 tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
-jarvis_brain-0.1.9.2.dist-info/METADATA,sha256=LSndFyZUD61amGNhFh381NRM6HNpFdlRFY45nYPqmso,241
-jarvis_brain-0.1.9.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.9.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.9.2.dist-info/RECORD,,
+jarvis_brain-0.1.9.3.dist-info/METADATA,sha256=chnRYsrmrSo8W9ljXcRd4gaT9MHz0VAmMYcu4bCieno,241
+jarvis_brain-0.1.9.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.9.3.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.9.3.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -20,14 +20,22 @@ one_turn_max_token = 20000
 
 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=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(
@@ -39,11 +47,18 @@ def register_visit_url(mcp: FastMCP, browser_manager: BrowserManager, client_man
 
 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]:
+              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()
-        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)
         _browser.activate_tab(tab)
         tab_id = tab.tab_id
@@ -52,14 +67,11 @@ def register_get_new_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyC
 
 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字段"
-                          "如果想要以域名对packet进行过滤，可以传入想要过滤的域名列表。"
-                          "如果想要以method对packet进行过滤，可以传入想要过滤的method列表，默认是：['GET', 'POST']")
-    async def pop_first_packet(browser_port: int, tab_id: str, domain_filter: list = None,
-                               method: list = ["GET", "POST"]) -> dict[str, Any]:
+              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(domain_filter, method)
+        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} 条数据"

tools/browser_proxy.py

@@ -12,12 +12,12 @@ one_turn_max_token = 20000
 
 
 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:
@@ -40,21 +40,11 @@ class DPProxyClient:
             pass
 
     # 每次调用函数，都从队列的左端弹出一个数据包
-    def pop_first_packet(self, domain_filter: list, method: list = ["GET", "POST"]):
+    def pop_first_packet(self):
         if self.packet_queue:
             result = self.packet_queue.popleft()
             current_queue_size = len(self.packet_queue)
-            packet_url = result["url"]
-            packet_method = result["method"]
-            packet_domain = urlparse(packet_url).netloc
-            # 留两个路径和params的口子，万一后续需要加入这两个的过滤器可以参考domain过滤器的方式
-            packet_path = urlparse(packet_url).path
-            packet_param = urlparse(packet_url).params
-            # 如果没有给domain_filter或者给了domain_filter且包的domain在domain_filter中，都正常返回
-            if domain_filter is None or (domain_filter and packet_domain in domain_filter):
-                if packet_method in method:
-                    return current_queue_size, json.dumps(result, ensure_ascii=False)
-            return current_queue_size, None
+            return current_queue_size, json.dumps(result, ensure_ascii=False)
         else:
             return 0, None
 
@@ -69,9 +59,10 @@ 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)
+        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}
@@ -147,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_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 = {