nc-user-terminator 0.1.3__py3-none-any.whl → 0.1.5__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,34 +1,40 @@
 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"
+PRODUCT_HEADER = "X-Product-Code"
+DEFAULT_TTL = 3600
 
 
 class OAuthClient:
     def __init__(
         self,
         base_url: str,
-        tenant_code: str,
+        product_code: str,
         redirect_url: Optional[str] = None,
         single_session: bool = False,
+        cache: Optional[BaseCache] = None,
     ):
         """
         OAuth 客户端
 
         :param base_url: 服务端基础地址 (例如 http://localhost:8000)
-        :param tenant_code: 租户编码
+        :param product_code: 产品编码
         :param redirect_url: 可选，重定向地址
         :param single_session: 是否单会话登录
         """
         self._base_url = base_url.rstrip("/")
-        self._tenant_code = tenant_code
+        self._product_code = product_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
 
     # ----------------------
     # 内部异步包装
@@ -37,7 +43,7 @@ class OAuthClient:
         return await asyncio.to_thread(request, *args, **kwargs)
 
     def _headers(self, extra: Optional[Dict[str, str]] = None) -> Dict[str, str]:
-        headers = {TENANT_HEADER: self._tenant_code}
+        headers = {PRODUCT_HEADER: self._product_code}
         if extra:
             headers.update(extra)
         return headers
@@ -143,19 +149,85 @@ 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)
+
+        if res_dict.get("success", True):
+            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)
+        if res_dict.get("success", True):
+            await self._cache_user_async(token, res_dict)
+
         return UserResponse(res_dict)
 
     # 刷新过期时间
@@ -178,9 +250,46 @@ 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
+
+async def main():
+    def get_redis_url() -> str:
+        return f'redis://default:1q2w3e@localhost:6379/1'
+
+
+    import redis.asyncio as redis
+    # —— Redis 连接与策略（Bearer + Redis）——
+    _redis = redis.from_url(get_redis_url(), decode_responses=True)
+
+    redis_cache = AsyncRedisCache(_redis)
+
+    client = OAuthClient("http://localhost:8000/", "bankgpt", "http://localhost:8000/auth/google/custom_callback", single_session=True, cache=redis_cache)
+    # authorize = client.authorize("google")
+    # print(authorize)
+
+
+    name = await client.say_my_name_async("Tu72u4SVue4ezadi1v5Ui9r9HjxH7YqbkY_yf5jFtPQ")
+    print(name)
+    name = await client.say_my_name_async("Tu72u4SVue4ezadi1v5Ui9r9HjxH7YqbkY_yf5jFtPQ")
+    print(name)
+    name = await client.logout_async("Tu72u4SVue4ezadi1v5Ui9r9HjxH7YqbkY_yf5jFtPQ")
+    print(name)
+
+
+if __name__ == '__main__':
+    asyncio.run(main())
+

nc_user_manager/utils.py

@@ -2,11 +2,26 @@ import json
 import urllib.parse
 import urllib.request
 import urllib.error
+from typing import Optional, Dict, Any
 
-from exceptions import OAuthError
 
-
-def request(method: str, url: str, params=None, headers=None, json_body=None) -> dict:
+def request(
+    method: str,
+    url: str,
+    params: Optional[Dict[str, Any]] = None,
+    headers: Optional[Dict[str, str]] = None,
+    json_body: Optional[dict] = None
+) -> dict:
+    """
+    发送 HTTP 请求并返回统一结果，不抛异常
+    返回格式:
+    {
+        "status": int,           # HTTP 状态码
+        "success": bool,         # 是否成功 (2xx)
+        "body": dict or str,     # JSON解析后的body, 或原始body
+        "error": Optional[str]   # 错误信息
+    }
+    """
     # 拼接 GET 参数
     if params:
         query = urllib.parse.urlencode(params)
@@ -20,20 +35,43 @@ def request(method: str, url: str, params=None, headers=None, json_body=None) ->
         headers["Content-Type"] = "application/json"
 
     req = urllib.request.Request(url, method=method.upper(), data=data)
-
     if headers:
         for k, v in headers.items():
             req.add_header(k, v)
 
+    result = {
+        "status": 0,
+        "success": False,
+        "message": None,
+        "error": None
+    }
+
     try:
         with urllib.request.urlopen(req) as resp:
             body = resp.read().decode()
+            if not body:
+                return {}
             try:
                 return json.loads(body)
             except json.JSONDecodeError:
-                raise OAuthError("Invalid JSON response", resp.getcode(), body)
+                result["status"] = 200
+                result["success"] = False
+                result["message"] = body
+                result["error"] = "Invalid JSON response"
+                return result
     except urllib.error.HTTPError as e:
         body = e.read().decode() if e.fp else None
-        raise OAuthError("HTTP request failed", e.code, body)
+        result["status"] = e.code
+        try:
+            result["message"] = json.loads(body) if body else None
+        except json.JSONDecodeError:
+            result["message"] = body
+        result["error"] = "HTTPError"
+        result["success"] = False
     except urllib.error.URLError as e:
-        raise OAuthError(f"Network error: {e.reason}")
+        result["status"] = 0
+        result["message"] = None
+        result["error"] = f"NetworkError: {e.reason}"
+        result["success"] = False
+
+    return result

{nc_user_terminator-0.1.3.dist-info → nc_user_terminator-0.1.5.dist-info}/METADATA

@@ -1,11 +1,15 @@
 Metadata-Version: 2.4
 Name: nc-user-terminator
-Version: 0.1.3
+Version: 0.1.5
 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
+
+# 更新
++ V0.1.5
+  - 新增本地缓存机制

nc_user_terminator-0.1.5.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=71pQ_4YZy1f_BJ9Pc2Md1r57SStqI1qRxnXU9IGAm5Y,11276
+nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
+nc_user_manager/models.py,sha256=mDK7zskIcaThxvUUTWVf6eMasw7YaA3hDGVVSd1ZJgo,1088
+nc_user_manager/utils.py,sha256=gxFSaUq0oiymIlvHITu2L7EkU2ZYQmW2q_okmUxGBeU,2319
+nc_user_terminator-0.1.5.dist-info/METADATA,sha256=1uCPVZ-m6nHokYebpNHDAdgJbtNxxJxugWNvzmqxm1U,378
+nc_user_terminator-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nc_user_terminator-0.1.5.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
+nc_user_terminator-0.1.5.dist-info/RECORD,,

nc_user_terminator-0.1.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-nc_user_manager/__init__.py,sha256=fF3FZD0XUW5YCfTbBeJs3RK-Mnm3IQ7lns6Eb_tMqPU,238
-nc_user_manager/client.py,sha256=rGHrFv8ULTp_UXxg8BF-NAmbov9YUgzytJs6Nut7KrE,7254
-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.3.dist-info/METADATA,sha256=YsxkK7xUovwQCna9nCZyjT5gkYJdVabM01ZmJag9t2g,327
-nc_user_terminator-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nc_user_terminator-0.1.3.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
-nc_user_terminator-0.1.3.dist-info/RECORD,,