nc-user-terminator 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

nc_user_manager/cache.py

@@ -0,0 +1,88 @@
+import json
+from typing import Any, Optional
+from cachetools import TTLCache
+
+
+DEFAULT_TTL = 3600
+
+
+class BaseCache:
+    """缓存接口"""
+    is_async = False
+
+    def set(self, key: str, value: Any, ttl: Optional[int] = None):
+        raise NotImplementedError
+
+    def get(self, key: str) -> Any:
+        raise NotImplementedError
+
+    def delete(self, key: str):
+        raise NotImplementedError
+
+
+# ---------------------
+# 内存缓存
+# ---------------------
+class MemoryCache(BaseCache):
+    is_async = False
+
+    def __init__(self, maxsize: int = 1000, ttl: int = DEFAULT_TTL):
+        self._cache = TTLCache(maxsize=maxsize, ttl=ttl)
+
+    def set(self, key: str, value: Any, ttl: Optional[int] = None):
+        # cachetools TTLCache 不支持 per-key TTL, 所以只使用全局 TTL
+        self._cache[key] = value
+
+    def get(self, key: str) -> Any:
+        return self._cache.get(key)
+
+    def delete(self, key: str):
+        self._cache.pop(key, None)
+
+
+# ---------------------
+# Redis 缓存
+# ---------------------
+class RedisCache(BaseCache):
+    """同步 Redis"""
+    is_async = False
+
+    def __init__(self, redis_client, ttl: int = DEFAULT_TTL):
+        self.redis = redis_client
+        self.ttl = ttl
+
+    def set(self, key: str, value: Any, ttl: Optional[int] = None):
+        ttl = ttl or self.ttl
+        self.redis.setex(key, ttl, json.dumps(value))
+
+    def get(self, key: str) -> Any:
+        data = self.redis.get(key)
+        if data:
+            return json.loads(data)
+        return None
+
+    def delete(self, key: str):
+        self.redis.delete(key)
+
+
+class AsyncRedisCache(BaseCache):
+    """异步 Redis"""
+    is_async = True
+
+    def __init__(self, redis_client, ttl: int = DEFAULT_TTL):
+        self.redis = redis_client
+        self.ttl = ttl
+
+    async def set(self, key: str, value: Any, ttl: Optional[int] = None):
+        ttl = ttl or self.ttl
+        await self.redis.setex(key, ttl, json.dumps(value))
+
+    async def get(self, key: str) -> Any:
+        data = await self.redis.get(key)
+        if data:
+            return json.loads(data)
+        return None
+
+    async def delete(self, key: str):
+        await self.redis.delete(key)
+

nc_user_manager/client.py

@@ -1,12 +1,14 @@
 import asyncio
 from typing import Optional, Dict, Any
 
+from cache import MemoryCache, BaseCache, AsyncRedisCache
 from models import UserResponse, OAuth2AuthorizeResponse, CallbackResponse
 from exceptions import OAuthError
 from utils import request
 
 
 TENANT_HEADER = "X-Tenant-Code"
+DEFAULT_TTL = 3600
 
 
 class OAuthClient:
@@ -16,6 +18,7 @@ class OAuthClient:
         tenant_code: str,
         redirect_url: Optional[str] = None,
         single_session: bool = False,
+        cache: Optional[BaseCache] = None,
     ):
         """
         OAuth 客户端
@@ -29,6 +32,9 @@ class OAuthClient:
         self._tenant_code = tenant_code
         self._redirect_url = redirect_url
         self._single_session = single_session
+        self._cache = cache or MemoryCache(maxsize=10000, ttl=DEFAULT_TTL)
+        # 异步缓存，仅允许异步 redis
+        self._async_cache = self._cache.is_async
 
     # ----------------------
     # 内部异步包装
@@ -113,7 +119,10 @@ class OAuthClient:
     # ----------------------
     def google_one_tap(self, credential: str) -> CallbackResponse:
         """同步 Google One Tap 登录"""
-        params = {"credential": credential}
+        params = {
+            "credential": credential,
+            "single_session": str(self._single_session).lower()
+        }
         if self._redirect_url:
             params["redirect_url"] = self._redirect_url
         res_dict = request(
@@ -126,7 +135,10 @@ class OAuthClient:
 
     async def google_one_tap_async(self, credential: str) -> CallbackResponse:
         """异步 Google One Tap 登录"""
-        params = {"credential": credential}
+        params = {
+            "credential": credential,
+            "single_session": str(self._single_session).lower()
+        }
         if self._redirect_url:
             params["redirect_url"] = self._redirect_url
         res_dict = await self._arequest(
@@ -137,19 +149,83 @@ class OAuthClient:
         )
         return CallbackResponse(res_dict)
 
+    # ----------------------
+    # 缓存工具
+    # ----------------------
+    def _cache_user(self, token: str, user_dict: dict, ttl=DEFAULT_TTL):
+        key = f"user:{token}"
+        self._cache.set(key, user_dict, ttl)
+
+        if self._single_session:
+            user_id = user_dict.get("id")
+            if user_id:
+                old_token = self._cache.get(f"user_token:{user_id}")
+                if old_token and old_token != token:
+                    self._cache.delete(f"user:{old_token}")
+                self._cache.set(f"user_token:{user_id}", token, ttl)
+
+    async def _cache_user_async(self, token: str, user_dict: dict, ttl=DEFAULT_TTL):
+        if not self._async_cache:
+            raise RuntimeError("异步缓存未配置")
+
+        key = f"user:{token}"
+        await self._cache.set(key, user_dict, ttl)
+
+        if self._single_session:
+            user_id = user_dict.get("id")
+            if user_id:
+                old_token = await self._cache.get(f"user_token:{user_id}")
+                if old_token and old_token != token:
+                    await self._cache.delete(f"user:{old_token}")
+                await self._cache.set(f"user_token:{user_id}", token, ttl)
+
+    def _uncache_user(self, token: str, user_dict: Optional[dict] = None):
+        self._cache.delete(f"user:{token}")
+        if self._single_session and user_dict:
+            user_id = user_dict.get("id")
+            if user_id:
+                self._cache.delete(f"user_token:{user_id}")
+
+    async def _uncache_user_async(self, token: str, user_dict: Optional[dict] = None):
+        await self._cache.delete(f"user:{token}")
+        if self._single_session and user_dict:
+            user_id = user_dict.get("id")
+            if user_id:
+                await self._cache.delete(f"user_token:{user_id}")
+
     # ----------------------
     # 获取用户信息
     # ----------------------
     def say_my_name(self, token: str) -> UserResponse:
         """同步获取当前用户"""
+        if self._async_cache:
+            raise RuntimeError("同步缓存未配置")
+
+        key = f"user:{token}"
+        data = self._cache.get(key)
+        if data:
+            return UserResponse(data)
+
         headers = self._headers({"Authorization": f"Bearer {token}"})
         res_dict = request("GET", f"{self._base_url}/api/me", headers=headers)
+
+        self._cache_user(token, res_dict)
         return UserResponse(res_dict)
 
     async def say_my_name_async(self, token: str) -> UserResponse:
+        if not self._async_cache:
+            raise RuntimeError("异步方法只支持异步缓存，请传入 async_cache")
+
         """异步获取当前用户"""
+        key = f"user:{token}"
+        data = await self._cache.get(key)
+        if data:
+            return UserResponse(data)
+
         headers = self._headers({"Authorization": f"Bearer {token}"})
         res_dict = await self._arequest("GET", f"{self._base_url}/api/me", headers=headers)
+
+        await self._cache_user_async(token, res_dict)
         return UserResponse(res_dict)
 
     # 刷新过期时间
@@ -172,9 +248,19 @@ class OAuthClient:
     # 登出
     def logout(self, token: str):
         headers = self._headers({"Authorization": f"Bearer {token}"})
-        return request("POST", f"{self._base_url}/api/auth/logout", headers=headers)
+        resp = request("POST", f"{self._base_url}/api/auth/logout", headers=headers)
+
+        data = self._cache.get(f"user:{token}")
+        self._uncache_user(token, data)
+        return resp
+
 
     async def logout_async(self, token: str) -> dict:
         """异步获取当前用户"""
         headers = self._headers({"Authorization": f"Bearer {token}"})
-        return await self._arequest("POST", f"{self._base_url}/api/auth/logout", headers=headers)
+        resp = await self._arequest("POST", f"{self._base_url}/api/auth/logout", headers=headers)
+
+        data = await self._cache.get(f"user:{token}")
+        await self._uncache_user_async(token, data)
+        return resp
+

{nc_user_terminator-0.1.2.dist-info → nc_user_terminator-0.1.4.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: nc-user-terminator
-Version: 0.1.2
+Version: 0.1.4
 Summary: OAuth client wrapper for multi-tenant projects
 Author: bw_song
 Author-email: m132777096902@gmail.com
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: cachetools==6.2.0
 Dynamic: author-email
 Dynamic: description-content-type
 Dynamic: requires-python

nc_user_terminator-0.1.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+nc_user_manager/__init__.py,sha256=fF3FZD0XUW5YCfTbBeJs3RK-Mnm3IQ7lns6Eb_tMqPU,238
+nc_user_manager/cache.py,sha256=u9ioXDwHmEJHRB4VKI4JU_pp-8Y5O4bLPm8-pwqiMVc,2273
+nc_user_manager/client.py,sha256=jCtHW65Hk3AV3VQaKj7QapCyLgKqDoHKuX3FKVtwZn4,10241
+nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
+nc_user_manager/models.py,sha256=mDK7zskIcaThxvUUTWVf6eMasw7YaA3hDGVVSd1ZJgo,1088
+nc_user_manager/utils.py,sha256=0QmJ9s3mzuYQSlwkcS8BW5XCe23lcoKskEeuqfdZHck,1245
+nc_user_terminator-0.1.4.dist-info/METADATA,sha256=-fUx3iRGBFFT3AqVd69tATCupipDXL7dVzHTQ6R_oFw,361
+nc_user_terminator-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nc_user_terminator-0.1.4.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
+nc_user_terminator-0.1.4.dist-info/RECORD,,

nc_user_terminator-0.1.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-nc_user_manager/__init__.py,sha256=fF3FZD0XUW5YCfTbBeJs3RK-Mnm3IQ7lns6Eb_tMqPU,238
-nc_user_manager/client.py,sha256=urNJFx2ssQc5KxmW6SshXfdAJw_Hq4Sm2x208oV20kM,7074
-nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
-nc_user_manager/models.py,sha256=mDK7zskIcaThxvUUTWVf6eMasw7YaA3hDGVVSd1ZJgo,1088
-nc_user_manager/utils.py,sha256=0QmJ9s3mzuYQSlwkcS8BW5XCe23lcoKskEeuqfdZHck,1245
-nc_user_terminator-0.1.2.dist-info/METADATA,sha256=iXTOp_tLVmJPR7LZug3BUkcZzixcdn2_gQgy13Bxfrc,327
-nc_user_terminator-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nc_user_terminator-0.1.2.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
-nc_user_terminator-0.1.2.dist-info/RECORD,,