pixelarraythirdparty 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl

pixelarraythirdparty/__init__.py

@@ -13,7 +13,7 @@ PixelArray 第三方微服务客户端
 - project: 项目管理模块
 """
 
-__version__ = "1.1.7"
+__version__ = "1.1.9"
 __author__ = "Lu qi"
 __email__ = "qi.lu@pixelarrayai.com"
 

pixelarraythirdparty/unified_login/__init__.py

@@ -1,4 +1,20 @@
-from .unified_login import GoogleLogin, WechatLogin, GitHubLogin
+from .unified_login import (
+    GoogleLogin,
+    WechatLogin,
+    GitHubLogin,
+    DouyinLogin,
+    GitLabLogin,
+    SMSLogin,
+    EmailLogin,
+)
 
-__all__ = ["GoogleLogin", "WechatLogin", "GitHubLogin"]
+__all__ = [
+    "GoogleLogin",
+    "WechatLogin",
+    "GitHubLogin",
+    "DouyinLogin",
+    "GitLabLogin",
+    "SMSLogin",
+    "EmailLogin",
+]
 

pixelarraythirdparty/unified_login/unified_login.py

@@ -14,6 +14,15 @@ class GoogleLogin(AsyncClient):
     ```
     google = GoogleLogin(api_key="your_api_key")
     user_info, success = await google.login()
+    if success:
+        access_token = user_info.get("access_token")
+        refresh_token = user_info.get("refresh_token")
+        
+        # 使用refresh_token刷新access_token
+        if refresh_token:
+            token_data, success = await google.refresh_access_token(refresh_token)
+            if success:
+                new_access_token = token_data.get("access_token")
     ```
     """
 
@@ -88,6 +97,31 @@ class GoogleLogin(AsyncClient):
 
         return {}, False
 
+    async def refresh_access_token(self, refresh_token: str) -> Tuple[Dict, bool]:
+        """
+        使用refresh_token刷新access_token
+        
+        :param refresh_token: Google OAuth refresh_token
+        :return: 包含新的access_token和可能的refresh_token的字典，以及是否成功的布尔值
+        
+        使用示例:
+        ```
+        google = GoogleLogin(api_key="your_api_key")
+        token_data, success = await google.refresh_access_token(refresh_token="your_refresh_token")
+        if success:
+            new_access_token = token_data.get("access_token")
+            new_refresh_token = token_data.get("refresh_token")  # 可能为None
+        ```
+        """
+        data, success = await self._request(
+            "POST",
+            "/api/unified-login/google/refresh-token",
+            json={"refresh_token": refresh_token},
+        )
+        if not success:
+            return {}, False
+        return data, True
+
 
 class WechatLogin(AsyncClient):
     """
@@ -459,3 +493,207 @@ class GitLabLogin(AsyncClient):
             await asyncio.sleep(interval)
 
         return {}, False
+
+
+class SMSLogin(AsyncClient):
+    """
+    短信验证码登录客户端
+
+    使用示例:
+    ```
+    sms = SMSLogin(api_key="your_api_key")
+    # 发送验证码
+    state, success = await sms.send_code(phone="13800138000")
+    if success:
+        # 验证验证码并登录
+        user_info, success = await sms.login(state=state, code="123456")
+    ```
+    """
+
+    def __init__(self, api_key: str):
+        super().__init__(api_key)
+
+    async def send_code(self, phone: str) -> Tuple[Optional[str], bool]:
+        """
+        发送短信验证码
+
+        :param phone: 手机号码
+        :return: (state, success) state用于后续验证验证码
+        """
+        data, success = await self._request(
+            "POST", "/api/unified-login/sms/send-code", json={"phone": phone}
+        )
+        if not success:
+            return None, False
+        state = data.get("state")
+        if not state:
+            return None, False
+        return state, True
+
+    async def verify_code(self, state: str, code: str) -> Tuple[Optional[str], bool]:
+        """
+        验证短信验证码
+
+        :param state: 发送验证码时返回的state
+        :param code: 验证码
+        :return: (state, success) state用于后续等待登录结果
+        """
+        data, success = await self._request(
+            "POST",
+            "/api/unified-login/sms/verify-code",
+            json={"state": state, "code": code},
+        )
+        if not success:
+            return None, False
+        new_state = data.get("state")
+        if not new_state:
+            return None, False
+        return new_state, True
+
+    async def _wait_for_login(
+        self, state: str, timeout: int
+    ) -> Tuple[Dict, bool]:
+        """
+        等待短信登录结果
+
+        :param state: 验证验证码时返回的state
+        :param timeout: 超时时间（秒）
+        """
+        interval = 2
+        total_checks = max(1, timeout // interval) if timeout > 0 else 1
+
+        for _ in range(total_checks):
+            status, response = await self._request_raw(
+                "POST",
+                "/api/unified-login/sms/wait-sms-login",
+                json={"state": state},
+            )
+
+            if status == 200 and response.get("success") is True:
+                return response.get("data", {}), True
+
+            if status in (400, 408):
+                break
+
+            await asyncio.sleep(interval)
+
+        return {}, False
+
+    async def login(
+        self, state: str, code: str, timeout: int = 180
+    ) -> Tuple[Dict, bool]:
+        """
+        验证验证码并等待登录结果
+
+        :param state: 发送验证码时返回的state
+        :param code: 验证码
+        :param timeout: 等待登录结果的超时时间（秒）
+        :return: (用户信息, 是否成功)
+        """
+        new_state, success = await self.verify_code(state, code)
+        if not success or not new_state:
+            return {}, False
+
+        return await self._wait_for_login(new_state, timeout)
+
+
+class EmailLogin(AsyncClient):
+    """
+    邮箱验证码登录客户端
+
+    使用示例:
+    ```
+    email = EmailLogin(api_key="your_api_key")
+    # 发送验证码
+    state, success = await email.send_code(email="user@example.com")
+    if success:
+        # 验证验证码并登录
+        user_info, success = await email.login(state=state, code="123456")
+    ```
+    """
+
+    def __init__(self, api_key: str):
+        super().__init__(api_key)
+
+    async def send_code(self, email: str) -> Tuple[Optional[str], bool]:
+        """
+        发送邮箱验证码
+
+        :param email: 邮箱地址
+        :return: (state, success) state用于后续验证验证码
+        """
+        data, success = await self._request(
+            "POST", "/api/unified-login/email/send-code", json={"email": email}
+        )
+        if not success:
+            return None, False
+        state = data.get("state")
+        if not state:
+            return None, False
+        return state, True
+
+    async def verify_code(self, state: str, code: str) -> Tuple[Optional[str], bool]:
+        """
+        验证邮箱验证码
+
+        :param state: 发送验证码时返回的state
+        :param code: 验证码
+        :return: (state, success) state用于后续等待登录结果
+        """
+        data, success = await self._request(
+            "POST",
+            "/api/unified-login/email/verify-code",
+            json={"state": state, "code": code},
+        )
+        if not success:
+            return None, False
+        new_state = data.get("state")
+        if not new_state:
+            return None, False
+        return new_state, True
+
+    async def _wait_for_login(
+        self, state: str, timeout: int
+    ) -> Tuple[Dict, bool]:
+        """
+        等待邮箱登录结果
+
+        :param state: 验证验证码时返回的state
+        :param timeout: 超时时间（秒）
+        """
+        interval = 2
+        total_checks = max(1, timeout // interval) if timeout > 0 else 1
+
+        for _ in range(total_checks):
+            status, response = await self._request_raw(
+                "POST",
+                "/api/unified-login/email/wait-email-login",
+                json={"state": state},
+            )
+
+            if status == 200 and response.get("success") is True:
+                return response.get("data", {}), True
+
+            if status in (400, 408):
+                break
+
+            await asyncio.sleep(interval)
+
+        return {}, False
+
+    async def login(
+        self, state: str, code: str, timeout: int = 180
+    ) -> Tuple[Dict, bool]:
+        """
+        验证验证码并等待登录结果
+
+        :param state: 发送验证码时返回的state
+        :param code: 验证码
+        :param timeout: 等待登录结果的超时时间（秒）
+        :return: (用户信息, 是否成功)
+        """
+        new_state, success = await self.verify_code(state, code)
+        if not success or not new_state:
+            return {}, False
+
+        return await self._wait_for_login(new_state, timeout)

{pixelarraythirdparty-1.1.7.dist-info → pixelarraythirdparty-1.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraythirdparty
-Version: 1.1.7
+Version: 1.1.9
 Summary: PixelArray 第三方微服务客户端
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT

{pixelarraythirdparty-1.1.7.dist-info → pixelarraythirdparty-1.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pixelarraythirdparty/__init__.py,sha256=DJD0HApoVd_9RhJ6bMGjlWfs3eBJm3jHrWNJ5KPdYjE,582
+pixelarraythirdparty/__init__.py,sha256=QoYi4YotAITkKgOLFe4a1RtY7dP_SXaSz2ArxGuGC-g,582
 pixelarraythirdparty/client.py,sha256=DY8w2DYsoGQ6cZYqT-FfoovmVd3Ry-aJbJls2Cxat8M,2006
 pixelarraythirdparty/cron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/cron/cron.py,sha256=nv4e2hX_UkEJ-kbEARbInU2J6aREyYZ61dZ-4b9UWJI,3146
@@ -10,12 +10,12 @@ pixelarraythirdparty/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 pixelarraythirdparty/product/product.py,sha256=5fgv2Ck860epYXxipY83vePziubCIlocFu43mGt_bhM,7497
 pixelarraythirdparty/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/project/project.py,sha256=a8swjckyn4y3NlIx0-tMbcRwDY9woOijGi7lb1wN7Ok,2455
-pixelarraythirdparty/unified_login/__init__.py,sha256=2ejSpO0gp-J-XkT5p19V45FlYOW7-NO_aCExukfUTIo,123
-pixelarraythirdparty/unified_login/unified_login.py,sha256=bbbUvYlcR_G5zdfXaDHRZkg9gGjKniVD6cUaKOxhfPQ,14134
+pixelarraythirdparty/unified_login/__init__.py,sha256=_PeHBsyrPLfcNjbdcsBgQ_75fr1CoRZCNu7S33fsh_Y,291
+pixelarraythirdparty/unified_login/unified_login.py,sha256=Rh0EVxvQkTKOGZN9092JxVeGbD2OQ7L2Zvy4M4BlgXI,21559
 pixelarraythirdparty/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/user/user.py,sha256=v018iisB5AQNs7AtrHIGfu8YIorX0vflDClsKrt3ZMU,5898
-pixelarraythirdparty-1.1.7.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
-pixelarraythirdparty-1.1.7.dist-info/METADATA,sha256=V4Dj8eyc9jYwDZWYPDn_Wi5WGyFGC9JRqOyB5alOf5I,993
-pixelarraythirdparty-1.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pixelarraythirdparty-1.1.7.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
-pixelarraythirdparty-1.1.7.dist-info/RECORD,,
+pixelarraythirdparty-1.1.9.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
+pixelarraythirdparty-1.1.9.dist-info/METADATA,sha256=6nk6d65Q13hI39JUzL-MCOS_AyPOSnho1zngzOqY1Lk,993
+pixelarraythirdparty-1.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pixelarraythirdparty-1.1.9.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
+pixelarraythirdparty-1.1.9.dist-info/RECORD,,