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

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.25",
+    version="1.1.26",
     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/utils/scripts.py

@@ -241,17 +241,46 @@ def _sandboxed_open(file, mode='r', *args, **kwargs):
 
 builtins.open = _sandboxed_open
 
-# 2. 智能判断原始命令是脚本还是模块，并执行
+# 2. 智能判断原始命令是脚本、模块还是代码字符串，并执行
 original_argv = sys.argv[1:]
-if original_argv and original_argv[0] == '-m':
-    sys.argv = original_argv[1:]
-    runpy.run_module(sys.argv[0], run_name='__main__')
-elif original_argv:
-    target_path = original_argv[0]
-    sys.argv = original_argv
+
+action = None
+action_arg = None
+passthrough_args = []
+i = 0
+while i < len(original_argv):
+    arg = original_argv[i]
+    if arg == '-m':
+        action = 'module'
+        if i + 1 < len(original_argv):
+            action_arg = original_argv[i+1]
+            passthrough_args = original_argv[i+2:]
+        break
+    elif arg == '-c':
+        action = 'command'
+        if i + 1 < len(original_argv):
+            action_arg = original_argv[i+1]
+            passthrough_args = original_argv[i+2:]
+        break
+    elif arg.startswith('-'):
+        i += 1
+    else:
+        action = 'file'
+        action_arg = arg
+        passthrough_args = original_argv[i+1:]
+        break
+
+if action == 'module' and action_arg:
+    sys.argv = [action_arg] + passthrough_args
+    runpy.run_module(action_arg, run_name='__main__')
+elif action == 'command' and action_arg:
+    sys.argv = ['-c'] + passthrough_args
+    exec(action_arg, {'__name__': '__main__'})
+elif action == 'file' and action_arg:
+    sys.argv = [action_arg] + passthrough_args
     # 使用原始的 open 来读取要执行的脚本，因为它本身不应受沙箱限制
-    with original_open(target_path, 'r') as f:
-        code = compile(f.read(), target_path, 'exec')
+    with original_open(action_arg, 'r') as f:
+        code = compile(f.read(), action_arg, 'exec')
         exec(code, {'__name__': '__main__'})
 else:
     pass

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.74.dist-info → beswarm-0.1.76.dist-info}/METADATA

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

{beswarm-0.1.74.dist-info → beswarm-0.1.76.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=BVwdyKZMbLYVowqki3LmD_JbicxGSgjOImjkUKUD0bU,487
+beswarm/aient/setup.py,sha256=hG7eswVWMMNc-xD67iN6hCTvU9HSIiqwkbkncpEpctA,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
@@ -40,7 +40,7 @@ beswarm/aient/src/aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p
 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=9ihTL2W3z5q6Qh6ZqCYplTEoonL4oSj8MBzpRbvc5IE,35329
+beswarm/aient/src/aient/utils/scripts.py,sha256=l8_NrwIRYxvzxPFg-vSJz120swdnxxGfgBcQRogJ4nI,36154
 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=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.74.dist-info/METADATA,sha256=aEPi6UrjdSG0TaoH93wr2nBWK1QIxzp-5NjN_mrk5S0,3553
-beswarm-0.1.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.74.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.74.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,,