beswarm 0.2.78__tar.gz → 0.2.80__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.78
+Version: 0.2.80
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -16,7 +16,7 @@ Requires-Dist: msgspec>=0.19.0
 Requires-Dist: networkx>=3.4.2
 Requires-Dist: numpy>=2.2.5
 Requires-Dist: pdfminer-six==20240706
-Requires-Dist: pillow>=11.2.1
+Requires-Dist: pillow>=10.4.0
 Requires-Dist: pyautogui>=0.9.54
 Requires-Dist: pygments>=2.19.1
 Requires-Dist: pyperclip>=1.9.0

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

@@ -12,6 +12,7 @@ broker = MessageBroker()
 mcp_manager = MCPManager()
 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."""

{beswarm-0.2.78 → beswarm-0.2.80}/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'].replace('\r', '\\r').replace('\n', '\\n')
+                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-0.2.78 → beswarm-0.2.80}/beswarm/tools/subtasks.py

@@ -153,7 +153,7 @@ def create_tasks_from_csv(goal_template: str, csv_file_path: str, tools_json_str
         csv_file_path (str): 输入的CSV文件的完整路径。CSV文件的第一行必须是列标题。
         tools_json_str (str): 一个JSON格式的字符串，表示所有子任务可用的工具列表。
                               例如: '["read_file", "write_to_file"]'。
-        base_work_dir (str): 所有子任务工作目录的根路径。每个子任务将在此目录下
+        base_work_dir (str): 所有子任务工作目录的根路径。每个子任务将在此目录下，**必须**使用绝对路径。
                              创建一个以其唯一标识（如CSV中的id列）命名的子目录。base_work_dir **禁止** 设置为主任务目录本身。
 
     Returns:

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

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List, Dict, Union
 
-from ..core import mcp_manager, broker, kgm, get_task_manager, current_task_manager
+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
@@ -12,6 +12,7 @@ async def worker(goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_
     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()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.78
+Version: 0.2.80
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -16,7 +16,7 @@ Requires-Dist: msgspec>=0.19.0
 Requires-Dist: networkx>=3.4.2
 Requires-Dist: numpy>=2.2.5
 Requires-Dist: pdfminer-six==20240706
-Requires-Dist: pillow>=11.2.1
+Requires-Dist: pillow>=10.4.0
 Requires-Dist: pyautogui>=0.9.54
 Requires-Dist: pygments>=2.19.1
 Requires-Dist: pyperclip>=1.9.0

{beswarm-0.2.78 → beswarm-0.2.80}/beswarm.egg-info/requires.txt

@@ -10,7 +10,7 @@ msgspec>=0.19.0
 networkx>=3.4.2
 numpy>=2.2.5
 pdfminer-six==20240706
-pillow>=11.2.1
+pillow>=10.4.0
 pyautogui>=0.9.54
 pygments>=2.19.1
 pyperclip>=1.9.0

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

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.78"
+version = "0.2.80"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -17,7 +17,7 @@ dependencies = [
     "networkx>=3.4.2",
     "numpy>=2.2.5",
     "pdfminer-six==20240706",
-    "pillow>=11.2.1",
+    "pillow>=10.4.0",
     "pyautogui>=0.9.54",
     "pygments>=2.19.1",
     "pyperclip>=1.9.0",