Jarvis-Brain 0.1.4.6__tar.gz → 0.1.5.4__tar.gz

{jarvis_brain-0.1.4.6 → jarvis_brain-0.1.5.4}/PKG-INFO

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

{jarvis_brain-0.1.4.6 → jarvis_brain-0.1.5.4}/mcp_tools/dp_tools.py

@@ -1,3 +1,4 @@
+import json
 import os
 from typing import Any
 
@@ -69,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
         )
 
 

{jarvis_brain-0.1.4.6 → jarvis_brain-0.1.5.4}/mcp_tools/main.py

@@ -7,14 +7,16 @@ 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:
-    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:

{jarvis_brain-0.1.4.6 → jarvis_brain-0.1.5.4}/pyproject.toml

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

{jarvis_brain-0.1.4.6 → jarvis_brain-0.1.5.4}/tools/browser_manager.py

@@ -1,7 +1,7 @@
 """浏览器池管理模块 - 单例模式确保状态共享"""
 import random
 from typing import Optional, Tuple
-
+import os
 from DrissionPage import ChromiumPage, ChromiumOptions
 
 
@@ -22,6 +22,10 @@ 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}")
+        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]
 

{jarvis_brain-0.1.4.6 → jarvis_brain-0.1.5.4}/tools/tools.py

@@ -21,8 +21,19 @@ def requests_html(url):
 def dp_headless_html(url):
     opt = ChromiumOptions().headless(True)
     opt.set_argument('--no-sandbox')
+    """创建新的浏览器实例"""
+    random_port = random.randint(9223, 9934)
+    while random_port in self.browser_pool:
+        random_port = random.randint(9223, 9934)
+
+    custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")
+    opt.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)
     # 随机端口，固定9222端口的话，可能会被瑞数检测到
-    opt.auto_port()
+    # opt.auto_port()
+    opt.set_local_port(random_port)
     page = ChromiumPage(opt)
     tab = page.latest_tab
     tab.get(url)