aient 1.1.6__tar.gz → 1.1.8__tar.gz

{aient-1.1.6/src/aient.egg-info → aient-1.1.8}/PKG-INFO

@@ -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 → aient-1.1.8}/setup.py

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

{aient-1.1.6 → aient-1.1.8}/src/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-1.1.8/src/aient/plugins/write_file.py

@@ -0,0 +1,91 @@
+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'):
+    """
+## write_to_file
+Description: Request to write full content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
+Parameters:
+- path: (required) The path of the file to write to (relative to the current working directory ${args.cwd})
+- content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified. Do NOT include the line numbers in the content though, just the actual content of the file.
+- mode: (optional) The mode to write to the file. Default is 'w'. 'w' for write, 'a' for append.
+Usage:
+<write_to_file>
+<path>File path here</path>
+<content>
+Your file content here
+</content>
+<mode>w</mode>
+</write_to_file>
+
+Example: Requesting to write to frontend-config.json
+<write_to_file>
+<path>frontend-config.json</path>
+<content>
+{
+  "apiEndpoint": "https://api.example.com",
+  "theme": {
+    "primaryColor": "#007bff",
+    "secondaryColor": "#6c757d",
+    "fontFamily": "Arial, sans-serif"
+  },
+  "features": {
+    "darkMode": true,
+    "notifications": true,
+    "analytics": false
+  },
+  "version": "1.0.0"
+}
+</content>
+</write_to_file>
+    """
+    # 确保目录存在
+    os.makedirs(os.path.dirname(path) or '.', exist_ok=True)
+
+    if content.startswith("##") and (path.endswith(".md") or path.endswith(".txt")):
+        content = "\n\n" + content
+
+    # 写入文件
+    with open(path, mode, encoding='utf-8') as file:
+        file.write(unescape_html(content))
+
+    return f"已成功写入文件：{path}"
+
+
+if __name__ == "__main__":
+    text = """
+&lt;!DOCTYPE html&gt;
+&lt;html lang=&quot;zh-CN&quot;&gt;
+&lt;head&gt;
+    &lt;meta charset=&quot;UTF-8&quot;&gt;
+    &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1.0&quot;&gt;
+    &lt;title&gt;Continuous Thought Machines (CTM) 原理解读&lt;/title&gt;
+    &lt;script&gt;MathJax={chtml:{fontURL:'https://cdn.jsdelivr.net/npm/mathjax@3/es5/output/chtml/fonts/woff-v2'}}&lt;/script&gt;
+    &lt;script src=&quot;https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js&quot; id=&quot;MathJax-script&quot; async&gt;&lt;/script&gt;
+    &lt;script src=&quot;https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js&quot; defer&gt;&lt;/script&gt;
+    &lt;script src=&quot;https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/full.render.js&quot; defer&gt;&lt;/script&gt;
+    &lt;script src=&quot;https://unpkg.com/@panzoom/panzoom@4.5.1/dist/panzoom.min.js&quot; defer&gt;&lt;/script&gt;
+    &lt;link href=&quot;https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/themes/prism-okaidia.min.css&quot; rel=&quot;stylesheet&quot;/&gt;
+    &lt;link href=&quot;https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&amp;family=Fira+Code:wght@400;500&amp;display=swap&quot; rel=&quot;stylesheet&quot;&gt;
+    &lt;link href=&quot;https://fonts.googleapis.com/icon?family=Material+Icons+Outlined&quot; rel=&quot;stylesheet&quot;&gt;
+&lt;style&gt;
+    """
+    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 → aient-1.1.8/src/aient.egg-info}/PKG-INFO

@@ -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/src/aient/plugins/write_file.py

@@ -1,54 +0,0 @@
-from .registry import register_tool
-
-import os
-
-@register_tool()
-def write_to_file(path, content, mode='w'):
-    """
-## write_to_file
-Description: Request to write full content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
-Parameters:
-- path: (required) The path of the file to write to (relative to the current working directory ${args.cwd})
-- content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified. Do NOT include the line numbers in the content though, just the actual content of the file.
-- mode: (optional) The mode to write to the file. Default is 'w'. 'w' for write, 'a' for append.
-Usage:
-<write_to_file>
-<path>File path here</path>
-<content>
-Your file content here
-</content>
-<mode>w</mode>
-</write_to_file>
-
-Example: Requesting to write to frontend-config.json
-<write_to_file>
-<path>frontend-config.json</path>
-<content>
-{
-  "apiEndpoint": "https://api.example.com",
-  "theme": {
-    "primaryColor": "#007bff",
-    "secondaryColor": "#6c757d",
-    "fontFamily": "Arial, sans-serif"
-  },
-  "features": {
-    "darkMode": true,
-    "notifications": true,
-    "analytics": false
-  },
-  "version": "1.0.0"
-}
-</content>
-</write_to_file>
-    """
-    # 确保目录存在
-    os.makedirs(os.path.dirname(path) or '.', exist_ok=True)
-
-    if content.startswith("##") and (path.endswith(".md") or path.endswith(".txt")):
-        content = "\n\n" + content
-
-    # 写入文件
-    with open(path, mode, encoding='utf-8') as file:
-        file.write(content)
-
-    return f"已成功写入文件：{path}"