sycommon-python-lib 0.2.5a40__tar.gz → 0.2.5a42__tar.gz

{sycommon_python_lib-0.2.5a40 → sycommon_python_lib-0.2.5a42}/PKG-INFO

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

{sycommon_python_lib-0.2.5a40 → sycommon_python_lib-0.2.5a42}/pyproject.toml

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

{sycommon_python_lib-0.2.5a40 → sycommon_python_lib-0.2.5a42}/src/sycommon/agent/deep_agent.py

@@ -1221,31 +1221,74 @@ async def create_deep_agent(
 
 
 def _parse_skill_version(content: str) -> str:
-    """从 SKILL.md 内容中解析 version 字段，无 version 返回空字符串"""
-    match = re.match(r"^---\s*\n(.*?)\n---\s*\n", content, re.DOTALL)
-    if not match:
-        return ""
-    try:
-        data = yaml.safe_load(match.group(1))
-        if isinstance(data, dict):
-            return str(data.get("version", ""))
-    except Exception:
-        pass
+    """从 SKILL.md 内容中解析 version 字段，无 version 返回空字符串
+
+    使用逐行解析而非 yaml.safe_load，避免 description 中含冒号导致 YAML 解析失败。
+    """
+    in_frontmatter = False
+    for line in content.split("\n"):
+        stripped = line.strip()
+        if stripped == "---":
+            if in_frontmatter:
+                break  # 结束 frontmatter
+            in_frontmatter = True
+            continue
+        if in_frontmatter and stripped.startswith("version:"):
+            return stripped.split(":", 1)[1].strip()
     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 _sync_skills_to_sandbox(
     skills_dir: str,
     backend: HTTPSandboxBackend,
 ) -> None:
-    """同步 skills SKILL.md 到沙箱（按版本检查，版本不一致则覆盖）
+    """同步技能目录到沙箱和 MinIO（按版本检查，版本不一致则全量覆盖）
 
-    只同步 SKILL.md 文件，不同步 scripts/ 等大目录。
-    scripts/ 在 agent 实际调用时由 HTTPSandboxBackend._lazy_sync_skill_from_path 按需同步。
+    遍历本地 skills_dir 下所有技能子目录，比较本地与沙箱的 SKILL.md version：
+    - 版本一致：跳过
+    - 版本不一致或沙箱无版本：删除旧目录，全量上传到沙箱和 MinIO
+    同步完成后将技能名加入 backend._synced_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()
@@ -1255,8 +1298,9 @@ async def _sync_skills_to_sandbox(
                 if child.is_dir:
                     existing_dirs.add(child.name)
 
-        # 遍历本地 skills，按版本决定是否同步
-        for skill_name in os.listdir(skills_dir):
+        skill_count = 0
+        skip_count = 0
+        for skill_name in sorted(os.listdir(skills_dir)):
             src = os.path.join(skills_dir, skill_name)
             if not os.path.isdir(src):
                 continue
@@ -1271,11 +1315,12 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
+            # 比较版本：一致则跳过
             if skill_name in existing_dirs:
-                # 读取沙箱中的版本
                 remote_version = ""
                 try:
-                    remote_content = await backend.aread(f"/skills/{skill_name}/SKILL.md")
+                    remote_content = await backend.aread(
+                        f"/skills/{skill_name}/SKILL.md")
                     if remote_content:
                         remote_version = _parse_skill_version(remote_content)
                 except Exception:
@@ -1284,27 +1329,33 @@ async def _sync_skills_to_sandbox(
                 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
                     continue
 
-                # 版本不一致或沙箱无版本，删除后重新上传
+                # 版本不一致或沙箱无版本，删除旧目录后全量覆盖
                 try:
                     await backend.aexecute(f"rm -rf /skills/{skill_name}")
                     SYLogger.info(
-                        f"[DeepAgent] 技能版本不一致，覆盖: {skill_name} ({remote_version or '无版本'} → {local_version})")
+                        f"[DeepAgent] 技能版本不一致，覆盖: {skill_name} "
+                        f"({remote_version or '无版本'} → {local_version})")
                 except Exception as e:
                     SYLogger.warning(
                         f"[DeepAgent] 删除旧版技能失败: {skill_name}, {e}")
-                    continue
 
-            # 只同步 SKILL.md（不再同步整个目录）
-            if os.path.isfile(local_skill_md):
-                with open(local_skill_md, "rb") as f:
-                    content = f.read()
-                await backend.aupload_files([
-                    (f"/skills/{skill_name}/SKILL.md", content)
-                ])
-                SYLogger.info(
-                    f"[DeepAgent] 同步技能元数据到沙箱: {skill_name} v{local_version} (仅 SKILL.md)")
+            # 全量上传整个技能目录到沙箱
+            await backend.async_sync_dirs([(src, f"/skills/{skill_name}")])
+            backend._synced_skills.add(skill_name)
+            skill_count += 1
+            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:
         SYLogger.warning(f"[DeepAgent] 技能同步失败: {e}")
 

{sycommon_python_lib-0.2.5a40 → sycommon_python_lib-0.2.5a42}/src/sycommon/auth/wecom_ldap_service.py

@@ -267,11 +267,45 @@ class WeComLDAPService(metaclass=SingletonMeta):
             async with session.post(url, json=json_body or {}) as resp:
                 return await resp.json()
 
+    async def _get_bot_access_token(self) -> str:
+        """获取用于 open_userid 解码的 access_token
+
+        本地开发（IS_DEV=true）时，使用 WeComDecodeUserID 配置的凭据，
+        线上直接使用 WeCom 配置的凭据。
+        """
+        import os
+        from sycommon.config.Config import Config
+
+        is_dev = os.environ.get("IS_DEV") == "true"
+        config = Config().config.get("llm", {})
+
+        if is_dev:
+            wecom_config = config.get("WeComDecodeUserID", {}) or config.get("WeCom", {})
+        else:
+            wecom_config = config.get("WeCom", {})
+
+        corpid = wecom_config.get("corpid", "")
+        corpsecret = wecom_config.get("corpsecret", "")
+        if not corpid or not corpsecret:
+            raise ValueError("解码凭据配置不完整，需要配置 llm.WeComDecodeUserID 或 llm.WeCom")
+
+        url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
+        params = {"corpid": corpid, "corpsecret": corpsecret}
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, params=params) as resp:
+                data = await resp.json()
+
+        if data.get("errcode") != 0:
+            raise RuntimeError(f"获取解码 access_token 失败: {data}")
+
+        logging.info("[WeComLDAP] 解码 access_token 已刷新")
+        return data["access_token"]
+
     async def _decode_open_userid(self, open_userid: str) -> Optional[str]:
         """将企微密文 open_userid 转换为明文 userid
 
-        当 userid 长度超过 20 位时，大概率是智能机器人的密文 open_userid，
-        需要通过 batch/openuserid_to_userid 接口解码。
+        使用机器人应用的 access_token 调用 batch/openuserid_to_userid 接口解码。
+        机器人回调推的 userid 是加密的 open_userid，只有机器人应用的 token 才能转换。
 
         Args:
             open_userid: 密文格式的企微用户ID
@@ -280,10 +314,14 @@ class WeComLDAPService(metaclass=SingletonMeta):
             解码后的明文 userid，失败返回 None
         """
         try:
-            data = await self._wecom_post(
-                "/cgi-bin/batch/openuserid_to_userid",
-                {"open_userid_list": [open_userid]},
-            )
+            token = await self._get_bot_access_token()
+            url = "https://qyapi.weixin.qq.com/cgi-bin/batch/openuserid_to_userid"
+            async with aiohttp.ClientSession() as session:
+                async with session.post(
+                    f"{url}?access_token={token}",
+                    json={"open_userid_list": [open_userid]},
+                ) as resp:
+                    data = await resp.json()
             if data.get("errcode") != 0:
                 SYLogger.warning(
                     f"[WeComLDAP] open_userid 解码失败: {data}"
@@ -334,10 +372,16 @@ class WeComLDAPService(metaclass=SingletonMeta):
         return decoded if decoded else userid
 
     async def _get_wecom_user(self, userid: str) -> Optional[dict]:
-        """获取单个企微用户详情"""
-        data = await self._wecom_get(
-            "/cgi-bin/user/get", {"userid": userid}
-        )
+        """获取单个企微用户详情
+
+        IS_DEV=true 时使用 WeComDecodeUserID 的 token，
+        线上使用 WeCom 的 token。
+        """
+        token = await self._get_bot_access_token()
+        url = f"https://qyapi.weixin.qq.com/cgi-bin/user/get"
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, params={"access_token": token, "userid": userid}) as resp:
+                data = await resp.json()
         if data.get("errcode") != 0:
             SYLogger.warning(f"[WeComLDAP] 获取企微用户 {userid} 失败: {data}")
             return None

{sycommon_python_lib-0.2.5a40 → sycommon_python_lib-0.2.5a42}/src/sycommon_python_lib.egg-info/PKG-INFO

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