beswarm 0.2.77__py3-none-any.whl → 0.2.79__py3-none-any.whl

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/core.py

@@ -1,3 +1,4 @@
+import contextvars
 from .broker import MessageBroker
 from .bemcp.bemcp import MCPManager
 from .taskmanager import TaskManager
@@ -9,5 +10,10 @@ 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')
+current_work_dir = contextvars.ContextVar('current_work_dir', default=None)
+
+def get_task_manager():
+    """Creates a new, isolated TaskManager instance."""
+    return TaskManager()

beswarm/tools/search_web.py

@@ -1,10 +1,14 @@
 import re
 import os
+import csv
+import time
 import json
 import httpx
 import threading
+from pathlib import Path
 
 from ..aient.aient.plugins import register_tool, get_url_content # Assuming a similar plugin structure
+from ..core import current_work_dir
 
 class ThreadWithReturnValue(threading.Thread):
     def run(self):
@@ -19,6 +23,7 @@ class ThreadWithReturnValue(threading.Thread):
 async def search_web(query: str):
     """
 获取 Google 搜索结果。
+搜索结果将保存在 csv 文件到 .beswarm/cache 目录下
 
 参数:
     query (str): 要在 Google 上搜索的查询字符串。
@@ -289,13 +294,45 @@ async def search_web(query: str):
     # with open(output_filename, "w", encoding="utf-8") as f:
     #     json.dump(final_web_content, f, indent=2, ensure_ascii=False)
     # print(f"Filtered web content saved to {output_filename}")
-    final_result = ""
-    for item in final_web_content:
-        final_result += item["content"]
-        final_result += "\n\n"
-    if not final_result:
-        return "No web content"
-    return final_result
+
+    if final_web_content:
+        work_dir = current_work_dir.get()
+        if work_dir:
+            output_path = Path(work_dir) / ".beswarm" / "cache"
+        else:
+            output_path = Path(".")
+
+        output_path.mkdir(parents=True, exist_ok=True)
+
+        # 使用时间戳生成唯一的文件名
+        timestamp = time.strftime("%Y%m%d-%H%M%S")
+        csv_filename = f"web_content_{timestamp}.csv"
+        csv_filepath = output_path / csv_filename
+
+        with open(csv_filepath, "w", newline="", encoding="utf-8") as csvfile:
+            # 根据字典中的键定义字段名
+            fieldnames = ["query", "url", "content"]
+            writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+
+            # 写入标题行
+            writer.writeheader()
+
+            # 写入数据行
+            for item in final_web_content:
+                item['query'] = query
+                if 'content' in item and isinstance(item['content'], str):
+                    item['content'] = item['content'].encode('unicode_escape').decode('utf-8')
+                writer.writerow(item)
+        return f"已将筛选后的网页内容保存到 {csv_filepath.absolute()}"
+    return "No web content"
+
+
+    # for item in final_web_content:
+    #     final_result += item["content"]
+    #     final_result += "\n\n"
+    # if not final_result:
+    #     return "No web content"
+    # return final_result
 
 import difflib
 

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/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, current_work_dir
 from ..agents.planact import BrokerWorker
 from ..agents.chatgroup import ChatGroupWorker
 from ..aient.aient.plugins import register_tool
@@ -10,6 +10,9 @@ 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)
+    current_work_dir.set(work_dir)
     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 +24,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 +37,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.dist-info → beswarm-0.2.79.dist-info}/METADATA

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

{beswarm-0.2.77.dist-info → beswarm-0.2.79.dist-info}/RECORD

@@ -1,6 +1,6 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/broker.py,sha256=64Y-djrKYaZfBQ8obwHOmr921QgZeu9BtScZWaYLfDo,9887
-beswarm/core.py,sha256=htssaaeIBZ_yOqvX9VtANoVWaZHt_7oWcxyDI1z0paQ,310
+beswarm/core.py,sha256=jKStpTTOu6Ojond_i-okTZLrvSAJ4yUoTZwtDfFTiRs,553
 beswarm/knowledge_graph.py,sha256=oiOMknAJzGrOHc2AyQgvrCcZAkGLhFnsnvSBdfFBWMw,14831
 beswarm/prompt.py,sha256=qlH-yYCGv9j9-5grnMXl0B53CDZgfTpe4ncwBwgWg7o,32816
 beswarm/taskmanager.py,sha256=vMmcoZ4FlNvjEliRkv3AniPji50NcY4Q1_2HETzR0DU,12226
@@ -21,7 +21,7 @@ beswarm/aient/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9
 beswarm/aient/aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 beswarm/aient/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-beswarm/aient/aient/models/chatgpt.py,sha256=R6qXgTbcshwYKx3nfSgh4uK2baQ6OZ37j8zV_wV8lLk,47189
+beswarm/aient/aient/models/chatgpt.py,sha256=2RaObZmliqJlGveOSWbwgpscjPWk7R1RmxwbEAH0xXo,47315
 beswarm/aient/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -112,11 +112,11 @@ beswarm/tools/repomap.py,sha256=w98aHmjNjtvcUVc5maWORqzKqDy2KVGLooOe__uJVCU,4523
 beswarm/tools/request_input.py,sha256=3n2UW8m8Q7dxGhd7L7hzSJ1kk4ekMbtdtNZZT3dJf20,938
 beswarm/tools/screenshot.py,sha256=hyL6F8_k9Y03Nb_X18cY-klCpWWdkqyC-iGXfKX-7jc,1007
 beswarm/tools/search_arxiv.py,sha256=NLiJV1B7Um6EuZXLxnL950d837_he2LGG7qaGACSgwg,10750
-beswarm/tools/search_web.py,sha256=NYrb5KL_WUGPm-fOKT8Cyjon04lxBU-gaLdrVjeYgGo,16143
-beswarm/tools/subtasks.py,sha256=OclAorPuuG9vnySoBN2ISzzoInZJV3wmLAVzdMF3FXM,10220
-beswarm/tools/worker.py,sha256=_cSkRUKRJMAiZiTfnBze_e9Kc7k7KvbB5hdxdvp4FW4,2009
+beswarm/tools/search_web.py,sha256=juFbife765vRZXpTHOV_6ki4h6NpSmZbBcWJ8Fp-uiE,17497
+beswarm/tools/subtasks.py,sha256=UI9QznALmZNbNOSoR_2AdlnDAkZBuKMq0GifnBCgpLo,10458
+beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.77.dist-info/METADATA,sha256=PKJty4NePxrtiZZ_yZMwA_j0ra5H1q2Am22x6DDM4t4,3878
-beswarm-0.2.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.77.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.77.dist-info/RECORD,,
+beswarm-0.2.79.dist-info/METADATA,sha256=owpFd3kO5L7n5-r1RpUs25emR-2kpRJ4SIasXxExmbQ,3878
+beswarm-0.2.79.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.79.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.79.dist-info/RECORD,,