aient 1.1.6__py3-none-any.whl → 1.1.8__py3-none-any.whl

aient/plugins/excute_command.py

@@ -35,7 +35,8 @@ def compare_line(line: str) -> bool:
         return False
     similarity = calculate_similarity(line, last_line)
     last_line = line
-    return similarity > 0.9
+    # print(f"similarity: {similarity}")
+    return similarity > 0.89
 
 def unescape_html(input_string: str) -> str:
   """
@@ -130,8 +131,6 @@ def excute_command(command):
                             continue
                         if "git clone" in command and ('Counting objects' in data_str or 'Resolving deltas' in data_str or 'Receiving objects' in data_str or 'Compressing objects' in data_str):
                             continue
-                        if compare_line(data_str):
-                            continue
                         output_lines.append(data_str)
                     # 检查进程是否已结束，避免在进程已退出后 select 仍然阻塞
                     if process.poll() is not None and not r:
@@ -160,8 +159,6 @@ def excute_command(command):
                         continue
                     if "git clone" in command and ('Counting objects' in line or 'Resolving deltas' in line or 'Receiving objects' in line or 'Compressing objects' in line):
                         continue
-                    if compare_line(line):
-                        continue
                     output_lines.append(line)
                 process.stdout.close()
             # print(f"\n--- 命令实时输出结束 (PIPE) ---")
@@ -174,8 +171,21 @@ def excute_command(command):
             stderr_output = process.stderr.read()
             process.stderr.close()
 
-        output_lines.append(last_line)
-        final_output_log = "".join(output_lines)
+        new_output_lines = []
+        output_lines = "".join(output_lines).strip().replace("\\u001b[A", "").replace("\\r", "\r").replace("\\\\", "").replace("\\n", "\n").replace("\r", "+++").replace("\n", "+++")
+        for line in output_lines.split("+++"):
+            if line.strip() == "":
+                continue
+            # aaa = last_line.strip()
+            is_same = compare_line(repr(line.strip()))
+            if not is_same:
+                # print(f"{repr(aaa)}", flush=True)
+                # print(f"{repr(line.strip())}", flush=True)
+                # print(f"is_same: {is_same}", flush=True)
+                # print(f"\n\n\n", flush=True)
+                new_output_lines.append(line)
+        final_output_log = "\n".join(new_output_lines)
+        # print(f"output_lines: {len(new_output_lines)}")
 
         if process.returncode == 0:
             return f"执行命令成功:\n{final_output_log}"
@@ -205,18 +215,31 @@ if __name__ == "__main__":
 # print('\\n-------TQDM 任务完成.')
 # """
 
+#     tqdm_script = """
+# import time
+# print("Hello, World!1")
+# print("Hello, World!2")
+# for i in range(10):
+#     print(f"TQDM 进度条测试: {i}")
+#     time.sleep(1)
+# """
+#     processed_tqdm_script = tqdm_script.replace('"', '\\"')
+#     tqdm_command = f"python -c \"{processed_tqdm_script}\""
+#     # print(f"执行: {tqdm_command}")
+#     print(excute_command(tqdm_command))
+
     tqdm_script = """
 import time
-print("Hello, World!1")
-print("Hello, World!2")
-for i in range(10):
-    print(f"TQDM 进度条测试: {i}")
-    time.sleep(1)
+with open("/Users/yanyuming/Downloads/GitHub/beswarm/1.txt", "r") as f:
+    content = f.read()
+for i in content.split("\\n"):
+    print(i)
 """
     processed_tqdm_script = tqdm_script.replace('"', '\\"')
     tqdm_command = f"python -c \"{processed_tqdm_script}\""
     # print(f"执行: {tqdm_command}")
     print(excute_command(tqdm_command))
+
 #     tqdm_script = """
 # import time
 # from tqdm import tqdm

aient/plugins/write_file.py

@@ -1,6 +1,19 @@
 from .registry import register_tool
 
 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'):
@@ -49,6 +62,30 @@ Example: Requesting to write to frontend-config.json
 
     # 写入文件
     with open(path, mode, encoding='utf-8') as file:
-        file.write(content)
+        file.write(unescape_html(content))
 
-    return f"已成功写入文件：{path}"
+    return f"已成功写入文件：{path}"
+
+
+if __name__ == "__main__":
+    text = """
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Continuous Thought Machines (CTM) 原理解读</title>
+    <script>MathJax={chtml:{fontURL:'https://cdn.jsdelivr.net/npm/mathjax@3/es5/output/chtml/fonts/woff-v2'}}</script>
+    <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js" id="MathJax-script" async></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js" defer></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/full.render.js" defer></script>
+    <script src="https://unpkg.com/@panzoom/panzoom@4.5.1/dist/panzoom.min.js" defer></script>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-okaidia.min.css" rel="stylesheet"/>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Fira+Code:wght@400;500&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Outlined" rel="stylesheet">
+<style>
+    """
+    with open("test.txt", "r", encoding="utf-8") as file:
+        content = file.read()
+    print(write_to_file("test.txt", content))
+    # python -m beswarm.aient.src.aient.plugins.write_file

{aient-1.1.6.dist-info → aient-1.1.8.dist-info}/METADATA

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

{aient-1.1.6.dist-info → aient-1.1.8.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=Vp6CG9ocdC_FAlCMEGtKj45xamir76DFxdJVvURNtog,6539
-aient/plugins/excute_command.py,sha256=w8KV_udnh9pmg9fK9ttMqvoWMkGVFpXhYem5Sxb7Kfw,9472
+aient/plugins/excute_command.py,sha256=A3WmfZboEikU1EHvtMWhBv-xHxCyMxbDddQ982I_8wE,10482
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 aient/plugins/list_directory.py,sha256=5ubm-mfrj-tanGSDp4M_Tmb6vQb3dx2-XVfQ2yL2G8A,1394
@@ -31,14 +31,14 @@ aient/plugins/read_file.py,sha256=-RRmaj-rSl8y--5VKnxCsZ1YQHe75OhnqvsDRLJyujM,84
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 aient/plugins/websearch.py,sha256=I4tYU7CGLdyG6Hd3yK19V-PoG5IbFI9FEEVggyrshRg,15227
-aient/plugins/write_file.py,sha256=qmT6iQ3mDyVAa9Sld1jfJq0KPZj0w2kRIHq0JyjpGeA,1853
+aient/plugins/write_file.py,sha256=YRvQKMvV-5lwohxlvwt9hjfxz2dRJP85AJWAMUIqbBY,3804
 aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
 aient/prompt/agent.py,sha256=6f5ZB66Rb8y0iQScHMRhvXZ1qMM3YsKpCBPCTAAw2rg,24917
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=NXmTxcZqHoRv3S13isLsv7kvqktXnA5ej7uMsxCJUe0,26656
-aient-1.1.6.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.6.dist-info/METADATA,sha256=aMpvAuMoIMSzN7RcdmEMhTKbUE1iLa1HQYKgcbRmU34,4967
-aient-1.1.6.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aient-1.1.6.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.6.dist-info/RECORD,,
+aient-1.1.8.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.8.dist-info/METADATA,sha256=vKhyqOW5DHgaoPPSdFa9Pmbp1YWNYRkaSjQ0DiWwIQE,4967
+aient-1.1.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+aient-1.1.8.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.8.dist-info/RECORD,,