Jarvis-Brain 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

{jarvis_brain-0.0.1.dist-info → jarvis_brain-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.0.1
+Version: 0.0.3
 Summary: Jarvis brain
 Requires-Python: >=3.10
 Requires-Dist: drissionpage

jarvis_brain-0.0.3.dist-info/RECORD

@@ -0,0 +1,7 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=TsBJM_Fdr6IreZvqoUZnDv2OJi-oMEYCLzO5cIIUVe4,5991
+mcp_tools/main.py,sha256=udTCzVeYLhYK_sFBuKQ9_idbF_qKY-0oTfJaigZc2_g,394
+jarvis_brain-0.0.3.dist-info/METADATA,sha256=OVAipWel585XsqFvWoETCsYA_RQVEakHo2l_EAa1N_I,176
+jarvis_brain-0.0.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.0.3.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.0.3.dist-info/RECORD,,

jarvis_brain-0.0.3.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+jarvis-mcp = mcp_tools.main:main

mcp_tools/dp_tools.py

@@ -9,7 +9,7 @@ from DrissionPage._elements.none_element import NoneElement
 from fastmcp import FastMCP
 from lxml import html, etree
 
-mcp = FastMCP("JARVIS_DP_TOOLS")
+# mcp = FastMCP("JARVIS_DP_TOOLS")
 
 html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
 
@@ -57,99 +57,99 @@ def get_page(port):
     return browser_pool.get(port, None)
 
 
-# @tool("visit_url", "使用Drissionpage打开url访问某个网站", {"url": str})
-@mcp.tool(name="visit_url", description="使用Drissionpage打开url访问某个网站")
-async def visit_url(url: str) -> dict[str, Any]:
-    port, _browser = create_browser()
-    tab = _browser.get_tab()
-    tab.get(url)
-    tab_id = tab.tab_id
-    return {
-        "content": [{
-            "type": "text",
-            "text": json.dumps({
-                "message": f"已在[{port}]端口创建浏览器对象，并已打开链接：{url}",
-                "tab_id": tab_id,
-                "browser_port": port,
-            }, ensure_ascii=False)
-        }]
-    }
-
-
-@mcp.tool(name="get_html", description="使用Drissionpage获取某一个tab页的html")
-async def get_html(browser_port: int, tab_id: str) -> dict[str, Any]:
-    _browser = get_page(browser_port)
-    tab = _browser.get_tab(tab_id)
-    file_name = tab.title + f"_{tab_id}.html"
-    abs_path = os.path.join(html_source_code_local_save_path, file_name)
-    with open(abs_path, "w", encoding="utf-8") as f:
-        f.write(compress_html(tab.html))
-    return {
-        "content": [{
-            "type": "text",
-            "text": json.dumps({
-                "message": f"已保存tab页：【{tab_id}】的html源码",
-                "tab_id": tab_id,
-                "html_local_path": abs_path
-            }, ensure_ascii=False)
-        }]
-    }
-
-
-@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 = get_page(browser_port)
-    tab = _browser.new_tab(url)
-    _browser.activate_tab(tab)
-    tab_id = tab.tab_id
-    return {
-        "content": [{
-            "type": "text",
-            "text": json.dumps({
-                "message": f"已创建新的tab页，并打开链接：{url}",
-                "tab_id": tab_id,
-            }, ensure_ascii=False)
-        }]
-    }
-
-
-@mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
-async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
-    _browser = get_page(browser_port)
-    _browser.activate_tab(tab_id)
-    return {
-        "content": [{
-            "type": "text",
-            "text": json.dumps({
-                "message": f"已将tab页:【{tab_id}】切换至最前端",
-            }, ensure_ascii=False)
-        }]
-    }
-
-
-@mcp.tool(name="close_tab", description="根据传入的tab_id关闭tab页", )
-async def close_tab(browser_port, tab_id) -> dict[str, Any]:
-    _browser = get_page(browser_port)
-    _browser.close_tabs(tab_id)
-    return {
-        "content": [{
-            "type": "text",
-            "text": json.dumps({
-                "message": f"已将tab页:【{tab_id}】关闭",
-            }, ensure_ascii=False)
-        }]
-    }
-
-
-@mcp.tool(name="check_selector", description="查找tab页中是否包含元素")
-async def check_selector(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
-    _browser = get_page(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 {
+def register_visit_url(mcp: FastMCP):
+    @mcp.tool(name="visit_url", description="使用Drissionpage打开url访问某个网站")
+    async def visit_url(url: str) -> dict[str, Any]:
+        port, _browser = create_browser()
+        tab = _browser.get_tab()
+        tab.get(url)
+        tab_id = tab.tab_id
+        return {
+            "content": [{
+                "type": "text",
+                "text": json.dumps({
+                    "message": f"已在[{port}]端口创建浏览器对象，并已打开链接：{url}",
+                    "tab_id": tab_id,
+                    "browser_port": port,
+                }, ensure_ascii=False)
+            }]
+        }
+
+def register_get_html(mcp: FastMCP):
+    @mcp.tool(name="get_html", description="使用Drissionpage获取某一个tab页的html")
+    async def get_html(browser_port: int, tab_id: str) -> dict[str, Any]:
+        _browser = get_page(browser_port)
+        tab = _browser.get_tab(tab_id)
+        file_name = tab.title + f"_{tab_id}.html"
+        abs_path = os.path.join(html_source_code_local_save_path, file_name)
+        with open(abs_path, "w", encoding="utf-8") as f:
+            f.write(compress_html(tab.html))
+        return {
+            "content": [{
+                "type": "text",
+                "text": json.dumps({
+                    "message": f"已保存tab页：【{tab_id}】的html源码",
+                    "tab_id": tab_id,
+                    "html_local_path": abs_path
+                }, ensure_ascii=False)
+            }]
+        }
+
+def register_get_new_tab(mcp: FastMCP):
+    @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 = get_page(browser_port)
+        tab = _browser.new_tab(url)
+        _browser.activate_tab(tab)
+        tab_id = tab.tab_id
+        return {
+            "content": [{
+                "type": "text",
+                "text": json.dumps({
+                    "message": f"已创建新的tab页，并打开链接：{url}",
+                    "tab_id": tab_id,
+                }, ensure_ascii=False)
+            }]
+        }
+
+def register_switch_tab(mcp: FastMCP):
+    @mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
+    async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
+        _browser = get_page(browser_port)
+        _browser.activate_tab(tab_id)
+        return {
+            "content": [{
+                "type": "text",
+                "text": json.dumps({
+                    "message": f"已将tab页:【{tab_id}】切换至最前端",
+                }, ensure_ascii=False)
+            }]
+        }
+
+def register_close_tab(mcp: FastMCP):
+    @mcp.tool(name="close_tab", description="根据传入的tab_id关闭tab页", )
+    async def close_tab(browser_port, tab_id) -> dict[str, Any]:
+        _browser = get_page(browser_port)
+        _browser.close_tabs(tab_id)
+        return {
+            "content": [{
+                "type": "text",
+                "text": json.dumps({
+                    "message": f"已将tab页:【{tab_id}】关闭",
+                }, ensure_ascii=False)
+            }]
+        }
+
+def register_check_selector(mcp: FastMCP):
+    @mcp.tool(name="check_selector", description="查找tab页中是否包含元素")
+    async def check_selector(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
+        _browser = get_page(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 {
         "content": [{
             "type": "text",
             "text": json.dumps({
@@ -162,9 +162,9 @@ async def check_selector(browser_port: int, tab_id: str, css_selector: str) -> d
     }
 
 
-def main():
-    mcp.run()
-
-
-if __name__ == '__main__':
-    main()
+# def main():
+#     mcp.run()
+#
+#
+# if __name__ == '__main__':
+#     main()

mcp_tools/main.py

@@ -0,0 +1,19 @@
+# main.py
+import os
+from src.mcp_tools.dp_tools import *
+from fastmcp import FastMCP
+
+mcp = FastMCP("Jarvis Brain DrissionPage mcp")
+
+# 根据环境变量加载模块
+enabled_modules = os.getenv("MCP_MODULES", "DrissionPage").split(",")
+
+if "DrissionPage" in enabled_modules:
+    register_visit_url(mcp)
+
+
+# if "api" in enabled_modules:
+#     register_api_tools(mcp)
+
+def main():
+    mcp.run()

jarvis_brain-0.0.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=hnxybSDa8KWEFYfrfFqMNbnO9f3VQNUhZFK-L1F34IM,5505
-jarvis_brain-0.0.1.dist-info/METADATA,sha256=ipfhv5W4pSRBTQNwBHTTECNp0wKFoxJF9pjXy8-RUPk,176
-jarvis_brain-0.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.0.1.dist-info/entry_points.txt,sha256=_6gPuZq_ipnObk2O6CtFIRWmUQrUIDGc_NcdNNhuOr0,54
-jarvis_brain-0.0.1.dist-info/RECORD,,

jarvis_brain-0.0.1.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-jarvis-dp = mcp_tools.dp_tools:main