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

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

@@ -1,12 +1,10 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.4
-Summary: Jarvis brain
+Version: 0.1.5.2
+Summary: Jarvis brain mcp
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4
 Requires-Dist: curl-cffi
 Requires-Dist: drissionpage
 Requires-Dist: fastmcp
-Requires-Dist: htmlmin
-Requires-Dist: jieba
-Requires-Dist: simhash
+Requires-Dist: minify-html

jarvis_brain-0.1.5.2.dist-info/RECORD

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

mcp_tools/dp_tools.py

@@ -1,3 +1,4 @@
+import json
 import os
 from typing import Any
 
@@ -5,8 +6,6 @@ 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
-import psutil
-from pathlib import Path
 
 html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
 waf_status_code_dict = {
@@ -71,19 +70,28 @@ def register_close_tab(mcp: FastMCP, browser_manager):
 
 
 def register_check_selector(mcp: FastMCP, browser_manager):
-    @mcp.tool(name="check_selector", description="查找tab页中是否包含某个元素")
-    async def check_selector(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
+    @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]:
         _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_ele = target_tab.ele(css_selector)
+        target_eles = target_tab.eles(css_selector)
+        exist_flag = False
+        if len(target_eles) != 0:
+            exist_flag = True
+        if attr_name == "text":
+            ele_text_list = [i.text.replace("\n", "") for i in target_eles]
+            attr_output = "\n".join(ele_text_list)
+        else:
+            attr_output = json.dumps([i.attr(attr_name) for i in target_eles])
         return dp_mcp_message_pack(
             f"已完成tab页:【{tab_id}】对：【{css_selector}】的检查",
             tab_id=tab_id,
             selector=css_selector,
-            selector_ele_exist=not isinstance(target_ele, NoneElement)
+            selector_ele_exist=exist_flag,
+            attr_output=attr_output
         )
 
 
@@ -149,21 +157,10 @@ 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_test(mcp: FastMCP, cwd: str):
-    @mcp.tool(name="test", description="用户说要进行测试时调用这个函数")
-    async def test() -> dict[str, Any]:
-        test_project = "获取根目录"
-        return dp_mcp_message_pack(
-            f"当前测试项目是：{test_project}",
-            result=cwd
-        )
+# 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

mcp_tools/main.py

@@ -1,6 +1,6 @@
-# main.py
-from mcp_tools.dp_tools import *
 from fastmcp import FastMCP
+
+from mcp_tools.dp_tools import *
 from tools.browser_manager import browser_manager
 
 mcp = FastMCP("Jarvis Brain Mcp Tools")
@@ -10,16 +10,17 @@ enabled_modules = os.getenv("MCP_MODULES", "TeamNode-Dp").split(",")
 base_cwd = os.getenv("BASE_CWD", os.environ.get("PWD"))
 
 if "TeamNode-Dp" in enabled_modules:
-    register_visit_url(mcp, browser_manager)
+    # 页面管理
     register_close_tab(mcp, browser_manager)
     register_switch_tab(mcp, browser_manager)
-    register_get_html(mcp, browser_manager)
     register_get_new_tab(mcp, browser_manager)
+    # 功能
+    register_visit_url(mcp, browser_manager)
+    register_get_html(mcp, browser_manager)
     register_check_selector(mcp, browser_manager)
 
 if "JarvisNode" in enabled_modules:
     register_assert_waf(mcp, browser_manager)
-    register_test(mcp, base_cwd)
 
 
 def main():

tools/browser_manager.py

@@ -1,7 +1,8 @@
 """浏览器池管理模块 - 单例模式确保状态共享"""
 import random
-from DrissionPage import ChromiumPage, ChromiumOptions
 from typing import Optional, Tuple
+import os
+from DrissionPage import ChromiumPage, ChromiumOptions
 
 
 class BrowserManager:
@@ -21,6 +22,11 @@ class BrowserManager:
             random_port = random.randint(9223, 9934)
 
         co = ChromiumOptions().set_local_port(random_port)
+        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)  # 设置用户数据路径
         self.browser_pool[random_port] = ChromiumPage(co)
         return random_port, self.browser_pool[random_port]
 

tools/tools.py

@@ -1,23 +1,10 @@
 import time
-import json
 
-import htmlmin
+import minify_html
+from DrissionPage import ChromiumPage, ChromiumOptions
+from bs4 import BeautifulSoup
 from curl_cffi import requests
 from lxml import html, etree
-from bs4 import BeautifulSoup
-from DrissionPage import ChromiumPage, ChromiumOptions
-
-
-# 传入requests的set-cookie的str，返回一个cookie dict
-def cookie_str2dict(cookie_str: str):
-    if cookie_str == "":
-        return {}
-    cookie_dict = {}
-    cookie_list = [cookie.split(";")[0] for cookie in cookie_str.split("HttpOnly,")]
-    for cookie in cookie_list:
-        key, value = cookie.split("=")
-        cookie_dict[key] = value
-    return cookie_dict
 
 
 # 使用requests获取html，用于测试是否使用了瑞数和jsl
@@ -26,8 +13,6 @@ def requests_html(url):
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
     }
     response = requests.get(url, headers=headers, verify=False)
-    # print("response headers=> ", type(response.headers.get("Set-Cookie")),
-    #       cookie_str2dict(response.headers.get("Set-Cookie", "")))
     response.encoding = "utf-8"
     return response.text, response.status_code
 
@@ -75,7 +60,7 @@ def compress_html(content, only_text=False):
                 element.attrib.pop(attr)
 
     result = etree.tostring(doc, encoding='unicode')
-    result = htmlmin.minify(result)
+    result = minify_html.minify(result)
     compress_rate = round(len(content) / len(result) * 100)
     print(f"html压缩比=> {compress_rate}%")
     if not only_text:

jarvis_brain-0.1.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=PwLd1zTFIQ673-cZjdON4TfU854_h5BgLPOVRbt_kVw,8349
-mcp_tools/main.py,sha256=WO9kNpIORRrIOAWW8jiAd3gNW6rFMExln8y4CquKrM8,837
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=AM9hIQKtgMVxIZsEPxfHj9q41ZtzHrOS69wtgGBE3-Q,1458
-tools/tools.py,sha256=3vTMCT_h0eDPtOMHc2KnhNVpQBUs6jgIChutBZZFMK4,5008
-jarvis_brain-0.1.4.dist-info/METADATA,sha256=CPa_sjNrcHRhHvOXryp09mbbgIW3EY0AP_fT0PKCoNM,275
-jarvis_brain-0.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.4.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.4.dist-info/RECORD,,