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

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

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

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

@@ -53,19 +53,24 @@ 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进行过滤，可以传入想要过滤的域名列表。")
-    async def pop_first_packet(browser_port: int, tab_id: str, domain_filter: list = None) -> dict[str, Any]:
+                          "如果想要以域名对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]:
         _browser = browser_manager.get_browser(browser_port)
         client = client_manager.get_client(tab_id)
-        packet_message = client.pop_first_packet(domain_filter)
+        current_queue_size, packet_message = client.pop_first_packet(domain_filter, method)
         message = f"tab页:【{tab_id}】，暂时没有监听到XHR数据包"
         if packet_message:
-            message = f"tab页:【{tab_id}】，监听到XHR数据包",
+            message = f"tab页:【{tab_id}】，监听到XHR数据包，当前数据包队列中还剩 {current_queue_size} 条数据"
+        if 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
+            packet_message=packet_message,
+            current_queue_size=current_queue_size,
         )
 
 

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

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

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

@@ -40,20 +40,23 @@ class DPProxyClient:
             pass
 
     # 每次调用函数，都从队列的左端弹出一个数据包
-    def pop_first_packet(self, domain_filter: list):
+    def pop_first_packet(self, domain_filter: list, method: list = ["GET", "POST"]):
         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):
-                return json.dumps(result, ensure_ascii=False)
-            return None
+                if packet_method in method:
+                    return current_queue_size, json.dumps(result, ensure_ascii=False)
+            return current_queue_size, None
         else:
-            return None
+            return 0, None
 
 
 class DPProxyClientManager: