sycommon-python-lib 0.2.7a38__tar.gz → 0.2.7a40__tar.gz

{sycommon_python_lib-0.2.7a38 → sycommon_python_lib-0.2.7a40}/PKG-INFO

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

{sycommon_python_lib-0.2.7a38 → sycommon_python_lib-0.2.7a40}/pyproject.toml

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

{sycommon_python_lib-0.2.7a38 → sycommon_python_lib-0.2.7a40}/src/sycommon/auth/wecom_ldap_service.py

@@ -188,7 +188,8 @@ class _LDAPIndex:
                 return candidates[0], "english_name"
             elif len(candidates) > 1 and position:
                 # 多候选人时用职位消歧
-                pos_hits = [c for c in candidates if c.title and c.title in position]
+                pos_hits = [
+                    c for c in candidates if c.title and c.title in position]
                 if len(pos_hits) == 1:
                     return pos_hits[0], "english_name_position"
 
@@ -223,7 +224,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
         # （~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)
+        # wecom_userid -> (unified_id, expire_ts)
+        self._resolve_cache: Dict[str, tuple] = {}
         self._resolve_locks: Dict[str, asyncio.Lock] = {}
         self._resolve_ttl: int = 300  # 进程内 L1 缓存 5 分钟
 
@@ -435,7 +437,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
         if data.get("errcode") != 0:
             return {}
 
-        self._dept_map = {d["id"]: d["name"] for d in data.get("department", [])}
+        self._dept_map = {d["id"]: d["name"]
+                          for d in data.get("department", [])}
         return self._dept_map
 
     # ─── LDAP 查询 ───
@@ -531,7 +534,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
 
                 except Exception as e:
                     last_error = e
-                    SYLogger.warning(f"[WeComLDAP] LDAP 连接 {url} 失败 (第 {attempt} 次): {e}")
+                    SYLogger.warning(
+                        f"[WeComLDAP] LDAP 连接 {url} 失败 (第 {attempt} 次): {e}")
                     continue
             else:
                 # 所有 URL 都失败
@@ -539,7 +543,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
                     time.sleep(retry_interval)
                     continue
                 else:
-                    SYLogger.error(f"[WeComLDAP] LDAP 全部 {max_retries} 次重试均失败，最后一次错误: {last_error}")
+                    SYLogger.error(
+                        f"[WeComLDAP] LDAP 全部 {max_retries} 次重试均失败，最后一次错误: {last_error}")
 
             break  # 成功则跳出重试循环
 
@@ -788,7 +793,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
             # 1. 查 Redis 缓存（L2）
             cached = await self._get_cached_mapping(wecom_userid)
             if cached:
-                self._resolve_cache[wecom_userid] = (cached, now + self._resolve_ttl)
+                self._resolve_cache[wecom_userid] = (
+                    cached, now + self._resolve_ttl)
                 return cached
 
             # 2. 查企微 + LDAP
@@ -813,7 +819,8 @@ class WeComLDAPService(metaclass=SingletonMeta):
             await self._set_cached_mapping(employee_id, unified_id)
 
             # 写入 L1
-            self._resolve_cache[wecom_userid] = (unified_id, time.time() + self._resolve_ttl)
+            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]:
@@ -850,11 +857,14 @@ class WeComLDAPService(metaclass=SingletonMeta):
                 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._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._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)
+                    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:

{sycommon_python_lib-0.2.7a38 → sycommon_python_lib-0.2.7a40}/src/sycommon_python_lib.egg-info/PKG-INFO

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