Jarvis-Brain 0.1.5.2__py3-none-any.whl → 0.1.5.4__py3-none-any.whl

{jarvis_brain-0.1.5.2.dist-info → jarvis_brain-0.1.5.4.dist-info}/METADATA

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

jarvis_brain-0.1.5.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=TsktupVxzQkDRH4w-niEqJba3LkeWxIeyyx24ehpqAs,8411
+mcp_tools/main.py,sha256=SiLF-tcEdApkzMjTZJEpVYX5d-LPW7aqy6A6lCBA7YQ,829
+tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/browser_manager.py,sha256=MrdONq-qxkDsq_xWeS5MjbUelCaB_UdQ3H79r1M1yuI,1746
+tools/tools.py,sha256=NMd7bSadWEh6rtw9LYg37-ZHzE28PmobE3mqFgbWdQg,5015
+jarvis_brain-0.1.5.4.dist-info/METADATA,sha256=blulHvE0xWUTsOrZBlfCKCSTmSlPRNZTOx9xOUD9l3w,241
+jarvis_brain-0.1.5.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.5.4.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.5.4.dist-info/RECORD,,

mcp_tools/main.py

@@ -7,7 +7,7 @@ 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"))
+base_cwd = os.getenv("BASE_CWD", os.path.expanduser('~'))
 
 if "TeamNode-Dp" in enabled_modules:
     # 页面管理

tools/browser_manager.py

@@ -23,10 +23,9 @@ class BrowserManager:
 
         co = ChromiumOptions().set_local_port(random_port)
         custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")
-
-        # 2. 配置浏览器选项，指定该目录
-        # co = ChromiumOptions()
         co.set_user_data_path(custom_data_dir)  # 设置用户数据路径
+        # if not os.path.exists(custom_data_dir):
+        #     os.makedirs(custom_data_dir)
         self.browser_pool[random_port] = ChromiumPage(co)
         return random_port, self.browser_pool[random_port]
 

tools/tools.py

@@ -21,8 +21,19 @@ def requests_html(url):
 def dp_headless_html(url):
     opt = ChromiumOptions().headless(True)
     opt.set_argument('--no-sandbox')
+    """创建新的浏览器实例"""
+    random_port = random.randint(9223, 9934)
+    while random_port in self.browser_pool:
+        random_port = random.randint(9223, 9934)
+
+    custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")
+    opt.set_user_data_path(custom_data_dir)  # 设置用户数据路径
+    # if not os.path.exists(custom_data_dir):
+    #     os.makedirs(custom_data_dir)
+    # self.browser_pool[random_port] = ChromiumPage(co)
     # 随机端口，固定9222端口的话，可能会被瑞数检测到
-    opt.auto_port()
+    # opt.auto_port()
+    opt.set_local_port(random_port)
     page = ChromiumPage(opt)
     tab = page.latest_tab
     tab.get(url)

jarvis_brain-0.1.5.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=TsktupVxzQkDRH4w-niEqJba3LkeWxIeyyx24ehpqAs,8411
-mcp_tools/main.py,sha256=ockDfiMWaNroXf6sJ9dk-jU-_SvoGgP-0t-TbW2XWyw,827
-tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/browser_manager.py,sha256=G0nUQSmMVWzS08IjO87reEyMCpy-IiM3BxwdNUvcmdI,1740
-tools/tools.py,sha256=qPa80xzQWCD8mSdg8isCgyei0XN8a7guGtR2J_MbQDU,4481
-jarvis_brain-0.1.5.2.dist-info/METADATA,sha256=s5BNa9hKn38Tk0_S8iGPpDxwZ7h-x2NO1iXLtV8kRzM,241
-jarvis_brain-0.1.5.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.5.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.5.2.dist-info/RECORD,,