Jarvis-Brain 0.1.7.1__tar.gz → 0.1.7.2__tar.gz

{jarvis_brain-0.1.7.1 → jarvis_brain-0.1.7.2}/PKG-INFO

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

{jarvis_brain-0.1.7.1 → jarvis_brain-0.1.7.2}/mcp_tools/dp_tools.py

@@ -42,7 +42,7 @@ def register_get_html(mcp: FastMCP, browser_manager, client_manager: DPProxyClie
     async def get_html(browser_port: int, tab_id: str) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         tab = _browser.get_tab(tab_id)
-        file_name_prefix = str(tab.title).replace("/", "_").replace(":", "_")
+        file_name_prefix = hashlib.md5(str(tab.title).encode('utf-8')).hexdigest()
         if not os.path.exists(html_source_code_local_save_path):
             os.makedirs(html_source_code_local_save_path)
         min_html, compress_rate = compress_html(tab.html)

{jarvis_brain-0.1.7.1 → jarvis_brain-0.1.7.2}/pyproject.toml

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

{jarvis_brain-0.1.7.1 → jarvis_brain-0.1.7.2}/tools/browser_proxy.py

@@ -1,6 +1,6 @@
 import threading
 from collections import deque
-
+import time
 from DrissionPage import ChromiumPage, ChromiumOptions
 from DrissionPage._pages.chromium_tab import ChromiumTab
 from DrissionPage._units.listener import DataPacket
@@ -133,31 +133,31 @@ def check_data_packet(packet: DataPacket, client: DPProxyClient):
     data = None
     if packet.request.hasPostData:
         data = packet.request.postData
+    body = packet.response.body
     temp_dict = {
         "url": url,
         "method": method,
         "request_data": data,
-        "request_headers": packet.request.headers,
-        "response_headers": packet.response.headers,
-        "response_body": packet.response.body,
+        "request_headers": dict(packet.request.headers),
+        "response_headers": dict(packet.response.headers),
+        "response_body": body,
     }
-    print(temp_dict)
+    # print(temp_dict)
     client.packet_queue.append(temp_dict)
 
 
 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)
+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)