beswarm 0.1.75__py3-none-any.whl → 0.1.77__py3-none-any.whl

beswarm/aient/setup.py

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

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

beswarm/aient/src/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'):

beswarm/aient/src/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

beswarm/tools/edit_file.py

@@ -1,9 +1,11 @@
 import os
 import re
+import difflib
 from ..aient.src.aient.plugins import register_tool
+from ..aient.src.aient.utils.scripts import unescape_html
 
 @register_tool()
-def edit_file(file_path, diff_content, match_precision=0.8):
+def edit_file(file_path, diff_content, match_precision=0.9):
     """
 使用diff模式编辑代码文件。**重要：此函数每次调用只能对文件进行一处修改。**
 
@@ -22,7 +24,7 @@ def edit_file(file_path, diff_content, match_precision=0.8):
 参数:
     file_path: 要编辑的文件路径。
     diff_content: 包含单次修改信息的diff字符串，格式必须符合上述要求。
-    match_precision: 匹配精度 (0.0-1.0)，值越高要求匹配越精确，默认0.8。当完全精确匹配失败时，此参数生效。
+    match_precision: 匹配精度 (0.0-1.0)，值越高要求匹配越精确，默认为0.9。当完全精确匹配失败时，此参数生效。
 
 返回:
     编辑结果的状态信息，包括成功或错误信息。
@@ -63,6 +65,8 @@ def edit_file(file_path, diff_content, match_precision=0.8):
         # 应用每个diff块
         new_content = content
         for search_block, replace_block in diff_blocks:
+            search_block = unescape_html(search_block)
+            replace_block = unescape_html(replace_block)
             # 检查搜索块是否为空
             if not search_block.strip():
                 return f"错误: 搜索块不能为空"
@@ -93,27 +97,19 @@ def edit_file(file_path, diff_content, match_precision=0.8):
                 for i in range(len(content_lines) - len(search_lines) + 1):
                     # 计算当前位置的匹配分数
                     match_score = 0
-                    total_chars = 0
+                    lines_compared = 0
 
                     for j in range(len(search_lines)):
                         search_line = search_lines[j]
                         content_line = content_lines[i + j]
 
-                        # 计算两行之间的相似度（使用更精确的算法）
-                        # 1. 字符级别的比较
-                        common_chars = sum(c1 == c2 for c1, c2 in zip(search_line, content_line))
-                        total_line_chars = max(len(search_line), len(content_line))
-
-                        if total_line_chars > 0:
-                            line_match = common_chars / total_line_chars
-                            match_score += line_match
-                            total_chars += 1
+                        # 使用 difflib 计算行相似度，该算法对插入和删除更具鲁棒性
+                        line_match = difflib.SequenceMatcher(None, search_line, content_line).ratio()
+                        match_score += line_match
+                        lines_compared += 1
 
                     # 计算整体匹配分数
-                    if total_chars > 0:
-                        match_score = match_score / total_chars
-                    else:
-                        match_score = 0
+                    match_score = match_score / lines_compared
 
                     # 如果使用高精度匹配 (>0.95)，我们需要更严格地检查匹配结果
                     if match_precision > 0.95:
@@ -146,7 +142,14 @@ def edit_file(file_path, diff_content, match_precision=0.8):
                     total_original_lines += original_lines
                     total_new_lines += new_lines
                 else:
-                    return f"错误: 在文件中未找到足够匹配的代码块，最佳匹配分数为 {best_match_score:.2f}，但要求为 {match_precision:.2f}"
+                    error_message = f"错误: 在文件中未找到足够匹配的代码块，最佳匹配分数为 {best_match_score:.2f}，但要求为 {match_precision:.2f}。"
+                    if best_match_index != -1:
+                        start_index = max(0, best_match_index - len(search_lines))
+                        end_index = min(len(content_lines), best_match_index + 2 * len(search_lines))
+                        context_lines = content_lines[start_index:end_index]
+                        context_block = '\n'.join(context_lines)
+                        error_message += f"\n\n文件的最佳匹配范围原文如下 (上下文已扩展):\n<real_file_content>\n{context_block}\n</real_file_content>"
+                    return error_message
 
         # 如果没有进行任何编辑，返回错误
         if edits_count == 0:
@@ -173,7 +176,7 @@ def edit_file(file_path, diff_content, match_precision=0.8):
 if __name__ == "__main__":
     edit_str = """
 <<<<<<< SEARCH
-    parser.add_argument('--dataset', type=str, default='cifar10', choices=['cifar10', 'cifar100', 'imagenet'], help="Dataset to use.")
+    parser.add_argument('--dataset',type=str,default='cifar10', choices=['cifar10', 'cifar100', 'imagenet'],help="Dataset to use.")
 =======
     parser.add_argument('--dataset', type=str, default='cifar10', choices=['cifar10', 'cifar100', 'imagenet', 'tinyimagenet'], help="Dataset to use.")
 >>>>>>> REPLACE

{beswarm-0.1.75.dist-info → beswarm-0.1.77.dist-info}/METADATA

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

{beswarm-0.1.75.dist-info → beswarm-0.1.77.dist-info}/RECORD

@@ -1,7 +1,7 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/utils.py,sha256=Z2Kuus2BLp9EHUC2ZNL9iUsb6NWnPj-MTA7SYzGyg24,1755
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=hG7eswVWMMNc-xD67iN6hCTvU9HSIiqwkbkncpEpctA,487
+beswarm/aient/setup.py,sha256=TVFBwEKEXhadb_ESCtRQva9W7btAzbXZUV3sj9vyPj4,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -25,7 +25,7 @@ beswarm/aient/src/aient/models/vertex.py,sha256=qVD5l1Q538xXUPulxG4nmDjXE1VoV4yu
 beswarm/aient/src/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/src/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/src/aient/plugins/config.py,sha256=QGyI9LlNaU36GUpY531o7UbTFBB39u7LfS6rrx_RTWw,7103
-beswarm/aient/src/aient/plugins/excute_command.py,sha256=-Meu3CcC8U8Oc2lYf4OpaVQQ3YrIjBmpPEJVgONDkyI,10313
+beswarm/aient/src/aient/plugins/excute_command.py,sha256=ybkgoMlrXxfeRLA8gizxNL1KuVda0s9xSKTSzC8CKyU,10021
 beswarm/aient/src/aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 beswarm/aient/src/aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 beswarm/aient/src/aient/plugins/list_directory.py,sha256=JZVuImecMSfEv6jLqii-0uQJ1UCsrpMNmYlwW3PEDg4,1374
@@ -35,12 +35,12 @@ beswarm/aient/src/aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY
 beswarm/aient/src/aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 beswarm/aient/src/aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 beswarm/aient/src/aient/plugins/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
-beswarm/aient/src/aient/plugins/write_file.py,sha256=ndMsQhfMuobvgbFuesxb17zIk9cQIYTd9Gdr6yiiZec,3896
+beswarm/aient/src/aient/plugins/write_file.py,sha256=aWOCuKjtpzjl2JiJV9W6YBmPg_WivxyXD509xUHiuCc,3631
 beswarm/aient/src/aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
 beswarm/aient/src/aient/prompt/agent.py,sha256=ebHYebxbgL-WEAKUs1NPNwxlUMucF3GNNoy3eNZrtIo,29737
 beswarm/aient/src/aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 beswarm/aient/src/aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-beswarm/aient/src/aient/utils/scripts.py,sha256=l8_NrwIRYxvzxPFg-vSJz120swdnxxGfgBcQRogJ4nI,36154
+beswarm/aient/src/aient/utils/scripts.py,sha256=JVR6oNxYc9NnfQL0PGsL8QuhG43dwg0-rPS8NR_pyBM,36461
 beswarm/aient/test/chatgpt.py,sha256=Hvl7FuDt1c74N5TVBmhErOPvJbJJzA7FNp5VoZM4u30,4957
 beswarm/aient/test/claude.py,sha256=IyB4qI1eJLwlSfDNSnt2FhbQWYyBighHUjJxEXc3osQ,1095
 beswarm/aient/test/test.py,sha256=rldnoLQdtRR8IKFSIzTti7eIK2MpPMoi9gL5qD8_K44,29
@@ -122,7 +122,7 @@ beswarm/queries/tree-sitter-languages/scala-tags.scm,sha256=UxQjz80JIrrJ7Pm56uUn
 beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky82DpgTMKXK_l2ySTuF2zrQ2fJAi9E,1253
 beswarm/tools/__init__.py,sha256=YXP65SJFE1dBNRlffapdd7zsB6M6tHZ6QaQykGq7KDU,1198
 beswarm/tools/click.py,sha256=TygaekCXTmU3fIu6Uom7ZcyzEgYMlCC_GX-5SmWHuLI,20762
-beswarm/tools/edit_file.py,sha256=npe_j0FHOtZu8q3cG4oFtaReVC02HY01NjPlSi3pJrE,8369
+beswarm/tools/edit_file.py,sha256=khKKMaet7FJzTY79SYuRmYdJ5sOzoyX6Rl5ChyjvK1g,8806
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
 beswarm/tools/repomap.py,sha256=N09K0UgwjCN7Zjg_5TYlVsulp3n2fztYlS8twalChU8,45003
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
@@ -130,7 +130,7 @@ beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0
 beswarm/tools/search_web.py,sha256=B24amOnGHnmdV_6S8bw8O2PdhZRRIDtJjg-wXcfP7dQ,11859
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=DLYzMgKzpf4UYGNKKJix__DHw6LHtX_T9CLVaexDQMg,12909
-beswarm-0.1.75.dist-info/METADATA,sha256=cBw1e9pd4J_L77sYBtm4eyQlu3CMJbBGbG_YZljayaY,3553
-beswarm-0.1.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.75.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.75.dist-info/RECORD,,
+beswarm-0.1.77.dist-info/METADATA,sha256=CjEUw07KUrfTxiusTUIk-XDMkBA5h1qqs6LLrLo_L8M,3553
+beswarm-0.1.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.77.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.77.dist-info/RECORD,,