beswarm 0.1.49__tar.gz → 0.1.51__tar.gz

{beswarm-0.1.49 → beswarm-0.1.51}/PKG-INFO

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

{beswarm-0.1.49 → beswarm-0.1.51}/beswarm/aient/setup.py

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

{beswarm-0.1.49 → beswarm-0.1.51}/beswarm/aient/src/aient/plugins/excute_command.py

@@ -12,6 +12,32 @@ IS_UNIX = hasattr(os, 'fork')
 if IS_UNIX:
     import pty
 
+import difflib
+
+last_line = ""
+def calculate_similarity(string1: str, string2: str) -> float:
+    """Calculates the similarity ratio between two strings.
+
+    Args:
+        string1: The first string.
+        string2: The second string.
+
+    Returns:
+        A float between 0 and 1, where 1 means the strings are identical
+        and 0 means they are completely different.
+    """
+    return difflib.SequenceMatcher(None, string1, string2).ratio()
+
+def compare_line(line: str) -> bool:
+    global last_line
+    if last_line == "":
+        last_line = line
+        return False
+    similarity = calculate_similarity(line, last_line)
+    last_line = line
+    # print(f"similarity: {similarity}")
+    return similarity > 0.89
+
 def unescape_html(input_string: str) -> str:
   """
   将字符串中的 HTML 实体（例如 &）转换回其原始字符（例如 &）。
@@ -101,6 +127,10 @@ def excute_command(command):
                             data_str = repr(data_bytes) + " (decode error)\n"
 
                         print(data_str, end='', flush=True)
+                        if "pip install" in command and '━━' in data_str:
+                            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
                         output_lines.append(data_str)
                     # 检查进程是否已结束，避免在进程已退出后 select 仍然阻塞
                     if process.poll() is not None and not r:
@@ -141,7 +171,21 @@ def excute_command(command):
             stderr_output = process.stderr.read()
             process.stderr.close()
 
-        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}"
@@ -171,6 +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
+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
@@ -184,9 +253,9 @@ if __name__ == "__main__":
 #     print(excute_command(tqdm_command))
 
 
-    tqdm_command = f"pip install requests"
-    # print(f"执行: {tqdm_command}")
-    print(excute_command(tqdm_command))
+    # tqdm_command = f"pip install requests"
+    # # print(f"执行: {tqdm_command}")
+    # print(excute_command(tqdm_command))
 
 
     # long_running_command_unix = "echo '开始长时间任务...' && for i in 1 2 3; do echo \"正在处理步骤 $i/3...\"; sleep 1; done && echo '长时间任务完成!'"

{beswarm-0.1.49 → beswarm-0.1.51}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.1.49 → beswarm-0.1.51}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.1.49"
+version = "0.1.51"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"