aient 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

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 '长时间任务完成!'"

{aient-1.1.5.dist-info → aient-1.1.7.dist-info}/METADATA

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

{aient-1.1.5.dist-info → aient-1.1.7.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=aUhszsXK-x6IOtQEu-kpRb8V10eyy2s6PUXqE1BZ028,7871
+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
@@ -37,8 +37,8 @@ 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.5.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.5.dist-info/METADATA,sha256=vhRceQwCI5GvuEi900uKSzD6U9RRemCwdXvdVLEq6i4,4967
-aient-1.1.5.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aient-1.1.5.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.5.dist-info/RECORD,,
+aient-1.1.7.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.7.dist-info/METADATA,sha256=E5vt-IeBPRrujR_c4oJPrm58dSm-hOX252wPmZ7QIYw,4967
+aient-1.1.7.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+aient-1.1.7.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.7.dist-info/RECORD,,