sycommon-python-lib 0.2.7a11__py3-none-any.whl → 0.2.7a12__py3-none-any.whl

sycommon/agent/deep_agent.py

@@ -1346,46 +1346,67 @@ async def _sync_skills_to_sandbox(
     版本比较只看沙箱 sandbox_dest/{name}/SKILL.md,无需 MinIO 锚点:
     - 沙箱有该技能且 version 一致 → 跳过
     - 沙箱没有 / 版本不一致 → 从本地 skills/ 全量上传到沙箱
+
+    性能: 比对与上传均绕过 backend 的懒同步(_skip_lazy_sync=True),
+    避免「比对 read SKILL.md 前先整目录上传」「删除前先上传再删」的往返浪费。
+    多技能的 SKILL.md 比对用 gather 并发; batch_upload 服务端无条件覆盖,
+    无需先删(删除仅在版本不一致时做,用 adelete 走 /delete 而非 /execute)。
     """
     if not os.path.isdir(skills_dir):
         return
 
     try:
-        # 获取沙箱 sandbox_dest 下已有的目录列表
-        existing_dirs = set()
-        tree_result = await backend.atree(sandbox_dest, max_depth=1)
-        if tree_result and tree_result.tree and tree_result.tree.children:
-            for child in tree_result.tree.children:
-                if child.is_dir:
-                    existing_dirs.add(child.name)
-
-        skill_count = 0
-        skip_count = 0
+        # 收集本地技能名 + 本地版本(纯本地读,快)
+        local_skills = []  # [(skill_name, local_version, src_path)]
         for skill_name in sorted(os.listdir(skills_dir)):
             src = os.path.join(skills_dir, skill_name)
             if not os.path.isdir(src):
                 continue
-
-            # 读取本地版本
-            local_skill_md = os.path.join(src, "SKILL.md")
             local_version = ""
+            local_skill_md = os.path.join(src, "SKILL.md")
             if os.path.isfile(local_skill_md):
                 try:
                     with open(local_skill_md, "r", encoding="utf-8") as f:
                         local_version = _parse_skill_version(f.read())
                 except Exception:
                     pass
+            local_skills.append((skill_name, local_version, src))
 
-            # 比较版本:只从沙箱 sandbox_dest/{name}/SKILL.md 读取
-            remote_version = ""
-            if skill_name in existing_dirs:
-                try:
-                    remote_content = await backend.aread(
-                        f"{sandbox_dest}/{skill_name}/SKILL.md")
-                    if remote_content:
-                        remote_version = _parse_skill_version(remote_content)
-                except Exception:
-                    pass
+        # 获取沙箱 sandbox_dest 下已有的目录列表(一次 atree)
+        existing_dirs = set()
+        tree_result = await backend.atree(sandbox_dest, max_depth=1)
+        if tree_result and tree_result.tree and tree_result.tree.children:
+            for child in tree_result.tree.children:
+                if child.is_dir:
+                    existing_dirs.add(child.name)
+
+        # 并发读取所有已存在技能的沙箱 SKILL.md 比对版本(跳过懒同步)
+        async def _read_remote_version(skill_name: str) -> str:
+            if skill_name not in existing_dirs:
+                return ""
+            try:
+                remote_content = await backend.aread(
+                    f"{sandbox_dest}/{skill_name}/SKILL.md",
+                    _skip_lazy_sync=True)
+                if remote_content and remote_content.file_data:
+                    # FileData 是 TypedDict(dict), 用键访问而非属性
+                    return _parse_skill_version(
+                        remote_content.file_data.get("content", "") or "")
+            except Exception:
+                pass
+            return ""
+
+        remote_versions = await asyncio.gather(
+            *[_read_remote_version(name) for name, _, _ in local_skills]
+        )
+        remote_version_map = {
+            name: rv for (name, _, _), rv in zip(local_skills, remote_versions)
+        }
+
+        skill_count = 0
+        skip_count = 0
+        for skill_name, local_version, src in local_skills:
+            remote_version = remote_version_map.get(skill_name, "")
 
             if remote_version and remote_version == local_version:
                 SYLogger.debug(
@@ -1394,10 +1415,13 @@ async def _sync_skills_to_sandbox(
                 skip_count += 1
                 continue
 
-            # 版本不一致或无版本,删除旧目录后全量覆盖
+            # 版本不一致或无版本,删除旧目录(走 /delete,跳过懒同步,毫秒级)
             if skill_name in existing_dirs:
                 try:
-                    await backend.aexecute(f"rm -rf {sandbox_dest}/{skill_name}")
+                    await backend.adelete(
+                        f"{sandbox_dest}/{skill_name}",
+                        recursive=True,
+                        _skip_lazy_sync=True)
                     SYLogger.info(
                         f"[DeepAgent] 技能版本不一致,覆盖: {skill_name} "
                         f"({remote_version or '无版本'} → {local_version})")
@@ -1405,7 +1429,7 @@ async def _sync_skills_to_sandbox(
                     SYLogger.warning(
                         f"[DeepAgent] 删除旧版技能失败: {skill_name}, {e}")
 
-            # 全量上传整个技能目录到沙箱
+            # 全量上传整个技能目录到沙箱(batch_upload 服务端无条件覆盖)
             await backend.async_sync_dirs([(src, f"{sandbox_dest}/{skill_name}")])
             backend._synced_skills.add(skill_name)
             skill_count += 1
@@ -1417,7 +1441,8 @@ async def _sync_skills_to_sandbox(
                 # sandbox_dest 是虚拟绝对路径(/skills/system),沙箱 shell 不重映射裸绝对路径,
                 # 须拼 $_SANDBOX_WORKSPACE 指向真实 workspace 才能命中。否则 chmod 静默失败。
                 await backend.aexecute(
-                    f'chmod -R 555 "$_SANDBOX_WORKSPACE{sandbox_dest}"')
+                    f'chmod -R 555 "$_SANDBOX_WORKSPACE{sandbox_dest}"',
+                    _skip_lazy_sync=True)
                 SYLogger.info(f"[DeepAgent] 已设只读: chmod -R 555 {sandbox_dest}")
             except Exception as e:
                 SYLogger.warning(f"[DeepAgent] chmod 只读失败(忽略): {e}")

sycommon/agent/sandbox/file_ops.py

@@ -333,11 +333,17 @@ class FileOperationsMixin:
         limit: int = 2000,
         *,
         timeout: int = None,
+        _skip_lazy_sync: bool = False,
     ) -> ReadResult:
-        """异步读取文件内容"""
+        """异步读取文件内容
+
+        _skip_lazy_sync=True 时跳过懒同步（供内部技能版本比对用，
+        避免 read SKILL.md 触发整目录上传）。
+        """
         try:
             # 按需懒同步：检测是否读取 skill 资源
-            await self._lazy_sync_skill_from_path(file_path)
+            if not _skip_lazy_sync:
+                await self._lazy_sync_skill_from_path(file_path)
 
             await self._ensure_synced_async()
             SYLogger.info(
@@ -738,10 +744,16 @@ class FileOperationsMixin:
         recursive: bool = False,
         *,
         timeout: int = None,
+        _skip_lazy_sync: bool = False,
     ) -> DeleteResult:
-        """异步删除文件或文件夹"""
+        """异步删除文件或文件夹
+
+        _skip_lazy_sync=True 时跳过懒同步（供内部技能覆盖删除用，
+        避免「删之前先把要删的技能上传一遍」的浪费）。
+        """
         try:
-            await self._lazy_sync_skill_from_path(path)
+            if not _skip_lazy_sync:
+                await self._lazy_sync_skill_from_path(path)
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步删除: {path} (recursive={recursive})")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/delete", {

sycommon/agent/sandbox/http_sandbox_backend.py

@@ -813,17 +813,21 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 truncated=False
             )
 
-    async def aexecute(self, command: str, *, timeout: int = None) -> ExecuteResponse:
+    async def aexecute(self, command: str, *, timeout: int = None, _skip_lazy_sync: bool = False) -> ExecuteResponse:
         """异步执行 shell 命令（服务端负责路径隔离和目录初始化）
 
         如果命令引用了 /skills/<name>/ 下的资源，
         会自动按需同步该 skill 的整个目录到沙箱。
+
+        _skip_lazy_sync=True 时跳过懒同步（仅供内部技能同步/删除使用，
+        避免删前先传、比对前先传的往返浪费）。
         """
         command = self._inject_env(command)
         SYLogger.info(f"[Sandbox] aexecute 开始: command={command}")
 
         # 按需懒同步：检测命令中是否引用了 skill 资源
-        await self._lazy_sync_skill_from_path(command)
+        if not _skip_lazy_sync:
+            await self._lazy_sync_skill_from_path(command)
 
         await self._ensure_synced_async()
         SYLogger.info(f"[Sandbox] _ensure_synced_async 完成，开始执行命令: {command}")

{sycommon_python_lib-0.2.7a11.dist-info → sycommon_python_lib-0.2.7a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a11
+Version: 0.2.7a12
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -11,14 +11,14 @@ Requires-Dist: anyio==4.14.1
 Requires-Dist: decorator==5.3.1
 Requires-Dist: deepagents==0.6.12
 Requires-Dist: elasticsearch==9.4.1
-Requires-Dist: fastapi==0.138.1
+Requires-Dist: fastapi==0.139.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: kafka-python==3.0.6
+Requires-Dist: kafka-python==3.0.7
 Requires-Dist: langchain==1.3.11
 Requires-Dist: langchain-core==1.4.8
 Requires-Dist: langchain-openai==1.3.3
-Requires-Dist: langfuse==4.12.0
-Requires-Dist: langgraph==1.2.6
+Requires-Dist: langfuse==4.13.0
+Requires-Dist: langgraph==1.2.7
 Requires-Dist: langgraph-checkpoint-postgres==3.1.0
 Requires-Dist: langgraph-checkpoint-redis==0.5.0
 Requires-Dist: ldap3==2.9.1
@@ -32,7 +32,7 @@ Requires-Dist: python-dotenv==1.2.2
 Requires-Dist: python-multipart==0.0.32
 Requires-Dist: pyyaml==6.0.3
 Requires-Dist: redis==7.4.0
-Requires-Dist: sentry-sdk[fastapi]==2.63.0
+Requires-Dist: sentry-sdk[fastapi]==2.64.0
 Requires-Dist: sqlalchemy[asyncio]==2.0.51
 Requires-Dist: starlette[full]==1.3.1
 Requires-Dist: tiktoken==0.13.0

{sycommon_python_lib-0.2.7a11.dist-info → sycommon_python_lib-0.2.7a12.dist-info}/RECORD

@@ -136,7 +136,7 @@ sycommon/services.py,sha256=CwC_gESafo05Qn41KLQgtulx6PfX7s2FkxlBI-hXve4,24861
 sycommon/agent/__init__.py,sha256=mxceAeUifQ-DKvWp7ZEJIFlmOCb5wpYHPGQw3rwEN8I,4378
 sycommon/agent/agent_manager.py,sha256=UhhaekEumT7g4v_Z1UB4jTp13X0n8M8erYaQdkGGWkA,13620
 sycommon/agent/chat_events.py,sha256=t7qWa6OrIWLfqtd1AnqaVP67QWkn1JxpCBTZYQpoLuM,14226
-sycommon/agent/deep_agent.py,sha256=F3kn4dsu4aWOGtAGmsbxUWsrzUkkT6Uv7-LLrs1Ve5M,70420
+sycommon/agent/deep_agent.py,sha256=MtMTTqRTUQ_HPpniGfDkL0t781b_ATxV-btLG5iwSt4,71834
 sycommon/agent/multi_agent_team.py,sha256=IbjwhUMDsW4HMyWr53leWBLeaALO-8iNdxcKL6irfz0,28672
 sycommon/agent/summarization_utils.py,sha256=bqZRFqSekNGlv2mYQPaT_s2QNA5VDTKddi2Va_SkHWc,18376
 sycommon/agent/acp/__init__.py,sha256=vQGMQYAA5-ZaejYmDZ4r4Fklqs17qH3cDXQ5pZlwj-0,1844
@@ -153,8 +153,8 @@ sycommon/agent/middleware/skill_wl_check.py,sha256=rCJ9F6aWPh8tVQBIPmcq2lKDsfwiJ
 sycommon/agent/middleware/skill_write_guard.py,sha256=N7EsHMc87eo5QFLjTxbIcn0kurM1LD3vlfeHSR3jVg4,2557
 sycommon/agent/sandbox/__init__.py,sha256=jR7LlkD4J4Y6QYyRXQClkwmqDBCCPmycV_hQV9p9YHw,4621
 sycommon/agent/sandbox/consistent_hash.py,sha256=8Jgk-W4NAD2-u5_vKRVlPmql_e0Vy4aNORiXOuzvIrs,7277
-sycommon/agent/sandbox/file_ops.py,sha256=7A-T5dV2o5OzPT2kaNrlOTAqmyQ8HGiHV7ifqqMivZA,32988
-sycommon/agent/sandbox/http_sandbox_backend.py,sha256=59FvNhU9WdevXx_X14uiN_REWnEtQk01OXT0UQlgoTk,68303
+sycommon/agent/sandbox/file_ops.py,sha256=knjRqtj_0lGALNXxocg4cCClNuEgd0dtCBtCJsfjbik,33469
+sycommon/agent/sandbox/http_sandbox_backend.py,sha256=ZEAyxEeLR9aJg3REmoeupdsYb5RLarbt7NYoZqPIXxQ,68528
 sycommon/agent/sandbox/minio_sync.py,sha256=HRtw3SwOlgy0G-AsXhWr_1Ob7s-n4Z-9bjpFRfKecTA,23438
 sycommon/agent/sandbox/sandbox_pool.py,sha256=eMn8sLakCWf90l6ni2-333QM8oBdX1CflV-WzneFp_k,9133
 sycommon/agent/sandbox/sandbox_recovery.py,sha256=X-eDODx1tmGMh_iTngV6e1ppfDBHpTdkPreJusN5MHY,7358
@@ -306,8 +306,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.7a11.dist-info/METADATA,sha256=uNouGqbjoHhu62nFa67_11WrNGxBCdNgppLjQduJA1s,7962
-sycommon_python_lib-0.2.7a11.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.7a11.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a11.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a11.dist-info/RECORD,,
+sycommon_python_lib-0.2.7a12.dist-info/METADATA,sha256=emXawvSwauqGcr4C8LfZaoj4SvUBY5PrpJ-iS6a03dc,7962
+sycommon_python_lib-0.2.7a12.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.7a12.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a12.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a12.dist-info/RECORD,,