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

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.27",
+    version="1.1.28",
     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/models/chatgpt.py

@@ -462,6 +462,10 @@ class chatgpt(BaseLLM):
                     print("full_response", full_response)
                 if function_parameter:
                     need_function_call = True
+                    if isinstance(self.conversation[convo_id][-1]["content"], str) and \
+                    "<tool_error>" in self.conversation[convo_id][-1]["content"]:
+                        need_function_call = False
+                        full_response = "接下来我需要做什么？"
                 else:
                     need_function_call = False
                     if self.print_log:

beswarm/aient/src/aient/plugins/excute_command.py

@@ -178,18 +178,21 @@ def excute_command(command):
         # print(f"output_lines: {len(new_output_lines)}")
 
         if process.returncode == 0:
-            return f"执行命令成功:\n{final_output_log}"
+            if final_output_log.strip() == "":
+                return f"执行命令成功"
+            else:
+                return f"执行命令成功:\n{final_output_log.strip()}"
         else:
             # 如果是 PTY 模式，stderr 已经包含在 final_output_log 中
             if IS_UNIX:
-                return f"执行命令失败 (退出码 {process.returncode}):\n输出/错误:\n{final_output_log}"
+                return f"<tool_error>执行命令失败 (退出码 {process.returncode}):\n输出/错误:\n{final_output_log}</tool_error>"
             else:
-                return f"执行命令失败 (退出码 {process.returncode}):\n错误: {stderr_output}\n输出: {final_output_log}"
+                return f"<tool_error>执行命令失败 (退出码 {process.returncode}):\n错误: {stderr_output}\n输出: {final_output_log}</tool_error>"
 
     except FileNotFoundError:
-        return f"执行命令失败: 命令或程序未找到 ({command})"
+        return f"<tool_error>执行命令失败: 命令或程序未找到 ({command})</tool_error>"
     except Exception as e:
-        return f"执行命令时发生异常: {e}"
+        return f"<tool_error>执行命令时发生异常: {e}</tool_error>"
 
 if __name__ == "__main__":
     # print(excute_command("ls -l && echo 'Hello, World!'"))

beswarm/aient/src/aient/plugins/list_directory.py

@@ -43,8 +43,8 @@ def list_directory(path="."):
         return result
 
     except FileNotFoundError:
-        return f"错误: 路径 '{path}' 不存在"
+        return f"<tool_error>路径 '{path}' 不存在</tool_error>"
     except PermissionError:
-        return f"错误: 没有权限访问路径 '{path}'"
+        return f"<tool_error>没有权限访问路径 '{path}'</tool_error>"
     except Exception as e:
-        return f"列出目录时发生错误: {e}"
+        return f"<tool_error>列出目录时发生错误: {e}</tool_error>"

beswarm/aient/src/aient/plugins/run_python.py

@@ -129,7 +129,7 @@ if _result is not None:
 
     except Exception as e:
         logging.error(f"Error executing code: {str(e)}")
-        return f"Error: {str(e)}"
+        return f"<tool_error>Error: {str(e)}</tool_error>"
 
     finally:
         try:

beswarm/aient/src/aient/plugins/write_file.py

@@ -53,7 +53,7 @@ Example: Requesting to write to frontend-config.json
         with open(path, mode, encoding='utf-8') as file:
             file.write(unescape_html(content))
     except PermissionError as e:
-        return f"写入文件失败: {e}"
+        return f"<tool_error>写入文件失败: {e}</tool_error>"
 
     return f"已成功写入文件：{path}"
 

beswarm/tools/edit_file.py

@@ -32,18 +32,18 @@ def edit_file(file_path, diff_content, match_precision=0.9):
     try:
         # 检查文件是否存在
         if not os.path.exists(file_path):
-            return f"错误: 文件 '{file_path}' 不存在"
+            return f"<tool_error>文件 '{file_path}' 不存在</tool_error>"
 
         # 检查是否为文件
         if not os.path.isfile(file_path):
-            return f"错误: '{file_path}' 不是一个文件"
+            return f"<tool_error>文件 '{file_path}' 不是一个文件</tool_error>"
 
         # 尝试读取文件的前几个字节来检测是否为二进制文件
         with open(file_path, 'rb') as file:
             data = file.read(1024)
             # 快速检查是否可能是二进制文件
             if b'\x00' in data:
-                return f"错误: 文件 '{file_path}' 可能是二进制文件，编码无法解析"
+                return f"<tool_error>文件 '{file_path}' 可能是二进制文件，编码无法解析</tool_error>"
 
         # 读取原文件内容
         with open(file_path, 'r', encoding='utf-8') as file:
@@ -53,9 +53,9 @@ def edit_file(file_path, diff_content, match_precision=0.9):
         diff_blocks = re.findall(r'<<<<<<< SEARCH\n(.*?)\n=======\n(.*?)\n>>>>>>> REPLACE', diff_content, re.DOTALL)
 
         if not diff_blocks:
-            return f"错误: 无效的diff格式，未找到搜索和替换块"
+            return f"<tool_error>无效的diff格式，未找到搜索和替换块</tool_error>"
         if len(diff_blocks) > 1:
-            return f"错误: 只支持单次修改，`diff_content`参数中**必须只包含一个** `<<<<<<< SEARCH ... >>>>>>> REPLACE` 块，但找到了 {len(diff_blocks)} 个修改块"
+            return f"<tool_error>只支持单次修改，`diff_content`参数中**必须只包含一个** `<<<<<<< SEARCH ... >>>>>>> REPLACE` 块，但找到了 {len(diff_blocks)} 个修改块</tool_error>"
 
         # 记录修改次数和行数变化
         edits_count = 0
@@ -69,7 +69,7 @@ def edit_file(file_path, diff_content, match_precision=0.9):
             replace_block = unescape_html(replace_block)
             # 检查搜索块是否为空
             if not search_block.strip():
-                return f"错误: 搜索块不能为空"
+                return f"<tool_error>搜索块不能为空</tool_error>"
 
             if search_block in new_content:
                 # 直接替换完全匹配的块
@@ -88,7 +88,7 @@ def edit_file(file_path, diff_content, match_precision=0.9):
 
                 # 避免空搜索块
                 if len(search_lines) == 0:
-                    return f"错误: 搜索块不能为空"
+                    return f"<tool_error>搜索块不能为空</tool_error>"
 
                 # 尝试找到最佳匹配位置
                 best_match_index = -1
@@ -142,18 +142,18 @@ def edit_file(file_path, diff_content, match_precision=0.9):
                     total_original_lines += original_lines
                     total_new_lines += new_lines
                 else:
-                    error_message = f"错误: 在文件中未找到足够匹配的代码块，最佳匹配分数为 {best_match_score:.2f}，但要求为 {match_precision:.2f}。"
+                    error_message = f"<tool_error>在文件中未找到足够匹配的代码块，最佳匹配分数为 {best_match_score:.2f}，但要求为 {match_precision:.2f}。</tool_error>"
                     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>"
+                        error_message += f"\n\nSEARCH块在原文件最佳匹配范围内的原文如下 (上下文已扩展)，放在在 <real_file_content>...</real_file_content> 之间，请根据原文内容修正 diff_content 参数:\n<real_file_content>\n{context_block}\n</real_file_content>"
                     return error_message
 
         # 如果没有进行任何编辑，返回错误
         if edits_count == 0:
-            return f"错误: 未能应用任何diff编辑"
+            return f"<tool_error>未能应用任何diff编辑</tool_error>"
 
         # 写入修改后的内容
         with open(file_path, 'w', encoding='utf-8') as file:
@@ -162,16 +162,16 @@ def edit_file(file_path, diff_content, match_precision=0.9):
         return f"成功: 文件 '{file_path}' 已更新。应用了 {edits_count} 处编辑，替换了 {total_original_lines} 行代码为 {total_new_lines} 行。"
 
     except PermissionError:
-        return f"错误: 没有权限修改文件 '{file_path}'"
+        return f"<tool_error>没有权限修改文件 '{file_path}'</tool_error>"
     except UnicodeDecodeError:
-        return f"错误: 文件 '{file_path}' 不是文本文件或编码不是UTF-8，无法进行编码解析"
+        return f"<tool_error>文件 '{file_path}' 不是文本文件或编码不是UTF-8，无法进行编码解析</tool_error>"
     except Exception as e:
         print(f"content: {content}")
         print(f"file_path: {file_path}")
         print(f"diff_content: {diff_content}")
         import traceback
         traceback.print_exc()
-        return f"编辑文件时发生错误: {e}"
+        return f"<tool_error>编辑文件时发生错误: {e}</tool_error>"
 
 if __name__ == "__main__":
     edit_str = """

beswarm/tools/search_arxiv.py

@@ -78,7 +78,7 @@ NoProp: Training Neural Networks without Back-propagation or Forward-propagation
         response = requests.get(base_url, params=params)
 
         if response.status_code != 200:
-            return f"错误: API请求失败，状态码 {response.status_code}"
+            return f"<tool_error>API请求失败，状态码 {response.status_code}</tool_error>"
 
         # 解析结果（arXiv API返回的是Atom XML格式）
         # 这里使用简化的解析方式，在实际使用中可能需要更复杂的XML解析
@@ -155,12 +155,12 @@ NoProp: Training Neural Networks without Back-propagation or Forward-propagation
             results.append(paper_info)
 
         if not results:
-            return f"未找到与查询'{query}'匹配的论文"
+            return f"<tool_error>未找到与查询'{query}'匹配的论文</tool_error>"
 
         return results
 
     except Exception as e:
-        return f"搜索arXiv论文时发生错误: {str(e)}"
+        return f"<tool_error>搜索arXiv论文时发生错误: {str(e)}</tool_error>"
 
 if __name__ == '__main__':
     # 简单的测试用例

beswarm/tools/worker.py

@@ -115,6 +115,8 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 raise Exception(f"The request body is too long, please try again.")
             if "任务已完成" == next_instruction.strip():
                 break
+            if "<instructions>" in next_instruction and "</instructions>" not in next_instruction:
+                next_instruction = next_instruction + "</instructions>"
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:
                 print("\n❌ 指令智能体生成的指令不符合要求，请重新生成。")
@@ -241,6 +243,8 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 raise Exception(f"The request body is too long, please try again.")
             if "任务已完成" == next_instruction.strip():
                 break
+            if "<instructions>" in next_instruction and "</instructions>" not in next_instruction:
+                next_instruction = next_instruction + "</instructions>"
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:
                 print("\n❌ 指令智能体生成的指令不符合要求，请重新生成。")

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

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

{beswarm-0.1.77.dist-info → beswarm-0.1.78.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=TVFBwEKEXhadb_ESCtRQva9W7btAzbXZUV3sj9vyPj4,487
+beswarm/aient/setup.py,sha256=Gq_GJudeaB2dhYFR6-KUFW40TKhARnt1_h4JlOBJ6eQ,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
@@ -16,7 +16,7 @@ beswarm/aient/src/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6U
 beswarm/aient/src/aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 beswarm/aient/src/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/src/aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-beswarm/aient/src/aient/models/chatgpt.py,sha256=sfXqmYAiTTAa_dH2h49BZnVvjebEl99LJdQGepD2sCQ,46244
+beswarm/aient/src/aient/models/chatgpt.py,sha256=9l6_7QCF4VuOWPGZiroTT-0dg1h_qze5RUQwauDw_A4,46539
 beswarm/aient/src/aient/models/claude.py,sha256=JezghW7y0brl4Y5qiSHvnYR5prQCFywX4RViHt39pGI,26037
 beswarm/aient/src/aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 beswarm/aient/src/aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -25,17 +25,17 @@ 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=ybkgoMlrXxfeRLA8gizxNL1KuVda0s9xSKTSzC8CKyU,10021
+beswarm/aient/src/aient/plugins/excute_command.py,sha256=XEGg1AX8U8iUBaHBqoCmZHLCpI_wQiDSmHDFvqG6ONE,10243
 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
+beswarm/aient/src/aient/plugins/list_directory.py,sha256=V_uKkLx_fQDL5z__bSDC-PqAP-o32KmQW6Pdhx0Fx0s,1433
 beswarm/aient/src/aient/plugins/read_file.py,sha256=Lv03AW-gWGzM2esos2vLTXHcceczdTqEO7_vqFT4yoY,8302
 beswarm/aient/src/aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4017
 beswarm/aient/src/aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 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/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
 beswarm/aient/src/aient/plugins/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
-beswarm/aient/src/aient/plugins/write_file.py,sha256=aWOCuKjtpzjl2JiJV9W6YBmPg_WivxyXD509xUHiuCc,3631
+beswarm/aient/src/aient/plugins/write_file.py,sha256=7spYxloI_aUbeANEQK-oXrGPoBqSfsD7sdfMAWlNxhU,3656
 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
@@ -122,15 +122,15 @@ 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=khKKMaet7FJzTY79SYuRmYdJ5sOzoyX6Rl5ChyjvK1g,8806
+beswarm/tools/edit_file.py,sha256=iwWl7a8sTVq4vj0e1ny3H6UGcHfYnxALRGcLuk5hZS8,9155
 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
-beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
+beswarm/tools/search_arxiv.py,sha256=GpuIOYX8T0iRC-X-hmuR9AUJVn15WWZq864DaoC7BUc,8004
 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.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,,
+beswarm/tools/worker.py,sha256=Gx_xMuqFApBLBjfyuHcpMvK76k94f89CYMRyQaPw2UU,13251
+beswarm-0.1.78.dist-info/METADATA,sha256=wQJj1Fcb63MZ-fEaUb6lSRb8LxMQIs7qRKFWCWY3Xmw,3553
+beswarm-0.1.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.78.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.78.dist-info/RECORD,,