sycommon-python-lib 0.2.5a18__tar.gz → 0.2.5a20__tar.gz

{sycommon_python_lib-0.2.5a18 → sycommon_python_lib-0.2.5a20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.5a18
+Version: 0.2.5a20
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.5a18 → sycommon_python_lib-0.2.5a20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.5a18"
+version = "0.2.5a20"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.5a18 → sycommon_python_lib-0.2.5a20}/src/sycommon/agent/mcp/tool_loader.py

@@ -4,6 +4,7 @@
 发现工具并作为 LangChain BaseTool 注入 Agent。
 """
 
+import asyncio
 import re
 import hashlib
 from typing import List, Optional, Callable, Awaitable, TYPE_CHECKING
@@ -45,45 +46,60 @@ def wrap_tool_with_error_handler(
     original_coroutine = tool.coroutine
     tool_name = tool.name
 
-    async def _safe_coroutine(*args, **kwargs):
-        try:
-            result = await original_coroutine(*args, **kwargs)
-            if on_tool_success:
-                try:
-                    await on_tool_success(server_config_id, original_tool_name)
-                except Exception:
-                    pass
-            return result
-        except Exception as e:
-            from langchain_core.tools import ToolException
-            err_type = type(e).__name__
-            err_msg = str(e)[:500]
-            SYLogger.warning(
-                f"[MCP] 工具 '{tool_name}' 调用失败 ({err_type}): {err_msg}")
+    MAX_RETRIES = 2
+    RETRY_DELAY_BASE = 1.0  # 秒
 
-            if on_tool_error:
-                try:
-                    await on_tool_error(server_config_id, original_tool_name, f"{err_type}: {err_msg}")
-                except Exception:
-                    pass
-
-            # 如果是 MCP 服务器返回的业务错误，将原始错误信息传给 LLM
-            if isinstance(e, ToolException):
-                friendly_msg = (
-                    f"MCP 工具 '{tool_name}' 调用失败。\n"
-                    f"错误详情: {err_msg}\n"
-                    f"请根据错误信息判断是否可以不使用该工具继续完成任务。"
-                )
-            else:
-                friendly_msg = (
-                    f"MCP 工具调用失败：工具 '{tool_name}' (服务器: {server_name}) 当前不可用。\n"
-                    f"错误类型: {err_type}\n"
-                    f"可能原因: MCP 服务器未启动、网络不可达或连接超时。\n"
-                    f"请尝试不使用该工具继续完成任务，或联系管理员检查 MCP 服务 '{server_name}'。"
-                )
-            if is_content_and_artifact:
-                return friendly_msg, None
-            return [friendly_msg]
+    async def _safe_coroutine(*args, **kwargs):
+        last_exception = None
+        for attempt in range(MAX_RETRIES + 1):
+            try:
+                result = await original_coroutine(*args, **kwargs)
+                if on_tool_success:
+                    try:
+                        await on_tool_success(server_config_id, original_tool_name)
+                    except Exception:
+                        pass
+                return result
+            except Exception as e:
+                last_exception = e
+                if attempt < MAX_RETRIES:
+                    delay = RETRY_DELAY_BASE * (attempt + 1)
+                    SYLogger.info(
+                        f"[MCP] 工具 '{tool_name}' 第 {attempt + 1}/{MAX_RETRIES} 次重试 "
+                        f"({type(e).__name__}: {str(e)[:200]}), {delay}s 后重试")
+                    await asyncio.sleep(delay)
+                    continue
+
+                # 重试耗尽，返回错误
+                from langchain_core.tools import ToolException
+                err_type = type(e).__name__
+                err_msg = str(e)[:500]
+                SYLogger.warning(
+                    f"[MCP] 工具 '{tool_name}' 调用失败，已重试 {MAX_RETRIES} 次 "
+                    f"({err_type}): {err_msg}")
+
+                if on_tool_error:
+                    try:
+                        await on_tool_error(server_config_id, original_tool_name, f"{err_type}: {err_msg}")
+                    except Exception:
+                        pass
+
+                if isinstance(e, ToolException):
+                    friendly_msg = (
+                        f"MCP 工具 '{tool_name}' 调用失败（已重试 {MAX_RETRIES} 次）。\n"
+                        f"错误详情: {err_msg}\n"
+                        f"请根据错误信息判断是否可以不使用该工具继续完成任务。"
+                    )
+                else:
+                    friendly_msg = (
+                        f"MCP 工具调用失败：工具 '{tool_name}' (服务器: {server_name}) 当前不可用（已重试 {MAX_RETRIES} 次）。\n"
+                        f"错误类型: {err_type}\n"
+                        f"可能原因: MCP 服务器未启动、网络不可达或连接超时。\n"
+                        f"请尝试不使用该工具继续完成任务，或联系管理员检查 MCP 服务 '{server_name}'。"
+                    )
+                if is_content_and_artifact:
+                    return friendly_msg, None
+                return [friendly_msg]
 
     tool.coroutine = _safe_coroutine
     return tool

{sycommon_python_lib-0.2.5a18 → sycommon_python_lib-0.2.5a20}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -42,6 +42,35 @@ def _read_file_safe(path: str) -> bytes:
         return f.read()
 
 
+def filter_instances_by_owner(instances: list, user_id: str, timeout: float = 3.0) -> list:
+    """过滤掉不属于当前用户的本地沙箱实例。
+
+    对每个实例调用 /v1/sandbox/health 获取 type 和 owner，
+    - remote 类型：始终保留（共享资源）
+    - local 类型：仅当 owner 与 user_id 匹配时保留（忽略大小写）
+    - health check 失败时保留实例（fail-open，由服务端 token 校验兜底）
+    """
+    filtered = []
+    for ins in instances:
+        sb_url = f"http://{ins['ip']}:{ins['port']}"
+        try:
+            resp = requests.get(f"{sb_url}/v1/sandbox/health", timeout=timeout)
+            if resp.status_code == 200:
+                data = resp.json()
+                sb_type = data.get("type", "remote")
+                owner = data.get("owner", "")
+                if sb_type == "local" and owner and owner.lower() != user_id.lower():
+                    SYLogger.info(
+                        f"[Sandbox] 过滤非所有者本地沙箱: {sb_url}, "
+                        f"owner={owner}, user_id={user_id}"
+                    )
+                    continue
+        except Exception:
+            pass
+        filtered.append(ins)
+    return filtered
+
+
 class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
     """
     通过 HTTP API 连接远程沙箱容器
@@ -105,7 +134,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             nacos_group: Nacos 服务分组
         """
         self._base_url = base_url.rstrip("/")
-        self._user_id = user_id
+        self._user_id = user_id.lower().replace(" ", "") if user_id else user_id
         self._timeout = timeout
         self._sync_dirs = sync_dirs or []
         self._auto_sync = auto_sync
@@ -250,6 +279,11 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         if not instances:
             raise RuntimeError(f"服务 [{service_name}] 无可用实例")
 
+        # 过滤掉不属于当前用户的本地沙箱
+        instances = filter_instances_by_owner(instances, user_id)
+        if not instances:
+            raise RuntimeError(f"服务 [{service_name}] 无可用实例（已过滤非所有者本地沙箱）")
+
         # 基于用户ID的负载均衡：使用哈希选择实例
         if load_balance and len(instances) > 1:
             hash_value = int(hashlib.md5(user_id.encode()).hexdigest(), 16)
@@ -320,6 +354,12 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 SYLogger.warning(f"[Sandbox] Nacos 未发现可用服务: {self._nacos_service_name}")
                 return False
 
+            # 过滤掉不属于当前用户的本地沙箱
+            instances = filter_instances_by_owner(instances, self._user_id)
+            if not instances:
+                SYLogger.warning(f"[Sandbox] 过滤后无可用服务: {self._nacos_service_name}")
+                return False
+
             instance = instances[0]
             new_url = f"http://{instance['ip']}:{instance['port']}"
 

{sycommon_python_lib-0.2.5a18 → sycommon_python_lib-0.2.5a20}/src/sycommon/middleware/sandbox.py

@@ -208,9 +208,9 @@ cd "$_SANDBOX_WORKSPACE"
 '''
 
 def _sanitize_user_id(user_id: str) -> str:
-    """将用户名中的空格等特殊字符替换为下划线，确保路径安全。"""
+    """将用户名中的空格等特殊字符替换为下划线，确保路径安全。统一小写。"""
     import re
-    return re.sub(r'[^a-zA-Z0-9._\-]', '_', user_id)
+    return re.sub(r'[^a-zA-Z0-9._\-]', '_', user_id.lower().replace(" ", ""))
 
 
 def get_user_workspace(user_id: str) -> str:

{sycommon_python_lib-0.2.5a18 → sycommon_python_lib-0.2.5a20}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.5a18
+Version: 0.2.5a20
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown