Jarvis-Brain 0.1.11.5__tar.gz → 0.1.11.7__tar.gz

{jarvis_brain-0.1.11.5 → jarvis_brain-0.1.11.7}/PKG-INFO

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

{jarvis_brain-0.1.11.5 → jarvis_brain-0.1.11.7}/mcp_tools/dp_tools.py

@@ -7,6 +7,7 @@ import os
 import time
 from typing import Any
 
+import DrissionPage
 from fastmcp import FastMCP
 
 from tools.browser_manager import BrowserManager
@@ -162,13 +163,13 @@ def register_check_selector(mcp: FastMCP, browser_manager):
             attr_output = json.dumps(ele_attr_list, ensure_ascii=False)
         # 对attr_output逐个截断，截断的长度为：一轮最大token除以元素个数+3个点+两个引号和逗号
         return dp_mcp_message_pack(
-            f"已完成tab页:【{tab_id}】对：【{css_selector}】的检查",
+            f"已完成tab页:【{tab_id}】对：【{css_selector}】的检查，当前选中了 {len(target_eles)} 个元素",
             tab_id=tab_id,
             selector=css_selector,
             selector_ele_exist=exist_flag,
             page_size=page_size,
             offset=offset,
-            attr_output=attr_output
+            attr_output=attr_output,
         )
 
 
@@ -236,27 +237,33 @@ def register_assert_waf(mcp: FastMCP, browser_manager):
 
 
 def register_click_action(mcp: FastMCP, browser_manager):
-    @mcp.tool(name="click_action", description="尝试点击tab页中的元素，返回元素是否可以被点击，以及是否点击成功。")
-    async def click_action(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
+    @mcp.tool(name="click_action",
+              description="尝试点击tab页中的元素，返回元素是否可以被点击，以及是否点击成功。"
+                          "其中target_element_index默认为0，当传入的Selector可以定位到多个元素时，需要传入target_element_index指定具体点击目标 ")
+    async def click_action(browser_port: int, tab_id: str, css_selector: str, target_element_index: int = 0) -> 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_eles = target_tab.eles(css_selector)
-        click_success = False
-        element_clickable = False
-        if len(target_eles) == 1:
-            target_element = target_eles[0]
-            element_clickable = target_element.states.is_clickable
-            try:
-                target_element.click()
-                click_success = True
-            except Exception as e:
-                click_success = False
-            message = f"tab页:【{tab_id}】点击【{css_selector}】 {'成功' if click_success else '失败'} 了"
+        # click_success = False
+        # element_clickable = False
+        # if len(target_eles) == 1:
+        target_element = target_eles[target_element_index]
+        element_clickable = target_element.states.is_clickable
+        try:
+            target_element.click()
+            click_success = True
+        except Exception as e:
+            click_success = False
+        if target_element_index > 0:
+            message = f"tab页:【{tab_id}】点击【{css_selector}】【index={target_element_index}】的元素 {'成功' if click_success else '失败'} 了"
         else:
-            message = f"tab页:【{tab_id}】传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
+            message = f"tab页:【{tab_id}】点击【{css_selector}】 {'成功' if click_success else '失败'} 了"
+        # else:
+        #     message = f"tab页:【{tab_id}】传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
         return dp_mcp_message_pack(
             message=message,
             browser_port=browser_port,
@@ -313,10 +320,11 @@ def register_get_screenshot(mcp: FastMCP, browser_manager):
     async def get_tab_screenshot(browser_port: int, tab_id: str) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         target_tab = _browser.get_tab(tab_id)
+        target_tab.wait.doc_loaded()
         if not os.path.exists(html_source_code_local_save_path):
             os.makedirs(html_source_code_local_save_path)
         timestamp = int(time.time() * 1000)
-        time.sleep(3)
+        # time.sleep(1)
         origin_png = target_tab.get_screenshot(as_bytes="png")
         compress_png = compress_image_bytes(origin_png)
         image_path = os.path.join(html_source_code_local_save_path, f"{browser_port}_{tab_id}_{timestamp}.png")

{jarvis_brain-0.1.11.5 → jarvis_brain-0.1.11.7}/pyproject.toml

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

{jarvis_brain-0.1.11.5 → jarvis_brain-0.1.11.7}/tools/browser_proxy.py

@@ -140,7 +140,10 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
         data = packet.request.postData
     domain = urlparse(url).netloc
     body = packet.response.body
-    body_str = json.dumps(body, ensure_ascii=False, separators=(',', ':'))
+    if isinstance(body, dict):
+        body_str = json.dumps(body, ensure_ascii=False, separators=(',', ':'))
+    else:
+        body_str = str(body)
     body_str_list = [body_str[i:i + one_turn_max_token] for i in range(0, len(body_str), one_turn_max_token)]
     body_completed = True
     packet_filter = client.packet_filter
@@ -155,9 +158,9 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
             continue
         if (index + 1) != len(body_str_list):
             body_completed = False
-        if packet.response:
+        try:
             response_headers = packet.response.headers
-        else:
+        except TypeError:
             response_headers = {}
         temp_dict = {
             "url": url,
@@ -172,17 +175,3 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
 
 
 client_manager = DPProxyClientManager()
-
-# if __name__ == '__main__':
-#     co = ChromiumOptions().set_user_agent(
-#         "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Mobile Safari/537.36")
-#     tab = ChromiumPage(co).latest_tab
-#     client = DPProxyClient(tab, self_kill=False)
-#     # client = CaptchaClient(tab, self_kill=True)
-#     tab = client.get_driver(True)
-#     url = "https://api.toutiaoapi.com/feoffline/hotspot_and_local/html/hot_list/index.html?client_extra_params=%7B%22custom_log_pb%22%3A%22%7B%5C%22style_id%5C%22%3A%5C%2240030%5C%22%2C%5C%22entrance_hotspot%5C%22%3A%5C%22search%5C%22%2C%5C%22location%5C%22%3A%5C%22hot_board%5C%22%2C%5C%22category_name%5C%22%3A%5C%22hotboard_light%5C%22%7D%22%7D&count=50&log_pb=%7B%22style_id%22%3A%2240030%22%2C%22entrance_hotspot%22%3A%22search%22%2C%22location%22%3A%22hot_board%22%2C%22category_name%22%3A%22hotboard_light%22%7D&only_hot_list=1&tab_name=stream&enter_keyword=%23%E7%BE%8E%E5%9B%BD%E9%80%80%E5%87%BA66%E4%B8%AA%E5%9B%BD%E9%99%85%E7%BB%84%E7%BB%87%23"
-#     tab.get(url)
-#     for _ in range(5056):
-#         new_packet = client.pop_first_packet()
-#         print(new_packet, "23")
-#         time.sleep(1)