beswarm 0.2.27__tar.gz → 0.2.29__tar.gz

{beswarm-0.2.27 → beswarm-0.2.29}/PKG-INFO

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

{beswarm-0.2.27 → beswarm-0.2.29}/beswarm/tools/__init__.py

@@ -8,6 +8,7 @@ from .repomap import get_code_repo_map
 from .click import find_and_click_element, scroll_screen
 from .search_web import search_web
 from .taskmanager import create_task, resume_task, get_all_tasks_status, get_task_result
+from .completion import task_complete
 
 #显式导入 aient.plugins 中的所需内容
 from ..aient.src.aient.plugins import (
@@ -55,4 +56,5 @@ __all__ = [
     "resume_task",
     "get_all_tasks_status",
     "get_task_result",
+    "task_complete",
 ]

beswarm-0.2.29/beswarm/tools/completion.py

@@ -0,0 +1,17 @@
+from ..aient.src.aient.plugins import register_tool
+
+@register_tool()
+def task_complete(message: str) -> str:
+    """
+    当任务完成时，调用此工具以返回最终结果。
+
+    这个工具接收一个表示任务完成信息的字符串，并将其直接返回。
+    它标志着一个任务的成功结束，并将最终的输出传递给用户或调用者。
+
+    Args:
+        message (str): 任务完成的信息或最终结果。
+
+    Returns:
+        str: 传入的任务完成信息。
+    """
+    return "<task_complete_message>" + message + "</task_complete_message>"

{beswarm-0.2.27 → beswarm-0.2.29}/beswarm/tools/worker.py

@@ -64,6 +64,8 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         tools += mcp_tools_name
 
     tools = [item for item in tools if not isinstance(item, dict)]
+    if "task_complete" not in tools:
+        tools.append("task_complete")
 
     tools_json = [value for _, value in get_function_call_list(tools).items()]
     work_agent_system_prompt = worker_system_prompt.format(
@@ -77,7 +79,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     work_agent_config = {
         "api_key": os.getenv("API_KEY"),
         "api_url": os.getenv("BASE_URL"),
-        "engine": os.getenv("MODEL"),
+        "engine": os.getenv("FAST_MODEL") or os.getenv("MODEL"),
         "system_prompt": work_agent_system_prompt,
         "print_log": True,
         # "max_tokens": 8000,
@@ -120,7 +122,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                     f"任务目标: {goal}\n\n",
                     f"任务目标新变化：\n{goal_diff}\n\n" if goal_diff else "",
                     "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
-                    "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复'任务已完成'。\n\n",
+                    "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，指示工作智能体调用task_complete工具。\n\n",
                 ])
             if last_instruction and 'fetch_gpt_response_stream HTTP Error' not in last_instruction:
                 instruction_prompt = (
@@ -131,6 +133,11 @@ async def worker(goal, tools, work_dir, cache_messages=None):
             # 让指令agent分析对话历史并生成新指令
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
+            if len(conversation_history) > 1 and conversation_history[-2]["role"] == "user" \
+            and "<task_complete_message>" in conversation_history[-2]["content"]:
+                task_complete_message = extract_xml_content(conversation_history[-2]["content"], "task_complete_message")
+                # del work_agent.conversation["default"][-4:]
+                return "<task_complete_message>" + task_complete_message + "</task_complete_message>"
 
             cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
@@ -169,8 +176,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 print(f"任务结束时间: {end_time.strftime('%Y-%m-%d %H:%M:%S')}")
                 print(f"总用时: {total_time}")
                 raise Exception(f"The request body is too long, please try again.")
-            if "任务已完成" == next_instruction.strip():
-                break
+
             last_instruction = next_instruction
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:
@@ -198,18 +204,19 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         return next_instruction
 
     need_instruction = True
+    result = None
     while True:
         next_instruction = ''
         if need_instruction:
             next_instruction = await instruction_agent_task()
 
             # 检查任务是否完成
-            if "任务已完成" in next_instruction and len(next_instruction) < 10:
+            if "<task_complete_message>" in next_instruction:
                 if finish_flag == 0:
                     finish_flag = 1
                     continue
                 elif finish_flag == 1:
-                    print("\n✅ 任务已完成！")
+                    result = extract_xml_content(next_instruction, "task_complete_message")
                     break
             else:
                 finish_flag = 0
@@ -225,11 +232,12 @@ async def worker(goal, tools, work_dir, cache_messages=None):
 
     end_time = datetime.now()
     total_time = end_time - start_time
+    print("\n✅ 任务已完成：", result)
     print(f"\n任务开始时间: {start_time.strftime('%Y-%m-%d %H:%M:%S')}")
     print(f"任务结束时间: {end_time.strftime('%Y-%m-%d %H:%M:%S')}")
     print(f"总用时: {total_time}")
     await manager.cleanup()
-    return "任务已完成"
+    return result
 
 async def worker_gen(goal, tools, work_dir, cache_messages=None):
     cache_dir = Path(work_dir) / ".beswarm"
@@ -265,6 +273,8 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
         tools += mcp_tools_name
 
     tools = [item for item in tools if not isinstance(item, dict)]
+    if "task_complete" not in tools:
+        tools.append("task_complete")
 
     tools_json = [value for _, value in get_function_call_list(tools).items()]
     work_agent_system_prompt = worker_system_prompt.format(
@@ -278,7 +288,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     work_agent_config = {
         "api_key": os.getenv("API_KEY"),
         "api_url": os.getenv("BASE_URL"),
-        "engine": os.getenv("MODEL"),
+        "engine": os.getenv("FAST_MODEL") or os.getenv("MODEL"),
         "system_prompt": work_agent_system_prompt,
         "print_log": True,
         # "max_tokens": 8000,
@@ -321,7 +331,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                     f"任务目标: {goal}\n\n",
                     f"任务目标新变化：\n{goal_diff}\n\n" if goal_diff else "",
                     "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
-                    "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复'任务已完成'。\n\n",
+                    "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，指示工作智能体调用task_complete工具。\n\n",
                 ])
             if last_instruction and 'fetch_gpt_response_stream HTTP Error' not in last_instruction:
                 instruction_prompt = (
@@ -332,6 +342,11 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
             # 让指令agent分析对话历史并生成新指令
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
+            if len(conversation_history) > 1 and conversation_history[-2]["role"] == "user" \
+            and "<task_complete_message>" in conversation_history[-2]["content"]:
+                task_complete_message = extract_xml_content(conversation_history[-2]["content"], "task_complete_message")
+                # del work_agent.conversation["default"][-4:]
+                return "<task_complete_message>" + task_complete_message + "</task_complete_message>"
 
             cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
@@ -370,8 +385,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 print(f"任务结束时间: {end_time.strftime('%Y-%m-%d %H:%M:%S')}")
                 print(f"总用时: {total_time}")
                 raise Exception(f"The request body is too long, please try again.")
-            if "任务已完成" == next_instruction.strip():
-                break
+
             last_instruction = next_instruction
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:
@@ -399,6 +413,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
         return next_instruction
 
     need_instruction = True
+    result = None
     while True:
         next_instruction = ''
         if need_instruction:
@@ -407,12 +422,12 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
             yield {"user": next_instruction}
 
             # 检查任务是否完成
-            if "任务已完成" in next_instruction and len(next_instruction) < 10:
+            if "<task_complete_message>" in next_instruction:
                 if finish_flag == 0:
                     finish_flag = 1
                     continue
                 elif finish_flag == 1:
-                    print("\n✅ 任务已完成！")
+                    result = extract_xml_content(next_instruction, "task_complete_message")
                     break
             else:
                 finish_flag = 0
@@ -429,6 +444,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
 
     end_time = datetime.now()
     total_time = end_time - start_time
+    print("\n✅ 任务已完成：", result)
     print(f"\n任务开始时间: {start_time.strftime('%Y-%m-%d %H:%M:%S')}")
     print(f"任务结束时间: {end_time.strftime('%Y-%m-%d %H:%M:%S')}")
     print(f"总用时: {total_time}")

{beswarm-0.2.27 → beswarm-0.2.29}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.27 → beswarm-0.2.29}/beswarm.egg-info/SOURCES.txt

@@ -135,6 +135,7 @@ beswarm/queries/tree-sitter-languages/scala-tags.scm
 beswarm/queries/tree-sitter-languages/typescript-tags.scm
 beswarm/tools/__init__.py
 beswarm/tools/click.py
+beswarm/tools/completion.py
 beswarm/tools/edit_file.py
 beswarm/tools/planner.py
 beswarm/tools/repomap.py

{beswarm-0.2.27 → beswarm-0.2.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.27"
+version = "0.2.29"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"