Jarvis-Brain 0.1.2__tar.gz → 0.1.4__tar.gz

{jarvis_brain-0.1.2 → jarvis_brain-0.1.4}/.idea/workspace.xml

@@ -26,36 +26,43 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;Python.1.executor&quot;: &quot;Run&quot;,
-    &quot;Python.2.executor&quot;: &quot;Run&quot;,
-    &quot;Python.dp_tools.executor&quot;: &quot;Run&quot;,
-    &quot;Python.main.executor&quot;: &quot;Run&quot;,
-    &quot;Python.requests_tools.executor&quot;: &quot;Run&quot;,
-    &quot;Python.simhash.executor&quot;: &quot;Run&quot;,
-    &quot;Python.simhash_tools.executor&quot;: &quot;Run&quot;,
-    &quot;Python.tools.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/user/PycharmProjects/JARVIS&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "DefaultHtmlFileTemplate": "HTML File",
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "Python.1 (1).executor": "Run",
+    "Python.1 (2).executor": "Run",
+    "Python.1.executor": "Run",
+    "Python.2.executor": "Run",
+    "Python.3.executor": "Run",
+    "Python.__init__.executor": "Run",
+    "Python.dp_tools (1).executor": "Run",
+    "Python.dp_tools.executor": "Run",
+    "Python.main.executor": "Run",
+    "Python.requests_tools.executor": "Run",
+    "Python.simhash.executor": "Run",
+    "Python.simhash_tools.executor": "Run",
+    "Python.tools.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "last_opened_file_path": "/Users/user/PycharmProjects/JARVIS/mcp_tools",
+    "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/mcp_tools" />
       <recent name="$PROJECT_DIR$" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
+      <recent name="$PROJECT_DIR$/tools" />
       <recent name="$PROJECT_DIR$/src/mcp_tools" />
       <recent name="$PROJECT_DIR$/src" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.1">
-    <configuration name="1" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Python.__init__">
+    <configuration name="1 (2)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="JARVIS" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -64,11 +71,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/task_router" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/dp_test" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/1.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/dp_test/1.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -77,7 +84,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="2" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="1" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="JARVIS" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -90,7 +97,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/2.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/1.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -99,7 +106,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="dp_tools" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+    <configuration name="2" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="JARVIS" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -108,11 +115,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/task_router" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/mcp_tools/dp_tools.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/2.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -121,7 +128,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="requests_tools" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="__init__" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="JARVIS" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -130,11 +137,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/mcp_tools" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tools" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/mcp_tools/requests_tools.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/__init__.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -143,7 +150,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="simhash_tools" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="dp_tools (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="JARVIS" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -152,11 +159,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tools" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/mcp_tools" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/simhash_tools.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/mcp_tools/dp_tools.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -165,7 +172,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="tools" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="dp_tools" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="JARVIS" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -174,11 +181,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tools" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/tools.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/mcp_tools/dp_tools.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -189,11 +196,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.1" />
-        <item itemvalue="Python.tools" />
+        <item itemvalue="Python.__init__" />
         <item itemvalue="Python.2" />
-        <item itemvalue="Python.requests_tools" />
-        <item itemvalue="Python.simhash_tools" />
+        <item itemvalue="Python.1 (2)" />
+        <item itemvalue="Python.1" />
+        <item itemvalue="Python.dp_tools (1)" />
       </list>
     </recent_temporary>
   </component>
@@ -214,4 +221,15 @@
     </task>
     <servers />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/tools/tools.py</url>
+          <line>17</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

{jarvis_brain-0.1.2 → jarvis_brain-0.1.4}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.2
+Version: 0.1.4
 Summary: Jarvis brain
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4
+Requires-Dist: curl-cffi
 Requires-Dist: drissionpage
 Requires-Dist: fastmcp
 Requires-Dist: htmlmin

jarvis_brain-0.1.4/dp_test/1.py

@@ -0,0 +1,26 @@
+import time
+
+from DrissionPage import ChromiumPage
+from bs4 import BeautifulSoup
+page = ChromiumPage()
+tab = page.latest_tab
+# url = "https://www.baidu.com"
+# url = "https://www.baidu.com/s?ie=utf-8&f=8&rsv_bp=1&rsv_idx=1&tn=baidu&wd=asdf&fenlei=256&rsv_pq=0x9647d2090000e43c&rsv_t=09ffuUN39r6wv9%2FBqsAwZUuAJ1q9z1hppzLcl1EgmLa%2FnBOH4t5RzqAdbyDX&rqlang=en&rsv_dl=tb&rsv_enter=1&rsv_sug3=5&rsv_sug1=1&rsv_sug7=100&rsv_btype=i&prefixsug=asdf&rsp=0&inputT=894&rsv_sug4=895"
+url = "https://www.nxzgh.org.cn/#/newsCenter/index2/2"
+tab.get(url)
+li_eles = tab.eles("css:div.pointer")
+ul_ele = tab.ele("css:div.right-box")
+# for li in li_eles:
+#     li.set.style('backgroundColor', 'rgba(255, 255, 0, 0.3)')
+ul_ele.set.style('backgroundColor', 'rgba(255, 255, 0, 0.3)')
+# tab.get_screenshot('screen_shot.png')
+rect_size = tab.rect.size
+print(rect_size)
+# tab.get_screenshot('screenshot_full.png', full_page=True, right_bottom=(1920, 1080))
+tab.get_screenshot('screenshot_full.png', right_bottom=(rect_size[0] / 2, rect_size[1] / 2))
+# time.sleep(50)
+#   .xpath-highlight {
+#     outline: 2px solid yellow !important;
+#     outline-offset: 2px;
+#     background-color: rgba(255, 255, 0, 0.2);
+#   }

jarvis_brain-0.1.4/mcp_tools/dp_tools.py

@@ -0,0 +1,169 @@
+import os
+from typing import Any
+
+from DrissionPage._elements.none_element import NoneElement
+from fastmcp import FastMCP
+
+from tools.tools import compress_html, requests_html, dp_headless_html, assert_waf_cookie, dp_mcp_message_pack
+import psutil
+from pathlib import Path
+
+html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
+waf_status_code_dict = {
+    412: "瑞数",
+    521: "加速乐"
+}
+
+
+def register_visit_url(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="visit_url", description="使用Drissionpage打开url访问某个网站")
+    async def visit_url(url: str) -> dict[str, Any]:
+        port, _browser = browser_manager.create_browser()
+        tab = _browser.get_tab()
+        tab.get(url)
+        tab_id = tab.tab_id
+        return dp_mcp_message_pack(
+            f"已在[{port}]端口创建浏览器对象，并已打开链接：{url}",
+            tab_id=tab_id,
+            browser_port=port
+        )
+
+
+def register_get_html(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="get_html", description="使用Drissionpage获取某一个tab页的html")
+    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 = tab.title + f"_{tab_id}.html"
+        if not os.path.exists(html_source_code_local_save_path):
+            os.makedirs(html_source_code_local_save_path)
+        abs_path = os.path.join(html_source_code_local_save_path, file_name)
+        with open(abs_path, "w", encoding="utf-8") as f:
+            min_html, compress_rate = compress_html(tab.html)
+            f.write(min_html)
+        return dp_mcp_message_pack(f"已保存tab页：【{tab_id}】的html源码", tab_id=tab_id, html_local_path=abs_path)
+
+
+def register_get_new_tab(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="get_new_tab", description="使用Drissionpage创建一个新的tab页，在新的tab页中打开url")
+    async def get_new_tab(browser_port: int, url: str) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        tab = _browser.new_tab(url)
+        _browser.activate_tab(tab)
+        tab_id = tab.tab_id
+        return dp_mcp_message_pack(f"已创建新的tab页，并打开链接：{url}", tab_id=tab_id)
+
+
+def register_switch_tab(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
+    async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        _browser.activate_tab(tab_id)
+        return dp_mcp_message_pack(f"已将tab页:【{tab_id}】切换至最前端")
+
+
+def register_close_tab(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="close_tab", description="根据传入的tab_id关闭tab页", )
+    async def close_tab(browser_port, tab_id) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        _browser.close_tabs(tab_id)
+        return dp_mcp_message_pack(f"已将tab页:【{tab_id}】关闭")
+
+
+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]:
+        _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)
+        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)
+        )
+
+
+def register_quit_browser(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="quit_browser", description="退出浏览器会话，关闭浏览器")
+    async def quit_browser(browser_port: int) -> dict[str, Any]:
+        flag, _browser = browser_manager.remove_page(browser_port)
+        if flag:
+            _browser.quit()
+        return dp_mcp_message_pack(
+            f"浏览器[{browser_port}]，退出会话，关闭浏览器{'成功' if flag else '失败'}",
+            browser_port=browser_port,
+            quit_flag=flag
+        )
+
+
+def register_assert_waf(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="assert_waf",
+              description="通过对比requests、有头浏览器、无头浏览器获取到的html，判断网页是否使用了waf以及是否为动态渲染的网页")
+    async def assert_waf(browser_port: int, tab_id: str) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        target_tab = _browser.get_tab(tab_id)
+        recommend_team = "drissionpage_head"
+        head_cookies = target_tab.cookies()
+        # 通过cookie判断是否有waf
+        waf_flag, waf_type = assert_waf_cookie(head_cookies)
+        head_html = target_tab.html
+        min_head_html, head_rate = compress_html(head_html, only_text=True)
+        raw_html, status_code = requests_html(target_tab.url)
+        min_raw_html, raw_rate = compress_html(raw_html, only_text=True)
+        r_h_rate_diff = abs(head_rate - raw_rate)
+        # 如果有已知的防火墙，则不浪费时间使用无头获取html和压缩比了
+        if waf_flag or status_code in waf_status_code_dict.keys():
+            return dp_mcp_message_pack(
+                f"已完成tab页:【{tab_id}】的分析，该tab页存在waf",
+                tab_id=tab_id,
+                recommend_team=recommend_team,
+                raw_head_rate_difference=r_h_rate_diff,
+                raw_headless_rate_difference=0,
+                head_headless_rate_difference=0
+            )
+
+        headless_html = dp_headless_html(target_tab.url)
+        min_headless_html, headless_rate = compress_html(headless_html, only_text=True)
+        r_hless_rate_diff = abs(raw_rate - headless_rate)
+        h_hless_rate_diff = abs(head_rate - headless_rate)
+        # 最优情况：requests，dp有头和无头拿到的结果基本一致，认定为没有防护的静态网页
+        if r_h_rate_diff < 40 and r_hless_rate_diff < 40 and h_hless_rate_diff < 40:
+            recommend_team = "requests"
+        # 最差情况：requests，dp有头和无头拿到的结果差距都很大，认定为有浏览器无头检测+动态网页
+        # if r_h_rate_diff < 40 and r_hless_rate_diff < 40 and h_hless_rate_diff < 40:
+        # 较差1：dp有头和无头差距很小，但是requests拿不到正确结果，认定为有requests防护 or 动态网页
+        elif h_hless_rate_diff < 30 and r_hless_rate_diff > 40:
+            recommend_team = "drissionpage_headless"
+        # 较差2：有头和无头差距很大，但是requests和有头拿到的结果基本一致，认定为要么有别的没有防护requests的waf，或者间歇性的瑞数【此时应该拿有头的cookie去判断其中是否有瑞数特征，上面已经做了】
+        # if r_h_rate_diff < 15 and h_hless_rate_diff > 40:
+        return dp_mcp_message_pack(
+            f"已完成tab页:【{tab_id}】的分析，该tab页存在waf",
+            tab_id=tab_id,
+            recommend_team=recommend_team,
+            raw_head_rate_difference=r_h_rate_diff,
+            raw_headless_rate_difference=h_hless_rate_diff,
+            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
+        )

jarvis_brain-0.1.4/mcp_tools/main.py

@@ -0,0 +1,30 @@
+# main.py
+from mcp_tools.dp_tools import *
+from fastmcp import FastMCP
+from tools.browser_manager import browser_manager
+
+mcp = FastMCP("Jarvis Brain Mcp Tools")
+
+# 根据环境变量加载模块
+enabled_modules = os.getenv("MCP_MODULES", "TeamNode-Dp").split(",")
+base_cwd = os.getenv("BASE_CWD", os.environ.get("PWD"))
+
+if "TeamNode-Dp" in enabled_modules:
+    register_visit_url(mcp, browser_manager)
+    register_close_tab(mcp, browser_manager)
+    register_switch_tab(mcp, browser_manager)
+    register_get_html(mcp, browser_manager)
+    register_get_new_tab(mcp, browser_manager)
+    register_check_selector(mcp, browser_manager)
+
+if "JarvisNode" in enabled_modules:
+    register_assert_waf(mcp, browser_manager)
+    register_test(mcp, base_cwd)
+
+
+def main():
+    mcp.run(transport="stdio")
+
+
+if __name__ == '__main__':
+    main()

{jarvis_brain-0.1.2 → jarvis_brain-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Jarvis_Brain"  # 别人下载时用的名字，必须在 PyPI 上唯一
-version = "0.1.2"
+version = "0.1.4"
 description = "Jarvis brain"
 dependencies = [
     "fastmcp",
@@ -9,7 +9,7 @@ dependencies = [
     "jieba",
     "simhash",
     "beautifulsoup4",
-    # 在这里列出 dp_tools.py 需要的其他库，例如 "pandas", "requests"
+    "curl_cffi"
 ]
 requires-python = ">=3.10"
 

{jarvis_brain-0.1.2 → jarvis_brain-0.1.4}/task_router/1.py

@@ -1,10 +1,9 @@
 import asyncio
 import os.path
-import aiofiles.os as async_os
 from typing import Callable, List
 import json
 
-from claude_agent_sdk import tool, create_sdk_mcp_server, ClaudeSDKClient, ClaudeAgentOptions
+from claude_agent_sdk import ClaudeSDKClient, ClaudeAgentOptions
 
 base_cwd = "/Users/user/PycharmProjects/JARVIS"
 
@@ -51,7 +50,7 @@ options = ClaudeAgentOptions(
     permission_mode='bypassPermissions',
     cwd=base_cwd,
     mcp_servers={
-        "team-node-dp": {
+        "JarvisNode": {
             "command": "uv",
             "args": [
                 "run",
@@ -60,32 +59,20 @@ options = ClaudeAgentOptions(
                 "main.py"
             ],
             "env": {
-                "MCP_MODULES": "TeamNode-Dp"
-            }
-        },
-        "jarvis-node": {
-            "command": "uv",
-            "args": [
-                "run",
-                "--directory",
-                "/Users/user/PycharmProjects/JARVIS/mcp_tools",
-                "main.py"
-            ],
-            "env": {
-                "MCP_MODULES": "JarvisNode"
+                "MCP_MODULES": "TeamNode-Dp,JarvisNode",
+                "BASE_CWD": os.getcwd(),
             }
         },
     },
     # setting_sources=["project"],
     allowed_tools=[
-        "mcp__team-node-dp__get_html",
-        "mcp__team-node-dp__visit_url",
-        "mcp__team-node-dp__get_new_tab",
-        "mcp__team-node-dp__switch_tab",
-        "mcp__team-node-dp__close_tab",
-        "mcp__team-node-dp__check_selector",
-        "mcp__jarvis-node__assert_Static_Web",  # 判断当前页面是否为静态页面
-        "mcp__jarvis-node__assert_waf",  # 判断传入的url是否使用了瑞数，jsl等防火墙
+        "mcp__JarvisNode__get_html",
+        "mcp__JarvisNode__visit_url",
+        "mcp__JarvisNode__get_new_tab",
+        "mcp__JarvisNode__switch_tab",
+        "mcp__JarvisNode__close_tab",
+        "mcp__JarvisNode__check_selector",
+        "mcp__JarvisNode__assert_waf",  # 判断传入的url是否使用了瑞数，jsl等防火墙
         'Read',
         'Write',
         'Edit',
@@ -113,10 +100,11 @@ async def run(url):
                     json文件的格式为:
                     {{
                         "url": "http://www.customs.gov.cn/customs/xwfb34/302425/index.html",
-                        "site_name":"今日海关"
-                        "waf_type":"瑞数",
-                        "static":true,
-                        "static_possibility":96%
+                        "site_name": "今日海关"
+                        "recommend_team": recommend_team
+                        "raw_head_rate_difference": raw_head_rate_difference,
+                        "raw_headless_rate_difference": raw_headless_rate_difference,
+                        "head_headless_rate_difference": head_headless_rate_difference
                     }}
                     """
         # prompt = f"请列出所有你可以使用的mcp工具"
@@ -129,14 +117,15 @@ async def run(url):
 
 async def main():
     tasks = []
-    with open("/Users/user/Desktop/mapping_copy.json", "r", encoding="utf-8") as f:
+    # with open("/Users/user/Desktop/mapping_copy.json", "r", encoding="utf-8") as f:
+    with open("/Users/user/Desktop/政务项目/mapping.json", "r", encoding="utf-8") as f:
         mapping = json.load(f)
     mapping = dict(list(mapping.items()))
     for key, value in mapping.items():
         tasks.append((run, (), {  # 关键字参数字典
             "url": value,
         }))
-    manager = SimpleTaskManager(max_concurrent=1)
+    manager = SimpleTaskManager(max_concurrent=5)
     results = await manager.process_all(tasks)
     # 输出结果
     print("\n任务结果摘要:")