Jarvis-Brain 0.1.10.0__tar.gz → 0.1.11.1__tar.gz

{jarvis_brain-0.1.10.0 → jarvis_brain-0.1.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.10.0
+Version: 0.1.11.1
 Summary: Jarvis brain mcp
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4
@@ -8,3 +8,4 @@ Requires-Dist: curl-cffi
 Requires-Dist: drissionpage
 Requires-Dist: fastmcp
 Requires-Dist: minify-html
+Requires-Dist: pillow

{jarvis_brain-0.1.10.0 → jarvis_brain-0.1.11.1}/mcp_tools/dp_tools.py

@@ -4,13 +4,14 @@
 import hashlib
 import json
 import os
+import time
 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, \
-    compress_html_js
+    compress_html_js, compress_image_bytes
 from tools.browser_proxy import DPProxyClient, DPProxyClientManager
 
 html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
@@ -304,3 +305,24 @@ def register_scroll_action(mcp: FastMCP, browser_manager):
             browser_port=browser_port,
             tab_id=tab_id,
         )
+
+
+def register_get_screenshot(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="get_tab_screenshot", description="尝试对传入tab页进行截图，并将截图压缩为1M大小png图片，会返回截图保存路径")
+    async def get_tab_screenshot(browser_port: int, tab_id: str) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        target_tab = _browser.get_tab(tab_id)
+        if not os.path.exists(html_source_code_local_save_path):
+            os.makedirs(html_source_code_local_save_path)
+        timestamp = int(time.time() * 1000)
+        origin_png = target_tab.get_screenshot(as_bytes="png")
+        compress_png = compress_image_bytes(origin_png)
+        image_path = os.path.join(html_source_code_local_save_path, f"{browser_port}_{tab_id}_{timestamp}.png")
+        with open(image_path, "wb") as f:
+            f.write(compress_png)
+        return dp_mcp_message_pack(
+            message=f"已完成对browser_port={browser_port},tab_id={tab_id}的截屏",
+            browser_port=browser_port,
+            tab_id=tab_id,
+            screenshot_path=image_path
+        )

{jarvis_brain-0.1.10.0 → jarvis_brain-0.1.11.1}/mcp_tools/main.py

@@ -20,6 +20,7 @@ if "TeamNode-Dp" in enabled_modules:
     register_get_html(mcp, browser_manager)
     register_check_selector(mcp, browser_manager)
     register_pop_first_packet(mcp, browser_manager, client_manager)
+    register_get_screenshot(mcp, browser_manager)
     # 页面交互
     register_click_action(mcp, browser_manager)
     register_scroll_action(mcp, browser_manager)
@@ -29,7 +30,7 @@ if "JarvisNode" in enabled_modules:
 
 
 def main():
-    mcp.run(transport="stdio",show_banner=False)
+    mcp.run(transport="stdio", show_banner=False)
 
 
 if __name__ == '__main__':

{jarvis_brain-0.1.10.0 → jarvis_brain-0.1.11.1}/pyproject.toml

@@ -1,13 +1,14 @@
 [project]
 name = "Jarvis_Brain"  # 别人下载时用的名字，必须在 PyPI 上唯一
-version = "0.1.10.0"
+version = "0.1.11.1"
 description = "Jarvis brain mcp"
 dependencies = [
     "fastmcp",
     "DrissionPage",
     "minify-html",
     "beautifulsoup4",
-    "curl_cffi"
+    "curl_cffi",
+    "pillow"
 ]
 requires-python = ">=3.10"
 

{jarvis_brain-0.1.10.0 → jarvis_brain-0.1.11.1}/tools/browser_proxy.py

@@ -126,6 +126,51 @@ class DrissionPageListenerProxy:
         return attr
 
 
+def check_data_packet(packet: DataPacket, client: DPProxyClient):
+    """
+    封装监听到的数据包，并将其存放在client的packet_queue中
+    :param packet:
+    :param client:
+    :return:
+    """
+    url = packet.url
+    method = packet.request.method
+    data = None
+    if packet.request.hasPostData:
+        data = packet.request.postData
+    domain = urlparse(url).netloc
+    body = packet.response.body
+    body_str = json.dumps(body, ensure_ascii=False, separators=(',', ':'))
+    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
+    packet_filter = client.packet_filter
+    domain_filter = packet_filter.get("domain_filter", None)
+    method_filter = packet_filter.get("method_filter", ["GET", "POST"])
+    for index, body_str in enumerate(body_str_list):
+        # 如果给了domain_filter并且domain没有在domain_filter中时跳过该数据包
+        if domain_filter and domain not in domain_filter:
+            continue
+        # 如果method没有在method_filter中，则跳过该数据包
+        if method not in method_filter:
+            continue
+        if (index + 1) != len(body_str_list):
+            body_completed = False
+        if packet.response:
+            response_headers = packet.response.headers
+        else:
+            response_headers = {}
+        temp_dict = {
+            "url": url,
+            "body_completed": body_completed,
+            "method": method,
+            "request_data": data,
+            "request_headers": dict(packet.request.headers),
+            "response_headers": dict(response_headers),
+            "response_body_segment": body_str.replace("\\", ""),
+        }
+        client.packet_queue.append(temp_dict)
+
+
 def check_data_packet(packet: DataPacket, client: DPProxyClient):
     """
     封装监听到的数据包，并将其存放在client的packet_queue中

{jarvis_brain-0.1.10.0 → jarvis_brain-0.1.11.1}/tools/tools.py

@@ -6,6 +6,9 @@ from DrissionPage import ChromiumPage, ChromiumOptions
 from bs4 import BeautifulSoup
 from curl_cffi import requests
 from lxml import html, etree
+import base64
+from PIL import Image
+import io
 
 compress_html_js = """
     function getSimplifiedDOM(node) {
@@ -188,6 +191,72 @@ def dp_mcp_message_pack(message: str, **kwargs):
         }]
     }
 
+
+def btyes2Base64Img(target_byte):
+    """
+    把byte转为base64，用于传输图片
+    :param target_byte:
+    :return:
+    """
+    return "data:image/png;base64," + base64.b64encode(target_byte).decode()
+
+
+def compress_image_bytes(input_bytes, target_size_mb=1):
+    """
+    压缩图片字节数据到目标大小
+
+    参数:
+        input_bytes: 输入图片的字节数据
+        target_size_mb: 目标大小(MB)，默认1MB
+
+    返回:
+        压缩后的图片字节数据
+    """
+    target_size = target_size_mb * 1024 * 1024  # 转换为字节
+
+    # 从字节数据打开图片
+    img = Image.open(io.BytesIO(input_bytes))
+
+    # 如果是PNG或其他格式，转换为RGB
+    if img.mode in ('RGBA', 'LA', 'P'):
+        img = img.convert('RGB')
+
+    # 初始质量设置
+    quality = 95
+
+    # 先尝试压缩
+    output_buffer = io.BytesIO()
+    img.save(output_buffer, 'JPEG', quality=quality, optimize=True)
+    output_bytes = output_buffer.getvalue()
+
+    # 如果文件仍然太大，逐步降低质量
+    while len(output_bytes) > target_size and quality > 10:
+        quality -= 5
+        output_buffer = io.BytesIO()
+        img.save(output_buffer, 'JPEG', quality=quality, optimize=True)
+        output_bytes = output_buffer.getvalue()
+
+    # 如果降低质量还不够，尝试缩小尺寸
+    if len(output_bytes) > target_size:
+        width, height = img.size
+
+        while len(output_bytes) > target_size and quality > 10:
+            # 缩小10%
+            width = int(width * 0.9)
+            height = int(height * 0.9)
+            img_resized = img.resize((width, height), Image.Resampling.LANCZOS)
+            output_buffer = io.BytesIO()
+            img_resized.save(output_buffer, 'JPEG', quality=quality, optimize=True)
+            output_bytes = output_buffer.getvalue()
+
+    final_size = len(output_bytes) / (1024 * 1024)
+    # print(f"压缩完成！")
+    # print(f"原始大小: {len(input_bytes) / (1024 * 1024):.2f}MB")
+    # print(f"压缩后大小: {final_size:.2f}MB")
+    # print(f"最终质量: {quality}")
+
+    return output_bytes
+
 # todo: 大致盘一下各种判定的逻辑【以下的所有压缩比之间的差距均取“绝对值”】
 #  1. 如果requests、无头、有头获取到的压缩比之间从差距都在15%以内，则认定该页面是静态页面，此时优先使用requests请求
 #  2. 如果requests的status_code为特定的412，或者521，则判定是瑞数和jsl。[此时还有一个特点：requests的压缩比会与其他两种方式获取到的压缩比差距非常大(一两千的那种)]

jarvis_brain-0.1.10.0/mcp_tools/chrome_devtools_tools.py

@@ -1,11 +0,0 @@
-"""
-这个文件中提供的工具作为谷歌官方mcp：chrome-devtools-mcp的辅助工具，仅提供功能补充与浏览器实例管理
-"""
-import hashlib
-import json
-import os
-from typing import Any
-
-from fastmcp import FastMCP
-
-from tools.browser_manager import BrowserManager