Jarvis-Brain 0.1.4.1__py3-none-any.whl → 0.1.4.2__py3-none-any.whl

{jarvis_brain-0.1.4.1.dist-info → jarvis_brain-0.1.4.2.dist-info}/METADATA

@@ -1,12 +1,10 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.4.1
-Summary: Jarvis brain
+Version: 0.1.4.2
+Summary: Jarvis brain mcp
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4
 Requires-Dist: curl-cffi
 Requires-Dist: drissionpage
 Requires-Dist: fastmcp
 Requires-Dist: htmlmin
-Requires-Dist: jieba
-Requires-Dist: simhash

jarvis_brain-0.1.4.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=W9DLblNn1hQUmjvsvVOpb_hXVWI1BKD6VvI_VeI_QBI,8024
+mcp_tools/main.py,sha256=WO9kNpIORRrIOAWW8jiAd3gNW6rFMExln8y4CquKrM8,837
+tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/browser_manager.py,sha256=AM9hIQKtgMVxIZsEPxfHj9q41ZtzHrOS69wtgGBE3-Q,1458
+tools/task_manager.py,sha256=jeJ8iG-EC2mbUgNlF-P7zf0C5gWjjPPhZS2R-vFQXss,1565
+tools/tools.py,sha256=xw-aqUGEjeg32SfQJmlx0sXvxlvVSQb9BF5PrIVJLk0,4473
+jarvis_brain-0.1.4.2.dist-info/METADATA,sha256=EBJkCHq9A7vyfgqgGJNJKo_VWamuwyE1tL4txPrvRdo,237
+jarvis_brain-0.1.4.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.4.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.4.2.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -149,21 +149,10 @@ 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_test(mcp: FastMCP, cwd: str):
-    @mcp.tool(name="test", description="用户说要进行测试时调用这个函数")
-    async def test() -> dict[str, Any]:
-        test_project = "获取根目录"
-        return dp_mcp_message_pack(
-            f"当前测试项目是：{test_project}",
-            result=cwd
-        )
+# 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

tools/task_manager.py

@@ -0,0 +1,42 @@
+import asyncio
+
+from typing import Callable, List
+
+
+class SimpleTaskManager:
+    def __init__(self, max_concurrent: int = 10):
+        self.semaphore = asyncio.Semaphore(max_concurrent)
+        self.results = []
+
+    async def execute_task(self, task_id: int, coro_func: Callable, *args, **kwargs):
+        """执行单个任务"""
+        async with self.semaphore:
+            try:
+                result = await coro_func(*args, **kwargs)
+                self.results.append((task_id, result))
+                print(f"✅ 任务 {task_id} 完成")
+                distribution_after_hook(*result)
+                return result
+            except Exception as e:
+                error_msg = f"任务 {task_id} 失败: {e}"
+                self.results.append((task_id, error_msg))
+                print(f"❌ {error_msg}")
+                return None
+
+    async def process_all(self, tasks: List[tuple]):
+        """
+        处理所有任务
+        tasks: 列表，每个元素是 (coro_func, args, kwargs) 元组
+        """
+        print(f"🚀 开始处理 {len(tasks)} 个任务，最大并发数: {self.semaphore._value}")
+
+        # 创建所有任务
+        task_coroutines = []
+        for i, (coro_func, args, kwargs) in enumerate(tasks):
+            task_coroutines.append(self.execute_task(i, coro_func, *args, **kwargs))
+
+        # 并发执行所有任务
+        await asyncio.gather(*task_coroutines)
+
+        print(f"🎉 所有任务完成！成功: {len([r for r in self.results if '失败' not in str(r[1])])}")
+        return self.results

tools/tools.py

@@ -1,5 +1,4 @@
 import time
-import json
 
 import htmlmin
 from curl_cffi import requests
@@ -8,26 +7,12 @@ from bs4 import BeautifulSoup
 from DrissionPage import ChromiumPage, ChromiumOptions
 
 
-# 传入requests的set-cookie的str，返回一个cookie dict
-def cookie_str2dict(cookie_str: str):
-    if cookie_str == "":
-        return {}
-    cookie_dict = {}
-    cookie_list = [cookie.split(";")[0] for cookie in cookie_str.split("HttpOnly,")]
-    for cookie in cookie_list:
-        key, value = cookie.split("=")
-        cookie_dict[key] = value
-    return cookie_dict
-
-
 # 使用requests获取html，用于测试是否使用了瑞数和jsl
 def requests_html(url):
     headers = {
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
     }
     response = requests.get(url, headers=headers, verify=False)
-    # print("response headers=> ", type(response.headers.get("Set-Cookie")),
-    #       cookie_str2dict(response.headers.get("Set-Cookie", "")))
     response.encoding = "utf-8"
     return response.text, response.status_code
 

jarvis_brain-0.1.4.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=PwLd1zTFIQ673-cZjdON4TfU854_h5BgLPOVRbt_kVw,8349
-mcp_tools/main.py,sha256=WO9kNpIORRrIOAWW8jiAd3gNW6rFMExln8y4CquKrM8,837
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=AM9hIQKtgMVxIZsEPxfHj9q41ZtzHrOS69wtgGBE3-Q,1458
-tools/tools.py,sha256=3vTMCT_h0eDPtOMHc2KnhNVpQBUs6jgIChutBZZFMK4,5008
-jarvis_brain-0.1.4.1.dist-info/METADATA,sha256=jJjlYvPAjlzahJ9OtI6EuL1JOoAk5_OUku2XtqXeztE,277
-jarvis_brain-0.1.4.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.4.1.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.4.1.dist-info/RECORD,,