sycommon-python-lib 0.2.5a42__tar.gz → 0.2.6a1__tar.gz

{sycommon_python_lib-0.2.5a42 → sycommon_python_lib-0.2.6a1}/PKG-INFO

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

{sycommon_python_lib-0.2.5a42 → sycommon_python_lib-0.2.6a1}/pyproject.toml

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

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

@@ -49,6 +49,7 @@ from langchain_core.messages import HumanMessage, BaseMessage, AIMessageChunk, A
 from langchain_core.tools import BaseTool, tool
 
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.tools.snowflake import Snowflake
 from sycommon.llm.get_llm import get_llm
 from sycommon.agent.sandbox.http_sandbox_backend import HTTPSandboxBackend
 from sycommon.agent.sandbox.sandbox_recovery import SandboxRecoveryManager
@@ -447,6 +448,11 @@ class DeepAgent:
         total_input_tokens = 0
         total_output_tokens = 0
 
+        # ── 设置 chat turn 级 trace_id ──
+        # 如果上层（HTTP 中间件等）已设置 trace_id 则沿用，否则生成新的
+        _chat_trace_id = SYLogger.get_trace_id() or str(Snowflake.id)
+        _trace_token = SYLogger.set_trace_id(_chat_trace_id)
+
         try:
             input_state = {"messages": [HumanMessage(content=message)]}
             if rubric:
@@ -911,6 +917,7 @@ class DeepAgent:
                     SYLogger.warning(f"[DeepAgent] Token 兜底统计失败: {te}")
 
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if total_input_tokens > 0 or total_output_tokens > 0:
                 event.data["input_tokens"] = total_input_tokens
                 event.data["output_tokens"] = total_output_tokens
@@ -936,9 +943,12 @@ class DeepAgent:
                 await on_event(event)
             yield event
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if on_event:
                 await on_event(event)
             yield event
+        finally:
+            SYLogger.reset_trace_id(_trace_token)
 
     # ============== 内部方法 ==============
 
@@ -1267,16 +1277,31 @@ async def _sync_skill_to_minio(
     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（按版本检查，版本不一致则全量覆盖）
 
-    遍历本地 skills_dir 下所有技能子目录，比较本地与沙箱的 SKILL.md version：
-    - 版本一致：跳过
-    - 版本不一致或沙箱无版本：删除旧目录，全量上传到沙箱和 MinIO
-    同步完成后将技能名加入 backend._synced_skills，跳过后续懒同步。
+    版本检查优先级：
+    1. 沙箱 /skills/{name}/SKILL.md — 最快，无需额外 IO
+    2. MinIO skills/{name}/SKILL.md — 沙箱为空时（新 Pod / 新沙箱）的兜底
+    版本一致则跳过，不一致或无版本则全量上传到沙箱和 MinIO。
     """
     if not os.path.isdir(skills_dir):
         return
@@ -1315,9 +1340,9 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
-            # 比较版本：一致则跳过
+            # 比较版本：优先从沙箱读，沙箱无则从 MinIO 读
+            remote_version = ""
             if skill_name in existing_dirs:
-                remote_version = ""
                 try:
                     remote_content = await backend.aread(
                         f"/skills/{skill_name}/SKILL.md")
@@ -1326,14 +1351,26 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
-                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
+            # 沙箱无版本，尝试从 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
 
-                # 版本不一致或沙箱无版本，删除旧目录后全量覆盖
+            # 版本不一致或无版本，删除旧目录后全量覆盖
+            if skill_name in existing_dirs:
                 try:
                     await backend.aexecute(f"rm -rf /skills/{skill_name}")
                     SYLogger.info(

{sycommon_python_lib-0.2.5a42 → sycommon_python_lib-0.2.6a1}/src/sycommon/agent/multi_agent_team.py

@@ -37,6 +37,7 @@ from langchain_core.messages import HumanMessage, BaseMessage
 from langchain_core.tools import BaseTool, tool
 
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.tools.snowflake import Snowflake
 from sycommon.llm.get_llm import get_llm
 from sycommon.agent.sandbox.http_sandbox_backend import HTTPSandboxBackend
 from sycommon.tools.env import get_env_var
@@ -221,6 +222,10 @@ class MultiAgentTeam:
         current_agent = self.coordinator_name
         seen_tool_call_ids = set()  # 去重：流式分片中同一 tool_call 多次到达
 
+        # ── 设置 chat turn 级 trace_id ──
+        _chat_trace_id = SYLogger.get_trace_id() or str(Snowflake.id)
+        _trace_token = SYLogger.set_trace_id(_chat_trace_id)
+
         try:
             async for chunk in self._astream_with_retry(
                 {"messages": [HumanMessage(content=message)]},
@@ -420,6 +425,7 @@ class MultiAgentTeam:
                 SYLogger.debug(f"[ai_message] {repr(ai_chunk_buffer[:100])}...")
 
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if on_event:
                 await on_event(event)
             yield event
@@ -437,9 +443,12 @@ class MultiAgentTeam:
                 await on_event(event)
             yield event
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if on_event:
                 await on_event(event)
             yield event
+        finally:
+            SYLogger.reset_trace_id(_trace_token)
 
     # ============== 内部方法 ==============
 

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

@@ -73,7 +73,8 @@ class LDAPFullUser(BaseModel):
 class WeComLDAPUser(BaseModel):
     """企微-LDAP 关联用户（最终返回结果）"""
 
-    wecom_userid: str  # 企微 userid
+    wecom_userid: str  # 企微 userid（明文工号，如 "0633"）
+    employee_id: Optional[str] = None  # 员工工号（与 wecom_userid 同值，语义更明确）
     wecom_name: str  # 企微中文名
     wecom_english_name: Optional[str] = None  # 企微英文名
     wecom_departments: List[str] = []  # 企微部门列表
@@ -603,8 +604,9 @@ class WeComLDAPService(metaclass=SingletonMeta):
 
         # 3. 合并返回
         result = await self._build_wecom_ldap_user(user_data, ldap_index)
-        # 保留原始传入的 wecom_userid
-        result.wecom_userid = wecom_userid
+        # 保留解码后的明文 userid（工号），而非原始密文
+        result.wecom_userid = decoded_userid
+        result.employee_id = decoded_userid
         return result
 
     async def get_all_users(self) -> List[WeComLDAPUser]:
@@ -623,6 +625,7 @@ class WeComLDAPService(metaclass=SingletonMeta):
         results = []
         for u in wecom_users:
             result = await self._build_wecom_ldap_user(u, ldap_index)
+            result.employee_id = result.wecom_userid
             results.append(result)
 
         matched = sum(1 for r in results if r.matched)
@@ -671,3 +674,137 @@ class WeComLDAPService(metaclass=SingletonMeta):
         if user.matched and user.ldap_user:
             return user.ldap_user.username
         return None
+
+    # ─── Redis 映射缓存 ───
+
+    # Redis key 前缀（保持与旧版 digital_work 命名兼容）
+    _UID_MAP_PREFIX = "digital_work:wecom_uid_map:"
+    _LDAP_TO_WECOM_PREFIX = "digital_work:ldap_to_wecom:"
+    _EMPLOYEE_ID_PREFIX = "digital_work:wecom_employee_id:"
+    _MAP_TTL = 7 * 24 * 3600  # 7 天
+
+    @staticmethod
+    def _get_redis():
+        """获取 RedisService（懒加载）"""
+        from sycommon.database.redis_service import RedisService
+        return RedisService
+
+    async def _get_cached_mapping(self, wecom_userid: str) -> Optional[str]:
+        """从 Redis 读取 wecom_userid -> unified_id 映射"""
+        try:
+            rs = self._get_redis()
+            val = await rs.get(f"{self._UID_MAP_PREFIX}{wecom_userid}")
+            if val:
+                return val
+        except Exception:
+            pass
+        return None
+
+    async def _set_cached_mapping(self, wecom_userid: str, unified_id: str):
+        """将 wecom_userid <-> unified_id 双向映射写入 Redis，同时保存工号"""
+        try:
+            rs = self._get_redis()
+            # 正向: wecom_userid -> unified_id (LDAP sAMAccountName)
+            await rs.set(
+                f"{self._UID_MAP_PREFIX}{wecom_userid}",
+                unified_id,
+                ex=self._MAP_TTL,
+            )
+            # 反向: unified_id -> wecom_userid（用于定时任务等主动推送场景）
+            await rs.set(
+                f"{self._LDAP_TO_WECOM_PREFIX}{unified_id}",
+                wecom_userid,
+                ex=self._MAP_TTL,
+            )
+            # 员工工号: unified_id -> wecom_userid（即工号，如 "0633"）
+            await rs.set(
+                f"{self._EMPLOYEE_ID_PREFIX}{unified_id}",
+                wecom_userid,
+                ex=self._MAP_TTL,
+            )
+        except Exception as e:
+            SYLogger.warning(f"[WeComLDAP] 缓存映射到 Redis 失败: {e}")
+
+    async def resolve_unified_user_id(self, wecom_userid: str) -> str:
+        """将企微 userid 解析为统一 user_id（LDAP sAMAccountName）
+
+        优先从 Redis 缓存读取，缓存未命中时查 LDAP 并写入 Redis。
+        匹配到 LDAP 返回 sAMAccountName，否则直接使用企微 userid。
+
+        Args:
+            wecom_userid: 企微用户ID（如 "0633"、密文 open_userid）
+
+        Returns:
+            统一 user_id（小写，如 "osulcode.xiao"）
+        """
+        # 1. 查 Redis 缓存
+        cached = await self._get_cached_mapping(wecom_userid)
+        if cached:
+            return cached
+
+        # 2. 查企微 + LDAP
+        unified_id = wecom_userid
+        employee_id = wecom_userid  # 默认用工号就是原始 userid
+        try:
+            result = await self.get_user_info(wecom_userid)
+            employee_id = result.wecom_userid  # get_user_info 返回解码后的明文工号
+            if result.matched and result.ldap_user and result.ldap_user.username:
+                unified_id = result.ldap_user.username
+                SYLogger.info(
+                    f"[WeComLDAP] 用户映射: wecom={wecom_userid} -> ldap={unified_id}")
+            else:
+                SYLogger.info(
+                    f"[WeComLDAP] 用户映射: wecom={wecom_userid} -> 未匹配LDAP，回退={unified_id}")
+        except Exception as e:
+            SYLogger.warning(
+                f"[WeComLDAP] 解析统一 user_id 失败: wecom_userid={wecom_userid}, error={e}")
+
+        # 3. 写入 Redis 缓存（统一小写）
+        unified_id = unified_id.lower().replace(" ", "")
+        await self._set_cached_mapping(employee_id, unified_id)
+
+        return unified_id
+
+    async def get_employee_id(self, unified_id: str) -> Optional[str]:
+        """从 Redis 获取企微员工工号
+
+        Args:
+            unified_id: 统一用户 ID（LDAP sAMAccountName，如 "osulcode.xiao"）
+
+        Returns:
+            员工工号（如 "0633"），未找到返回 None
+        """
+        try:
+            rs = self._get_redis()
+            uid = unified_id.lower().replace(" ", "")
+            val = await rs.get(f"{self._EMPLOYEE_ID_PREFIX}{uid}")
+            if val:
+                return val
+        except Exception:
+            pass
+        return None
+
+    async def batch_set_uid_mapping(self, mapping: dict[str, str]):
+        """批量写入企微-LDAP 映射到 Redis（pipeline 优化，含反向映射和工号）
+
+        Args:
+            mapping: {wecom_userid: unified_id, ...}
+        """
+        if not mapping:
+            return
+        try:
+            rs = self._get_redis()
+            client = rs.get_client()
+            async with client.pipeline(transaction=True) as pipe:
+                for wecom_userid, unified_id in mapping.items():
+                    uid = unified_id.lower().replace(" ", "")
+                    # 正向
+                    pipe.set(f"{self._UID_MAP_PREFIX}{wecom_userid}", uid, ex=self._MAP_TTL)
+                    # 反向
+                    pipe.set(f"{self._LDAP_TO_WECOM_PREFIX}{uid}", wecom_userid, ex=self._MAP_TTL)
+                    # 员工工号
+                    pipe.set(f"{self._EMPLOYEE_ID_PREFIX}{uid}", wecom_userid, ex=self._MAP_TTL)
+                await pipe.execute()
+            logging.info(f"[WeComLDAP] 批量写入 {len(mapping)} 条映射到 Redis")
+        except Exception as e:
+            SYLogger.warning(f"[WeComLDAP] 批量缓存映射到 Redis 失败: {e}")

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

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