Jarvis-Brain 0.1.7.1__py3-none-any.whl → 0.1.8.3__py3-none-any.whl

{jarvis_brain-0.1.7.1.dist-info → jarvis_brain-0.1.8.3.dist-info}/METADATA

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

jarvis_brain-0.1.8.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=B39pf4GedGnO-7eh1b9hc-qoXrIZEQ7AFsiCLuvVheM,13366
+mcp_tools/main.py,sha256=1oM11IvEfwBvJ4bigIQzr2AigTISX-LIJ63oFtYnwFY,1049
+tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
+tools/browser_proxy.py,sha256=sybZoxjp_its4fzEGO3E7aeQhmTVv1kIFm-nuOjBHiw,6797
+tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
+jarvis_brain-0.1.8.3.dist-info/METADATA,sha256=vfEWVhj6kYKaqJQ4SyT4JLurD_Pu_Ox_vXbPwBJQEdg,241
+jarvis_brain-0.1.8.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.8.3.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.8.3.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -15,7 +15,7 @@ waf_status_code_dict = {
     521: "加速乐"
 }
 # 一轮最大输入，以免单个html最大长度超过ai最大输入
-ont_turn_max_token = 25000
+one_turn_max_token = 20000
 
 
 def register_visit_url(mcp: FastMCP, browser_manager: BrowserManager, client_manager: DPProxyClientManager):
@@ -37,16 +37,47 @@ 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)
         tab = _browser.get_tab(tab_id)
-        file_name_prefix = str(tab.title).replace("/", "_").replace(":", "_")
+        file_name_prefix = hashlib.md5(str(tab.title).encode('utf-8')).hexdigest()
         if not os.path.exists(html_source_code_local_save_path):
             os.makedirs(html_source_code_local_save_path)
         min_html, compress_rate = compress_html(tab.html)
-        html_str_list = [min_html[i:i + ont_turn_max_token] for i in range(0, len(min_html), ont_turn_max_token)]
+        html_str_list = [min_html[i:i + one_turn_max_token] for i in range(0, len(min_html), one_turn_max_token)]
         html_file_list = []
         for index, html_str in enumerate(html_str_list):
             file_name = file_name_prefix + f"_{tab_id}_segment{index}.html"
@@ -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,9 +105,13 @@ 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):
-    @mcp.tool(name="check_selector", description="查找tab页中是否包含元素，并返回元素attr_name所对应的值")
-    async def check_selector(browser_port: int, tab_id: str, css_selector: str, attr_name: str = "text") -> dict[
+def register_check_selector(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="check_selector",
+              description="查找tab页中是否包含元素，并返回元素attr_name所对应的值。"
+                          "当要选择的元素包含过多元素时，需要传入offset和page_size来分批查看元素，一般不建议调整page_size，更推荐你调整offset"
+                          "同时如果单个元素属性值太长，函数会进行截断。一般的单个元素的属性值超过300个字符的就会触发截断，截断后会在最后拼接'...'")
+    async def check_selector(browser_port: int, tab_id: str, css_selector: str, attr_name: str = "text",
+                             offset: int = 0, page_size: int = 10) -> dict[
         str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         target_tab = _browser.get_tab(tab_id)
@@ -100,21 +122,33 @@ def register_check_selector(mcp: FastMCP, browser_manager, client_manager: DPPro
         exist_flag = False
         if len(target_eles) != 0:
             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]
+            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)
+        # 对attr_output逐个截断，截断的长度为：一轮最大token除以元素个数+3个点+两个引号和逗号
         return dp_mcp_message_pack(
             f"已完成tab页:【{tab_id}】对：【{css_selector}】的检查",
             tab_id=tab_id,
             selector=css_selector,
             selector_ele_exist=exist_flag,
+            page_size=page_size,
+            offset=offset,
             attr_output=attr_output
         )
 
 
-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)
@@ -127,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")
-    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]:
@@ -193,3 +209,36 @@ 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"点击【{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 ""
+        )

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():

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:

tools/browser_proxy.py

@@ -1,12 +1,14 @@
 import threading
 from collections import deque
-
+import time
 from DrissionPage import ChromiumPage, ChromiumOptions
 from DrissionPage._pages.chromium_tab import ChromiumTab
 from DrissionPage._units.listener import DataPacket
 from typing import Tuple, Optional
 import json
 
+one_turn_max_token = 20000
+
 
 class DPProxyClient:
     def __init__(self, driver: ChromiumTab, self_kill=False):
@@ -58,7 +60,7 @@ class DPProxyClientManager:
     def create_client(self, tab: ChromiumTab, self_kill=False) -> Tuple[str, DPProxyClient, ChromiumTab]:
         """创建新的tab页面代理实例"""
         client = DPProxyClient(tab, self_kill=self_kill)
-        tab = client.get_driver(True)
+        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
@@ -133,21 +135,27 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
     data = None
     if packet.request.hasPostData:
         data = packet.request.postData
-    temp_dict = {
-        "url": url,
-        "method": method,
-        "request_data": data,
-        "request_headers": packet.request.headers,
-        "response_headers": packet.response.headers,
-        "response_body": packet.response.body,
-    }
-    print(temp_dict)
-    client.packet_queue.append(temp_dict)
+    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
+    for index, body_str in enumerate(body_str_list):
+        if (index + 1) != len(body_str_list):
+            body_completed = False
+        temp_dict = {
+            "url": url,
+            "body_completed": body_completed,
+            "method": method,
+            "request_data": data,
+            "request_headers": dict(packet.request.headers),
+            "response_headers": dict(packet.response.headers),
+            "response_body_segment": body_str,
+        }
+        client.packet_queue.append(temp_dict)
 
 
 client_manager = DPProxyClientManager()
 
-#
 # if __name__ == '__main__':
 #     co = ChromiumOptions().set_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")

jarvis_brain-0.1.7.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=ZOmHTIofSeuqiY3YZHNnK72-_MRo22tBAB9NJ4KyEbo,10416
-mcp_tools/main.py,sha256=Fdt2N3oKGwvruuno_ywnuWSlm1BexE9ZY669H2LTo9w,1056
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=EXM7n-sDOtdQGpWkVTAZHWhepVU-7PAoUTDNgGF9_fQ,1938
-tools/browser_proxy.py,sha256=YbqXT6h0Zz_H1TMGBd8wwPABIGpE0nGLwYzDlA4t674,6320
-tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
-jarvis_brain-0.1.7.1.dist-info/METADATA,sha256=nLX_3KOUhtCzLP_qScoyY6sdH0CtAWekIlqtfM2RZR0,241
-jarvis_brain-0.1.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.7.1.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.7.1.dist-info/RECORD,,