beswarm 0.1.85__py3-none-any.whl → 0.1.87__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.32",
+    version="1.1.33",
     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

@@ -12,7 +12,7 @@ from pathlib import Path
 
 from .base import BaseLLM
 from ..plugins import PLUGINS, get_tools_result_async, function_call_list, update_tools_config
-from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml
+from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml, remove_xml_tags_and_content
 from ..core.request import prepare_request_payload
 from ..core.response import fetch_response_stream
 
@@ -465,7 +465,7 @@ class chatgpt(BaseLLM):
                     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 = "接下来我需要做什么？"
+                        full_response = remove_xml_tags_and_content(full_response) + "上面是我的分析，还没有实际行动。\n\n接下来我需要做什么？"
                 else:
                     need_function_call = False
                     if self.print_log:

beswarm/aient/src/aient/utils/scripts.py

@@ -1,4 +1,5 @@
 import os
+import re
 import json
 import requests
 import urllib.parse
@@ -148,6 +149,35 @@ def safe_get(data, *keys, default=None):
             return default
     return data
 
+def remove_xml_tags_and_content(text: str) -> str:
+    """
+    删除字符串中所有的XML标签及其包裹的内容。
+    这个函数通过迭代地移除最内层的标签来处理嵌套标签和自闭合标签。
+
+    Args:
+        text: 包含XML标签的输入字符串。
+
+    Returns:
+        清理掉XML标签和内容后的字符串。
+    """
+    # 正则表达式匹配成对的标签及其内容（非贪婪模式）以及自闭合标签
+    # 捕获组 \1 用于确保开始和结束标签名匹配
+    pair_pattern = r'<([a-zA-Z0-9_:]+)\b[^>]*>.*?</\1>'
+    self_closing_pattern = r'<[^>/]+/>'
+
+    cleaned_text = text
+    while True:
+        # 使用 re.sub 替换所有非重叠的匹配项
+        new_text = re.sub(pair_pattern, '', cleaned_text, flags=re.DOTALL)
+        new_text = re.sub(self_closing_pattern, '', new_text)
+
+        # 如果没有更多内容被移除，则退出循环
+        if new_text == cleaned_text:
+            break
+        cleaned_text = new_text
+
+    return cleaned_text.strip()
+
 import asyncio
 def async_generator_to_sync(async_gen):
     """
@@ -919,14 +949,15 @@ if __name__ == "__main__":
 
 请提供前两个 `excute_command` 的执行结果。
 """
-    test_xml = """
-好的，我现在执行第一步。
-<tools>
-<list_directory>
-<path>/Downloads/GitHub/beswarm/work/test</path>
-</list_directory>
-</tools>
-"""
-    print(parse_function_xml(test_xml))
+#     test_xml = """
+# 好的，我现在执行第一步。
+# <tools>
+# <list_directory>
+# <path>/Downloads/GitHub/beswarm/work/test</path>
+# </list_directory>
+# </tools>
+# """
+    # print(parse_function_xml(test_xml))
+    print(remove_xml_tags_and_content(test_xml))
 
 # 运行本文件：python -m beswarm.aient.src.aient.utils.scripts

beswarm/tools/worker.py

@@ -29,6 +29,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         str: 当任务成功完成时，返回字符串 "任务已完成"。
     """
     start_time = datetime.now()
+    finish_flag = 0
 
     tools_json = [value for _, value in get_function_call_list(tools).items()]
     work_agent_system_prompt = worker_system_prompt.format(
@@ -153,8 +154,14 @@ async def worker(goal, tools, work_dir, cache_messages=None):
 
             # 检查任务是否完成
             if "任务已完成" in next_instruction and len(next_instruction) < 10:
-                print("\n✅ 任务已完成！")
-                break
+                if finish_flag == 0:
+                    finish_flag = 1
+                    continue
+                elif finish_flag == 1:
+                    print("\n✅ 任务已完成！")
+                    break
+            else:
+                finish_flag = 0
         if "find_and_click_element" in str(tools_json):
             next_instruction = await get_current_screen_image_message(next_instruction)
         result = await work_agent.ask_async(next_instruction)
@@ -174,6 +181,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
 
 async def worker_gen(goal, tools, work_dir, cache_messages=None):
     start_time = datetime.now()
+    finish_flag = 0
     tools_json = [value for _, value in get_function_call_list(tools).items()]
     work_agent_system_prompt = worker_system_prompt.format(
         os_version=platform.platform(),
@@ -300,8 +308,14 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
 
             # 检查任务是否完成
             if "任务已完成" in next_instruction and len(next_instruction) < 10:
-                print("\n✅ 任务已完成！")
-                break
+                if finish_flag == 0:
+                    finish_flag = 1
+                    continue
+                elif finish_flag == 1:
+                    print("\n✅ 任务已完成！")
+                    break
+            else:
+                finish_flag = 0
         if "find_and_click_element" in str(tools_json):
             next_instruction = await get_current_screen_image_message(next_instruction)
         result = await work_agent.ask_async(next_instruction)

{beswarm-0.1.85.dist-info → beswarm-0.1.87.dist-info}/METADATA

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

{beswarm-0.1.85.dist-info → beswarm-0.1.87.dist-info}/RECORD

@@ -2,7 +2,7 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=1jNxVXjfhb-A8CVHoudRxytV4qDT6FZIIk1NRCCE1Ns,31365
 beswarm/utils.py,sha256=cOYwuONpNG_dkSYIvdEqQOxRUdIy0Bh9CTYkvKKskdw,2816
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=ub3Tx7R0rcvHG9bJy7qp-mDWUjcxJJ3yQm8jpOtx8AY,487
+beswarm/aient/setup.py,sha256=NkFRjOyvZkKzSLI_JMU1fJkQzf7gLfSPGt7nj-JDnpg,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
@@ -17,7 +17,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=9l6_7QCF4VuOWPGZiroTT-0dg1h_qze5RUQwauDw_A4,46539
+beswarm/aient/src/aient/models/chatgpt.py,sha256=MKCdstV_gTkcf_bT2mmQVDLgK5f4PUUfEO3_WHzahpE,46665
 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
@@ -39,7 +39,7 @@ beswarm/aient/src/aient/plugins/websearch.py,sha256=FsUxM9GL4AAjmYJ8TS2jSqv4qfCA
 beswarm/aient/src/aient/plugins/write_file.py,sha256=7spYxloI_aUbeANEQK-oXrGPoBqSfsD7sdfMAWlNxhU,3656
 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=sXS0MrfRDQGAXOHW4BEwz4lUj_ORchdbVRh62XxidZQ,35939
+beswarm/aient/src/aient/utils/scripts.py,sha256=8NJCASleffBsA20E3K7HvChCH6rb-7-Qa_ygXXpEsCE,37051
 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
@@ -128,8 +128,8 @@ beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1
 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=BfaU_iBDN4XrueCWkvBtpgcHva95e9X26T8HVNVDynY,15569
-beswarm-0.1.85.dist-info/METADATA,sha256=1Vtaw1TKQI8N3yi1xyqYZH018FvC_xdMaDeaceql9Lk,3553
-beswarm-0.1.85.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.85.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.85.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=VOulEZBEc5nF2RBR9aLYs0vT7WBD-r2mlWH5ueEo4hM,16007
+beswarm-0.1.87.dist-info/METADATA,sha256=CML-RDiBOUvDdvhSn8ITmQevVj4kUkSIB6rroWnThSU,3553
+beswarm-0.1.87.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.87.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.87.dist-info/RECORD,,