beswarm 0.2.36__tar.gz → 0.2.37__tar.gz

{beswarm-0.2.36 → beswarm-0.2.37}/PKG-INFO

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

beswarm-0.2.36/beswarm/tools/worker.py → beswarm-0.2.37/beswarm/agents/planact.py

@@ -12,10 +12,9 @@ from typing import List, Dict, Union
 
 from ..broker import MessageBroker
 from ..aient.src.aient.models import chatgpt
-from ..aient.src.aient.plugins import register_tool, get_function_call_list, registry
+from ..aient.src.aient.plugins import get_function_call_list, registry
 from ..prompt import worker_system_prompt, instruction_system_prompt
 from ..utils import extract_xml_content, get_current_screen_image_message, replace_xml_content, register_mcp_tools
-from ..bemcp.bemcp import MCPManager
 
 class BaseAgent:
     """Base class for agents, handling common initialization and disposal."""
@@ -198,12 +197,9 @@ class Tee:
         for f in self.files:
             f.flush()
 
-broker = MessageBroker()
-mcp_manager = MCPManager()
-
 class BrokerWorker:
     """The 'glue' class that orchestrates agents via a MessageBroker."""
-    def __init__(self, goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None, broker: MessageBroker = None, mcp_manager: MCPManager = None):
+    def __init__(self, goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None, broker = None, mcp_manager = None, task_manager = None):
         self.goal = goal
         self.tools = tools
         self.work_dir = Path(work_dir)
@@ -211,6 +207,7 @@ class BrokerWorker:
 
         self.broker = broker
         self.mcp_manager = mcp_manager
+        self.task_manager = task_manager
         self.task_completion_event = asyncio.Event()
         self.final_result = None
         self._status_subscription = None
@@ -224,7 +221,7 @@ class BrokerWorker:
     def setup(self):
         cache_dir = self.work_dir / ".beswarm"
         cache_dir.mkdir(parents=True, exist_ok=True)
-        task_manager.set_root_path(self.work_dir)
+        self.task_manager.set_root_path(self.work_dir)
         self.cache_file = cache_dir / "work_agent_conversation_history.json"
         if not self.cache_file.exists():
             self.cache_file.write_text("[]", encoding="utf-8")
@@ -339,29 +336,4 @@ class BrokerWorker:
         finally:
             instruction_agent.dispose()
             worker_agent.dispose()
-            await self.mcp_manager.cleanup()
-
-
-@register_tool()
-async def worker(goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None):
-    start_time = datetime.now()
-    worker_instance = BrokerWorker(goal, tools, work_dir, cache_messages, broker, mcp_manager)
-    result = await worker_instance.run()
-    end_time = datetime.now()
-    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"总用时: {end_time - start_time}")
-    return result
-
-@register_tool()
-async def worker_gen(goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None):
-    start_time = datetime.now()
-    worker_instance = BrokerWorker(goal, tools, work_dir, cache_messages, broker, mcp_manager)
-    async for result in worker_instance.stream_run():
-        yield result
-    end_time = datetime.now()
-    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"总用时: {end_time - start_time}")
-
-from .taskmanager import task_manager
+            await self.mcp_manager.cleanup()

beswarm-0.2.37/beswarm/core.py

@@ -0,0 +1,11 @@
+from .taskmanager import TaskManager
+from .broker import MessageBroker
+from .bemcp.bemcp import MCPManager
+
+"""
+全局共享实例
+"""
+
+task_manager = TaskManager()
+broker = MessageBroker()
+mcp_manager = MCPManager()

{beswarm-0.2.36/beswarm/tools → beswarm-0.2.37/beswarm}/taskmanager.py

@@ -1,11 +1,10 @@
-import ast
 import json
 import uuid
 import asyncio
 from enum import Enum
 from pathlib import Path
 
-from ..aient.src.aient.plugins import register_tool, registry
+from .aient.src.aient.plugins import registry
 
 class TaskStatus(Enum):
     """任务状态枚举"""
@@ -91,7 +90,7 @@ class TaskManager:
         running_task_id_list = [task_id for task_id, task in self.tasks_cache.items() if task_id != "root_path" and task.get("status") == "RUNNING"]
         for task_id in running_task_id_list:
             tasks_params = self.tasks_cache[task_id]["args"]
-            task_id = task_manager.resume_task(task_id, worker_fun, tasks_params)
+            task_id = self.resume_task(task_id, registry.tools["worker"], tasks_params)
 
     def resume_task(self, task_id, task_coro, args):
         """
@@ -223,85 +222,8 @@ class TaskManager:
             # 如果任务ID不存在，则返回-1
             return -1
 
-
-task_manager = TaskManager()
-
-worker_fun = registry.tools["worker"]
-
-@register_tool()
-def create_task(goal, tools, work_dir):
-    """
-    启动一个子任务来自动完成指定的任务目标 (`goal`)。
-
-    这个子任务接收一个清晰的任务描述、一组可供调用的工具 (`tools`)，以及一个工作目录 (`work_dir`)。
-    它会结合可用的工具，自主规划并逐步执行必要的操作，直到最终完成指定的任务目标。
-    核心功能是根据输入的目标，驱动整个任务执行流程。
-    子任务下上文为空，因此需要细致的背景信息。
-
-    Args:
-        goal (str): 需要完成的具体任务目标描述。子任务将围绕此目标进行工作。必须清晰、具体。必须包含背景信息，完成指标等。写清楚什么时候算任务完成，同时交代清楚任务的背景信息，这个背景信息可以是需要读取的文件等一切有助于完成任务的信息。
-        tools (list[str]): 一个包含可用工具函数对象的列表。子任务在执行任务时可能会调用这些工具来与环境交互（例如读写文件、执行命令等）。
-        work_dir (str): 工作目录的绝对路径。子任务将在此目录上下文中执行操作。子任务的工作目录位置在主任务的工作目录的子目录。子任务工作目录**禁止**设置为主任务目录本身。
-
-    Returns:
-        str: 当任务成功完成时，返回字符串 "任务已完成"。
-    """
-    tasks_params = [
-        {"goal": goal, "tools": ast.literal_eval(tools), "work_dir": work_dir, "cache_messages": True}
-    ]
-    task_ids = task_manager.create_tasks(worker_fun, tasks_params)
-    return task_ids
-
-@register_tool()
-def resume_task(task_id, goal):
-    """
-    恢复一个子任务。
-    """
-    if task_id not in task_manager.tasks_cache:
-        return f"任务 {task_id} 不存在"
-    tasks_params = task_manager.tasks_cache[task_id]["args"]
-    tasks_params["goal"] = goal
-    tasks_params["cache_messages"] = True
-    task_id = task_manager.resume_task(task_id, worker_fun, tasks_params)
-    return f"任务 {task_id} 已恢复"
-
-@register_tool()
-def get_all_tasks_status():
-    """
-    获取所有任务的状态。
-    子任务状态会持久化到磁盘，因此即使历史记录为空，之前的子任务仍然存在。
-
-    Returns:
-        str: 所有任务的状态。每个任务的id，状态，结果。
-    """
-    return task_manager.tasks_cache
-
-@register_tool()
-async def get_task_result():
-    """
-    等待并获取子任务的执行结果。如果需要等待子任务完成，请使用这个工具。一旦有任务完成，会自动获取结果。如果调用时没有任务完成，会等待直到有任务完成。
-
-    Returns:
-        str: 子任务的执行结果。
-    """
-    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") == "RUNNING"])
-    if running_tasks_num == 0:
-        return "All tasks are finished."
-    task_id, status, result = await task_manager.get_next_result()
-
-    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}" if unfinished_tasks else "All tasks are finished.",
-    ])
-
-    return text
-
 async def main():
     manager = TaskManager()
-    from worker import worker
 
     # --- 任务提交阶段 ---
     print("--- 任务提交 ---")
@@ -313,7 +235,7 @@ async def main():
         {"goal": 2},
         {"goal": 4},
     ]
-    task_ids = manager.create_tasks(worker, tasks_to_run)
+    task_ids = manager.create_tasks(registry.tools["worker"], tasks_to_run)
     print(f"\n主程序: {len(task_ids)} 个任务已提交，现在开始等待结果...\n")
 
     # --- 结果处理阶段 ---

{beswarm-0.2.36 → beswarm-0.2.37}/beswarm/tools/__init__.py

@@ -1,60 +1,58 @@
 from .edit_file import edit_file
-from .worker import worker, worker_gen
-from .screenshot import save_screenshot_to_file
-from .request_input import request_admin_input
-
+from .search_web import search_web
+from .completion import task_complete
 from .search_arxiv import search_arxiv
 from .repomap import get_code_repo_map
+from .worker import worker, worker_gen
+from .request_input import request_admin_input
+from .screenshot import save_screenshot_to_file
 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
+from .subtasks import create_task, resume_task, get_all_tasks_status, get_task_result
 
 #显式导入 aient.plugins 中的所需内容
 from ..aient.src.aient.plugins import (
-    excute_command,
     get_time,
+    read_file,
+    read_image,
+    register_tool,
+    write_to_file,
+    excute_command,
     generate_image,
     list_directory,
-    read_file,
+    get_url_content,
     run_python_script,
+    set_readonly_path,
     get_search_results,
-    write_to_file,
     download_read_arxiv_pdf,
-    get_url_content,
-    read_image,
-    set_readonly_path,
-    register_tool,
 )
 
 __all__ = [
-    "edit_file",
     "worker",
+    "get_time",
+    "edit_file",
+    "read_file",
     "worker_gen",
+    "read_image",
+    "search_web",
+    "create_task",
+    "resume_task",
     "search_arxiv",
-    "get_code_repo_map",
-    # aient.plugins
+    "write_to_file",
+    "scroll_screen",
+    "register_tool",
+    "task_complete",
     "excute_command",
-    "read_image",
-    "get_time",
     "generate_image",
     "list_directory",
-    "read_file",
-    "run_python_script",
-    "get_search_results",
-    "write_to_file",
-    "download_read_arxiv_pdf",
+    "get_task_result",
     "get_url_content",
-    "find_and_click_element",
-    "scroll_screen",
-    "register_tool",
-    "search_web",
-    "save_screenshot_to_file",
     "set_readonly_path",
+    "get_code_repo_map",
+    "run_python_script",
+    "get_search_results",
     "request_admin_input",
-    "create_task",
-    "resume_task",
     "get_all_tasks_status",
-    "get_task_result",
-    "task_complete",
+    "find_and_click_element",
+    "download_read_arxiv_pdf",
+    "save_screenshot_to_file",
 ]

beswarm-0.2.37/beswarm/tools/subtasks.py

@@ -0,0 +1,77 @@
+import ast
+
+from ..core import task_manager
+from ..aient.src.aient.plugins import register_tool, registry
+
+worker_fun = registry.tools["worker"]
+
+@register_tool()
+def create_task(goal, tools, work_dir):
+    """
+    启动一个子任务来自动完成指定的任务目标 (`goal`)。
+
+    这个子任务接收一个清晰的任务描述、一组可供调用的工具 (`tools`)，以及一个工作目录 (`work_dir`)。
+    它会结合可用的工具，自主规划并逐步执行必要的操作，直到最终完成指定的任务目标。
+    核心功能是根据输入的目标，驱动整个任务执行流程。
+    子任务下上文为空，因此需要细致的背景信息。
+
+    Args:
+        goal (str): 需要完成的具体任务目标描述。子任务将围绕此目标进行工作。必须清晰、具体。必须包含背景信息，完成指标等。写清楚什么时候算任务完成，同时交代清楚任务的背景信息，这个背景信息可以是需要读取的文件等一切有助于完成任务的信息。
+        tools (list[str]): 一个包含可用工具函数对象的列表。子任务在执行任务时可能会调用这些工具来与环境交互（例如读写文件、执行命令等）。
+        work_dir (str): 工作目录的绝对路径。子任务将在此目录上下文中执行操作。子任务的工作目录位置在主任务的工作目录的子目录。子任务工作目录**禁止**设置为主任务目录本身。
+
+    Returns:
+        str: 当任务成功完成时，返回字符串 "任务已完成"。
+    """
+    tasks_params = [
+        {"goal": goal, "tools": ast.literal_eval(tools), "work_dir": work_dir, "cache_messages": True}
+    ]
+    task_ids = task_manager.create_tasks(worker_fun, tasks_params)
+    return task_ids
+
+@register_tool()
+def resume_task(task_id, goal):
+    """
+    恢复一个子任务。
+    """
+    if task_id not in task_manager.tasks_cache:
+        return f"任务 {task_id} 不存在"
+    tasks_params = task_manager.tasks_cache[task_id]["args"]
+    tasks_params["goal"] = goal
+    tasks_params["cache_messages"] = True
+    task_id = task_manager.resume_task(task_id, worker_fun, tasks_params)
+    return f"任务 {task_id} 已恢复"
+
+@register_tool()
+def get_all_tasks_status():
+    """
+    获取所有任务的状态。
+    子任务状态会持久化到磁盘，因此即使历史记录为空，之前的子任务仍然存在。
+
+    Returns:
+        str: 所有任务的状态。每个任务的id，状态，结果。
+    """
+    return task_manager.tasks_cache
+
+@register_tool()
+async def get_task_result():
+    """
+    等待并获取子任务的执行结果。如果需要等待子任务完成，请使用这个工具。一旦有任务完成，会自动获取结果。如果调用时没有任务完成，会等待直到有任务完成。
+
+    Returns:
+        str: 子任务的执行结果。
+    """
+    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") == "RUNNING"])
+    if running_tasks_num == 0:
+        return "All tasks are finished."
+    task_id, status, result = await task_manager.get_next_result()
+
+    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}" if unfinished_tasks else "All tasks are finished.",
+    ])
+
+    return text

beswarm-0.2.37/beswarm/tools/worker.py

@@ -0,0 +1,29 @@
+from datetime import datetime
+from typing import List, Dict, Union
+
+from ..core import mcp_manager, broker, task_manager
+from ..agents.planact import BrokerWorker
+from ..aient.src.aient.plugins import register_tool
+
+
+@register_tool()
+async def worker(goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None):
+    start_time = datetime.now()
+    worker_instance = BrokerWorker(goal, tools, work_dir, cache_messages, broker, mcp_manager, task_manager)
+    result = await worker_instance.run()
+    end_time = datetime.now()
+    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"总用时: {end_time - start_time}")
+    return result
+
+@register_tool()
+async def worker_gen(goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None):
+    start_time = datetime.now()
+    worker_instance = BrokerWorker(goal, tools, work_dir, cache_messages, broker, mcp_manager, task_manager)
+    async for result in worker_instance.stream_run():
+        yield result
+    end_time = datetime.now()
+    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"总用时: {end_time - start_time}")

{beswarm-0.2.36 → beswarm-0.2.37}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.36 → beswarm-0.2.37}/beswarm.egg-info/SOURCES.txt

@@ -3,13 +3,16 @@ README.md
 pyproject.toml
 beswarm/__init__.py
 beswarm/broker.py
+beswarm/core.py
 beswarm/prompt.py
+beswarm/taskmanager.py
 beswarm/utils.py
 beswarm.egg-info/PKG-INFO
 beswarm.egg-info/SOURCES.txt
 beswarm.egg-info/dependency_links.txt
 beswarm.egg-info/requires.txt
 beswarm.egg-info/top_level.txt
+beswarm/agents/planact.py
 beswarm/aient/main.py
 beswarm/aient/setup.py
 beswarm/aient/src/aient/__init__.py
@@ -144,7 +147,7 @@ beswarm/tools/request_input.py
 beswarm/tools/screenshot.py
 beswarm/tools/search_arxiv.py
 beswarm/tools/search_web.py
-beswarm/tools/taskmanager.py
+beswarm/tools/subtasks.py
 beswarm/tools/worker.py
 test/test_TaskManager.py
 test/test_broker.py

{beswarm-0.2.36 → beswarm-0.2.37}/pyproject.toml

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