Jarvis-Brain 0.1.5.5__py3-none-any.whl → 0.1.5.6__py3-none-any.whl

{jarvis_brain-0.1.5.5.dist-info → jarvis_brain-0.1.5.6.dist-info}/METADATA

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

jarvis_brain-0.1.5.6.dist-info/RECORD

@@ -0,0 +1,10 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=ARrxVFpY2zb5JKfqny0mj4QkvQF2EWr7OEBkhK4kdcg,8718
+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.6.dist-info/METADATA,sha256=emj8lgXEsC98KUYBsvJOcROwou39qE6U8cbYsGlVQKk,241
+jarvis_brain-0.1.5.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.5.6.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.5.6.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -2,7 +2,6 @@ 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
@@ -71,7 +70,8 @@ def register_close_tab(mcp: FastMCP, browser_manager):
 
 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
@@ -157,10 +157,18 @@ 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

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,6 +23,8 @@ 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}")
         co.set_user_data_path(custom_data_dir)  # 设置用户数据路径
         # if not os.path.exists(custom_data_dir):

jarvis_brain-0.1.5.5.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=SiLF-tcEdApkzMjTZJEpVYX5d-LPW7aqy6A6lCBA7YQ,829
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=MrdONq-qxkDsq_xWeS5MjbUelCaB_UdQ3H79r1M1yuI,1746
-tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
-jarvis_brain-0.1.5.5.dist-info/METADATA,sha256=dvTinD5zIVsMuiTqrpXFnHdzyTDN7ROGXKDY9G6Brx0,241
-jarvis_brain-0.1.5.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.5.5.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.5.5.dist-info/RECORD,,