beswarm 0.1.84__py3-none-any.whl → 0.1.86__py3-none-any.whl

beswarm/tools/worker.py

@@ -3,12 +3,13 @@ import re
 import copy
 import json
 import platform
+from pathlib import Path
 from datetime import datetime
 
 from ..aient.src.aient.models import chatgpt
 from ..aient.src.aient.plugins import register_tool, get_function_call_list
 from ..prompt import worker_system_prompt, instruction_system_prompt
-from ..utils import extract_xml_content, get_current_screen_image_message
+from ..utils import extract_xml_content, get_current_screen_image_message, replace_xml_content
 
 @register_tool()
 async def worker(goal, tools, work_dir, cache_messages=None):
@@ -28,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(
@@ -48,7 +50,13 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         "function_call_max_loop": 100,
     }
     if cache_messages:
-        work_agent_config["cache_messages"] = cache_messages
+        if isinstance(cache_messages, bool) and cache_messages == True:
+            cache_file_path = Path(work_dir) / ".beswarm" / "work_agent_conversation_history.json"
+            if cache_file_path.exists():
+                with cache_file_path.open("r", encoding="utf-8") as f:
+                    cache_messages = json.load(f)
+        first_user_message = replace_xml_content(cache_messages[1]["content"], "goal", goal)
+        work_agent_config["cache_messages"] = cache_messages[0:1] + [{"role": "user", "content": first_user_message}] + cache_messages[2:]
 
     instruction_agent_config = {
         "api_key": os.getenv("API_KEY"),
@@ -131,7 +139,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 if conversation_history == []:
                     next_instruction = (
                         "任务描述：\n"
-                        f"{goal}\n\n"
+                        f"<goal>{goal}</goal>\n\n"
                         "现在开始执行第一步：\n"
                         f"{next_instruction}"
                     )
@@ -146,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)
@@ -167,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(),
@@ -186,7 +201,13 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
         "function_call_max_loop": 100,
     }
     if cache_messages:
-        work_agent_config["cache_messages"] = cache_messages
+        if isinstance(cache_messages, bool) and cache_messages == True:
+            cache_file_path = Path(work_dir) / ".beswarm" / "work_agent_conversation_history.json"
+            if cache_file_path.exists():
+                with cache_file_path.open("r", encoding="utf-8") as f:
+                    cache_messages = json.load(f)
+        first_user_message = replace_xml_content(cache_messages[1]["content"], "goal", goal)
+        work_agent_config["cache_messages"] = cache_messages[0:1] + [{"role": "user", "content": first_user_message}] + cache_messages[2:]
 
     instruction_agent_config = {
         "api_key": os.getenv("API_KEY"),
@@ -270,7 +291,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 if conversation_history == []:
                     next_instruction = (
                         "任务描述：\n"
-                        f"{goal}\n\n"
+                        f"<goal>{goal}</goal>\n\n"
                         "现在开始执行第一步：\n"
                         f"{next_instruction}"
                     )
@@ -287,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/utils.py

@@ -10,6 +10,28 @@ def extract_xml_content(text, xml_tag):
         return ''
     return result
 
+def replace_xml_content(original_string: str, tag_name: str, replacement_content: str) -> str:
+    """
+    将指定XML标签内的内容替换为新内容。
+
+    此函数使用正则表达式查找所有匹配的XML标签对（例如 `<tag>...</tag>`），
+    并将其中的内容替换为 `replacement_content`。
+
+    Args:
+        original_string (str): 包含XML标记的原始字符串。
+        tag_name (str): 要定位的XML标签的名称（不带尖括号）。
+        replacement_content (str): 用于替换标签内部内容的新字符串。
+
+    Returns:
+        str: 返回内容已被替换的新字符串。如果未找到匹配的标签，则返回原始字符串。
+    """
+    pattern = f"<{tag_name}>.*?<\\/{tag_name}>"
+    replacement = f"<{tag_name}>{replacement_content}</{tag_name}>"
+
+    new_string = re.sub(pattern, replacement, original_string, flags=re.DOTALL)
+
+    return new_string
+
 import io
 import base64
 from .aient.src.aient.core.utils import get_image_message, get_text_message

{beswarm-0.1.84.dist-info → beswarm-0.1.86.dist-info}/METADATA

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

{beswarm-0.1.84.dist-info → beswarm-0.1.86.dist-info}/RECORD

@@ -1,6 +1,6 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=1jNxVXjfhb-A8CVHoudRxytV4qDT6FZIIk1NRCCE1Ns,31365
-beswarm/utils.py,sha256=YBuoJC240LNKTTCvkoZjohylT71PM6QZLpZofXWLaJ0,1895
+beswarm/utils.py,sha256=cOYwuONpNG_dkSYIvdEqQOxRUdIy0Bh9CTYkvKKskdw,2816
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
 beswarm/aient/setup.py,sha256=ub3Tx7R0rcvHG9bJy7qp-mDWUjcxJJ3yQm8jpOtx8AY,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
@@ -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=6wM7apb6UM52sRC-XRO9KZdzO77xhyvChoxzXVKBjXA,14489
-beswarm-0.1.84.dist-info/METADATA,sha256=7G2T9n4Z9DYIMLBsqR82ocQvDZZ9p5g8UZzukCKuPvo,3553
-beswarm-0.1.84.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.84.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.84.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=VOulEZBEc5nF2RBR9aLYs0vT7WBD-r2mlWH5ueEo4hM,16007
+beswarm-0.1.86.dist-info/METADATA,sha256=CEzs_BeynBW6FQDq9GBOZmkYU0eQ4EkYxzSgwBnGfz4,3553
+beswarm-0.1.86.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.86.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.86.dist-info/RECORD,,