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

beswarm/tools/edit_file.py

@@ -1,9 +1,10 @@
 import os
 import re
+import difflib
 from ..aient.src.aient.plugins import register_tool
 
 @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 +23,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。当完全精确匹配失败时，此参数生效。
 
 返回:
     编辑结果的状态信息，包括成功或错误信息。
@@ -93,27 +94,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:
@@ -173,7 +166,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.76.dist-info}/METADATA

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

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

@@ -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=B1rAKxgd9ZksRpZysF4SOglTIp-_k0hnFK5fZ5BBvGk,8039
 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.76.dist-info/METADATA,sha256=REGvO25NvgVgRw3qBdQf_172ht7ZgBIDfCBYNWnR6Uk,3553
+beswarm-0.1.76.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.76.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.76.dist-info/RECORD,,