beswarm 0.1.60__py3-none-any.whl → 0.1.62__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.15",
+    version="1.1.16",
     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/prompt/agent.py

@@ -44,6 +44,7 @@ system_prompt = """
 2. Always respond in 中文。
 3. 尽力满足user的请求，如果 user 要求你使用工具，请自行根据工具的参数要求，组织参数，将工具调用组织成xml格式，即可触发工具执行流程。如果user提供了明确的xml工具调用，请直接复述user的xml工具调用。你必须复述user的xml工具调用才能真正调用工具。
 4. 禁止要求user调用工具，当你需要调用工具时，请自行组织参数，将工具调用组织成xml格式，即可触发工具执行流程。禁止自己没有使用xml格式调用工具就假定工具已经调用。
+5. 仔细阅读并理解 user 的任务描述和当前指令。user 会根据任务描述分步骤让你执行，因此请严格遵循 user 指令按步骤操作，并请勿自行完成 user 未指定的步骤。在 user 明确给出下一步指令前，绝不擅自行动或推测、执行任何未明确要求的后续步骤。完成当前 user 指定的步骤后，必须主动向 user 汇报该步骤的完成情况，并明确请求 user 提供下一步的操作指令。
 </communication>
 
 <making_code_changes>

beswarm/tools/worker.py

@@ -1,4 +1,5 @@
 import os
+import re
 import copy
 import json
 import platform
@@ -82,7 +83,25 @@ async def worker(goal, tools, work_dir, cache_messages=None):
             with open(cache_file, "w", encoding="utf-8") as f:
                 f.write(json.dumps(conversation_history, ensure_ascii=False, indent=4))
 
-            conversation_history.pop(0)
+            work_agent_system_prompt = conversation_history.pop(0)
+            if conversation_history:
+                # 获取原始内容
+                original_content = work_agent_system_prompt["content"]
+
+                # 定义正则表达式
+                regex = r"<latest_file_content>(.*?)</latest_file_content>"
+
+                # 进行匹配
+                match = re.search(regex, original_content, re.DOTALL)
+
+                # 提取内容或设置为空字符串
+                if match:
+                    extracted_content = f"<latest_file_content>{match.group(1)}</latest_file_content>\n\n"
+                else:
+                    extracted_content = ""
+
+                conversation_history[0]["content"] = extracted_content + conversation_history[0]["content"]
+
             instruction_agent.conversation["default"][1:] = conversation_history
             if "find_and_click_element" in str(tools_json):
                 instruction_prompt = await get_current_screen_image_message(instruction_prompt)

{beswarm-0.1.60.dist-info → beswarm-0.1.62.dist-info}/METADATA

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

{beswarm-0.1.60.dist-info → beswarm-0.1.62.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=A2q_i7Phzeh-ii_T_-TOguYtW3tJuV8qY-V5WowGCrk,487
+beswarm/aient/setup.py,sha256=Sd2NPcQ4WHx-F_jSx8hMYbLMTtRxIo6a-wxcEkruwW0,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
@@ -36,7 +36,7 @@ beswarm/aient/src/aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdr
 beswarm/aient/src/aient/plugins/websearch.py,sha256=llxy1U0vJiNMiKvamMr4p7IruLb3nnDR4YErz8TYimc,15215
 beswarm/aient/src/aient/plugins/write_file.py,sha256=YRvQKMvV-5lwohxlvwt9hjfxz2dRJP85AJWAMUIqbBY,3804
 beswarm/aient/src/aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
-beswarm/aient/src/aient/prompt/agent.py,sha256=y2GETN6ScC5yQVs75VFfzm4YUWzblbqLYz0Sy6JnPRw,24950
+beswarm/aient/src/aient/prompt/agent.py,sha256=ZNsbgXRyvYzAFTRRziAnNVqcTyAnxrGcsGfGrt72j6k,25427
 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=LD8adnfuRrJoY2tWKseXOPJXaxbrUmz4czsnUvHswNY,29096
@@ -127,8 +127,8 @@ beswarm/tools/repomap.py,sha256=N09K0UgwjCN7Zjg_5TYlVsulp3n2fztYlS8twalChU8,4500
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 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=2EOag_yo8qC020jx32tcU9G_gzT3PeYasukLwuuOAJQ,5976
-beswarm-0.1.60.dist-info/METADATA,sha256=H7moorce2OKfYVPmPizKxYp00P6vy4MH_uYyteAP0UE,3553
-beswarm-0.1.60.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-beswarm-0.1.60.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.60.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=6tg2973BZkr85W73RWcTQ7cGub2sIRxHgluriorVBNc,6741
+beswarm-0.1.62.dist-info/METADATA,sha256=RzS5f38zi_lsfKumv6AqZARc0atpVl0OV_5g4hQ1AkE,3553
+beswarm-0.1.62.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+beswarm-0.1.62.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.62.dist-info/RECORD,,