aient 1.1.25__py3-none-any.whl → 1.1.27__py3-none-any.whl

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 可执行文件的路径。

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'):

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
@@ -241,17 +254,46 @@ def _sandboxed_open(file, mode='r', *args, **kwargs):
 
 builtins.open = _sandboxed_open
 
-# 2. 智能判断原始命令是脚本还是模块，并执行
+# 2. 智能判断原始命令是脚本、模块还是代码字符串，并执行
 original_argv = sys.argv[1:]
-if original_argv and original_argv[0] == '-m':
-    sys.argv = original_argv[1:]
-    runpy.run_module(sys.argv[0], run_name='__main__')
-elif original_argv:
-    target_path = original_argv[0]
-    sys.argv = original_argv
+
+action = None
+action_arg = None
+passthrough_args = []
+i = 0
+while i < len(original_argv):
+    arg = original_argv[i]
+    if arg == '-m':
+        action = 'module'
+        if i + 1 < len(original_argv):
+            action_arg = original_argv[i+1]
+            passthrough_args = original_argv[i+2:]
+        break
+    elif arg == '-c':
+        action = 'command'
+        if i + 1 < len(original_argv):
+            action_arg = original_argv[i+1]
+            passthrough_args = original_argv[i+2:]
+        break
+    elif arg.startswith('-'):
+        i += 1
+    else:
+        action = 'file'
+        action_arg = arg
+        passthrough_args = original_argv[i+1:]
+        break
+
+if action == 'module' and action_arg:
+    sys.argv = [action_arg] + passthrough_args
+    runpy.run_module(action_arg, run_name='__main__')
+elif action == 'command' and action_arg:
+    sys.argv = ['-c'] + passthrough_args
+    exec(action_arg, {'__name__': '__main__'})
+elif action == 'file' and action_arg:
+    sys.argv = [action_arg] + passthrough_args
     # 使用原始的 open 来读取要执行的脚本，因为它本身不应受沙箱限制
-    with original_open(target_path, 'r') as f:
-        code = compile(f.read(), target_path, 'exec')
+    with original_open(action_arg, 'r') as f:
+        code = compile(f.read(), action_arg, 'exec')
         exec(code, {'__name__': '__main__'})
 else:
     pass

{aient-1.1.25.dist-info → aient-1.1.27.dist-info}/METADATA

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

{aient-1.1.25.dist-info → aient-1.1.27.dist-info}/RECORD

@@ -23,7 +23,7 @@ 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=ybkgoMlrXxfeRLA8gizxNL1KuVda0s9xSKTSzC8CKyU,10021
 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
@@ -33,14 +33,14 @@ 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/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
-aient/plugins/write_file.py,sha256=ndMsQhfMuobvgbFuesxb17zIk9cQIYTd9Gdr6yiiZec,3896
+aient/plugins/write_file.py,sha256=aWOCuKjtpzjl2JiJV9W6YBmPg_WivxyXD509xUHiuCc,3631
 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=9ihTL2W3z5q6Qh6ZqCYplTEoonL4oSj8MBzpRbvc5IE,35329
-aient-1.1.25.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.25.dist-info/METADATA,sha256=Vl_t8k-8RDWtEcGzqhvbrto7O-MxZ4uHnajBG_T6Ndk,4968
-aient-1.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.25.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.25.dist-info/RECORD,,
+aient/utils/scripts.py,sha256=JVR6oNxYc9NnfQL0PGsL8QuhG43dwg0-rPS8NR_pyBM,36461
+aient-1.1.27.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.27.dist-info/METADATA,sha256=a3i0FAh-ilxdSvPFbnnxhH0WxVTIWQGfBRlQtryTi-g,4968
+aient-1.1.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.27.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.27.dist-info/RECORD,,