sycommon-python-lib 0.2.6a10__tar.gz → 0.2.6a12__tar.gz

{sycommon_python_lib-0.2.6a10 → sycommon_python_lib-0.2.6a12}/PKG-INFO

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

{sycommon_python_lib-0.2.6a10 → sycommon_python_lib-0.2.6a12}/pyproject.toml

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

{sycommon_python_lib-0.2.6a10 → sycommon_python_lib-0.2.6a12}/src/sycommon/agent/deep_agent.py

@@ -1260,72 +1260,20 @@ def _parse_skill_version(content: str) -> str:
     return ""
 
 
-async def _sync_skill_to_minio(
-    minio_service,
-    local_skill_dir: str,
-    skill_name: str,
-) -> int:
-    """将单个技能目录上传到 MinIO（skills/{skill_name}/...）
-
-    Returns:
-        成功上传的文件数量
-    """
-    count = 0
-    for root, _dirs, files in os.walk(local_skill_dir):
-        for fname in files:
-            fpath = os.path.join(root, fname)
-            rel = os.path.relpath(fpath, local_skill_dir)
-            # 统一使用 / 作为分隔符
-            object_key = f"skills/{skill_name}/{rel.replace(os.sep, '/')}"
-            try:
-                content = await asyncio.to_thread(
-                    lambda p: open(p, "rb").read(), fpath)
-                await minio_service.aupload_bytes(object_key, content)
-                count += 1
-            except Exception as e:
-                SYLogger.warning(
-                    f"[MinIO] 技能文件上传失败: {object_key}, {e}")
-    SYLogger.info(f"[MinIO] 技能 {skill_name} 同步完成: {count} 个文件")
-    return count
-
-
-async def _get_minio_skill_version(minio_service, skill_name: str) -> str:
-    """从 MinIO 全局 skills/ 路径下读取技能版本"""
-    try:
-        content = await asyncio.to_thread(
-            minio_service._client.get_object,
-            minio_service._bucket,
-            f"skills/{skill_name}/SKILL.md",
-        )
-        data = content.read()
-        content.close()
-        return _parse_skill_version(data.decode("utf-8"))
-    except Exception:
-        return ""
-
-
 async def _sync_skills_to_sandbox(
     skills_dir: str,
     backend: HTTPSandboxBackend,
 ) -> None:
-    """同步技能目录到沙箱和 MinIO（按版本检查，版本不一致则全量覆盖）
+    """同步技能目录到沙箱（按版本检查，版本不一致则全量覆盖）
 
-    版本检查优先级：
-    1. 沙箱 /skills/{name}/SKILL.md — 最快，无需额外 IO
-    2. MinIO skills/{name}/SKILL.md — 沙箱为空时（新 Pod / 新沙箱）的兜底
-    版本一致则跳过，不一致或无版本则全量上传到沙箱和 MinIO。
+    技能来源是仓库内的 skills/ 目录（随部署持久，不随 Pod 重启丢失），
+    版本比较只看沙箱 /skills/{name}/SKILL.md，无需 MinIO 锚点：
+    - 沙箱有该技能且 version 一致 → 跳过
+    - 沙箱没有 / version 不一致 → 从本地 skills/ 全量上传到沙箱
     """
     if not os.path.isdir(skills_dir):
         return
 
-    try:
-        from sycommon.agent.sandbox.minio_sync import MinioSyncService
-        minio_available = MinioSyncService.is_available()
-        minio_service = MinioSyncService() if minio_available else None
-    except Exception:
-        minio_available = False
-        minio_service = None
-
     try:
         # 获取沙箱 /skills 下已有的目录列表
         existing_dirs = set()
@@ -1352,7 +1300,7 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
-            # 比较版本：优先从沙箱读，沙箱无则从 MinIO 读
+            # 比较版本：只从沙箱 /skills/{name}/SKILL.md 读取
             remote_version = ""
             if skill_name in existing_dirs:
                 try:
@@ -1363,22 +1311,11 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
-            # 沙箱无版本，尝试从 MinIO 全局 skills/ 读取
-            if not remote_version and minio_service:
-                remote_version = await _get_minio_skill_version(
-                    minio_service, skill_name)
-
             if remote_version and remote_version == local_version:
                 SYLogger.debug(
                     f"[DeepAgent] 技能版本一致，跳过: {skill_name} v{local_version}")
                 backend._synced_skills.add(skill_name)
                 skip_count += 1
-                # 沙箱为空但 MinIO 有（版本一致）：只恢复到沙箱，不再上传 MinIO
-                if skill_name not in existing_dirs:
-                    await backend.async_sync_dirs(
-                        [(src, f"/skills/{skill_name}")])
-                    SYLogger.info(
-                        f"[DeepAgent] 从本地恢复技能到沙箱: {skill_name} v{local_version}")
                 continue
 
             # 版本不一致或无版本，删除旧目录后全量覆盖
@@ -1399,10 +1336,6 @@ async def _sync_skills_to_sandbox(
             SYLogger.info(
                 f"[DeepAgent] 全量同步技能到沙箱: {skill_name} v{local_version}")
 
-            # 同步到 MinIO
-            if minio_service:
-                await _sync_skill_to_minio(minio_service, src, skill_name)
-
         SYLogger.info(
             f"[DeepAgent] 技能同步完成: 同步 {skill_count} 个, 跳过 {skip_count} 个")
     except Exception as e:

{sycommon_python_lib-0.2.6a10 → sycommon_python_lib-0.2.6a12}/src/sycommon/agent/summarization_utils.py

@@ -191,9 +191,14 @@ _approx_counter = functools.partial(
 
 async def _patched_awrap_model_call(self, request, handler):
     effective_messages = self._get_effective_messages(request)
-    truncated_messages, _ = self._truncate_args(
+    # deepagents 0.6.10: _truncate_args(messages, total_tokens) ——
+    # 与内置 awrap_model_call 一致：count 一次（tool-schema 转换很贵），共享计数。
+    total_tokens = self._count_tokens(
         effective_messages, request.system_message, request.tools,
     )
+    truncated_messages, _ = self._truncate_args(
+        effective_messages, total_tokens,
+    )
     counted_messages = [request.system_message, *
                         truncated_messages] if request.system_message is not None else truncated_messages
 

{sycommon_python_lib-0.2.6a10 → sycommon_python_lib-0.2.6a12}/src/sycommon_python_lib.egg-info/PKG-INFO

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