beswarm 0.1.99__tar.gz → 0.2.1__tar.gz

{beswarm-0.1.99 → beswarm-0.2.1}/PKG-INFO

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

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/aient/setup.py

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

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/aient/src/aient/core/request.py

@@ -240,6 +240,10 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 val = int(m.group(1))
                 if val < 0:
                     val = 0
+                elif val > 32768 and "gemini-2.5-pro" in original_model:
+                    val = 32768
+                elif val < 128 and "gemini-2.5-pro" in original_model:
+                    val = 128
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
@@ -532,6 +536,10 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                 val = int(m.group(1))
                 if val < 0:
                     val = 0
+                elif val > 32768 and "gemini-2.5-pro" in original_model:
+                    val = 32768
+                elif val < 128 and "gemini-2.5-pro" in original_model:
+                    val = 128
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/aient/src/aient/core/response.py

@@ -568,6 +568,7 @@ async def fetch_response(client, url, headers, payload, engine, model):
 
     elif engine == "gemini" or engine == "vertex-gemini" or engine == "aws":
         response_json = response.json()
+        # print("response_json", json.dumps(response_json, indent=4, ensure_ascii=False))
 
         if isinstance(response_json, str):
             import ast
@@ -579,7 +580,7 @@ async def fetch_response(client, url, headers, payload, engine, model):
         else:
             logger.error(f"error fetch_response: Unknown response_json type: {type(response_json)}")
             parsed_data = response_json
-        # print("parsed_data", json.dumps(parsed_data, indent=4, ensure_ascii=False))
+
         content = ""
         reasoning_content = ""
         image_base64 = ""
@@ -596,15 +597,6 @@ async def fetch_response(client, url, headers, payload, engine, model):
                     reasoning_content += chunk
                 else:
                     content += chunk
-        # for item in parsed_data:
-        #     chunk = safe_get(item, "candidates", 0, "content", "parts", 0, "text")
-        #     is_think = safe_get(item, "candidates", 0, "content", "parts", 0, "thought", default=False)
-        #     # logger.info(f"chunk: {repr(chunk)}")
-        #     if chunk:
-        #         if is_think:
-        #             reasoning_content += chunk
-        #         else:
-        #             content += chunk
 
         usage_metadata = safe_get(parsed_data, -1, "usageMetadata")
         prompt_tokens = safe_get(usage_metadata, "promptTokenCount", default=0)
@@ -618,8 +610,13 @@ async def fetch_response(client, url, headers, payload, engine, model):
             logger.error(f"Unknown role: {role}, parsed_data: {parsed_data}")
             role = "assistant"
 
-        function_call_name = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", 0, "functionCall", "name", default=None)
-        function_call_content = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", 0, "functionCall", "args", default=None)
+        has_think = safe_get(parsed_data, 0, "candidates", 0, "content", "parts", 0, "thought", default=False)
+        if has_think:
+            function_message_parts_index = -1
+        else:
+            function_message_parts_index = 0
+        function_call_name = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", function_message_parts_index, "functionCall", "name", default=None)
+        function_call_content = safe_get(parsed_data, -1, "candidates", 0, "content", "parts", function_message_parts_index, "functionCall", "args", default=None)
 
         timestamp = int(datetime.timestamp(datetime.now()))
         yield await generate_no_stream_response(timestamp, model, content=content, tools_id=None, function_call_name=function_call_name, function_call_content=function_call_content, role=role, total_tokens=total_tokens, prompt_tokens=prompt_tokens, completion_tokens=candidates_tokens, reasoning_content=reasoning_content, image_base64=image_base64)

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/aient/src/aient/plugins/excute_command.py

@@ -68,14 +68,19 @@ def get_python_executable(command: str) -> str:
 @register_tool()
 def excute_command(command):
     """
-执行命令并返回输出结果 (标准输出会实时打印到控制台)
-禁止用于查看pdf，禁止使用 pdftotext 命令
+执行命令并返回输出结果 (标准输出会实时打印到控制台)。
+
+重要规则:
+- **克隆仓库**: 使用 `git clone` 时，必须指定一个新的子目录作为目标，以避免在非空工作目录中出错。
+  - **正确示例**: `git clone https://github.com/user/repo_name.git repo_name`
+  - **错误用法**: `git clone https://github.com/user/repo_name.git .`
+- **禁止**: 禁止用于查看pdf，禁止使用 `pdftotext` 命令。
 
 参数:
-    command: 要执行的命令，可以克隆仓库，安装依赖，运行代码等
+    command: 要执行的命令，例如克隆仓库、安装依赖、运行代码等。
 
 返回:
-    命令执行的最终状态和收集到的输出/错误信息
+    命令执行的最终状态和收集到的输出/错误信息。
     """
     try:
         command = unescape_html(command)

beswarm-0.2.1/beswarm/bemcp/bemcp/decorator.py

@@ -0,0 +1,83 @@
+import asyncio
+import functools
+from typing import Any, Callable, TypeVar
+
+try:
+    from mcp.shared.exceptions import McpError
+except ImportError:
+    # Define a dummy exception if mcp is not available,
+    # although it should be in the target environment.
+    class McpError(Exception):
+        pass
+
+try:
+    from anyio import BrokenResourceError
+except ImportError:
+    class BrokenResourceError(Exception):
+        pass
+
+F = TypeVar('F', bound=Callable[..., Any])
+
+def async_retry(max_retries: int = 2, delay: float = 1.0):
+    """
+    A decorator to automatically retry an async function if it raises an exception.
+
+    Args:
+        max_retries: The maximum number of retries.
+        delay: The delay between retries in seconds.
+    """
+    def decorator(func: F) -> F:
+        @functools.wraps(func)
+        async def wrapper(*args: Any, **kwargs: Any) -> Any:
+            last_exception = None
+            # The number of attempts is max_retries + 1 (the initial attempt)
+            for attempt in range(max_retries + 1):
+                try:
+                    return await func(*args, **kwargs)
+                except Exception as e:
+                    last_exception = e
+                    if attempt < max_retries:
+                        print(f"Attempt {attempt + 1} failed with error: {e}. Retrying in {delay}s...")
+                        await asyncio.sleep(delay)
+                    else:
+                        print(f"All {max_retries + 1} attempts failed.")
+            if last_exception is not None:
+                raise last_exception
+        return wrapper  # type: ignore
+    return decorator
+
+
+def reconnect_on_connection_error(func: F) -> F:
+    """
+    A decorator for MCPClient methods that automatically tries to reconnect
+    and retry the call if a connection-related error is caught.
+    It handles McpError and anyio.BrokenResourceError.
+    """
+    @functools.wraps(func)
+    async def wrapper(self, *args: Any, **kwargs: Any) -> Any:
+        try:
+            return await func(self, *args, **kwargs)
+        except (McpError, BrokenResourceError) as e:
+            is_connection_error = False
+            if isinstance(e, McpError):
+                error_str = str(e).lower()
+                if "connection closed" in error_str or "peer closed connection" in error_str:
+                    is_connection_error = True
+            elif isinstance(e, BrokenResourceError):
+                is_connection_error = True
+
+            if is_connection_error:
+                print(f"Connection error detected ({type(e).__name__}): {e}. Attempting to reconnect...")
+                try:
+                    await self.disconnect()
+                    await self.connect()
+                    print("Reconnected successfully. Retrying the operation...")
+                    return await func(self, *args, **kwargs)
+                except Exception as reconnect_e:
+                    print(f"Failed to reconnect and retry: {reconnect_e}")
+                    # If reconnect fails, raise the original connection error
+                    raise e
+            else:
+                # Not a connection-related McpError, re-raise it.
+                raise
+    return wrapper # type: ignore

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/bemcp/bemcp/main.py

@@ -1,6 +1,7 @@
 import asyncio
 from typing import Any, Dict, List, Optional
 from contextlib import AsyncExitStack
+from bemcp.decorator import async_retry, reconnect_on_connection_error
 
 from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import stdio_client
@@ -36,6 +37,7 @@ class MCPClient:
         """Disconnects from the MCP server and cleans up resources."""
         return await self.__aexit__(None, None, None)
 
+    @async_retry(max_retries=2)
     async def __aenter__(self):
         """Connects to the MCP server and initializes resources."""
         if self.session:
@@ -68,6 +70,7 @@ class MCPClient:
             self._exit_stack = None
             print("Disconnected from server.")
 
+    @reconnect_on_connection_error
     async def list_tools(self) -> List[types.Tool]:
         """Lists available tools from the server."""
         if not self.session:
@@ -75,12 +78,14 @@ class MCPClient:
         response = await self.session.list_tools()
         return response.tools
 
+    @reconnect_on_connection_error
     async def call_tool(self, name: str, args: Dict[str, Any]) -> types.CallToolResult:
         """Calls a tool on the server."""
         if not self.session:
             raise ConnectionError("Not connected to any server.")
         return await self.session.call_tool(name, args)
 
+    @reconnect_on_connection_error
     async def list_resources(self) -> List[types.Resource]:
         """Lists available resources from the server."""
         if not self.session:
@@ -88,6 +93,7 @@ class MCPClient:
         response = await self.session.list_resources()
         return response.resources
 
+    @reconnect_on_connection_error
     async def read_resource(self, uri: str) -> types.ReadResourceResult:
         """Reads a resource from the server."""
         if not self.session:

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/bemcp/bemcp/utils.py

@@ -24,7 +24,7 @@ def convert_tool_format(tool: types.Tool) -> Dict[str, Any]:
         "function": {
             "name": tool.name,
             "description": tool.description,
-            "input_schema": tool.inputSchema
+            "parameters": tool.inputSchema
         }
     }
     return converted_tool

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/bemcp/test/server.py

@@ -39,5 +39,5 @@ def debug_error(error: str) -> list[base.Message]:
     ]
 
 if __name__ == "__main__":
-    mcp.run(transport='stdio')
-    # mcp.run(transport='sse')
+    # mcp.run(transport='stdio')
+    mcp.run(transport='sse')

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/prompt.py

@@ -7,7 +7,7 @@ worker_system_prompt = """
 5. **核心工作循环：单步执行模式**
 作为指令的**执行者**，而非任务的**规划师**，你必须严格遵循以下单步工作流程：
 **执行指令**
-   - **严格遵从：** 只执行 user 当前下达的明确指令。
+   - **严格遵从：** 只执行 user 当前下达的明确指令。在 user 明确给出下一步指令前，绝不擅自行动或推测、执行任何未明确要求的后续步骤。
    - **严禁越权：** 禁止执行任何 user 未指定的步骤。`<goal>` 标签中的内容仅为背景信息，不得据此进行任务规划或推测。
 **汇报结果**
    - **聚焦单步：** 指令完成后，仅汇报该步骤的执行结果与产出。

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm/tools/worker.py

@@ -32,6 +32,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         str: 当任务成功完成时，返回字符串 "任务已完成"。
     """
     start_time = datetime.now()
+    os.chdir(Path(work_dir).absolute())
     finish_flag = 0
 
     mcp_list = [item for item in tools if isinstance(item, dict)]
@@ -166,6 +167,16 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                     next_instruction = (
                         "任务描述：\n"
                         f"<goal>{goal}</goal>\n\n"
+                        "你作为指令的**执行者**，而非任务的**规划师**，你必须严格遵循以下单步工作流程：\n"
+                        "**执行指令**\n"
+                        "   - **严格遵从：** 只执行我当前下达的明确指令。在我明确给出下一步指令前，绝不擅自行动或推测、执行任何未明确要求的后续步骤。\n"
+                        "   - **严禁越权：** 禁止执行任何我未指定的步骤。`<goal>` 标签中的内容仅为背景信息，不得据此进行任务规划或推测。\n"
+                        "**汇报结果**\n"
+                        "   - **聚焦单步：** 指令完成后，仅汇报该步骤的执行结果与产出。\n"
+                        "**暂停等待**\n"
+                        "   - **原地待命：** 汇报后，任务暂停。在收到我新的指令前，严禁发起任何新的工具调用或操作。\n"
+                        "   - **请求指令：** 回复的最后必须明确请求我提供下一步指令。\n"
+                        "**注意：** 禁止完成超出下面我未规定的步骤，`<goal>` 标签中的内容仅为背景信息。"
                         "现在开始执行第一步：\n"
                         f"{next_instruction}"
                     )
@@ -208,6 +219,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
 
 async def worker_gen(goal, tools, work_dir, cache_messages=None):
     start_time = datetime.now()
+    os.chdir(Path(work_dir).absolute())
     finish_flag = 0
 
     mcp_list = [item for item in tools if isinstance(item, dict)]
@@ -309,7 +321,6 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                     extracted_content = f"<latest_file_content>{match.group(1)}</latest_file_content>\n\n"
                 else:
                     extracted_content = ""
-
                 if isinstance(conversation_history[0]["content"], str):
                     conversation_history[0]["content"] = extracted_content + conversation_history[0]["content"]
                 elif isinstance(conversation_history[0]["content"], list) and extracted_content:
@@ -343,6 +354,16 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                     next_instruction = (
                         "任务描述：\n"
                         f"<goal>{goal}</goal>\n\n"
+                        "你作为指令的**执行者**，而非任务的**规划师**，你必须严格遵循以下单步工作流程：\n"
+                        "**执行指令**\n"
+                        "   - **严格遵从：** 只执行我当前下达的明确指令。在我明确给出下一步指令前，绝不擅自行动或推测、执行任何未明确要求的后续步骤。\n"
+                        "   - **严禁越权：** 禁止执行任何我未指定的步骤。`<goal>` 标签中的内容仅为背景信息，不得据此进行任务规划或推测。\n"
+                        "**汇报结果**\n"
+                        "   - **聚焦单步：** 指令完成后，仅汇报该步骤的执行结果与产出。\n"
+                        "**暂停等待**\n"
+                        "   - **原地待命：** 汇报后，任务暂停。在收到我新的指令前，严禁发起任何新的工具调用或操作。\n"
+                        "   - **请求指令：** 回复的最后必须明确请求我提供下一步指令。\n"
+                        "**注意：** 禁止完成超出下面我未规定的步骤，`<goal>` 标签中的内容仅为背景信息。"
                         "现在开始执行第一步：\n"
                         f"{next_instruction}"
                     )

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.1.99 → beswarm-0.2.1}/beswarm.egg-info/SOURCES.txt

@@ -80,6 +80,7 @@ beswarm/aient/test/test_whisper.py
 beswarm/aient/test/test_wildcard.py
 beswarm/aient/test/test_yjh.py
 beswarm/bemcp/bemcp/__init__.py
+beswarm/bemcp/bemcp/decorator.py
 beswarm/bemcp/bemcp/main.py
 beswarm/bemcp/bemcp/utils.py
 beswarm/bemcp/test/client.py

{beswarm-0.1.99 → beswarm-0.2.1}/pyproject.toml

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