Jarvis-Brain 0.1.13.8__py3-none-any.whl → 0.1.13.10__py3-none-any.whl

{jarvis_brain-0.1.13.8.dist-info → jarvis_brain-0.1.13.10.dist-info}/METADATA

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

jarvis_brain-0.1.13.10.dist-info/RECORD

@@ -0,0 +1,11 @@
+mcp_tools/__init__.py,sha256=_ZzedxbxmVkdRH00ONOjQR31pZW-B8WPn5P2qE6T-Iw,3012
+mcp_tools/dp_tools.py,sha256=fPxeXA2OdvISgBebi2BP_uCZekDaJltvTDaYrqUxFzw,26265
+mcp_tools/main.py,sha256=hIiYV7QVT8XDEDihhTQTUmL7Ftlsd0DlfhKMHEqj244,1262
+tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
+tools/browser_proxy.py,sha256=VAhuVrBIoXmKyXvCmJh4eRYCWpLIhbTYmFHK8l8eoTA,6590
+tools/tools.py,sha256=14ETum8I_sXyu_re11aN0q18dIpPqAP-rEaGcAIGuYA,12928
+jarvis_brain-0.1.13.10.dist-info/METADATA,sha256=z9bFvrmXxrCcBU-XiDgvS7XACmWSCboh1UOAR09tqsw,265
+jarvis_brain-0.1.13.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.13.10.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.13.10.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -7,7 +7,7 @@ import os
 import time
 from typing import Any
 
-import DrissionPage
+from DrissionPage.errors import NoRectError
 from fastmcp import FastMCP
 
 from tools.browser_manager import BrowserManager
@@ -386,36 +386,44 @@ def register_get_ele_info(mcp: FastMCP, browser_manager):
                 css_selector=css_selector,
                 element_index=element_index,
             )
-        has_rect = target_element.states.has_rect,
-        element_rect_size = tuple()
-        if not has_rect:
-            element_rect_size = target_element.rect.size,
         try:
-            child_count=target_element.child_count
-        except Exception:
-            child_count=0
-        return dp_mcp_message_pack(
-            message="元素可以被正常的选择到，以下是元素相关的一系列信息",
-            browser_port=browser_port,
-            tab_id=tab_id,
-            css_selector=css_selector,
-            element_index=element_index,
-            element_tag=target_element.tag,
-            element_attrs_key=list(target_element.attrs.keys()),
-            element_child_count=child_count,
-            element_rect_size=element_rect_size,
-            is_in_viewport=target_element.states.is_in_viewport,
-            is_whole_in_viewport=target_element.states.is_whole_in_viewport,
-            is_alive=target_element.states.is_alive,
-            is_checked=target_element.states.is_checked,
-            is_selected=target_element.states.is_selected,
-            is_enabled=target_element.states.is_enabled,
-            is_displayed=target_element.states.is_displayed,
-            is_covered=target_element.states.is_covered,
-            is_clickable=target_element.states.is_clickable,
-            has_rect=has_rect
-        )
-
+            has_rect = target_element.states.has_rect,
+            element_rect_size = tuple()
+            if not has_rect:
+                element_rect_size = target_element.rect.size,
+            try:
+                child_count=target_element.child_count
+            except Exception:
+                child_count=0
+            return dp_mcp_message_pack(
+                message="元素可以被正常的选择到，以下是元素相关的一系列信息",
+                browser_port=browser_port,
+                tab_id=tab_id,
+                css_selector=css_selector,
+                element_index=element_index,
+                element_tag=target_element.tag,
+                element_attrs_key=list(target_element.attrs.keys()),
+                element_child_count=child_count,
+                element_rect_size=element_rect_size,
+                is_in_viewport=target_element.states.is_in_viewport,
+                is_whole_in_viewport=target_element.states.is_whole_in_viewport,
+                is_alive=target_element.states.is_alive,
+                is_checked=target_element.states.is_checked,
+                is_selected=target_element.states.is_selected,
+                is_enabled=target_element.states.is_enabled,
+                is_displayed=target_element.states.is_displayed,
+                is_covered=target_element.states.is_covered,
+                is_clickable=target_element.states.is_clickable,
+                has_rect=has_rect
+            )
+        except NoRectError:
+            return dp_mcp_message_pack(
+                message="报错：NoRectError: 该元素没有位置及大小。你传入的css_selector和element_index选出的元素没有rect，请确认该元素是否可见",
+                browser_port=browser_port,
+                tab_id=tab_id,
+                css_selector=css_selector,
+                element_index=element_index,
+            )
 
 def register_get_screenshot(mcp: FastMCP, browser_manager):
     @mcp.tool(name="get_tab_screenshot",

tools/tools.py

@@ -102,11 +102,11 @@ function getSimplifiedDOM(node) {
 return getSimplifiedDOM(document.body);
 """
 
-# 我自己优化后的版本，逻辑为：删除不可见元素、标签的任何属性value的长度大于20时直接删除这个属性、id和class采用简写方式：id=>#，class=>.
+# 我自己优化后的版本，逻辑为：删除不可见元素、标签的任何属性value的长度大于30时直接删除这个属性、id和class采用简写方式：id=>#，class=>.
 compress_html_js="""
 function getSimplifiedDOM(node) {
     // 全局配置：最大属性值长度
-    const MAX_ATTR_LEN = 40;
+    const MAX_ATTR_LEN = 30;
 
     // 1. 处理文本节点
     if (node.nodeType === Node.TEXT_NODE) {

jarvis_brain-0.1.13.8.dist-info/RECORD

@@ -1,11 +0,0 @@
-mcp_tools/__init__.py,sha256=_ZzedxbxmVkdRH00ONOjQR31pZW-B8WPn5P2qE6T-Iw,3012
-mcp_tools/dp_tools.py,sha256=AzAb5W-3jI_JcU_zz1LhzFiAKQwUuoXkiMQcclhXeZk,25688
-mcp_tools/main.py,sha256=hIiYV7QVT8XDEDihhTQTUmL7Ftlsd0DlfhKMHEqj244,1262
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
-tools/browser_proxy.py,sha256=VAhuVrBIoXmKyXvCmJh4eRYCWpLIhbTYmFHK8l8eoTA,6590
-tools/tools.py,sha256=wp5U1PM8Fh2yAZPDmXmCG-svtGIf9n0yb-YL3KPewWI,12928
-jarvis_brain-0.1.13.8.dist-info/METADATA,sha256=BBWTdcMJ8iof4QA3E3OxdueAD4jdRvuPO8fWdTGsH3g,264
-jarvis_brain-0.1.13.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.13.8.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.13.8.dist-info/RECORD,,