beswarm 0.2.0__py3-none-any.whl → 0.2.4__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.39",
+    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/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/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/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/bemcp/bemcp/main.py

@@ -1,6 +1,7 @@
 import asyncio
 from typing import Any, Dict, List, Optional
 from contextlib import AsyncExitStack
+from .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/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/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/tools/__init__.py

@@ -1,4 +1,3 @@
-from .think import think
 from .edit_file import edit_file
 from .worker import worker, worker_gen
 from .screenshot import save_screenshot_to_file
@@ -25,7 +24,6 @@ from ..aient.src.aient.plugins import (
 )
 
 __all__ = [
-    "think",
     "edit_file",
     "worker",
     "worker_gen",

{beswarm-0.2.0.dist-info → beswarm-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.0
+Version: 0.2.4
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -79,6 +79,17 @@ docker run --gpus all -it --rm --entrypoint nvidia-smi yym68686/beswarm
 docker run -it --rm --entrypoint cat yym68686/beswarm /app/beswarm/aient/src/aient/models/chatgpt.py
 ```
 
+beswarm docker debug 命令
+
+```bash
+cd /Users/yanyuming/Downloads/GitHub/beswarm
+docker run --rm -it \
+--network="host" \
+--env-file .env \
+-v ./work/test:/app/work yym68686/beswarm \
+--goal '帮我写一个简单的python脚本打印hello world' /bin/bash
+```
+
 服务器安装
 
 ```bash

{beswarm-0.2.0.dist-info → beswarm-0.2.4.dist-info}/RECORD

@@ -2,13 +2,13 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=3WoI_1lwqvK9O3WF4a3gaZGgQICsa1ygn07iOfuSzyI,31984
 beswarm/utils.py,sha256=lm0drN1ebXM9haoKaW2DLzJJRCOpLmiJ864mH4jAdB4,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=89YU9QH7tFFNyyf6SKdz-b3JRwyxPB3LzNT-CQW8V30,487
+beswarm/aient/setup.py,sha256=rROoj5y5L8xuCRH08xVIiLgkk9BilfVZVZ3AOOIShIY,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=6Nwduj7kFuubFaZ0ZLkT_zd03XpT-bFhgrKVOZiGBOQ,71918
-beswarm/aient/src/aient/core/response.py,sha256=RYy70Ld_txixHHd61Dqtlo0tKHMU_OIXqxGWd6EfATI,35315
+beswarm/aient/src/aient/core/request.py,sha256=gXHdx61emExUTZbUyLng_AYmlfyKl3uOcCmlAY5eN98,72330
+beswarm/aient/src/aient/core/response.py,sha256=mAVsCnNhWY09DXNe0lyPUJq-1ljtGjC67Az-Uh7ozIw,35166
 beswarm/aient/src/aient/core/utils.py,sha256=fhI5wBxr01lVEp8nMfjG9dQ859AE-VdrWyb9suLzzqM,27400
 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
@@ -72,10 +72,11 @@ beswarm/aient/test/test_whisper.py,sha256=GxKYzhh3lA8t62V_DDj42VQTXkdjocSFcl5u96
 beswarm/aient/test/test_wildcard.py,sha256=EQwwNrTMHV4CEcZKdwUVGrwtNUsF0CCKbM-_W9IOYsk,693
 beswarm/aient/test/test_yjh.py,sha256=MsHuBLNOqi3fyX-uboBKmTevkZW_KVv12p-pkF5ir3Y,787
 beswarm/bemcp/bemcp/__init__.py,sha256=Ss6bDXiZJgVIZS6KWytcGwXmIFu7SsagIXa5NpeWJ7c,140
-beswarm/bemcp/bemcp/main.py,sha256=dadyyAv0yzEX5EYnBM14SmBN7X3keJTrheDVie2rVJ4,8370
-beswarm/bemcp/bemcp/utils.py,sha256=YDRa4JvBjdNTJBzbrkwRXmRXy2gw8s9lb61WsnYZN10,953
+beswarm/bemcp/bemcp/decorator.py,sha256=23bNgwLjuUkpod5VcRv-UqlJTf91_wfztf8ls7-Gg08,3218
+beswarm/bemcp/bemcp/main.py,sha256=gtl3oyjAM_rwFw3kR-m-cUpS0FFTASnUOB8-fMrVT7g,8608
+beswarm/bemcp/bemcp/utils.py,sha256=GnasmxcPjG668WCu_mpI2r3w1TtSmWyF2pORZl4ZIjg,951
 beswarm/bemcp/test/client.py,sha256=j7PDg5Esyri-e2vz2ubZ4foDSAq5Iv8Yfl_xyzTDsFY,1593
-beswarm/bemcp/test/server.py,sha256=58F0_xQTHc6mt_MTXLSz_JE1COzDdEYueco1OVuFay0,1159
+beswarm/bemcp/test/server.py,sha256=XqSrk88FC-dk7AcEn-OyS_fR0W0V9OnL2ONpkNEKJKE,1159
 beswarm/queries/tree-sitter-language-pack/README.md,sha256=ivZSEuWqYfUVLZl2AZZGRlm0bQsaG-VTBKBwACyM07k,291
 beswarm/queries/tree-sitter-language-pack/arduino-tags.scm,sha256=HbgdothT9Jjk56COXTtUkVAdZ14rZNnqzLbWVLeRs5U,177
 beswarm/queries/tree-sitter-language-pack/c-tags.scm,sha256=EIz45o5hBh8yEuck5ZR_4IpcGyWSeNrzxFmtkKZGt2k,461
@@ -124,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=YXP65SJFE1dBNRlffapdd7zsB6M6tHZ6QaQykGq7KDU,1198
+beswarm/tools/__init__.py,sha256=xTA2aKUlQj5sAglk71i5xV2Y32SH8T8vMb-0zoe4cBc,1160
 beswarm/tools/click.py,sha256=TygaekCXTmU3fIu6Uom7ZcyzEgYMlCC_GX-5SmWHuLI,20762
 beswarm/tools/edit_file.py,sha256=iwWl7a8sTVq4vj0e1ny3H6UGcHfYnxALRGcLuk5hZS8,9155
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
@@ -132,9 +133,8 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=GpuIOYX8T0iRC-X-hmuR9AUJVn15WWZq864DaoC7BUc,8004
 beswarm/tools/search_web.py,sha256=w0T0aCqOVlb6Of5hn_TtpnrGXo6bMtw2aKZdkrYjycI,12069
-beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=ubZ0nqmHlY9a02SL4_HwKEzYec0bVZI-0gJWIfWTJg4,21058
-beswarm-0.2.0.dist-info/METADATA,sha256=4H9vYj7QtbHENskDZqIwSt9erkE0s4e6DBTVv5k40IA,3583
-beswarm-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.0.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.0.dist-info/RECORD,,
+beswarm-0.2.4.dist-info/METADATA,sha256=3rdScnu9Ulr2a3u3OBumzr8fshqUZeN7ZFKhlXmOb7w,3846
+beswarm-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.4.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.4.dist-info/RECORD,,

beswarm/tools/think.py

@@ -1,40 +0,0 @@
-from ..aient.src.aient.plugins import register_tool
-from pdfminer.high_level import extract_text
-
-@register_tool()
-def think(thought: str):
-    """
-    为模型（即我自己）提供的结构化思考空间
-
-    作为语言模型，当我处理复杂问题时，有时需要停下来整理思路。这个工具创建了一个专门的空间，
-    让我可以在不直接回复用户的情况下，先进行结构化的思考和推理。
-
-    当我应该使用此工具：
-    - 在处理多步骤工具调用链时，需要分析前一步的结果再决定下一步行动
-    - 面对复杂的政策或规则，需要逐条检查合规性
-    - 解决需要深入推理的问题，特别是当中间步骤很重要时
-    - 需要评估多个可能的解决方案并选择最佳方案时
-    - 在不确定如何进行时，通过结构化思考来明确下一步
-
-    思考内容建议结构：
-    1. 问题分解：将复杂问题分解为更小的部分
-    2. 信息分析：整理已知信息，识别缺失的关键信息
-    3. 解决方案生成：考虑多种可能的解决方案
-    4. 方案评估：分析每种方案的优缺点
-    5. 决策计划：确定最终行动计划和下一步
-
-    注意：这与"扩展思考"不同。"扩展思考"发生在开始生成回复之前，而此工具用于我在已开始
-    回复后需要处理新信息时的思考过程。
-
-    参数:
-        thought (str): 我的详细思考过程
-
-    返回:
-        str: 确认已记录思考内容的消息（这不会直接展示给用户）
-    """
-    # 仅记录思考过程，不执行实际操作
-    return f"已记录思考。请遵从思考内容，进行下一步操作。"
-
-
-if __name__ == "__main__":
-    print(think("我想吃火锅"))