pixelarraythirdparty 1.1.6__tar.gz → 1.1.9__tar.gz

{pixelarraythirdparty-1.1.6 → pixelarraythirdparty-1.1.9}/PKG-INFO

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

{pixelarraythirdparty-1.1.6 → pixelarraythirdparty-1.1.9}/pixelarraythirdparty/__init__.py

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

{pixelarraythirdparty-1.1.6 → pixelarraythirdparty-1.1.9}/pixelarraythirdparty/cron/cron.py

@@ -2,40 +2,7 @@ from pixelarraythirdparty.client import AsyncClient
 
 
 class CronManagerAsync(AsyncClient):
-    async def get_cron_status(self):
-        """
-        description:
-            获取Cron服务状态，包括已注册的任务、工作节点状态等。
-        return:
-            data(dict): Cron服务状态信息
-                - registered_tasks(dict): 已注册的任务列表，按工作节点分组
-                - worker_stats(dict): 工作节点统计信息
-                - scheduled_task_count(int): 定时任务数量
-                - timestamp(str): 状态获取时间
-            success(bool): 操作是否成功
-        """
-        data, success = await self._request("GET", "/api/cron/status")
-        if not success:
-            return {}, False
-        return data, True
-
-    async def get_cron_tasks(self):
-        """
-        description:
-            获取所有已注册的Cron任务列表。
-        return:
-            data(dict): 任务列表信息
-                - tasks(list): 已注册的任务名称列表
-                - count(int): 任务数量
-                - timestamp(str): 获取时间
-            success(bool): 操作是否成功
-        """
-        data, success = await self._request("GET", "/api/cron/tasks")
-        if not success:
-            return {}, False
-        return data, True
-
-    async def get_cron_tasks_scheduled(self):
+    async def list_cron_task(self):
         """
         description:
             获取所有配置的定时任务列表，包括任务详情、执行时间、状态等。

pixelarraythirdparty-1.1.9/pixelarraythirdparty/unified_login/__init__.py

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

{pixelarraythirdparty-1.1.6 → pixelarraythirdparty-1.1.9}/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.6 → pixelarraythirdparty-1.1.9}/pixelarraythirdparty.egg-info/PKG-INFO

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

{pixelarraythirdparty-1.1.6 → pixelarraythirdparty-1.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pixelarraythirdparty"
-version = "1.1.6"
+version = "1.1.9"
 authors = [
     {name = "Lu qi", email = "qi.lu@pixelarrayai.com"},
 ]

pixelarraythirdparty-1.1.6/pixelarraythirdparty/unified_login/__init__.py

@@ -1,4 +0,0 @@
-from .unified_login import GoogleLogin, WechatLogin, GitHubLogin
-
-__all__ = ["GoogleLogin", "WechatLogin", "GitHubLogin"]
-