beswarm 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.82",
+    version="1.0.84",
     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/core/utils.py

@@ -21,7 +21,7 @@ def get_model_dict(provider):
         if type(model) == str:
             model_dict[model] = model
         if isinstance(model, dict):
-            model_dict.update({new: old for old, new in model.items()})
+            model_dict.update({str(new): old for old, new in model.items()})
     return model_dict
 
 class BaseAPI:

beswarm/aient/src/aient/models/chatgpt.py

@@ -540,10 +540,10 @@ class chatgpt(BaseLLM):
                 if tool_name == "read_file" and "<read_file error>" not in tool_response:
                     self.latest_file_content[tool_info['parameter']["file_path"]] = tool_response
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead file successfully! The file content has been updated in the tag <latest_file_content>.")
-                elif tool_name == "write_to_file":
-                    tool_info['parameter']["content"] = "...文件已写入，内容已省略以节省上下文..."
-                    tool_args = json.dumps(tool_info['parameter'], ensure_ascii=False) if not isinstance(tool_info['parameter'], str) else tool_info['parameter']
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
+                # elif tool_name == "write_to_file":
+                #     tool_info['parameter']["content"] = "...文件已写入，内容已省略以节省上下文..."
+                #     tool_args = json.dumps(tool_info['parameter'], ensure_ascii=False) if not isinstance(tool_info['parameter'], str) else tool_info['parameter']
+                #     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
                 else:
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 

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

@@ -1,21 +1,26 @@
 import subprocess
 from .registry import register_tool
 
+import html
+
+def unescape_html(input_string: str) -> str:
+  """
+  将字符串中的 HTML 实体（例如 &）转换回其原始字符（例如 &）。
+
+  Args:
+    input_string: 包含 HTML 实体的输入字符串。
+
+  Returns:
+    转换后的字符串。
+  """
+  return html.unescape(input_string)
+
 # 执行命令
 @register_tool()
 def excute_command(command):
     """
 执行命令并返回输出结果
 禁止用于查看pdf，禁止使用 pdftotext 命令
-请确保生成的命令字符串可以直接在终端执行，特殊字符（例如 &&）必须保持原样，不要进行 HTML 编码或任何形式的转义，禁止使用 &&
-
-for example:
-
-correct:
-ls -l && echo 'Hello, World!'
-
-incorrect:
-ls -l && echo 'Hello, World!'
 
 参数:
     command: 要执行的命令，可以克隆仓库，安装依赖，运行代码等
@@ -25,6 +30,7 @@ ls -l && echo 'Hello, World!'
     """
     try:
         # 使用subprocess.run捕获命令输出
+        command = unescape_html(command)
         result = subprocess.run(command, shell=True, check=True, capture_output=True, text=True)
         # 返回命令的标准输出
         if "pip install" in command:
@@ -36,4 +42,8 @@ ls -l && echo 'Hello, World!'
         # 如果命令执行失败，返回错误信息和错误输出
         return f"执行命令失败 (退出码 {e.returncode}):\n错误: {e.stderr}\n输出: {e.stdout}"
     except Exception as e:
-        return f"执行命令时发生异常: {e}"
+        return f"执行命令时发生异常: {e}"
+
+if __name__ == "__main__":
+    print(excute_command("ls -l && echo 'Hello, World!'"))
+    print(excute_command("ls -l && echo 'Hello, World!'"))

{beswarm-0.1.23.dist-info → beswarm-0.1.25.dist-info}/METADATA

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

{beswarm-0.1.23.dist-info → beswarm-0.1.25.dist-info}/RECORD

@@ -1,21 +1,21 @@
 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=BrSrH3v4sLL6WJ2hIxlgl7skLYNf7ZCP7SXCwXCSoRI,487
+beswarm/aient/setup.py,sha256=llEi2LmYhrh4rYWh_h2si7x9ibWXM45h7tx8IgGnAik,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
 beswarm/aient/src/aient/core/models.py,sha256=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
 beswarm/aient/src/aient/core/request.py,sha256=DzjOtWb7rm1frsyKRIsnhONCuttURfwtqERc_qJqHgg,60931
 beswarm/aient/src/aient/core/response.py,sha256=CSAOQmybBu3i2Yq2YUyi91dZWTN1tmtJEBTI8RFwj_s,30594
-beswarm/aient/src/aient/core/utils.py,sha256=Pmr_ghNsmhKTG65g8_M8BBc_pHGgnD88-SNsJNPJFw4,26158
+beswarm/aient/src/aient/core/utils.py,sha256=W-PDhwoJIbmlt4xfyrV9GXHu9TwRk4pivBOcDVXjgsc,26163
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
 beswarm/aient/src/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
 beswarm/aient/src/aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 beswarm/aient/src/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/src/aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-beswarm/aient/src/aient/models/chatgpt.py,sha256=ysw9jEXnGRAxqyvSjf4y7EzLGeyCZqElkYS3sW6G6KI,44775
+beswarm/aient/src/aient/models/chatgpt.py,sha256=0LbiDbBnAUQNnvWBPhQuBWNhKEPXWE171DDwEGhLdIY,44783
 beswarm/aient/src/aient/models/claude.py,sha256=thK9P8qkaaoUN3OOJ9Shw4KDs-pAGKPoX4FOPGFXva8,28597
 beswarm/aient/src/aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 beswarm/aient/src/aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -24,7 +24,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=ixSN1q2d3JoJK8OipRB9M2XGMnf4R1b1o_E7F5cUSOU,1392
+beswarm/aient/src/aient/plugins/excute_command.py,sha256=A5jvmo8DGcluylIooczMHk8t8zs7vq-wQzbF1ETYY2A,1606
 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
@@ -125,7 +125,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=JZkMT4JAkrV_0-CBATLAPVZzVGEMMEM2XUTTMGmED0E,5245
-beswarm-0.1.23.dist-info/METADATA,sha256=tabySq-673q5cObDj5JfG_cbZ-UzrYV5SfWaCI8E6kI,2870
-beswarm-0.1.23.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-beswarm-0.1.23.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.23.dist-info/RECORD,,
+beswarm-0.1.25.dist-info/METADATA,sha256=8ZKP725Gzt9mnuWTSJ2-kdHcz3BnOzHZWrDdq5yfTg8,2870
+beswarm-0.1.25.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+beswarm-0.1.25.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.25.dist-info/RECORD,,

{beswarm-0.1.23.dist-info → beswarm-0.1.25.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any