sycommon-python-lib 0.2.7a25__py3-none-any.whl → 0.2.7a26__py3-none-any.whl

sycommon/auth/wecom_ldap_service.py

@@ -211,6 +211,17 @@ class WeComLDAPService(metaclass=SingletonMeta):
         # 企微部门 ID -> 名称 缓存
         self._dept_map: Dict[int, str] = {}
 
+        # 🔑 resolve 进程内 L1 缓存 + per-userid 并发去重锁
+        # 背景：企微 push 把「文件+文字」拆成两条并发 asyncio task，各自在 handler
+        # 入口 await resolve_unified_user_id。Redis(L2) 缓存写入有传播/竞态延迟，
+        # 并发的两个请求互相看不到对方刚写的 Redis → 各自查一遍企微 user/get API
+        # （~1-2s/次）→ 文件 handler 入口被卡 2s+ → 注册 _user_tasks 晚 → 文字抢先
+        # 起 agent → 双气泡。L1 命中直接返回；per-userid 锁保证同一人同时只查一次，
+        # 其余并发请求等结果复用。TTL 短（5min），Redis 仍负责跨进程持久化。
+        self._resolve_cache: Dict[str, tuple] = {}  # wecom_userid -> (unified_id, expire_ts)
+        self._resolve_locks: Dict[str, asyncio.Lock] = {}
+        self._resolve_ttl: int = 300  # 进程内 L1 缓存 5 分钟
+
         # 订阅配置热更新（幂等）
         from sycommon.config.config_change_notifier import notifier
         notifier.register("wecom_ldap", sync_cb=self.reload)
@@ -232,6 +243,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
         # access_token 直接作废，避免用旧 secret 换来的 token 继续生效。
         self._access_token = None
         self._token_expires_at = 0
+        # 配置热更新时清空 resolve L1 缓存，避免用旧映射继续返回。
+        self._resolve_cache.clear()
 
     # ─── 企微 API ───
 
@@ -737,8 +750,10 @@ class WeComLDAPService(metaclass=SingletonMeta):
     async def resolve_unified_user_id(self, wecom_userid: str) -> str:
         """将企微 userid 解析为统一 user_id（LDAP sAMAccountName）
 
-        优先从 Redis 缓存读取，缓存未命中时查 LDAP 并写入 Redis。
-        匹配到 LDAP 返回 sAMAccountName，否则直接使用企微 userid。
+        优先从进程内 L1 缓存读取（命中直接返回，无任何网络开销），其次 Redis(L2) 缓存，
+        最后查企微+LDAP 并写入两层缓存。per-userid 锁保证同一 userid 的并发请求只查一次
+        API，其余等结果复用——这是修复「文件+文字并发各查一遍企微 API → 文件 handler
+        入口被卡 → 双气泡」的关键。
 
         Args:
             wecom_userid: 企微用户ID（如 "0633"、密文 open_userid）
@@ -746,33 +761,55 @@ class WeComLDAPService(metaclass=SingletonMeta):
         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}")
+        now = time.time()
+
+        # 0. L1 进程内缓存（最快，无网络）
+        hit = self._resolve_cache.get(wecom_userid)
+        if hit and hit[1] > now:
+            return hit[0]
+
+        # per-userid 锁：同一 userid 并发只放一个进去查，其余等结果
+        lock = self._resolve_locks.get(wecom_userid)
+        if lock is None:
+            lock = asyncio.Lock()
+            self._resolve_locks[wecom_userid] = lock
+        async with lock:
+            # 双检：拿到锁后可能已被前一个并发请求填好 L1
+            now = time.time()
+            hit = self._resolve_cache.get(wecom_userid)
+            if hit and hit[1] > now:
+                return hit[0]
+
+            # 1. 查 Redis 缓存（L2）
+            cached = await self._get_cached_mapping(wecom_userid)
+            if cached:
+                self._resolve_cache[wecom_userid] = (cached, now + self._resolve_ttl)
+                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)
+            # 3. 写入 Redis 缓存（统一小写）
+            unified_id = unified_id.lower().replace(" ", "")
+            await self._set_cached_mapping(employee_id, unified_id)
 
-        return unified_id
+            # 写入 L1
+            self._resolve_cache[wecom_userid] = (unified_id, time.time() + self._resolve_ttl)
+            return unified_id
 
     async def get_employee_id(self, unified_id: str) -> Optional[str]:
         """从 Redis 获取企微员工工号

{sycommon_python_lib-0.2.7a25.dist-info → sycommon_python_lib-0.2.7a26.dist-info}/METADATA

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

{sycommon_python_lib-0.2.7a25.dist-info → sycommon_python_lib-0.2.7a26.dist-info}/RECORD

@@ -166,7 +166,7 @@ sycommon/auth/ldap_service.py,sha256=fOcpVov5LWJkBk62qbTaltks1c4la7JsbD104KfdBOI
 sycommon/auth/oa_cache.py,sha256=u673y-mK-xo24pSqvfjL68_YFASO2zoxd_iAQ0HetCo,3491
 sycommon/auth/oa_crypto.py,sha256=xpY1R1Bj3KLENXB0TuThB6Eku1E9PYjcoSpOdgDmCgc,1898
 sycommon/auth/oa_service.py,sha256=kLepV9zgqpZoaB73DRPpMA5tJJQjoaDtQPdzBcGXeak,6235
-sycommon/auth/wecom_ldap_service.py,sha256=5DWXu-mR3ckZm2lkCJu7gLi_3GCiLNZNpK3bFCPcQAc,31122
+sycommon/auth/wecom_ldap_service.py,sha256=atVuYs8zL1EfEN5yX9bwHcHpCsB3BdnMnMlR2bbmD6c,33416
 sycommon/config/ACPAgentConfig.py,sha256=paAa0c0gy1RnDDum-Q6m7QLTe7lhz2dsFt4r72QtmWE,3202
 sycommon/config/Config.py,sha256=MP92XxB7hsQiOnyjMkZskbxuMn_OUAZ4RTbC74ZATl4,7885
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
@@ -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.7a25.dist-info/METADATA,sha256=h6F3kRXGeBg5wu9iLFgCXfgRQzfdRte-f-7NhXuBuvg,7962
-sycommon_python_lib-0.2.7a25.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-sycommon_python_lib-0.2.7a25.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a25.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a25.dist-info/RECORD,,
+sycommon_python_lib-0.2.7a26.dist-info/METADATA,sha256=DBrGqUqt5wJG8QAqbbRk7ZfswekMXYBMztNXrW0BnhM,7962
+sycommon_python_lib-0.2.7a26.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+sycommon_python_lib-0.2.7a26.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a26.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a26.dist-info/RECORD,,