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

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

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

jarvis_brain-0.1.5.10.dist-info/RECORD

@@ -0,0 +1,10 @@
+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,,

mcp_tools/dp_tools.py

@@ -1,8 +1,8 @@
+import hashlib
 import json
 import os
 from typing import Any
 
-from DrissionPage._elements.none_element import NoneElement
 from fastmcp import FastMCP
 
 from tools.tools import compress_html, requests_html, dp_headless_html, assert_waf_cookie, dp_mcp_message_pack
@@ -12,6 +12,8 @@ waf_status_code_dict = {
     412: "瑞数",
     521: "加速乐"
 }
+# 一轮最大输入，以免单个html最大长度超过ai最大输入
+ont_turn_max_token = 25000
 
 
 def register_visit_url(mcp: FastMCP, browser_manager):
@@ -33,15 +35,20 @@ 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 = tab.title + f"_{tab_id}.html"
+        file_name = str(tab.title).replace("/", "_").replace(":", "_")
         if not os.path.exists(html_source_code_local_save_path):
             os.makedirs(html_source_code_local_save_path)
-        abs_path = os.path.join(html_source_code_local_save_path, file_name)
-        with open(abs_path, "w", encoding="utf-8") as f:
-            min_html, compress_rate = compress_html(tab.html)
-            f.write(min_html)
-        return dp_mcp_message_pack(f"已保存tab页：【{tab_id}】的html源码", tab_id=tab_id, html_local_path=abs_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"
+            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)
+            html_file_list.append(abs_path)
+        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")
@@ -52,7 +59,6 @@ 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]:
@@ -60,7 +66,6 @@ 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]:
@@ -68,10 +73,10 @@ 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[str, Any]:
+    async def check_selector(browser_port: int, tab_id: str, css_selector: str, attr_name: str = "text") -> dict[
+        str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         target_tab = _browser.get_tab(tab_id)
         css_selector = css_selector
@@ -94,7 +99,6 @@ 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]:
@@ -107,7 +111,6 @@ 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以及是否为动态渲染的网页")
@@ -157,10 +160,17 @@ def register_assert_waf(mcp: FastMCP, browser_manager):
             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, selector: str) -> dict[str, Any]:
-#         _browser = browser_manager.get_browser(browser_port)
-#         tab = _browser.get_tab(tab_id)
-#         tab.ele
+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

mcp_tools/main.py

@@ -7,7 +7,7 @@ mcp = FastMCP("Jarvis Brain Mcp Tools")
 
 # 根据环境变量加载模块
 enabled_modules = os.getenv("MCP_MODULES", "TeamNode-Dp").split(",")
-base_cwd = os.getenv("BASE_CWD", os.environ.get("PWD"))
+base_cwd = os.getenv("BASE_CWD", os.path.expanduser('~'))
 
 if "TeamNode-Dp" in enabled_modules:
     # 页面管理

tools/browser_manager.py

@@ -3,6 +3,7 @@ import random
 from typing import Optional, Tuple
 import os
 from DrissionPage import ChromiumPage, ChromiumOptions
+import platform
 
 
 class BrowserManager:
@@ -22,11 +23,12 @@ class BrowserManager:
             random_port = random.randint(9223, 9934)
 
         co = ChromiumOptions().set_local_port(random_port)
+        if platform.system() != 'Windows':
+            co.set_argument('--no-sandbox')
         custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")
-
-        # 2. 配置浏览器选项，指定该目录
-        # co = ChromiumOptions()
         co.set_user_data_path(custom_data_dir)  # 设置用户数据路径
+        # if not os.path.exists(custom_data_dir):
+        #     os.makedirs(custom_data_dir)
         self.browser_pool[random_port] = ChromiumPage(co)
         return random_port, self.browser_pool[random_port]
 

tools/tools.py

@@ -1,5 +1,6 @@
 import time
-
+import random
+import os
 import minify_html
 from DrissionPage import ChromiumPage, ChromiumOptions
 from bs4 import BeautifulSoup
@@ -21,8 +22,11 @@ def requests_html(url):
 def dp_headless_html(url):
     opt = ChromiumOptions().headless(True)
     opt.set_argument('--no-sandbox')
-    # 随机端口，固定9222端口的话，可能会被瑞数检测到
-    opt.auto_port()
+    """创建新的浏览器实例"""
+    random_port = random.randint(9934, 10034)
+    custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")
+    opt.set_user_data_path(custom_data_dir)  # 设置用户数据路径
+    opt.set_local_port(random_port)
     page = ChromiumPage(opt)
     tab = page.latest_tab
     tab.get(url)

jarvis_brain-0.1.5.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=TsktupVxzQkDRH4w-niEqJba3LkeWxIeyyx24ehpqAs,8411
-mcp_tools/main.py,sha256=ockDfiMWaNroXf6sJ9dk-jU-_SvoGgP-0t-TbW2XWyw,827
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=G0nUQSmMVWzS08IjO87reEyMCpy-IiM3BxwdNUvcmdI,1740
-tools/tools.py,sha256=qPa80xzQWCD8mSdg8isCgyei0XN8a7guGtR2J_MbQDU,4481
-jarvis_brain-0.1.5.2.dist-info/METADATA,sha256=s5BNa9hKn38Tk0_S8iGPpDxwZ7h-x2NO1iXLtV8kRzM,241
-jarvis_brain-0.1.5.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.5.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.5.2.dist-info/RECORD,,