beswarm 0.2.41__py3-none-any.whl → 0.2.43__py3-none-any.whl

beswarm/agents/planact.py

@@ -124,10 +124,10 @@ class InstructionAgent(BaseAgent):
 
         self.broker.publish({"status": "new_message", "result": "\n🤖 指令智能体:\n" + raw_response}, self.status_topic)
 
-        self.last_instruction = raw_response
         instruction = extract_xml_content(raw_response, "instructions")
         if instruction:
             if len(message["conversation"]) == 1:
+                instruction = re.sub(r'^<task_complete>([\D\d\s]+)<\/task_complete>$', '', instruction, flags=re.MULTILINE)
                 instruction = (
                     "任务描述：\n"
                     f"<goal>{self.goal}</goal>\n\n"
@@ -145,9 +145,11 @@ class InstructionAgent(BaseAgent):
                     f"{instruction}"
                 )
             self.broker.publish({"instruction": instruction, "conversation": message["conversation"]}, self.publish_topic)
+            self.last_instruction = None
         else:
             self.logger.error("\n❌ 指令智能体生成的指令不符合要求，正在重新生成。")
             self.broker.publish(message, self.error_topic)
+            self.last_instruction = raw_response
 
 
 class WorkerAgent(BaseAgent):

beswarm/prompt.py

@@ -106,7 +106,7 @@ instruction_system_prompt = """
 所有回复必须使用中文。
 运行工作智能体的系统信息：{os_version}
 你的工作目录为：{workspace_path}，请在指令中使用绝对路径。所有操作必须基于工作目录。
-禁止在工作目录之外进行任何操作。你当前运行目录不一定就是工作目录。禁止默认你当前就在工作目录。
+除了任务目标里面明确提到的目录，禁止在工作目录之外进行任何操作。你当前运行目录不一定就是工作目录。禁止默认你当前就在工作目录。
 
 当前时间：{current_time}
 

beswarm/tools/subtasks.py

@@ -67,27 +67,68 @@ def get_all_tasks_status():
     return task_manager.tasks_cache
 
 @register_tool()
-async def get_task_result():
+async def get_task_result(reduce: bool = False):
     """
-    等待并获取子任务的执行结果。如果需要等待子任务完成，请使用这个工具。一旦有任务完成，会自动获取结果。如果调用时没有任务完成，会等待直到有任务完成。
+    等待并获取子任务的执行结果。
+
+    如果 `reduce` 为 `False`（默认），此工具会等待并返回任何一个子任务完成的结果。
+    一旦有任务完成，它会立即获取并返回该任务的结果。如果调用时没有任务完成，它会阻塞并等待。
+
+    如果 `reduce` 为 `True`，此工具会进入“规约”模式，等待 **所有** 正在运行或待处理的子任务都执行完毕后，
+    才将所有任务的结果汇总并返回。这在子任务之间无依赖、可以完全并行执行的场景下非常有用，
+    可以避免为了获取每个任务的结果而进行多次轮询，从而节省token。
+
+    警告：当子任务之间存在依赖关系，或者需要根据一个任务的结果来决定下一步操作时，**禁止** 使用 `reduce=True`。
+
+    Args:
+        reduce (bool, optional): 是否启用规约模式。默认为 `False`。
 
     Returns:
-        str: 子任务的执行结果。
+        str:
+        - 当 `reduce=False` 时，返回单个子任务的执行结果。
+        - 当 `reduce=True` 时，返回一个包含所有任务最终状态和结果的汇总字符串。
     """
-    running_tasks_num = len([task_id for task_id, task in task_manager.tasks_cache.items() if task_id != "root_path" and task.get("status") in ["PENDING", "RUNNING"]])
-    if running_tasks_num == 0:
-        return "All tasks are finished."
-    task_id, status, result = await task_manager.get_next_result()
+    def get_running_tasks_count():
+        return len([
+            task_id for task_id, task in task_manager.tasks_cache.items()
+            if task_id != "root_path" and task.get("status") in ["PENDING", "RUNNING"]
+        ])
 
-    unfinished_tasks = [task_id for task_id, task in task_manager.tasks_cache.items() if task_id != "root_path" and task.get("status") != "DONE"]
-    text = "".join([
-        f"Task ID: {task_id}\n",
-        f"Status: {status.value}\n",
-        f"Result: {result}\n\n",
-        f"There are {len(unfinished_tasks)} unfinished tasks, unfinished task ids: {unfinished_tasks[:5]} ..." if unfinished_tasks else "All tasks are finished.",
-    ])
+    if get_running_tasks_count() == 0:
+        return "All tasks are finished."
 
-    return text
+    if not reduce:
+        # 默认行为：获取下一个完成的任务结果
+        task_id, status, result = await task_manager.get_next_result()
+
+        unfinished_tasks = [tid for tid, task in task_manager.tasks_cache.items() if tid != "root_path" and task.get("status") not in ["DONE", "ERROR"]]
+        text = "".join([
+            f"Task ID: {task_id}\n",
+            f"Status: {status.value}\n",
+            f"Result: {result}\n\n",
+            f"There are {len(unfinished_tasks)} unfinished tasks, unfinished task ids: {unfinished_tasks[:5]} ..." if unfinished_tasks else "All tasks are finished.",
+        ])
+        return text
+    else:
+        # 规约模式：等待所有任务完成
+        while get_running_tasks_count() > 0:
+            await task_manager.get_next_result()
+
+        # 收集所有任务的结果
+        all_results = []
+        for task_id, task in task_manager.tasks_cache.items():
+            if task_id == "root_path":
+                continue
+
+            status = task.get('status', 'UNKNOWN')
+            result = task.get('result', 'No result available')
+            all_results.append(
+                f"Task ID: {task_id}\nStatus: {status}\nResult: {result}"
+            )
+
+        summary = f"All {len(all_results)} subtasks have been completed.\n\n"
+        summary += "\n\n".join(all_results)
+        return summary
 
 import os
 import csv

{beswarm-0.2.41.dist-info → beswarm-0.2.43.dist-info}/METADATA

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

{beswarm-0.2.41.dist-info → beswarm-0.2.43.dist-info}/RECORD

@@ -1,11 +1,11 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/broker.py,sha256=RtnQZVbhf25acUHahNBiaS5FGxcrj0rhBhkon9gFY_M,9873
 beswarm/core.py,sha256=_J_LPc0HZFQTLGHy021OMEh2WbsjL_hc6jxd2engpyY,216
-beswarm/prompt.py,sha256=5JMfOuXWHscsaeDzwBn223mj9N85eAQdOHXQZk7zeWE,32238
+beswarm/prompt.py,sha256=n0a1a6NThIxAYSkisg1sEKjvz2w0tozpKL4BIplaAkI,32286
 beswarm/taskmanager.py,sha256=_v1lNHu9WpKK2ial22hvEVPzMJBUiaKTSUbXOxpEYlU,12119
 beswarm/utils.py,sha256=S9jEtht0hTZbjZ2Hk24p4Ip41R69BogOkYS6fgPKY2Y,8219
 beswarm/agents/chatgroup.py,sha256=4QTjTjssFDvS2kI5A58TdN92BWjL-XaNzrcd36pTQGQ,11939
-beswarm/agents/planact.py,sha256=BFUbz_e1PxZ-_Z6eYRhqejidmWTFo1CI1JWxFV6nTWo,17299
+beswarm/agents/planact.py,sha256=NyZankMtcivZBvIj_EYCTlQky_E1J8q6D0B2WK9RMlc,17468
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
 beswarm/aient/setup.py,sha256=Mq1M05mT9_UYBK2jk5mP_sLxKQAolcuh8PYXexfj-XU,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
@@ -140,10 +140,10 @@ beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdw
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=8naYRvmELQryMIcCCBHebIEzNJ8_YivXamM4fzGG3Dk,10754
 beswarm/tools/search_web.py,sha256=LhgXOSHL9fwxg5T2AAOV4TTJkcJVLogsfRJW2faPvDE,16147
-beswarm/tools/subtasks.py,sha256=8RmDhpyjDI3vhwfVhh6HQZIv-OZ0mI3e27zS3FnF09E,7881
+beswarm/tools/subtasks.py,sha256=KCXFzwvxiyX48TF8EAyzucO29PanSAaT5D14TD3GXqQ,9670
 beswarm/tools/worker.py,sha256=auoAEeg8U_Q59dlyM2nv9cAJIWG3PuR8oy7Bp2cM2S0,1993
 beswarm/tools/write_csv.py,sha256=-r5OghcvjCg00hY0YQbp6u31VIJLrgaqDIvczAFoqDE,1470
-beswarm-0.2.41.dist-info/METADATA,sha256=OBUu8wl3eJH4n5s4lV9NLisFY6LsQBPK8O7zON4Arf4,3878
-beswarm-0.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.41.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.41.dist-info/RECORD,,
+beswarm-0.2.43.dist-info/METADATA,sha256=qoj6R5aqa7sqxtwaRwDtAvpU0qV453VQ56yis9GO4m4,3878
+beswarm-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.43.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.43.dist-info/RECORD,,