beswarm 0.2.25__py3-none-any.whl → 0.2.27__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.46",
+    version="1.1.47",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

beswarm/aient/src/aient/core/request.py

@@ -256,8 +256,6 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
-                if val == 0:
-                    payload["generationConfig"].pop("thinkingConfig", None)
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
@@ -554,8 +552,6 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
-                if val == 0:
-                    payload["generationConfig"].pop("thinkingConfig", None)
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass

beswarm/aient/src/aient/core/response.py

@@ -141,7 +141,13 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
             sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=None, function_call_content=function_full_response)
             yield sse_string
 
-        if cache_buffer == "[]":
+        cache_buffer_json = {}
+        try:
+            cache_buffer_json = json.loads(cache_buffer)
+        except json.JSONDecodeError:
+            cache_buffer_json = {}
+
+        if cache_buffer == "[]" or safe_get(cache_buffer_json, 0, "promptFeedback", "blockReason") == "PROHIBITED_CONTENT":
             sse_string = await generate_sse_response(timestamp, model, stop="PROHIBITED_CONTENT")
             yield sse_string
         else:

beswarm/aient/src/aient/plugins/websearch.py

@@ -83,7 +83,7 @@ def jina_ai_Web_crawler(url: str, isSearch=False) -> str:
         from bs4 import BeautifulSoup
         requests.packages.urllib3.disable_warnings()
         url = "https://r.jina.ai/" + url
-        response = requests.get(url, headers=headers, verify=False, timeout=5, stream=True)
+        response = requests.get(url, headers=headers, verify=False, timeout=20, stream=True)
         if response.status_code == 404:
             print("Page not found:", url)
             return "抱歉，网页不存在，目前无法访问该网页。@Trash@"
@@ -133,6 +133,7 @@ def get_url_content(url: str) -> str:
     # print(markdown_content)
     # print('-----------------------------')
     jina_content = jina_ai_Web_crawler(url)
+    # print(jina_content)
     # print('-----------------------------')
 
     # 定义评分函数

beswarm/tools/__init__.py

@@ -1,5 +1,5 @@
 from .edit_file import edit_file
-from .worker import worker, worker_gen, create_task, get_task_result
+from .worker import worker, worker_gen
 from .screenshot import save_screenshot_to_file
 from .request_input import request_admin_input
 
@@ -7,6 +7,8 @@ from .search_arxiv import search_arxiv
 from .repomap import get_code_repo_map
 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
+
 #显式导入 aient.plugins 中的所需内容
 from ..aient.src.aient.plugins import (
     excute_command,
@@ -50,5 +52,7 @@ __all__ = [
     "set_readonly_path",
     "request_admin_input",
     "create_task",
+    "resume_task",
+    "get_all_tasks_status",
     "get_task_result",
 ]

beswarm/tools/search_web.py

@@ -368,5 +368,6 @@ if __name__ == '__main__':
         print(results)
 
     asyncio.run(main())
+    # print(get_url_content("https://www.ces.org.cn/res/ces/2308/69c936072d86b5161d7cca95c30ea832.pdf"))
 
 # python -m beswarm.tools.search_web

beswarm/tools/taskmanager.py

@@ -1,9 +1,12 @@
-import os
+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
+
 class TaskStatus(Enum):
     """任务状态枚举"""
     PENDING = "PENDING"
@@ -19,7 +22,49 @@ class TaskManager:
     def __init__(self):
         self.tasks = {}  # 使用字典来存储任务，key是task_id, value是task对象
         self.results_queue = asyncio.Queue()
-        self.root_path = Path(os.getcwd())
+        self.root_path = None
+        self.tasks_cache = {}
+
+    def set_root_path(self, root_path):
+        if self.root_path:
+            return
+        self.root_path = Path(root_path)
+        self.cache_dir = self.root_path / ".beswarm"
+        self.task_cache_file = self.cache_dir / "tasks.json"
+        self.task_cache_file.touch(exist_ok=True)
+        self.read_tasks_cache()
+        self.set_task_cache("root_path", str(self.root_path))
+
+    def set_task_cache(self, *keys_and_value):
+        """
+        设置可嵌套的任务缓存。
+        接受无限个键和一个值，例如 set_task_cache('a', 'b', 'c', value)
+        会转换为 tasks_cache['a']['b']['c'] = value
+        """
+        if len(keys_and_value) < 2:
+            return  # 至少需要一个键和一个值
+
+        keys = keys_and_value[:-1]
+        value = keys_and_value[-1]
+
+        d = self.tasks_cache
+        # 遍历到倒数第二个键，确保路径存在
+        for key in keys[:-1]:
+            d = d.setdefault(key, {})
+
+        # 在最后一个键上设置值
+        d[keys[-1]] = value
+        self.save_tasks_cache()
+
+    def save_tasks_cache(self):
+        self.task_cache_file.write_text(json.dumps(self.tasks_cache, ensure_ascii=False, indent=4), encoding="utf-8")
+
+    def read_tasks_cache(self):
+        content = self.task_cache_file.read_text(encoding="utf-8")
+        try:
+            self.tasks_cache = json.loads(content) if content else {}
+        except json.JSONDecodeError:
+            raise ValueError("任务缓存文件格式错误")
 
     def create_tasks(self, task_coro, tasks_params):
         """
@@ -37,8 +82,27 @@ class TaskManager:
             coro = task_coro(**args)
             task_id = self.create_task(coro)
             task_ids.append(task_id)
+            self.set_task_cache(task_id, "args", args)
+            self.set_task_cache(task_id, "status", TaskStatus.RUNNING.value)
         return task_ids
 
+    def resume_task(self, task_id, task_coro, args):
+        """
+        恢复一个任务。
+        """
+        task = self.tasks_cache.get(task_id)
+        if not task:
+            return TaskStatus.NOT_FOUND
+
+        coro = task_coro(**args)
+        task_id = self.create_task(coro)
+        self.set_task_cache(task_id, "args", args)
+        self.set_task_cache(task_id, "status", TaskStatus.RUNNING.value)
+        print(f"任务已恢复: ID={task_id}, Name={task_id}")
+        print(f"args: {args}")
+        print(f"self.tasks_cache: {json.dumps(self.tasks_cache, ensure_ascii=False, indent=4)}")
+        return task_id
+
     def create_task(self, coro):
         """
         创建并注册一个新任务。
@@ -108,14 +172,19 @@ class TaskManager:
             self.results_queue.put_nowait(
                 (task_id, TaskStatus.DONE, task.result())
             )
+            self.set_task_cache(task_id, "status", TaskStatus.DONE.value)
+            self.set_task_cache(task_id, "result", task.result())
         except asyncio.CancelledError:
             self.results_queue.put_nowait(
                 (task_id, TaskStatus.CANCELLED, None)
             )
+            self.set_task_cache(task_id, "status", TaskStatus.CANCELLED.value)
         except Exception as e:
             self.results_queue.put_nowait(
                 (task_id, TaskStatus.ERROR, e)
             )
+            self.set_task_cache(task_id, "status", TaskStatus.ERROR.value)
+            self.set_task_cache(task_id, "result", str(e))
 
     async def get_next_result(self):
         """
@@ -146,8 +215,78 @@ class TaskManager:
             # 如果任务ID不存在，则返回-1
             return -1
 
-    def set_root_path(self, root_path):
-        self.root_path = Path(root_path)
+
+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: 子任务的执行结果。
+    """
+    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()

beswarm/tools/worker.py

@@ -1,7 +1,6 @@
 import os
 import re
 import sys
-import ast
 import copy
 import json
 import difflib
@@ -27,50 +26,14 @@ 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()
-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, 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)
+    task_manager.set_root_path(work_dir)
     cache_file = cache_dir / "work_agent_conversation_history.json"
     if not cache_file.exists():
         cache_file.write_text("[]", encoding="utf-8")
@@ -271,6 +234,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
 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)
+    task_manager.set_root_path(work_dir)
     cache_file = cache_dir / "work_agent_conversation_history.json"
     if not cache_file.exists():
         cache_file.write_text("[]", encoding="utf-8")
@@ -468,4 +432,6 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     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"总用时: {total_time}")
-    await manager.cleanup()
+    await manager.cleanup()
+
+from .taskmanager import task_manager

{beswarm-0.2.25.dist-info → beswarm-0.2.27.dist-info}/METADATA

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

{beswarm-0.2.25.dist-info → beswarm-0.2.27.dist-info}/RECORD

@@ -2,13 +2,13 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=5JMfOuXWHscsaeDzwBn223mj9N85eAQdOHXQZk7zeWE,32238
 beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=TTd2yaKXQpCf2v-b35OeJhLMXEJ-QRkhO48wTq7edKk,487
+beswarm/aient/setup.py,sha256=mDFzdO4betWxiHRtK2bR9z4ahWthoYip79BFKMMGvFo,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 beswarm/aient/src/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
-beswarm/aient/src/aient/core/request.py,sha256=r8IvC62GZ6NuBXx82Fd0hiPjYrtqhW3hKz2jdqVY8L0,72473
-beswarm/aient/src/aient/core/response.py,sha256=_FVvvakplKAvBMljXy8jm9hMGJ8xgHGrsU8Aio9Xk1o,35408
+beswarm/aient/src/aient/core/request.py,sha256=8HlSFaBhWMs5thhL4C5qj-hvuDZWUXCYWwVShFR99QU,72263
+beswarm/aient/src/aient/core/response.py,sha256=xSOmc4aBFeoT-Cx42B6GrRvsxalx-dOiGdjN1WByyXs,35673
 beswarm/aient/src/aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -35,7 +35,7 @@ beswarm/aient/src/aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9u
 beswarm/aient/src/aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 beswarm/aient/src/aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 beswarm/aient/src/aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
-beswarm/aient/src/aient/plugins/websearch.py,sha256=51tNjEe3pAElXY3SIxaXFYjRrHdGiY6nkmVPU1lTWoY,15258
+beswarm/aient/src/aient/plugins/websearch.py,sha256=LPS5NmHrY-Rc0FCPlhHrUWE90XJmXF_AvShLHTV_Zqc,15285
 beswarm/aient/src/aient/plugins/write_file.py,sha256=hExFLuoNPtjYxJI3pVbofZRpokvUabpXdEkd3mZJPPc,3778
 beswarm/aient/src/aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 beswarm/aient/src/aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
@@ -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=egPX4B021Pf8dIaOodJ2yxQ_YCG-giI4cHiXsbX70BA,1306
+beswarm/tools/__init__.py,sha256=HCONX8-OBX-FdBEkcSGSolUIHE7UAlhkH8HA1_inBFQ,1413
 beswarm/tools/click.py,sha256=I62GF-bzcoNzhfu3DeWdiA88Sd_6gMFihrQSwFj4nks,20795
 beswarm/tools/edit_file.py,sha256=iwWl7a8sTVq4vj0e1ny3H6UGcHfYnxALRGcLuk5hZS8,9155
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
@@ -133,10 +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=eEE_aRcocttAwWfkcQdElI_BZw73xiRIEfbHDWAoQqU,15996
-beswarm/tools/taskmanager.py,sha256=oB_768qy6Lb58JNIcSLVgbPrgNB3duIq9DawbVHRbrg,6270
-beswarm/tools/worker.py,sha256=Vwn1XuTZ2dIStd5dQ6DhJ4f7LmwDc-Sx9PwLG0Xw-MQ,24062
-beswarm-0.2.25.dist-info/METADATA,sha256=Wwq8gqLH0xv1KMUkNsbfZEw6XRGKNORHzNTMXyPLjxs,3847
-beswarm-0.2.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.25.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.25.dist-info/RECORD,,
+beswarm/tools/search_web.py,sha256=XkKb2_Snm4-bIOrkMhsyxao0-VPsYmfM2CKQbJ5TGFI,16101
+beswarm/tools/taskmanager.py,sha256=rVLB0xwteT-5y9svmJ68K65U3JuX9BJGvqNzyxPvjaI,12178
+beswarm/tools/worker.py,sha256=2Qf8pQn2FQCLW5hd0mBaJ9zMU1Ft-hWXGdkNj4nX1yI,22274
+beswarm-0.2.27.dist-info/METADATA,sha256=7UHHfWdWSWPT--MEIxRsjTXizA_xlQxg_e3mthXuGb0,3847
+beswarm-0.2.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.27.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.27.dist-info/RECORD,,