beswarm 0.2.16__py3-none-any.whl → 0.2.18__py3-none-any.whl

beswarm/tools/__init__.py

@@ -1,5 +1,5 @@
 from .edit_file import edit_file
-from .worker import worker, worker_gen
+from .worker import worker, worker_gen, create_task, get_task_result
 from .screenshot import save_screenshot_to_file
 from .request_input import request_admin_input
 
@@ -49,4 +49,6 @@ __all__ = [
     "save_screenshot_to_file",
     "set_readonly_path",
     "request_admin_input",
+    "create_task",
+    "get_task_result",
 ]

beswarm/tools/search_web.py

@@ -183,13 +183,7 @@ async def search_web(query: str):
     web_contents_raw = []
     if results and isinstance(results, list) and len(results) > 0:
         # print(f"Fetching content for {len(results)} URLs...")
-    # threads = []
-    # for url in url_set_list:
-    #     # url_search_thread = ThreadWithReturnValue(target=jina_ai_Web_crawler, args=(url,True,))
-    #     url_search_thread = ThreadWithReturnValue(target=get_url_content, args=(url,))
-    #     # url_search_thread = ThreadWithReturnValue(target=Web_crawler, args=(url,True,))
-    #     url_search_thread.start()
-    #     threads.append(url_search_thread)
+
         threads = []
         for i, link in enumerate(results):
             print(f"Processing URL {i + 1}/{len(results)}: {link}")

beswarm/tools/taskmanager.py

@@ -0,0 +1,197 @@
+import os
+import uuid
+import asyncio
+from enum import Enum
+from pathlib import Path
+
+class TaskStatus(Enum):
+    """任务状态枚举"""
+    PENDING = "PENDING"
+    RUNNING = "RUNNING"
+    DONE = "DONE"
+    CANCELLED = "CANCELLED"
+    ERROR = "ERROR"
+    NOT_FOUND = "NOT_FOUND"
+
+
+class TaskManager:
+    """一个简单的异步任务管理器"""
+    def __init__(self):
+        self.tasks = {}  # 使用字典来存储任务，key是task_id, value是task对象
+        self.results_queue = asyncio.Queue()
+        self.root_path = Path(os.getcwd())
+
+    def create_tasks(self, task_coro, tasks_params):
+        """
+        批量创建并注册任务。
+
+        Args:
+            task_coro: 用于创建任务的协程函数。
+            tasks_params (list): 包含任务参数的列表。
+
+        Returns:
+            list: 创建的任务ID列表。
+        """
+        task_ids = []
+        for args in tasks_params:
+            coro = task_coro(**args)
+            task_id = self.create_task(coro)
+            task_ids.append(task_id)
+        return task_ids
+
+    def create_task(self, coro):
+        """
+        创建并注册一个新任务。
+
+        Args:
+            coro: 要执行的协程。
+            name (str, optional): 任务的可读名称。 Defaults to None.
+
+        Returns:
+            str: 任务的唯一ID。
+        """
+        task_id = str(uuid.uuid4())
+        task_name = f"Task-{task_id[:8]}"
+
+        # 使用 asyncio.create_task() 创建任务
+        task = asyncio.create_task(coro, name=task_name)
+
+        # 将任务存储在管理器中
+        # 当任务完成时，通过回调函数将结果放入队列
+        task.add_done_callback(
+            lambda t: self._on_task_done(task_id, t)
+        )
+        self.tasks[task_id] = task
+        print(f"任务已创建: ID={task_id}, Name={task_name}")
+        return task_id
+
+    def get_task_status(self, task_id):
+        """
+        查询特定任务的状态。
+
+        Args:
+            task_id (str): 要查询的任务ID。
+
+        Returns:
+            TaskStatus: 任务的当前状态。
+        """
+        task = self.tasks.get(task_id)
+        if not task:
+            return TaskStatus.NOT_FOUND
+
+        if task.done():
+            if task.cancelled():
+                return TaskStatus.CANCELLED
+            elif task.exception() is not None:
+                return TaskStatus.ERROR
+            else:
+                return TaskStatus.DONE
+
+        # asyncio.Task 没有直接的 'RUNNING' 状态。
+        # 如果任务还没有完成，它要么是等待执行（PENDING），要么是正在执行（RUNNING）。
+        # 这里我们简化处理，认为未完成的就是运行中。
+        return TaskStatus.RUNNING
+
+    def get_task_result(self, task_id):
+        """获取已完成任务的结果，如果任务未完成或出错则返回相应信息。"""
+        task = self.tasks.get(task_id)
+        if self.get_task_status(task_id) == TaskStatus.DONE:
+            return task.result()
+        elif self.get_task_status(task_id) == TaskStatus.ERROR:
+            return task.exception()
+        return None
+
+    def _on_task_done(self, task_id, task):
+        """私有回调函数，在任务完成时将结果放入队列。"""
+        try:
+            # 将元组 (task_id, status, result) 放入队列
+            self.results_queue.put_nowait(
+                (task_id, TaskStatus.DONE, task.result())
+            )
+        except asyncio.CancelledError:
+            self.results_queue.put_nowait(
+                (task_id, TaskStatus.CANCELLED, None)
+            )
+        except Exception as e:
+            self.results_queue.put_nowait(
+                (task_id, TaskStatus.ERROR, e)
+            )
+
+    async def get_next_result(self):
+        """
+        等待并返回下一个完成的任务结果。
+
+        如果所有任务都已提交，但没有任务完成，此方法将异步等待。
+
+        Returns:
+            tuple: 一个包含 (task_id, status, result) 的元组。
+        """
+        return await self.results_queue.get()
+
+    def get_task_index(self, task_id):
+        """
+        获取任务在任务字典中的插入顺序索引。
+
+        Args:
+            task_id (str): 要查询的任务ID。
+
+        Returns:
+            int: 任务的索引（从0开始），如果未找到则返回-1。
+        """
+        try:
+            # 将字典的键转换为列表并查找索引
+            task_ids_list = list(self.tasks.keys())
+            return task_ids_list.index(task_id)
+        except ValueError:
+            # 如果任务ID不存在，则返回-1
+            return -1
+
+    def set_root_path(self, root_path):
+        self.root_path = Path(root_path)
+
+async def main():
+    manager = TaskManager()
+    from worker import worker
+
+    # --- 任务提交阶段 ---
+    print("--- 任务提交 ---")
+
+    tasks_to_run = [
+        {"goal": ""},
+        {"goal": 1},
+        {"goal": 5},
+        {"goal": 2},
+        {"goal": 4},
+    ]
+    task_ids = manager.create_tasks(worker, tasks_to_run)
+    print(f"\n主程序: {len(task_ids)} 个任务已提交，现在开始等待结果...\n")
+
+    # --- 结果处理阶段 ---
+    # 使用 get_next_result() 逐个获取已完成任务的结果
+    print("--- 结果处理 ---")
+    for i in range(len(task_ids)):
+        print(f"等待第 {i + 1} 个任务完成...")
+        # 此处会异步等待，直到队列中有可用的结果
+        task_id, status, result = await manager.get_next_result()
+
+        # 从管理器中获取任务名称（如果需要）
+        task_name = manager.tasks[task_id].get_name()
+
+        print(f"-> 收到结果: 任务 {task_name}, index: {manager.get_task_index(task_id)}")
+        print(f"  - 状态: {status.value}")
+
+        if status == TaskStatus.DONE:
+            print(f"  - 结果: '{result}'")
+        elif status == TaskStatus.ERROR:
+            print(f"  - 错误: {result}")
+        elif status == TaskStatus.CANCELLED:
+            print("  - 结果: 任务被取消")
+        print("-" * 20)
+
+    print("\n--- 所有任务的结果都已处理完毕 ---")
+
+
+# 运行主协程
+if __name__ == "__main__":
+    asyncio.run(main())
+    print("\n主程序: 所有任务都已完成并处理。")

beswarm/tools/worker.py

@@ -1,6 +1,7 @@
 import os
 import re
 import sys
+import ast
 import copy
 import json
 import difflib
@@ -26,29 +27,56 @@ from ..aient.src.aient.plugins import register_tool, get_function_call_list, reg
 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 MCPClient, convert_tool_format, MCPManager
+from .taskmanager import TaskManager
 
 manager = MCPManager()
+task_manager = TaskManager()
 
 @register_tool()
-async def worker(goal, tools, work_dir, cache_messages=None):
+def create_task(goal, tools, work_dir):
     """
-    启动一个 **工作智能体 (Worker Agent)** 来自动完成指定的任务目标 (`goal`)。
+    启动一个子任务来自动完成指定的任务目标 (`goal`)。
 
-    这个工作智能体接收一个清晰的任务描述、一组可供调用的工具 (`tools`)，以及一个工作目录 (`work_dir`)。
+    这个子任务接收一个清晰的任务描述、一组可供调用的工具 (`tools`)，以及一个工作目录 (`work_dir`)。
     它会利用语言模型的能力，结合可用的工具，自主规划并逐步执行必要的操作，直到最终完成指定的任务目标。
     核心功能是根据输入的目标，驱动整个任务执行流程。
 
     Args:
-        goal (str): 需要完成的具体任务目标描述。工作智能体将围绕此目标进行工作。必须清晰、具体。
-        tools (list[str]): 一个包含可用工具函数对象的列表。工作智能体在执行任务时可能会调用这些工具来与环境交互（例如读写文件、执行命令等）。
-        work_dir (str): 工作目录的绝对路径。工作智能体将在此目录上下文中执行操作。
+        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, tasks_params)
+    return task_ids
+
+@register_tool()
+async def get_task_result():
+    """
+    等待并获取子任务的执行结果。
+
+    Returns:
+        str: 子任务的执行结果。
+    """
+    task_id, status, result = await task_manager.get_next_result()
+    return result
+
+@register_tool()
+async def worker(goal, tools, work_dir, cache_messages=None):
+    cache_dir = Path(work_dir) / ".beswarm"
+    cache_dir.mkdir(parents=True, exist_ok=True)
+    cache_file = cache_dir / "work_agent_conversation_history.json"
+    if not cache_file.exists():
+        cache_file.write_text("[]", encoding="utf-8")
+
     DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
     if DEBUG:
-        log_file = open(Path(work_dir) / ".beswarm" / "history.log", "a", encoding="utf-8")
+        log_file = open(cache_dir / "history.log", "a", encoding="utf-8")
         log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
         original_stdout = sys.stdout
         original_stderr = sys.stderr
@@ -94,11 +122,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     }
     if cache_messages:
         if isinstance(cache_messages, bool) and cache_messages == True:
-            cache_messages = None
-            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)
+            cache_messages = json.loads(cache_file.read_text(encoding="utf-8"))
         if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
             old_goal = extract_xml_content(cache_messages[1]["content"], "goal")
             if old_goal.strip() != goal.strip():
@@ -144,11 +168,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
 
-            cache_dir = os.path.join(work_dir, ".beswarm")
-            os.makedirs(cache_dir, exist_ok=True)
-            cache_file = os.path.join(cache_dir, "work_agent_conversation_history.json")
-            with open(cache_file, "w", encoding="utf-8") as f:
-                f.write(json.dumps(conversation_history, ensure_ascii=False, indent=4))
+            cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
             work_agent_system_prompt = conversation_history.pop(0)
             if conversation_history:
@@ -248,9 +268,15 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     return "任务已完成"
 
 async def worker_gen(goal, tools, work_dir, cache_messages=None):
+    cache_dir = Path(work_dir) / ".beswarm"
+    cache_dir.mkdir(parents=True, exist_ok=True)
+    cache_file = cache_dir / "work_agent_conversation_history.json"
+    if not cache_file.exists():
+        cache_file.write_text("[]", encoding="utf-8")
+
     DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
     if DEBUG:
-        log_file = open(Path(work_dir) / ".beswarm" / "history.log", "a", encoding="utf-8")
+        log_file = open(cache_dir / "history.log", "a", encoding="utf-8")
         log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
         original_stdout = sys.stdout
         original_stderr = sys.stderr
@@ -296,11 +322,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     }
     if cache_messages:
         if isinstance(cache_messages, bool) and cache_messages == True:
-            cache_messages = None
-            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)
+            cache_messages = json.loads(cache_file.read_text(encoding="utf-8"))
         if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
             old_goal = extract_xml_content(cache_messages[1]["content"], "goal")
             if old_goal.strip() != goal.strip():
@@ -346,11 +368,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
 
-            cache_dir = os.path.join(work_dir, ".beswarm")
-            os.makedirs(cache_dir, exist_ok=True)
-            cache_file = os.path.join(cache_dir, "work_agent_conversation_history.json")
-            with open(cache_file, "w", encoding="utf-8") as f:
-                f.write(json.dumps(conversation_history, ensure_ascii=False, indent=4))
+            cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
             work_agent_system_prompt = conversation_history.pop(0)
             if conversation_history:

{beswarm-0.2.16.dist-info → beswarm-0.2.18.dist-info}/METADATA

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

{beswarm-0.2.16.dist-info → beswarm-0.2.18.dist-info}/RECORD

@@ -125,7 +125,7 @@ beswarm/queries/tree-sitter-languages/ruby-tags.scm,sha256=vIidsCeE2A0vdFN18yXKq
 beswarm/queries/tree-sitter-languages/rust-tags.scm,sha256=9ljM1nzhfPs_ZTRw7cr2P9ToOyhGcKkCoN4_HPXSWi4,1451
 beswarm/queries/tree-sitter-languages/scala-tags.scm,sha256=UxQjz80JIrrJ7Pm56uUnQyThfmQNvwk7aQzPNypB-Ao,1761
 beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky82DpgTMKXK_l2ySTuF2zrQ2fJAi9E,1253
-beswarm/tools/__init__.py,sha256=JkrgZVtTPeBfI6Y39-RJ1g9z_VyALP7skx3W0n0f9kE,1234
+beswarm/tools/__init__.py,sha256=egPX4B021Pf8dIaOodJ2yxQ_YCG-giI4cHiXsbX70BA,1306
 beswarm/tools/click.py,sha256=TygaekCXTmU3fIu6Uom7ZcyzEgYMlCC_GX-5SmWHuLI,20762
 beswarm/tools/edit_file.py,sha256=iwWl7a8sTVq4vj0e1ny3H6UGcHfYnxALRGcLuk5hZS8,9155
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
@@ -133,9 +133,10 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
 beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdwk,942
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=caVIUOzMhFu-r_gVgJZrH2EO9xI5iV_qLAg0b3Ie9Xg,8095
-beswarm/tools/search_web.py,sha256=w0T0aCqOVlb6Of5hn_TtpnrGXo6bMtw2aKZdkrYjycI,12069
-beswarm/tools/worker.py,sha256=ZFgSe17Je9NJuITvojZ89uEk2p-pXWJIy9GHNvMDAVo,23491
-beswarm-0.2.16.dist-info/METADATA,sha256=7dkfw1GTU0uQQ5_DxHdk956ZuvAWHfI4m6jWThucZ_4,3847
-beswarm-0.2.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.16.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.16.dist-info/RECORD,,
+beswarm/tools/search_web.py,sha256=Zxt2Mpeuqa40sKttCxeI71O_TWnoANw7na7CdlGknvg,11659
+beswarm/tools/taskmanager.py,sha256=oB_768qy6Lb58JNIcSLVgbPrgNB3duIq9DawbVHRbrg,6270
+beswarm/tools/worker.py,sha256=W-NqcO8T6Y_gsgVvNaKk4hbpqA8_odz18v6qb17s64w,23674
+beswarm-0.2.18.dist-info/METADATA,sha256=hYbFl-3T_3aou4zXfHLa96ltL4xoDIfafI-8f_Van7s,3847
+beswarm-0.2.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.18.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.18.dist-info/RECORD,,