Jarvis-Brain 0.1.5.8__tar.gz → 0.1.5.10__tar.gz

{jarvis_brain-0.1.5.8 → jarvis_brain-0.1.5.10}/PKG-INFO

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

{jarvis_brain-0.1.5.8 → jarvis_brain-0.1.5.10}/mcp_tools/dp_tools.py

@@ -1,3 +1,4 @@
+import hashlib
 import json
 import os
 from typing import Any
@@ -11,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,16 +36,19 @@ def register_get_html(mcp: FastMCP, browser_manager):
         _browser = browser_manager.get_browser(browser_port)
         tab = _browser.get_tab(tab_id)
         file_name = str(tab.title).replace("/", "_").replace(":", "_")
-        file_name = file_name + f"_{tab_id}.html"
         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)
-        tab.wait.doc_loaded()
-        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")
@@ -53,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]:
@@ -61,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]:
@@ -69,7 +73,6 @@ 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[
@@ -96,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]:
@@ -109,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以及是否为动态渲染的网页")
@@ -159,7 +160,6 @@ 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, css_selector: str) -> dict[str, Any]:

{jarvis_brain-0.1.5.8 → jarvis_brain-0.1.5.10}/pyproject.toml

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