Jarvis-Brain 0.1.4.6__py3-none-any.whl → 0.1.5.0__py3-none-any.whl

{jarvis_brain-0.1.4.6.dist-info → jarvis_brain-0.1.5.0.dist-info}/METADATA

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

{jarvis_brain-0.1.4.6.dist-info → jarvis_brain-0.1.5.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=S0__-GrhekKlJ4TjibgUHzlIFabu4zCkHSei6i5H5uo,7985
+mcp_tools/dp_tools.py,sha256=TsktupVxzQkDRH4w-niEqJba3LkeWxIeyyx24ehpqAs,8411
 mcp_tools/main.py,sha256=wplNNm2IjL1QcmPPBf1SOU2_HZIU75VQA3UBjun33g8,795
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/browser_manager.py,sha256=WPvQjG54oblGa--2qWOAJOf8bmvVbu8UniB1zLSM_hM,1459
 tools/tools.py,sha256=qPa80xzQWCD8mSdg8isCgyei0XN8a7guGtR2J_MbQDU,4481
-jarvis_brain-0.1.4.6.dist-info/METADATA,sha256=-LUwetAQs5uP-PUHBCOqg7-c1tEeC3XLjVfAflhLyMk,241
-jarvis_brain-0.1.4.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.4.6.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.4.6.dist-info/RECORD,,
+jarvis_brain-0.1.5.0.dist-info/METADATA,sha256=ZOOB8ZZapYxhABzMVkZU6qwVrp8ic5F5WgdFCyV_7FI,241
+jarvis_brain-0.1.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.5.0.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.5.0.dist-info/RECORD,,

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
         )