Jarvis-Brain 0.1.5.10__py3-none-any.whl → 0.1.6.1__py3-none-any.whl

{jarvis_brain-0.1.5.10.dist-info → jarvis_brain-0.1.6.1.dist-info}/METADATA

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

jarvis_brain-0.1.6.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=hijWdWQ9fhAQXrtrtqkaUd3CUH5sORAoQaF7BVtljfY,9078
+mcp_tools/main.py,sha256=SiLF-tcEdApkzMjTZJEpVYX5d-LPW7aqy6A6lCBA7YQ,829
+tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/browser_manager.py,sha256=EXM7n-sDOtdQGpWkVTAZHWhepVU-7PAoUTDNgGF9_fQ,1938
+tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
+jarvis_brain-0.1.6.1.dist-info/METADATA,sha256=1CSoEWNLJzbP1L_4Gz3ElX2jANUxnsMh8EqtwM5D6Pw,241
+jarvis_brain-0.1.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.6.1.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.6.1.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -5,6 +5,7 @@ from typing import Any
 
 from fastmcp import FastMCP
 
+from tools.browser_manager import BrowserManager
 from tools.tools import compress_html, requests_html, dp_headless_html, assert_waf_cookie, dp_mcp_message_pack
 
 html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
@@ -16,15 +17,19 @@ waf_status_code_dict = {
 ont_turn_max_token = 25000
 
 
-def register_visit_url(mcp: FastMCP, browser_manager):
-    @mcp.tool(name="visit_url", description="使用Drissionpage打开url访问某个网站")
-    async def visit_url(url: str) -> dict[str, Any]:
-        port, _browser = browser_manager.create_browser()
+def register_visit_url(mcp: FastMCP, browser_manager: BrowserManager):
+    @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]:
+        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()
         tab.get(url)
         tab_id = tab.tab_id
         return dp_mcp_message_pack(
-            f"已在[{port}]端口创建浏览器对象，并已打开链接：{url}",
+            f"已在[{port}]端口创建浏览器对象，并已打开链接：{url}，打开的模式是：{'手机版' if use_mobile_user_agent else '电脑版'}",
             tab_id=tab_id,
             browser_port=port
         )
@@ -35,14 +40,14 @@ def register_get_html(mcp: FastMCP, browser_manager):
     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 = str(tab.title).replace("/", "_").replace(":", "_")
+        file_name_prefix = str(tab.title).replace("/", "_").replace(":", "_")
         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_file_list = []
         for index, html_str in enumerate(html_str_list):
-            file_name = file_name + f"_{tab_id}_segment{index}.html"
+            file_name = file_name_prefix + f"_{tab_id}_segment{index}.html"
             abs_path = os.path.join(html_source_code_local_save_path, file_name)
             with open(abs_path, "w", encoding="utf-8") as f:
                 f.write(html_str)
@@ -50,8 +55,10 @@ def register_get_html(mcp: FastMCP, browser_manager):
         message = f"已保存tab页：【{tab_id}】的html源码片段共{len(html_file_list)}个"
         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):
-    @mcp.tool(name="get_new_tab", description="使用Drissionpage创建一个新的tab页，在新的tab页中打开url")
+    @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(url)
@@ -59,6 +66,7 @@ def register_get_new_tab(mcp: FastMCP, browser_manager):
         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):
     @mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
     async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
@@ -66,6 +74,7 @@ def register_switch_tab(mcp: FastMCP, browser_manager):
         _browser.activate_tab(tab_id)
         return dp_mcp_message_pack(f"已将tab页:【{tab_id}】切换至最前端")
 
+
 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]:
@@ -73,6 +82,7 @@ def register_close_tab(mcp: FastMCP, browser_manager):
         _browser.close_tabs(tab_id)
         return dp_mcp_message_pack(f"已将tab页:【{tab_id}】关闭")
 
+
 def register_check_selector(mcp: FastMCP, browser_manager):
     @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[
@@ -99,6 +109,7 @@ def register_check_selector(mcp: FastMCP, browser_manager):
             attr_output=attr_output
         )
 
+
 def register_quit_browser(mcp: FastMCP, browser_manager):
     @mcp.tool(name="quit_browser", description="退出浏览器会话，关闭浏览器")
     async def quit_browser(browser_port: int) -> dict[str, Any]:
@@ -111,6 +122,7 @@ def register_quit_browser(mcp: FastMCP, browser_manager):
             quit_flag=flag
         )
 
+
 def register_assert_waf(mcp: FastMCP, browser_manager):
     @mcp.tool(name="assert_waf",
               description="通过对比requests、有头浏览器、无头浏览器获取到的html，判断网页是否使用了waf以及是否为动态渲染的网页")
@@ -159,18 +171,3 @@ def register_assert_waf(mcp: FastMCP, browser_manager):
             raw_headless_rate_difference=h_hless_rate_diff,
             head_headless_rate_difference=h_hless_rate_diff
         )
-
-def register_highlight_element_captcha(mcp: FastMCP, browser_manager):
-    @mcp.tool(name="highlight_element_captcha", description="将传入的Selector在页面上高亮，并截屏")
-    async def highlight_element_captcha(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
-        _browser = browser_manager.get_browser(browser_port)
-        tab = _browser.get_tab(tab_id)
-        highlight_style = 'background-color: rgba(255, 255, 0, 0.2); outline: 2px solid yellow !important; outline-offset: 2px'
-        css_selector = css_selector
-        if "css:" not in css_selector:
-            css_selector = "css:" + css_selector
-
-        target_eles = tab.eles(css_selector)
-        exist_flag = False
-        if len(target_eles) != 0:
-            exist_flag = True

tools/browser_manager.py

@@ -16,13 +16,15 @@ class BrowserManager:
             cls._instance.browser_pool = {}
         return cls._instance
 
-    def create_browser(self) -> Tuple[int, ChromiumPage]:
+    def create_browser(self, user_agent: str = None) -> Tuple[int, ChromiumPage]:
         """创建新的浏览器实例"""
         random_port = random.randint(9223, 9934)
         while random_port in self.browser_pool:
             random_port = random.randint(9223, 9934)
 
         co = ChromiumOptions().set_local_port(random_port)
+        if user_agent:
+            co.set_user_agent(user_agent)
         if platform.system() != 'Windows':
             co.set_argument('--no-sandbox')
         custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")

jarvis_brain-0.1.5.10.dist-info/RECORD

@@ -1,10 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=TqHQRFKKIImXKnGpuCQ8TatARLpezos3iV9nCcdEzrY,9224
-mcp_tools/main.py,sha256=SiLF-tcEdApkzMjTZJEpVYX5d-LPW7aqy6A6lCBA7YQ,829
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=J8aNQECiQvucsUjLJQ9N-3f2xoyoCIxjV-kJ7YcoHv4,1849
-tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
-jarvis_brain-0.1.5.10.dist-info/METADATA,sha256=LfotsulMPGBk8opa0nS4ZZPrQi0S8UynJ-0F-KTrWfY,242
-jarvis_brain-0.1.5.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.5.10.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.5.10.dist-info/RECORD,,