sycommon-python-lib 0.2.7a30__py3-none-any.whl → 0.2.7a31__py3-none-any.whl

sycommon/agent/mcp/tool_loader.py

@@ -350,15 +350,11 @@ async def _load_one_server(
                 pass
         return []
     except asyncio.CancelledError:
-        # 单飞失败透传的哨兵（_discover_with_cache 失败时唤醒等待者用），按失败处理
-        SYLogger.warning(
-            f"[MCP] 服务器 '{config.name}' ({config.server_url}) 发现失败，跳过")
-        if on_server_failure:
-            try:
-                await on_server_failure(config.id, "发现失败")
-            except Exception:
-                pass
-        return []
+        # 外层取消（如会话重置 cancel 后台 _mcp_task）→ 必须向上传播，不能吞。
+        # 吞掉会让 load_mcp_tools_background 的 `except CancelledError: raise` 守卫失效、
+        # 任务被标记为正常完成而非已取消。单飞失败的哨兵是 RuntimeError(走下方 except Exception)，
+        # 不会进这个分支，故这里只需 raise。
+        raise
     except Exception as e:
         SYLogger.warning(
             f"[MCP] 服务器 '{config.name}' ({config.server_url}) 连接失败，跳过: {e}")

sycommon/agent/sandbox/minio_sync.py

@@ -24,9 +24,24 @@ from sycommon.logging.kafka_log import SYLogger
 # 日期快照功能预留，当前暂不启用
 _SNAPSHOT_ENABLED = False
 
-# restore_from_minio 的 MinIO 下载并发度（同时下载的文件数上限）。
-# 与 _sync_batch(sync→minio 方向)的 batch_size 对齐为 5，避免压垮 MinIO/网络。
-_RESTORE_CONCURRENCY = 5
+# restore_from_minio 的 MinIO 下载并发度。
+# 两层信号量：
+#   - 单用户层 _RESTORE_PER_USER：每个用户恢复时最多 5 路并发下载（单用户恢复够快）；
+#   - 全局层   _RESTORE_GLOBAL_CAP：全进程最多 15 路下载，防 N 个用户同时恢复时
+#     N×5 路把默认线程池(≈min(32,cpu+4)=12)打满、挤占主请求路径的沙箱操作。
+# 单用户独享 5 槽 + 全局封顶 15，兼顾「单用户快」与「多用户不互相压垮」。
+_RESTORE_PER_USER = 5
+_RESTORE_GLOBAL_CAP = 15
+# 全局信号量惰性创建（绑定到首次调用时的 event loop；单 loop 部署下不变）。
+_RESTORE_DOWNLOAD_SEM: "asyncio.Semaphore | None" = None
+
+
+def _get_restore_download_sem() -> "asyncio.Semaphore":
+    """惰性创建全局下载信号量。"""
+    global _RESTORE_DOWNLOAD_SEM
+    if _RESTORE_DOWNLOAD_SEM is None:
+        _RESTORE_DOWNLOAD_SEM = asyncio.Semaphore(_RESTORE_GLOBAL_CAP)
+    return _RESTORE_DOWNLOAD_SEM
 
 
 class MinioSyncService(metaclass=SingletonMeta):
@@ -763,15 +778,18 @@ class MinioSyncService(metaclass=SingletonMeta):
 
         SYLogger.info(f"[MinIO] 需恢复 {len(to_restore)} 个文件到沙箱: user={user_id}")
 
-        # 4. 并发恢复：MinIO 下载用全局 Semaphore(5) 限流并发，沙箱上传仍按批 batch_upload。
-        # 旧实现是「批内串行下载 + 批间串行」，N 个文件 ≈ N 次串行 MinIO GET，27 个文件要数十秒。
-        # 改为 Semaphore(5) 后下载并发，总耗时 ≈ ceil(N/5) 次串行往返，对齐 _sync_batch 的并发度。
+        # 4. 并发恢复：两层限流。
+        #   - per_user_sem（每次 restore 新建，本用户独享 5 槽）：单用户恢复够快；
+        #   - global_sem（进程级 15 槽）：多用户同时恢复时全局封顶，防 N×5 路下载
+        #     打满线程池、挤占主请求路径的沙箱操作。
+        # 下载协程先抢本用户 5 槽、再抢全局 15 槽，故实际并发 = min(本用户待下载, 全局剩余)。
         restored = 0
-        download_sem = asyncio.Semaphore(_RESTORE_CONCURRENCY)
+        global_sem = _get_restore_download_sem()
+        per_user_sem = asyncio.Semaphore(_RESTORE_PER_USER)
 
         async def _download_one(rel_path: str):
             """下载单个 MinIO 对象到内存，返回 (沙箱绝对路径, 内容) 或 None。"""
-            async with download_sem:
+            async with per_user_sem, global_sem:
                 try:
                     def _download_object(bucket, key):
                         resp = self._client.get_object(bucket, key)
@@ -786,18 +804,18 @@ class MinioSyncService(metaclass=SingletonMeta):
                     )
                     return (f"/{rel_path}", content)
                 except Exception as e:
-                    SYLogger.warning(f"[MinIO] 下载文件失败: {rel_path}, error={e}")
+                    SYLogger.warning(f"[MinIO] 下载文件失败: {rel_path}, error: {e}")
                     return None
 
-        # 全量并发下载(受 Semaphore 限流)，比按批串行快得多
+        # 全量并发下载(受两层 Semaphore 限流)，比按批串行快得多
         download_results = await asyncio.gather(
             *[_download_one(rp) for rp in to_restore]
         )
         downloaded = [r for r in download_results if r is not None]
 
         # 上传仍走 batch_upload(服务端并发)，按 5 个一批发(沙箱端点对超大批量可能限流)
-        for i in range(0, len(downloaded), _RESTORE_CONCURRENCY):
-            batch = downloaded[i:i + _RESTORE_CONCURRENCY]
+        for i in range(0, len(downloaded), _RESTORE_PER_USER):
+            batch = downloaded[i:i + _RESTORE_PER_USER]
             if not batch:
                 continue
             try:

{sycommon_python_lib-0.2.7a30.dist-info → sycommon_python_lib-0.2.7a31.dist-info}/METADATA

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

{sycommon_python_lib-0.2.7a30.dist-info → sycommon_python_lib-0.2.7a31.dist-info}/RECORD

@@ -146,7 +146,7 @@ sycommon/agent/acp/ssh_init.py,sha256=5y1kIyNHpsh9ayx9RWO5gS0GOOn2GfZpU4fNrGuhOY
 sycommon/agent/acp/tool.py,sha256=yt6ohKL2y7wIZMNiLv-m5oCg5u1p5GAbqgjzQVt285Y,10975
 sycommon/agent/mcp/__init__.py,sha256=iKrdDhIrFsNIkqG_kgcwNe-nOiM6uVfolKv44LfQ-FQ,636
 sycommon/agent/mcp/models.py,sha256=zda4ho-UTYOJ5oPAZPZ-vxhfDRLghUCsMroHnA2A2QQ,1490
-sycommon/agent/mcp/tool_loader.py,sha256=B0dCaRKm2WGGsK6d9TIp4zmuun6QxPwXCVFY7drKEkA,17824
+sycommon/agent/mcp/tool_loader.py,sha256=pwhZoSoZuQVYo6BgfdMoRHlGnRPDRxvOvxEgvUM5q7Q,17818
 sycommon/agent/middleware/sandbox_path_guard.py,sha256=K1SnxA8pDxkCSucOkranwUvC9_8rd3l_-TIR8gMMTK8,8102
 sycommon/agent/middleware/sensitive_guard.py,sha256=8e7qSAoak0MNB5fRLscQF0PVGZ07SKdwmGk590GubOI,22870
 sycommon/agent/middleware/sitecustomize.py,sha256=Bt7XFnWV_LJo89l858AGp5VUkXwefpLGmjkCtLe-CMw,4800
@@ -157,7 +157,7 @@ sycommon/agent/sandbox/__init__.py,sha256=jR7LlkD4J4Y6QYyRXQClkwmqDBCCPmycV_hQV9
 sycommon/agent/sandbox/consistent_hash.py,sha256=8Jgk-W4NAD2-u5_vKRVlPmql_e0Vy4aNORiXOuzvIrs,7277
 sycommon/agent/sandbox/file_ops.py,sha256=VTK7xduMMWLVTr9JViMnmPeh7s8Ojr8YwYA4ovMZZg0,37138
 sycommon/agent/sandbox/http_sandbox_backend.py,sha256=1Cj_JYdvwP3PFPa_4xFPnrGdt67Wp5iQdoziSzjeqoE,70481
-sycommon/agent/sandbox/minio_sync.py,sha256=c2TQmnawlpfTyEalSmcIRSK4DNkrZluq-9SjoySrf-M,34515
+sycommon/agent/sandbox/minio_sync.py,sha256=zloxzaoNhEgoiz43NcBalHC_LMd74BoBpr5rN_UfmDA,35432
 sycommon/agent/sandbox/sandbox_pool.py,sha256=eMn8sLakCWf90l6ni2-333QM8oBdX1CflV-WzneFp_k,9133
 sycommon/agent/sandbox/sandbox_recovery.py,sha256=X-eDODx1tmGMh_iTngV6e1ppfDBHpTdkPreJusN5MHY,7358
 sycommon/agent/sandbox/session.py,sha256=TjzC3yFC-VaJ75UwCyL26QX4PRTGNNfQae1FKFuOsYI,2365
@@ -308,8 +308,8 @@ sycommon/tools/syemail.py,sha256=BDFhgf7WDOQeTcjxJEQdu0dQhnHFPO_p3eI0-Ni3LhQ,561
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=1yifwIBNGsCIxLnQjHKiBlbsigc_zvPH-dMTZcNxe-Q,7649
-sycommon_python_lib-0.2.7a30.dist-info/METADATA,sha256=A_VXT1ygWDo4Hkvwonq65az8FeY0k_8ik6hkReVPKWY,7962
-sycommon_python_lib-0.2.7a30.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-sycommon_python_lib-0.2.7a30.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a30.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a30.dist-info/RECORD,,
+sycommon_python_lib-0.2.7a31.dist-info/METADATA,sha256=Tk61Oi4TEDQ8Slxh92K3AJzTEiKvtdIfo61T9TU3k8A,7962
+sycommon_python_lib-0.2.7a31.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+sycommon_python_lib-0.2.7a31.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a31.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a31.dist-info/RECORD,,