beswarm 0.2.77__tar.gz → 0.2.78__tar.gz

{beswarm-0.2.77 → beswarm-0.2.78}/PKG-INFO

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

{beswarm-0.2.77 → beswarm-0.2.78}/beswarm/aient/aient/models/chatgpt.py

@@ -757,6 +757,7 @@ class chatgpt(BaseLLM):
 
         # 发送请求并处理响应
         retry_times = 0
+        error_to_raise = None
         while True:
             tmp_post_json = copy.deepcopy(json_post)
             if need_done_prompt:
@@ -840,7 +841,8 @@ class chatgpt(BaseLLM):
                 continue
             except InputTokenCountExceededError as e:
                 self.logger.error(f"The request body is too long: {e}")
-                raise
+                error_to_raise = e
+                break
             except BadRequestError as e:
                 self.logger.error(f"Bad request error: {e}")
                 raise
@@ -873,6 +875,9 @@ class chatgpt(BaseLLM):
                 if retry_times == 9:
                     raise RetryFailedError(str(e))
 
+        if error_to_raise:
+            raise error_to_raise
+
     def ask_stream(
         self,
         prompt: list,

{beswarm-0.2.77 → beswarm-0.2.78}/beswarm/core.py

@@ -1,3 +1,4 @@
+import contextvars
 from .broker import MessageBroker
 from .bemcp.bemcp import MCPManager
 from .taskmanager import TaskManager
@@ -9,5 +10,9 @@ from .knowledge_graph import KnowledgeGraphManager
 
 broker = MessageBroker()
 mcp_manager = MCPManager()
-task_manager = TaskManager()
-kgm = KnowledgeGraphManager(broker=broker)
+kgm = KnowledgeGraphManager(broker=broker)
+current_task_manager = contextvars.ContextVar('current_task_manager')
+
+def get_task_manager():
+    """Creates a new, isolated TaskManager instance."""
+    return TaskManager()

{beswarm-0.2.77 → beswarm-0.2.78}/beswarm/tools/subtasks.py

@@ -1,6 +1,6 @@
 import ast
 from pathlib import Path
-from ..core import task_manager
+from ..core import current_task_manager
 from ..aient.aient.plugins import register_tool, registry
 
 worker_fun = registry.tools["worker"]
@@ -23,6 +23,7 @@ def create_task(goal, tools, work_dir):
     Returns:
         str: 当任务成功完成时，返回字符串 "任务已完成"。
     """
+    task_manager = current_task_manager.get()
     # 获取 worker 函数，这是正确的
     worker_fun = registry.tools["worker"]
 
@@ -50,6 +51,7 @@ def resume_task(task_id, goal):
     """
     恢复一个子任务。
     """
+    task_manager = current_task_manager.get()
     if task_id not in task_manager.tasks_cache:
         return f"任务 {task_id} 不存在"
     tasks_params = task_manager.tasks_cache[task_id]["args"]
@@ -67,6 +69,7 @@ def get_all_tasks_status():
     Returns:
         str: 所有任务的状态。每个任务的id，状态，结果。
     """
+    task_manager = current_task_manager.get()
     return task_manager.tasks_cache
 
 @register_tool()
@@ -91,6 +94,7 @@ async def get_task_result(reduce: bool = False):
         - 当 `reduce=False` 时，返回单个子任务的执行结果。
         - 当 `reduce=True` 时，返回一个包含所有任务最终状态和结果的汇总字符串。
     """
+    task_manager = current_task_manager.get()
     def get_running_tasks_count():
         return len([
             task_id for task_id, task in task_manager.tasks_cache.items()
@@ -155,6 +159,7 @@ def create_tasks_from_csv(goal_template: str, csv_file_path: str, tools_json_str
     Returns:
         str: 批量创建任务的执行摘要，或在发生错误时返回错误信息。
     """
+    task_manager = current_task_manager.get()
     # 1. 校验输入参数
     if not os.path.exists(csv_file_path):
         return f"<tool_error>CSV文件不存在: {csv_file_path}</tool_error>"

{beswarm-0.2.77 → beswarm-0.2.78}/beswarm/tools/worker.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List, Dict, Union
 
-from ..core import mcp_manager, broker, task_manager, kgm
+from ..core import mcp_manager, broker, kgm, get_task_manager, current_task_manager
 from ..agents.planact import BrokerWorker
 from ..agents.chatgroup import ChatGroupWorker
 from ..aient.aient.plugins import register_tool
@@ -10,6 +10,8 @@ from ..aient.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()
+    task_manager = get_task_manager()
+    current_task_manager.set(task_manager)
     worker_instance = BrokerWorker(goal, tools, work_dir, cache_messages, broker, mcp_manager, task_manager, kgm)
     result = await worker_instance.run()
     end_time = datetime.now()
@@ -21,6 +23,8 @@ async def worker(goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_
 @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()
+    task_manager = get_task_manager()
+    current_task_manager.set(task_manager)
     worker_instance = BrokerWorker(goal, tools, work_dir, cache_messages, broker, mcp_manager, task_manager, kgm)
     async for result in worker_instance.stream_run():
         yield result
@@ -32,6 +36,8 @@ async def worker_gen(goal: str, tools: List[Union[str, Dict]], work_dir: str, ca
 @register_tool()
 async def chatgroup(tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None):
     start_time = datetime.now()
+    task_manager = get_task_manager()
+    current_task_manager.set(task_manager)
     worker_instance = ChatGroupWorker(tools, work_dir, cache_messages, broker, mcp_manager, task_manager, kgm)
     result = await worker_instance.run()
     end_time = datetime.now()

{beswarm-0.2.77 → beswarm-0.2.78}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.77 → beswarm-0.2.78}/pyproject.toml

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