beswarm 0.1.35__py3-none-any.whl → 0.1.37__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.92",
+    version="1.0.93",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

beswarm/aient/src/aient/plugins/excute_command.py

@@ -1,6 +1,7 @@
 import subprocess
 from .registry import register_tool
 
+import re
 import html
 
 def unescape_html(input_string: str) -> str:
@@ -15,6 +16,32 @@ def unescape_html(input_string: str) -> str:
   """
   return html.unescape(input_string)
 
+def get_python_executable(command: str) -> str:
+    """
+    获取 Python 可执行文件的路径。
+
+    Returns:
+        str: Python 可执行文件的路径。
+    """
+    cmd_parts = command.split(None, 1)
+    if cmd_parts:
+        executable = cmd_parts[0]
+        args_str = cmd_parts[1] if len(cmd_parts) > 1 else ""
+
+        # 检查是否是 python 可执行文件 (如 python, python3, pythonX.Y)
+        is_python_exe = False
+        if executable == "python" or re.match(r"^python[23]?(\.\d+)?$", executable):
+            is_python_exe = True
+
+        if is_python_exe:
+            # 检查参数中是否已经有 -u 选项
+            args_list = args_str.split()
+            has_u_option = "-u" in args_list
+            if not has_u_option:
+                if args_str:
+                    command = f"{executable} -u {args_str}"
+    return command
+
 # 执行命令
 @register_tool()
 def excute_command(command):
@@ -31,6 +58,9 @@ def excute_command(command):
     try:
         command = unescape_html(command) # 保留 HTML 解码
 
+        command = get_python_executable(command)
+
+
         # 使用 Popen 以便实时处理输出
         # bufsize=1 表示行缓冲, universal_newlines=True 与 text=True 效果类似，用于文本模式
         process = subprocess.Popen(
@@ -106,9 +136,9 @@ if __name__ == "__main__":
     # print(excute_command(long_running_command_unix))
 
 
-    long_running_command_unix = "pip install torch"
-    print(f"执行: {long_running_command_unix}")
-    print(excute_command(long_running_command_unix))
+    # long_running_command_unix = "pip install torch"
+    # print(f"执行: {long_running_command_unix}")
+    # print(excute_command(long_running_command_unix))
 
 
 #     python_long_task_command = """
@@ -118,5 +148,5 @@ if __name__ == "__main__":
 #     print(f"执行: {python_long_task_command}")
 #     print(excute_command(python_long_task_command))
 
-
+    print(get_python_executable("python -c 'print(123)'"))
 # python -m beswarm.aient.src.aient.plugins.excute_command

beswarm/tools/UIworker.py

@@ -3,7 +3,6 @@ import io
 import copy
 import base64
 import platform
-import pyautogui
 from datetime import datetime
 from ..aient.src.aient.plugins import register_tool, get_function_call_list
 
@@ -16,6 +15,7 @@ from ..utils import extract_xml_content
 async def get_current_screen_image_message(prompt):
     print("instruction agent 正在截取当前屏幕...")
     try:
+        import pyautogui
         # 使用 pyautogui 截取屏幕，返回 PIL Image 对象
         screenshot = pyautogui.screenshot()
         # img_width, img_height = screenshot.size # 获取截图尺寸

{beswarm-0.1.35.dist-info → beswarm-0.1.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.1.35
+Version: 0.1.37
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.1.35.dist-info → beswarm-0.1.37.dist-info}/RECORD

@@ -1,7 +1,7 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/utils.py,sha256=AdDCcqAIIKQEMl7PfryVgeT9G5sHe7QNsZnrvmTGA8E,283
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=LYfkRgq2T63yBlZ2EdqRCqob-B0tJP_RdJWodotCAW4,487
+beswarm/aient/setup.py,sha256=UvQkQk0MwjVxgzgR4-QJxBy2A4et3GTfTnlbiHw6LVQ,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -25,7 +25,7 @@ beswarm/aient/src/aient/models/vertex.py,sha256=qVD5l1Q538xXUPulxG4nmDjXE1VoV4yu
 beswarm/aient/src/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/src/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/src/aient/plugins/config.py,sha256=KnZ5xtb5o41FI2_qvxTEQhssdd3WJc7lIAFNR85INQw,7817
-beswarm/aient/src/aient/plugins/excute_command.py,sha256=1DPFXXXbhQAO7tqsxfxisO7I1VbTEzFvYwone4Sw9I4,4422
+beswarm/aient/src/aient/plugins/excute_command.py,sha256=u-JOZ21dDcDx1j3O0KVIHAsa6MNuOxHFBdV3iCnTih0,5413
 beswarm/aient/src/aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 beswarm/aient/src/aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 beswarm/aient/src/aient/plugins/list_directory.py,sha256=5ubm-mfrj-tanGSDp4M_Tmb6vQb3dx2-XVfQ2yL2G8A,1394
@@ -119,7 +119,7 @@ beswarm/queries/tree-sitter-languages/ruby-tags.scm,sha256=vIidsCeE2A0vdFN18yXKq
 beswarm/queries/tree-sitter-languages/rust-tags.scm,sha256=9ljM1nzhfPs_ZTRw7cr2P9ToOyhGcKkCoN4_HPXSWi4,1451
 beswarm/queries/tree-sitter-languages/scala-tags.scm,sha256=UxQjz80JIrrJ7Pm56uUnQyThfmQNvwk7aQzPNypB-Ao,1761
 beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky82DpgTMKXK_l2ySTuF2zrQ2fJAi9E,1253
-beswarm/tools/UIworker.py,sha256=9e0iWBIi-ET6OvhRftuMSphixihySlTjvB4pCZvKuAU,6331
+beswarm/tools/UIworker.py,sha256=YRrzW5GxWqA-tcmmm2c6mMbkVI0kHIqosIUz-GcoQOQ,6339
 beswarm/tools/__init__.py,sha256=-h_zoMEjnLCg9iVgSoor9BI3yK64LdVOQkVB0DgGFmo,1001
 beswarm/tools/click.py,sha256=vjCN6_00xJw-dcMZEv9sneTBmuKI7lFN4xApZZizd5k,20760
 beswarm/tools/edit_file.py,sha256=qKOVanfh_79eavRrqqyFirRo07sZ897jUL2PD4GRKJk,6965
@@ -128,7 +128,7 @@ beswarm/tools/repomap.py,sha256=CwvwoN5Swr42EzrORTTeV8MMb7mPviy4a4b0fxBu50k,4082
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=FfKCx7KFNbMRoAXtjU1_nJQjx9WHny7KBq8OXSYICJs,5334
-beswarm-0.1.35.dist-info/METADATA,sha256=2n62NH7Tgpl295Mz2BjjEmh48XRWtUmRYmdH3bWbap8,3197
-beswarm-0.1.35.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-beswarm-0.1.35.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.35.dist-info/RECORD,,
+beswarm-0.1.37.dist-info/METADATA,sha256=aBx-kjQIXjn2HYky3L99c2oBOXJRWYNRP7xF0Ndj9h4,3197
+beswarm-0.1.37.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+beswarm-0.1.37.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.37.dist-info/RECORD,,