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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/.idea/workspace.xml +29 -23
  2. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/PKG-INFO +1 -1
  3. jarvis_brain-0.1.4/dp_test/1.py +26 -0
  4. jarvis_brain-0.1.4/dp_test/screen_shot.png +0 -0
  5. jarvis_brain-0.1.4/dp_test/screenshot_full.png +0 -0
  6. jarvis_brain-0.1.4/mcp_tools/dp_tools.py +169 -0
  7. jarvis_brain-0.1.4/mcp_tools/main.py +30 -0
  8. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/pyproject.toml +1 -1
  9. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/task_router/1.py +25 -59
  10. jarvis_brain-0.1.4/task_router/2.py +128 -0
  11. jarvis_brain-0.1.4/tools/__init__.py +0 -0
  12. jarvis_brain-0.1.4/tools/browser_manager.py +42 -0
  13. jarvis_brain-0.1.4/tools/tools.py +119 -0
  14. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/uv.lock +24 -1
  15. jarvis_brain-0.1.3/mcp_tools/dp_tools.py +0 -231
  16. jarvis_brain-0.1.3/mcp_tools/main.py +0 -29
  17. jarvis_brain-0.1.3/mcp_tools/requests_tools.py +0 -40
  18. jarvis_brain-0.1.3/tools/simhash_tools.py +0 -228
  19. jarvis_brain-0.1.3/tools/tools.py +0 -163
  20. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/.idea/.gitignore +0 -0
  21. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/.idea/JARVIS.iml +0 -0
  22. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/.idea/inspectionProfiles/profiles_settings.xml +0 -0
  23. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/.idea/misc.xml +0 -0
  24. {jarvis_brain-0.1.3 → jarvis_brain-0.1.4}/.idea/modules.xml +0 -0
  25. {jarvis_brain-0.1.3/mcp_tools → jarvis_brain-0.1.4/dp_test}/__init__.py +0 -0
  26. {jarvis_brain-0.1.3/task_router → jarvis_brain-0.1.4/mcp_tools}/__init__.py +0 -0
  27. {jarvis_brain-0.1.3/tools → jarvis_brain-0.1.4/task_router}/__init__.py +0 -0
@@ -13,8 +13,8 @@
13
13
  <component name="FileTemplateManagerImpl">
14
14
  <option name="RECENT_TEMPLATES">
15
15
  <list>
16
- <option value="Python Script" />
17
16
  <option value="HTML File" />
17
+ <option value="Python Script" />
18
18
  </list>
19
19
  </option>
20
20
  </component>
@@ -30,9 +30,13 @@
30
30
  "keyToString": {
31
31
  "DefaultHtmlFileTemplate": "HTML File",
32
32
  "ModuleVcsDetector.initialDetectionPerformed": "true",
33
+ "Python.1 (1).executor": "Run",
34
+ "Python.1 (2).executor": "Run",
33
35
  "Python.1.executor": "Run",
34
36
  "Python.2.executor": "Run",
35
37
  "Python.3.executor": "Run",
38
+ "Python.__init__.executor": "Run",
39
+ "Python.dp_tools (1).executor": "Run",
36
40
  "Python.dp_tools.executor": "Run",
37
41
  "Python.main.executor": "Run",
38
42
  "Python.requests_tools.executor": "Run",
@@ -41,22 +45,24 @@
41
45
  "Python.tools.executor": "Run",
42
46
  "RunOnceActivity.ShowReadmeOnStart": "true",
43
47
  "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
44
- "last_opened_file_path": "/Users/user/PycharmProjects/JARVIS",
48
+ "last_opened_file_path": "/Users/user/PycharmProjects/JARVIS/mcp_tools",
45
49
  "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
46
50
  }
47
51
  }]]></component>
48
52
  <component name="RecentsManager">
49
53
  <key name="CopyFile.RECENT_KEYS">
54
+ <recent name="$PROJECT_DIR$/mcp_tools" />
50
55
  <recent name="$PROJECT_DIR$" />
51
56
  </key>
52
57
  <key name="MoveFile.RECENT_KEYS">
53
58
  <recent name="$PROJECT_DIR$" />
59
+ <recent name="$PROJECT_DIR$/tools" />
54
60
  <recent name="$PROJECT_DIR$/src/mcp_tools" />
55
61
  <recent name="$PROJECT_DIR$/src" />
56
62
  </key>
57
63
  </component>
58
- <component name="RunManager" selected="Python.1">
59
- <configuration name="1" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
64
+ <component name="RunManager" selected="Python.__init__">
65
+ <configuration name="1 (2)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
60
66
  <module name="JARVIS" />
61
67
  <option name="ENV_FILES" value="" />
62
68
  <option name="INTERPRETER_OPTIONS" value="" />
@@ -65,11 +71,11 @@
65
71
  <env name="PYTHONUNBUFFERED" value="1" />
66
72
  </envs>
67
73
  <option name="SDK_HOME" value="" />
68
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/task_router" />
74
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/dp_test" />
69
75
  <option name="IS_MODULE_SDK" value="true" />
70
76
  <option name="ADD_CONTENT_ROOTS" value="true" />
71
77
  <option name="ADD_SOURCE_ROOTS" value="true" />
72
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/1.py" />
78
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/dp_test/1.py" />
73
79
  <option name="PARAMETERS" value="" />
74
80
  <option name="SHOW_COMMAND_LINE" value="false" />
75
81
  <option name="EMULATE_TERMINAL" value="false" />
@@ -78,7 +84,7 @@
78
84
  <option name="INPUT_FILE" value="" />
79
85
  <method v="2" />
80
86
  </configuration>
81
- <configuration name="2" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
87
+ <configuration name="1" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
82
88
  <module name="JARVIS" />
83
89
  <option name="ENV_FILES" value="" />
84
90
  <option name="INTERPRETER_OPTIONS" value="" />
@@ -91,7 +97,7 @@
91
97
  <option name="IS_MODULE_SDK" value="true" />
92
98
  <option name="ADD_CONTENT_ROOTS" value="true" />
93
99
  <option name="ADD_SOURCE_ROOTS" value="true" />
94
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/2.py" />
100
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/1.py" />
95
101
  <option name="PARAMETERS" value="" />
96
102
  <option name="SHOW_COMMAND_LINE" value="false" />
97
103
  <option name="EMULATE_TERMINAL" value="false" />
@@ -100,7 +106,7 @@
100
106
  <option name="INPUT_FILE" value="" />
101
107
  <method v="2" />
102
108
  </configuration>
103
- <configuration name="3" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
109
+ <configuration name="2" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
104
110
  <module name="JARVIS" />
105
111
  <option name="ENV_FILES" value="" />
106
112
  <option name="INTERPRETER_OPTIONS" value="" />
@@ -113,7 +119,7 @@
113
119
  <option name="IS_MODULE_SDK" value="true" />
114
120
  <option name="ADD_CONTENT_ROOTS" value="true" />
115
121
  <option name="ADD_SOURCE_ROOTS" value="true" />
116
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/3.py" />
122
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/task_router/2.py" />
117
123
  <option name="PARAMETERS" value="" />
118
124
  <option name="SHOW_COMMAND_LINE" value="false" />
119
125
  <option name="EMULATE_TERMINAL" value="false" />
@@ -122,7 +128,7 @@
122
128
  <option name="INPUT_FILE" value="" />
123
129
  <method v="2" />
124
130
  </configuration>
125
- <configuration name="dp_tools" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
131
+ <configuration name="__init__" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
126
132
  <module name="JARVIS" />
127
133
  <option name="ENV_FILES" value="" />
128
134
  <option name="INTERPRETER_OPTIONS" value="" />
@@ -131,11 +137,11 @@
131
137
  <env name="PYTHONUNBUFFERED" value="1" />
132
138
  </envs>
133
139
  <option name="SDK_HOME" value="" />
134
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
140
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tools" />
135
141
  <option name="IS_MODULE_SDK" value="true" />
136
142
  <option name="ADD_CONTENT_ROOTS" value="true" />
137
143
  <option name="ADD_SOURCE_ROOTS" value="true" />
138
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/mcp_tools/dp_tools.py" />
144
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/__init__.py" />
139
145
  <option name="PARAMETERS" value="" />
140
146
  <option name="SHOW_COMMAND_LINE" value="false" />
141
147
  <option name="EMULATE_TERMINAL" value="false" />
@@ -144,7 +150,7 @@
144
150
  <option name="INPUT_FILE" value="" />
145
151
  <method v="2" />
146
152
  </configuration>
147
- <configuration name="requests_tools" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
153
+ <configuration name="dp_tools (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
148
154
  <module name="JARVIS" />
149
155
  <option name="ENV_FILES" value="" />
150
156
  <option name="INTERPRETER_OPTIONS" value="" />
@@ -157,7 +163,7 @@
157
163
  <option name="IS_MODULE_SDK" value="true" />
158
164
  <option name="ADD_CONTENT_ROOTS" value="true" />
159
165
  <option name="ADD_SOURCE_ROOTS" value="true" />
160
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/mcp_tools/requests_tools.py" />
166
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/mcp_tools/dp_tools.py" />
161
167
  <option name="PARAMETERS" value="" />
162
168
  <option name="SHOW_COMMAND_LINE" value="false" />
163
169
  <option name="EMULATE_TERMINAL" value="false" />
@@ -166,7 +172,7 @@
166
172
  <option name="INPUT_FILE" value="" />
167
173
  <method v="2" />
168
174
  </configuration>
169
- <configuration name="tools" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
175
+ <configuration name="dp_tools" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
170
176
  <module name="JARVIS" />
171
177
  <option name="ENV_FILES" value="" />
172
178
  <option name="INTERPRETER_OPTIONS" value="" />
@@ -175,11 +181,11 @@
175
181
  <env name="PYTHONUNBUFFERED" value="1" />
176
182
  </envs>
177
183
  <option name="SDK_HOME" value="" />
178
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tools" />
184
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
179
185
  <option name="IS_MODULE_SDK" value="true" />
180
186
  <option name="ADD_CONTENT_ROOTS" value="true" />
181
187
  <option name="ADD_SOURCE_ROOTS" value="true" />
182
- <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tools/tools.py" />
188
+ <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/mcp_tools/dp_tools.py" />
183
189
  <option name="PARAMETERS" value="" />
184
190
  <option name="SHOW_COMMAND_LINE" value="false" />
185
191
  <option name="EMULATE_TERMINAL" value="false" />
@@ -190,11 +196,11 @@
190
196
  </configuration>
191
197
  <recent_temporary>
192
198
  <list>
193
- <item itemvalue="Python.1" />
194
- <item itemvalue="Python.tools" />
195
- <item itemvalue="Python.3" />
199
+ <item itemvalue="Python.__init__" />
196
200
  <item itemvalue="Python.2" />
197
- <item itemvalue="Python.requests_tools" />
201
+ <item itemvalue="Python.1 (2)" />
202
+ <item itemvalue="Python.1" />
203
+ <item itemvalue="Python.dp_tools (1)" />
198
204
  </list>
199
205
  </recent_temporary>
200
206
  </component>
@@ -220,7 +226,7 @@
220
226
  <breakpoints>
221
227
  <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
222
228
  <url>file://$PROJECT_DIR$/tools/tools.py</url>
223
- <line>16</line>
229
+ <line>17</line>
224
230
  <option name="timeStamp" value="1" />
225
231
  </line-breakpoint>
226
232
  </breakpoints>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: Jarvis_Brain
3
- Version: 0.1.3
3
+ Version: 0.1.4
4
4
  Summary: Jarvis brain
5
5
  Requires-Python: >=3.10
6
6
  Requires-Dist: beautifulsoup4
@@ -0,0 +1,26 @@
1
+ import time
2
+
3
+ from DrissionPage import ChromiumPage
4
+ from bs4 import BeautifulSoup
5
+ page = ChromiumPage()
6
+ tab = page.latest_tab
7
+ # url = "https://www.baidu.com"
8
+ # 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"
9
+ url = "https://www.nxzgh.org.cn/#/newsCenter/index2/2"
10
+ tab.get(url)
11
+ li_eles = tab.eles("css:div.pointer")
12
+ ul_ele = tab.ele("css:div.right-box")
13
+ # for li in li_eles:
14
+ # li.set.style('backgroundColor', 'rgba(255, 255, 0, 0.3)')
15
+ ul_ele.set.style('backgroundColor', 'rgba(255, 255, 0, 0.3)')
16
+ # tab.get_screenshot('screen_shot.png')
17
+ rect_size = tab.rect.size
18
+ print(rect_size)
19
+ # tab.get_screenshot('screenshot_full.png', full_page=True, right_bottom=(1920, 1080))
20
+ tab.get_screenshot('screenshot_full.png', right_bottom=(rect_size[0] / 2, rect_size[1] / 2))
21
+ # time.sleep(50)
22
+ # .xpath-highlight {
23
+ # outline: 2px solid yellow !important;
24
+ # outline-offset: 2px;
25
+ # background-color: rgba(255, 255, 0, 0.2);
26
+ # }
@@ -0,0 +1,169 @@
1
+ import os
2
+ from typing import Any
3
+
4
+ from DrissionPage._elements.none_element import NoneElement
5
+ from fastmcp import FastMCP
6
+
7
+ from tools.tools import compress_html, requests_html, dp_headless_html, assert_waf_cookie, dp_mcp_message_pack
8
+ import psutil
9
+ from pathlib import Path
10
+
11
+ html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
12
+ waf_status_code_dict = {
13
+ 412: "瑞数",
14
+ 521: "加速乐"
15
+ }
16
+
17
+
18
+ def register_visit_url(mcp: FastMCP, browser_manager):
19
+ @mcp.tool(name="visit_url", description="使用Drissionpage打开url访问某个网站")
20
+ async def visit_url(url: str) -> dict[str, Any]:
21
+ port, _browser = browser_manager.create_browser()
22
+ tab = _browser.get_tab()
23
+ tab.get(url)
24
+ tab_id = tab.tab_id
25
+ return dp_mcp_message_pack(
26
+ f"已在[{port}]端口创建浏览器对象,并已打开链接:{url}",
27
+ tab_id=tab_id,
28
+ browser_port=port
29
+ )
30
+
31
+
32
+ def register_get_html(mcp: FastMCP, browser_manager):
33
+ @mcp.tool(name="get_html", description="使用Drissionpage获取某一个tab页的html")
34
+ async def get_html(browser_port: int, tab_id: str) -> dict[str, Any]:
35
+ _browser = browser_manager.get_browser(browser_port)
36
+ tab = _browser.get_tab(tab_id)
37
+ file_name = tab.title + f"_{tab_id}.html"
38
+ if not os.path.exists(html_source_code_local_save_path):
39
+ os.makedirs(html_source_code_local_save_path)
40
+ abs_path = os.path.join(html_source_code_local_save_path, file_name)
41
+ with open(abs_path, "w", encoding="utf-8") as f:
42
+ min_html, compress_rate = compress_html(tab.html)
43
+ f.write(min_html)
44
+ return dp_mcp_message_pack(f"已保存tab页:【{tab_id}】的html源码", tab_id=tab_id, html_local_path=abs_path)
45
+
46
+
47
+ def register_get_new_tab(mcp: FastMCP, browser_manager):
48
+ @mcp.tool(name="get_new_tab", description="使用Drissionpage创建一个新的tab页,在新的tab页中打开url")
49
+ async def get_new_tab(browser_port: int, url: str) -> dict[str, Any]:
50
+ _browser = browser_manager.get_browser(browser_port)
51
+ tab = _browser.new_tab(url)
52
+ _browser.activate_tab(tab)
53
+ tab_id = tab.tab_id
54
+ return dp_mcp_message_pack(f"已创建新的tab页,并打开链接:{url}", tab_id=tab_id)
55
+
56
+
57
+ def register_switch_tab(mcp: FastMCP, browser_manager):
58
+ @mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
59
+ async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
60
+ _browser = browser_manager.get_browser(browser_port)
61
+ _browser.activate_tab(tab_id)
62
+ return dp_mcp_message_pack(f"已将tab页:【{tab_id}】切换至最前端")
63
+
64
+
65
+ def register_close_tab(mcp: FastMCP, browser_manager):
66
+ @mcp.tool(name="close_tab", description="根据传入的tab_id关闭tab页", )
67
+ async def close_tab(browser_port, tab_id) -> dict[str, Any]:
68
+ _browser = browser_manager.get_browser(browser_port)
69
+ _browser.close_tabs(tab_id)
70
+ return dp_mcp_message_pack(f"已将tab页:【{tab_id}】关闭")
71
+
72
+
73
+ def register_check_selector(mcp: FastMCP, browser_manager):
74
+ @mcp.tool(name="check_selector", description="查找tab页中是否包含某个元素")
75
+ async def check_selector(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
76
+ _browser = browser_manager.get_browser(browser_port)
77
+ target_tab = _browser.get_tab(tab_id)
78
+ css_selector = css_selector
79
+ if "css:" not in css_selector:
80
+ css_selector = "css:" + css_selector
81
+ target_ele = target_tab.ele(css_selector)
82
+ return dp_mcp_message_pack(
83
+ f"已完成tab页:【{tab_id}】对:【{css_selector}】的检查",
84
+ tab_id=tab_id,
85
+ selector=css_selector,
86
+ selector_ele_exist=not isinstance(target_ele, NoneElement)
87
+ )
88
+
89
+
90
+ def register_quit_browser(mcp: FastMCP, browser_manager):
91
+ @mcp.tool(name="quit_browser", description="退出浏览器会话,关闭浏览器")
92
+ async def quit_browser(browser_port: int) -> dict[str, Any]:
93
+ flag, _browser = browser_manager.remove_page(browser_port)
94
+ if flag:
95
+ _browser.quit()
96
+ return dp_mcp_message_pack(
97
+ f"浏览器[{browser_port}],退出会话,关闭浏览器{'成功' if flag else '失败'}",
98
+ browser_port=browser_port,
99
+ quit_flag=flag
100
+ )
101
+
102
+
103
+ def register_assert_waf(mcp: FastMCP, browser_manager):
104
+ @mcp.tool(name="assert_waf",
105
+ description="通过对比requests、有头浏览器、无头浏览器获取到的html,判断网页是否使用了waf以及是否为动态渲染的网页")
106
+ async def assert_waf(browser_port: int, tab_id: str) -> dict[str, Any]:
107
+ _browser = browser_manager.get_browser(browser_port)
108
+ target_tab = _browser.get_tab(tab_id)
109
+ recommend_team = "drissionpage_head"
110
+ head_cookies = target_tab.cookies()
111
+ # 通过cookie判断是否有waf
112
+ waf_flag, waf_type = assert_waf_cookie(head_cookies)
113
+ head_html = target_tab.html
114
+ min_head_html, head_rate = compress_html(head_html, only_text=True)
115
+ raw_html, status_code = requests_html(target_tab.url)
116
+ min_raw_html, raw_rate = compress_html(raw_html, only_text=True)
117
+ r_h_rate_diff = abs(head_rate - raw_rate)
118
+ # 如果有已知的防火墙,则不浪费时间使用无头获取html和压缩比了
119
+ if waf_flag or status_code in waf_status_code_dict.keys():
120
+ return dp_mcp_message_pack(
121
+ f"已完成tab页:【{tab_id}】的分析,该tab页存在waf",
122
+ tab_id=tab_id,
123
+ recommend_team=recommend_team,
124
+ raw_head_rate_difference=r_h_rate_diff,
125
+ raw_headless_rate_difference=0,
126
+ head_headless_rate_difference=0
127
+ )
128
+
129
+ headless_html = dp_headless_html(target_tab.url)
130
+ min_headless_html, headless_rate = compress_html(headless_html, only_text=True)
131
+ r_hless_rate_diff = abs(raw_rate - headless_rate)
132
+ h_hless_rate_diff = abs(head_rate - headless_rate)
133
+ # 最优情况:requests,dp有头和无头拿到的结果基本一致,认定为没有防护的静态网页
134
+ if r_h_rate_diff < 40 and r_hless_rate_diff < 40 and h_hless_rate_diff < 40:
135
+ recommend_team = "requests"
136
+ # 最差情况:requests,dp有头和无头拿到的结果差距都很大,认定为有浏览器无头检测+动态网页
137
+ # if r_h_rate_diff < 40 and r_hless_rate_diff < 40 and h_hless_rate_diff < 40:
138
+ # 较差1:dp有头和无头差距很小,但是requests拿不到正确结果,认定为有requests防护 or 动态网页
139
+ elif h_hless_rate_diff < 30 and r_hless_rate_diff > 40:
140
+ recommend_team = "drissionpage_headless"
141
+ # 较差2:有头和无头差距很大,但是requests和有头拿到的结果基本一致,认定为要么有别的没有防护requests的waf,或者间歇性的瑞数【此时应该拿有头的cookie去判断其中是否有瑞数特征,上面已经做了】
142
+ # if r_h_rate_diff < 15 and h_hless_rate_diff > 40:
143
+ return dp_mcp_message_pack(
144
+ f"已完成tab页:【{tab_id}】的分析,该tab页存在waf",
145
+ tab_id=tab_id,
146
+ recommend_team=recommend_team,
147
+ raw_head_rate_difference=r_h_rate_diff,
148
+ raw_headless_rate_difference=h_hless_rate_diff,
149
+ head_headless_rate_difference=h_hless_rate_diff
150
+ )
151
+
152
+
153
+ def register_highlight_element_captcha(mcp: FastMCP, browser_manager):
154
+ @mcp.tool(name="highlight_element_captcha",
155
+ description="将传入的Selector在页面上高亮,并截屏")
156
+ async def highlight_element_captcha(browser_port: int, tab_id: str, selector: str) -> dict[str, Any]:
157
+ _browser = browser_manager.get_browser(browser_port)
158
+ tab = _browser.get_tab(tab_id)
159
+ tab.ele
160
+
161
+
162
+ def register_test(mcp: FastMCP, cwd: str):
163
+ @mcp.tool(name="test", description="用户说要进行测试时调用这个函数")
164
+ async def test() -> dict[str, Any]:
165
+ test_project = "获取根目录"
166
+ return dp_mcp_message_pack(
167
+ f"当前测试项目是:{test_project}",
168
+ result=cwd
169
+ )
@@ -0,0 +1,30 @@
1
+ # main.py
2
+ from mcp_tools.dp_tools import *
3
+ from fastmcp import FastMCP
4
+ from tools.browser_manager import browser_manager
5
+
6
+ mcp = FastMCP("Jarvis Brain Mcp Tools")
7
+
8
+ # 根据环境变量加载模块
9
+ enabled_modules = os.getenv("MCP_MODULES", "TeamNode-Dp").split(",")
10
+ base_cwd = os.getenv("BASE_CWD", os.environ.get("PWD"))
11
+
12
+ if "TeamNode-Dp" in enabled_modules:
13
+ register_visit_url(mcp, browser_manager)
14
+ register_close_tab(mcp, browser_manager)
15
+ register_switch_tab(mcp, browser_manager)
16
+ register_get_html(mcp, browser_manager)
17
+ register_get_new_tab(mcp, browser_manager)
18
+ register_check_selector(mcp, browser_manager)
19
+
20
+ if "JarvisNode" in enabled_modules:
21
+ register_assert_waf(mcp, browser_manager)
22
+ register_test(mcp, base_cwd)
23
+
24
+
25
+ def main():
26
+ mcp.run(transport="stdio")
27
+
28
+
29
+ if __name__ == '__main__':
30
+ main()
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "Jarvis_Brain" # 别人下载时用的名字,必须在 PyPI 上唯一
3
- version = "0.1.3"
3
+ version = "0.1.4"
4
4
  description = "Jarvis brain"
5
5
  dependencies = [
6
6
  "fastmcp",
@@ -1,10 +1,9 @@
1
1
  import asyncio
2
2
  import os.path
3
- import aiofiles.os as async_os
4
3
  from typing import Callable, List
5
4
  import json
6
5
 
7
- from claude_agent_sdk import tool, create_sdk_mcp_server, ClaudeSDKClient, ClaudeAgentOptions
6
+ from claude_agent_sdk import ClaudeSDKClient, ClaudeAgentOptions
8
7
 
9
8
  base_cwd = "/Users/user/PycharmProjects/JARVIS"
10
9
 
@@ -51,64 +50,29 @@ options = ClaudeAgentOptions(
51
50
  permission_mode='bypassPermissions',
52
51
  cwd=base_cwd,
53
52
  mcp_servers={
54
- "jarvis": {
55
- "command": "uvx",
56
- "args": ["--from", "jarvis_brain", "jarvis-mcp"],
53
+ "JarvisNode": {
54
+ "command": "uv",
55
+ "args": [
56
+ "run",
57
+ "--directory",
58
+ "/Users/user/PycharmProjects/JARVIS/mcp_tools",
59
+ "main.py"
60
+ ],
57
61
  "env": {
58
- "MCP_MODULES": "TeamNode-Dp"
62
+ "MCP_MODULES": "TeamNode-Dp,JarvisNode",
63
+ "BASE_CWD": os.getcwd(),
59
64
  }
60
65
  },
61
- # "team-node-dp": {
62
- # "command": "uv",
63
- # "args": [
64
- # "run",
65
- # "--directory",
66
- # "/Users/user/PycharmProjects/JARVIS/mcp_tools",
67
- # "main.py"
68
- # ],
69
- # "env": {
70
- # "MCP_MODULES": "TeamNode-Dp"
71
- # }
72
- # },
73
- # "jarvis-node": {
74
- # "command": "uv",
75
- # "args": [
76
- # "run",
77
- # "--directory",
78
- # "/Users/user/PycharmProjects/JARVIS/mcp_tools",
79
- # "main.py"
80
- # ],
81
- # "env": {
82
- # "MCP_MODULES": "JarvisNode"
83
- # }
84
- # },
85
66
  },
86
67
  # setting_sources=["project"],
87
- # allowed_tools=[
88
- # "mcp__team-node-dp__get_html",
89
- # "mcp__team-node-dp__visit_url",
90
- # "mcp__team-node-dp__get_new_tab",
91
- # "mcp__team-node-dp__switch_tab",
92
- # "mcp__team-node-dp__close_tab",
93
- # "mcp__team-node-dp__check_selector",
94
- # "mcp__jarvis-node__assert_Static_Web", # 判断当前页面是否为静态页面
95
- # "mcp__jarvis-node__assert_waf", # 判断传入的url是否使用了瑞数,jsl等防火墙
96
- # 'Read',
97
- # 'Write',
98
- # 'Edit',
99
- # 'MultiEdit',
100
- # 'Grep',
101
- # 'Glob',
102
- # 'TodoWrite'
103
- # ]
104
68
  allowed_tools=[
105
- "mcp__jarvis__get_html",
106
- "mcp__jarvis__visit_url",
107
- "mcp__jarvis__get_new_tab",
108
- "mcp__jarvis__switch_tab",
109
- "mcp__jarvis__close_tab",
110
- "mcp__jarvis__check_selector",
111
- "mcp__jarvis__check_selector",
69
+ "mcp__JarvisNode__get_html",
70
+ "mcp__JarvisNode__visit_url",
71
+ "mcp__JarvisNode__get_new_tab",
72
+ "mcp__JarvisNode__switch_tab",
73
+ "mcp__JarvisNode__close_tab",
74
+ "mcp__JarvisNode__check_selector",
75
+ "mcp__JarvisNode__assert_waf", # 判断传入的url是否使用了瑞数,jsl等防火墙
112
76
  'Read',
113
77
  'Write',
114
78
  'Edit',
@@ -136,10 +100,11 @@ async def run(url):
136
100
  json文件的格式为:
137
101
  {{
138
102
  "url": "http://www.customs.gov.cn/customs/xwfb34/302425/index.html",
139
- "site_name":"今日海关"
140
- "waf_type":"瑞数",
141
- "static":true,
142
- "static_possibility":96%
103
+ "site_name": "今日海关"
104
+ "recommend_team": recommend_team
105
+ "raw_head_rate_difference": raw_head_rate_difference,
106
+ "raw_headless_rate_difference": raw_headless_rate_difference,
107
+ "head_headless_rate_difference": head_headless_rate_difference
143
108
  }}
144
109
  """
145
110
  # prompt = f"请列出所有你可以使用的mcp工具"
@@ -152,7 +117,8 @@ async def run(url):
152
117
 
153
118
  async def main():
154
119
  tasks = []
155
- with open("/Users/user/Desktop/mapping_copy.json", "r", encoding="utf-8") as f:
120
+ # with open("/Users/user/Desktop/mapping_copy.json", "r", encoding="utf-8") as f:
121
+ with open("/Users/user/Desktop/政务项目/mapping.json", "r", encoding="utf-8") as f:
156
122
  mapping = json.load(f)
157
123
  mapping = dict(list(mapping.items()))
158
124
  for key, value in mapping.items():