aient 1.1.26__py3-none-any.whl → 1.1.28__py3-none-any.whl

aient/models/chatgpt.py

@@ -462,6 +462,10 @@ class chatgpt(BaseLLM):
                     print("full_response", full_response)
                 if function_parameter:
                     need_function_call = True
+                    if isinstance(self.conversation[convo_id][-1]["content"], str) and \
+                    "<tool_error>" in self.conversation[convo_id][-1]["content"]:
+                        need_function_call = False
+                        full_response = "接下来我需要做什么？"
                 else:
                     need_function_call = False
                     if self.print_log:

aient/plugins/excute_command.py

@@ -1,10 +1,9 @@
 import subprocess
 from .registry import register_tool
-from ..utils.scripts import sandbox
+from ..utils.scripts import sandbox, unescape_html
 
 import re
 import os
-import html
 import select
 
 # 检查是否在 Unix-like 系统上 (pty 模块主要用于 Unix)
@@ -39,18 +38,6 @@ def compare_line(line: str) -> bool:
     # print(f"similarity: {similarity}")
     return similarity > 0.89
 
-def unescape_html(input_string: str) -> str:
-  """
-  将字符串中的 HTML 实体（例如 &）转换回其原始字符（例如 &）。
-
-  Args:
-    input_string: 包含 HTML 实体的输入字符串。
-
-  Returns:
-    转换后的字符串。
-  """
-  return html.unescape(input_string)
-
 def get_python_executable(command: str) -> str:
     """
     获取 Python 可执行文件的路径。
@@ -191,18 +178,21 @@ def excute_command(command):
         # print(f"output_lines: {len(new_output_lines)}")
 
         if process.returncode == 0:
-            return f"执行命令成功:\n{final_output_log}"
+            if final_output_log.strip() == "":
+                return f"执行命令成功"
+            else:
+                return f"执行命令成功:\n{final_output_log.strip()}"
         else:
             # 如果是 PTY 模式，stderr 已经包含在 final_output_log 中
             if IS_UNIX:
-                return f"执行命令失败 (退出码 {process.returncode}):\n输出/错误:\n{final_output_log}"
+                return f"<tool_error>执行命令失败 (退出码 {process.returncode}):\n输出/错误:\n{final_output_log}</tool_error>"
             else:
-                return f"执行命令失败 (退出码 {process.returncode}):\n错误: {stderr_output}\n输出: {final_output_log}"
+                return f"<tool_error>执行命令失败 (退出码 {process.returncode}):\n错误: {stderr_output}\n输出: {final_output_log}</tool_error>"
 
     except FileNotFoundError:
-        return f"执行命令失败: 命令或程序未找到 ({command})"
+        return f"<tool_error>执行命令失败: 命令或程序未找到 ({command})</tool_error>"
     except Exception as e:
-        return f"执行命令时发生异常: {e}"
+        return f"<tool_error>执行命令时发生异常: {e}</tool_error>"
 
 if __name__ == "__main__":
     # print(excute_command("ls -l && echo 'Hello, World!'"))

aient/plugins/list_directory.py

@@ -43,8 +43,8 @@ def list_directory(path="."):
         return result
 
     except FileNotFoundError:
-        return f"错误: 路径 '{path}' 不存在"
+        return f"<tool_error>路径 '{path}' 不存在</tool_error>"
     except PermissionError:
-        return f"错误: 没有权限访问路径 '{path}'"
+        return f"<tool_error>没有权限访问路径 '{path}'</tool_error>"
     except Exception as e:
-        return f"列出目录时发生错误: {e}"
+        return f"<tool_error>列出目录时发生错误: {e}</tool_error>"

aient/plugins/run_python.py

@@ -129,7 +129,7 @@ if _result is not None:
 
     except Exception as e:
         logging.error(f"Error executing code: {str(e)}")
-        return f"Error: {str(e)}"
+        return f"<tool_error>Error: {str(e)}</tool_error>"
 
     finally:
         try:

aient/plugins/write_file.py

@@ -1,19 +1,7 @@
 from .registry import register_tool
+from ..utils.scripts import unescape_html
 
 import os
-import html
-
-def unescape_html(input_string: str) -> str:
-  """
-  将字符串中的 HTML 实体（例如 &）转换回其原始字符（例如 &）。
-
-  Args:
-    input_string: 包含 HTML 实体的输入字符串。
-
-  Returns:
-    转换后的字符串。
-  """
-  return html.unescape(input_string)
 
 @register_tool()
 def write_to_file(path, content, mode='w'):
@@ -65,7 +53,7 @@ Example: Requesting to write to frontend-config.json
         with open(path, mode, encoding='utf-8') as file:
             file.write(unescape_html(content))
     except PermissionError as e:
-        return f"写入文件失败: {e}"
+        return f"<tool_error>写入文件失败: {e}</tool_error>"
 
     return f"已成功写入文件：{path}"
 

aient/utils/scripts.py

@@ -202,6 +202,19 @@ def parse_tools_from_cursor_prompt(text):
             print(f"解析 JSON 时出错: {e}")
     return []
 
+import html
+def unescape_html(input_string: str) -> str:
+  """
+  将字符串中的 HTML 实体（例如 &）转换回其原始字符（例如 &）。
+
+  Args:
+    input_string: 包含 HTML 实体的输入字符串。
+
+  Returns:
+    转换后的字符串。
+  """
+  return html.unescape(input_string)
+
 import sys
 import shlex
 import builtins

{aient-1.1.26.dist-info → aient-1.1.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.26
+Version: 1.1.28
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE

{aient-1.1.26.dist-info → aient-1.1.28.dist-info}/RECORD

@@ -14,7 +14,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-aient/models/chatgpt.py,sha256=sfXqmYAiTTAa_dH2h49BZnVvjebEl99LJdQGepD2sCQ,46244
+aient/models/chatgpt.py,sha256=9l6_7QCF4VuOWPGZiroTT-0dg1h_qze5RUQwauDw_A4,46539
 aient/models/claude.py,sha256=JezghW7y0brl4Y5qiSHvnYR5prQCFywX4RViHt39pGI,26037
 aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -23,24 +23,24 @@ aient/models/vertex.py,sha256=qVD5l1Q538xXUPulxG4nmDjXE1VoV4yuAkTCpIeJVw0,16795
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=QGyI9LlNaU36GUpY531o7UbTFBB39u7LfS6rrx_RTWw,7103
-aient/plugins/excute_command.py,sha256=-Meu3CcC8U8Oc2lYf4OpaVQQ3YrIjBmpPEJVgONDkyI,10313
+aient/plugins/excute_command.py,sha256=XEGg1AX8U8iUBaHBqoCmZHLCpI_wQiDSmHDFvqG6ONE,10243
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
-aient/plugins/list_directory.py,sha256=JZVuImecMSfEv6jLqii-0uQJ1UCsrpMNmYlwW3PEDg4,1374
+aient/plugins/list_directory.py,sha256=V_uKkLx_fQDL5z__bSDC-PqAP-o32KmQW6Pdhx0Fx0s,1433
 aient/plugins/read_file.py,sha256=Lv03AW-gWGzM2esos2vLTXHcceczdTqEO7_vqFT4yoY,8302
 aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4017
 aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
-aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
+aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
 aient/plugins/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
-aient/plugins/write_file.py,sha256=ndMsQhfMuobvgbFuesxb17zIk9cQIYTd9Gdr6yiiZec,3896
+aient/plugins/write_file.py,sha256=7spYxloI_aUbeANEQK-oXrGPoBqSfsD7sdfMAWlNxhU,3656
 aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
 aient/prompt/agent.py,sha256=ebHYebxbgL-WEAKUs1NPNwxlUMucF3GNNoy3eNZrtIo,29737
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-aient/utils/scripts.py,sha256=l8_NrwIRYxvzxPFg-vSJz120swdnxxGfgBcQRogJ4nI,36154
-aient-1.1.26.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.26.dist-info/METADATA,sha256=CAiFkA5V7mMkXr5LvzzEL8pko1NEEcfOTnfUPN5g9yI,4968
-aient-1.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.26.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.26.dist-info/RECORD,,
+aient/utils/scripts.py,sha256=JVR6oNxYc9NnfQL0PGsL8QuhG43dwg0-rPS8NR_pyBM,36461
+aient-1.1.28.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.28.dist-info/METADATA,sha256=rsd1SRNSieT3WfswVg7WT7biuCkPNgiyhBAEKoQKbO4,4968
+aient-1.1.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.28.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.28.dist-info/RECORD,,