pixelarraythirdparty 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

pixelarraythirdparty/__init__.py

@@ -11,7 +11,7 @@ PixelArray 第三方微服务客户端
 - unified_login: 统一登录模块
 """
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 __author__ = "Lu qi"
 __email__ = "qi.lu@pixelarrayai.com"
 

pixelarraythirdparty/unified_login/unified_login.py

@@ -92,21 +92,38 @@ class GoogleLogin(AsyncClient):
 class WechatLogin(AsyncClient):
     """
     微信 OAuth2 登录客户端
+    
+    支持两种登录方式：
+    - desktop: PC端扫码登录（使用微信开放平台）
+    - mobile: 微信公众号OAuth登录（手机端微信内打开）
 
     使用示例:
     ```
     wechat = WechatLogin(api_key="your_api_key")
-    user_info, success = await wechat.login()
+    # PC端扫码登录
+    user_info, success = await wechat.login(login_type="desktop")
+    # 微信公众号登录（手机端）
+    user_info, success = await wechat.login(login_type="mobile")
     ```
     """
 
     def __init__(self, api_key: str):
         super().__init__(api_key)
 
-    async def _get_auth_url(self) -> Tuple[Optional[Dict[str, str]], bool]:
-        data, success = await self._request(
-            "POST", "/api/unified-login/wechat/auth-url"
-        )
+    async def _get_auth_url(self, login_type: str = "desktop") -> Tuple[Optional[Dict[str, str]], bool]:
+        """
+        获取微信授权URL
+        
+        :param login_type: 登录类型，desktop 表示PC端扫码登录，mobile 表示微信公众号登录
+        """
+        if login_type == "mobile":
+            # 微信公众号OAuth登录（手机端）
+            endpoint = "/api/unified-login/wechat-official/auth-url"
+        else:
+            # PC端扫码登录
+            endpoint = "/api/unified-login/wechat/auth-url"
+        
+        data, success = await self._request("POST", endpoint)
         if not success:
             return None, False
         auth_url = data.get("auth_url")
@@ -114,14 +131,24 @@ class WechatLogin(AsyncClient):
             return None, False
         return data, True
 
-    async def login(self, timeout: int = 180) -> Tuple[Dict, bool]:
+    async def login(self, login_type: str = "desktop", timeout: int = 180) -> Tuple[Dict, bool]:
         """
         仿 Supabase CLI 的一键登录流程：打开浏览器完成授权，
         终端端轮询等待登录结果
 
+        :param login_type: 登录类型，desktop 表示PC端扫码登录，mobile 表示微信公众号登录
         :param timeout: 等待用户完成授权的超时时间（秒）
+        
+        使用示例:
+        ```
+        wechat = WechatLogin(api_key="your_api_key")
+        # PC端扫码登录
+        user_info, success = await wechat.login(login_type="desktop")
+        # 微信公众号登录（手机端）
+        user_info, success = await wechat.login(login_type="mobile")
+        ```
         """
-        auth_data, success = await self._get_auth_url()
+        auth_data, success = await self._get_auth_url(login_type)
         if not success or not auth_data:
             return {}, False
 
@@ -133,7 +160,7 @@ class WechatLogin(AsyncClient):
 
         webbrowser.open(auth_url, new=2)
 
-        return await self._wait_for_wechat_login(state, timeout)
+        return await self._wait_for_wechat_login(state, timeout, login_type)
 
     def _extract_state(self, auth_url: Optional[str]) -> Optional[str]:
         if not auth_url:
@@ -149,15 +176,28 @@ class WechatLogin(AsyncClient):
         return None
 
     async def _wait_for_wechat_login(
-        self, state: str, timeout: int
+        self, state: str, timeout: int, login_type: str = "desktop"
     ) -> Tuple[Dict, bool]:
+        """
+        等待微信登录结果
+        
+        :param state: 登录状态标识
+        :param timeout: 超时时间（秒）
+        :param login_type: 登录类型，desktop 表示PC端扫码登录，mobile 表示微信公众号登录
+        """
         interval = 2
         total_checks = max(1, timeout // interval) if timeout > 0 else 1
 
+        # 根据登录类型选择不同的等待接口
+        if login_type == "mobile":
+            endpoint = "/api/unified-login/wechat-official/wait-login"
+        else:
+            endpoint = "/api/unified-login/wechat/wait-login"
+
         for _ in range(total_checks):
             status, response = await self._request_raw(
                 "POST",
-                "/api/unified-login/wechat/wait-login",
+                endpoint,
                 json={"state": state},
             )
 
@@ -255,16 +295,84 @@ class GitHubLogin(AsyncClient):
         return {}, False
 
 
-class UnifiedLogin(AsyncClient):
+class DouyinLogin(AsyncClient):
+    """
+    抖音 OAuth2 登录客户端
+
+    使用示例:
+    ```
+    douyin = DouyinLogin(api_key="your_api_key")
+    user_info, success = await douyin.login()
+    ```
+    """
+
     def __init__(self, api_key: str):
         super().__init__(api_key)
 
-    async def login(self, provider: str, timeout: int = 180) -> Tuple[Dict, bool]:
-        if provider == "google":
-            return await GoogleLogin(self.api_key).login(timeout)
-        elif provider == "wechat":
-            return await WechatLogin(self.api_key).login(timeout)
-        elif provider == "github":
-            return await GitHubLogin(self.api_key).login(timeout)
-        else:
+    async def _get_auth_url(self) -> Tuple[Optional[Dict[str, str]], bool]:
+        data, success = await self._request(
+            "POST", "/api/unified-login/douyin/auth-url"
+        )
+        if not success:
+            return None, False
+        auth_url = data.get("auth_url")
+        if not auth_url:
+            return None, False
+        return data, True
+
+    async def login(self, timeout: int = 180) -> Tuple[Dict, bool]:
+        """
+        仿 Supabase CLI 的一键登录流程：打开浏览器完成授权，
+        终端端轮询等待登录结果
+
+        :param timeout: 等待用户完成授权的超时时间（秒）
+        """
+        auth_data, success = await self._get_auth_url()
+        if not success or not auth_data:
             return {}, False
+
+        auth_url = auth_data.get("auth_url")
+        state = auth_data.get("state") or self._extract_state(auth_url)
+
+        if not auth_url or not state:
+            return {}, False
+
+        webbrowser.open(auth_url, new=2)
+
+        return await self._wait_for_douyin_login(state, timeout)
+
+    def _extract_state(self, auth_url: Optional[str]) -> Optional[str]:
+        if not auth_url:
+            return None
+        try:
+            parsed = urllib.parse.urlparse(auth_url)
+            query = urllib.parse.parse_qs(parsed.query)
+            values = query.get("state")
+            if values:
+                return values[0]
+        except Exception:
+            return None
+        return None
+
+    async def _wait_for_douyin_login(
+        self, state: str, timeout: int
+    ) -> Tuple[Dict, bool]:
+        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/douyin/wait-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

{pixelarraythirdparty-1.1.2.dist-info → pixelarraythirdparty-1.1.3.dist-info}/METADATA

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

{pixelarraythirdparty-1.1.2.dist-info → pixelarraythirdparty-1.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pixelarraythirdparty/__init__.py,sha256=6Gb-EBJU0w8cIVBjgIA6hIcCmeY_PMAEutBpNtmTcyI,490
+pixelarraythirdparty/__init__.py,sha256=4SwrWVbKxryIzsDKZuZiIojd6EcRc-zLC01GzoHQBsI,490
 pixelarraythirdparty/client.py,sha256=DY8w2DYsoGQ6cZYqT-FfoovmVd3Ry-aJbJls2Cxat8M,2006
 pixelarraythirdparty/cron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/cron/cron.py,sha256=2oxnIJvRY0A-ynhKSHJvZmJLj1EWzYcqSIl8r9yh9a0,4402
@@ -7,11 +7,11 @@ pixelarraythirdparty/order/order.py,sha256=rk9O73m5kOhjzavq3wIfN-JKj3cLwAItHVTJ2
 pixelarraythirdparty/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/product/product.py,sha256=5fgv2Ck860epYXxipY83vePziubCIlocFu43mGt_bhM,7497
 pixelarraythirdparty/unified_login/__init__.py,sha256=2ejSpO0gp-J-XkT5p19V45FlYOW7-NO_aCExukfUTIo,123
-pixelarraythirdparty/unified_login/unified_login.py,sha256=em5qBdAWPS4Fs4SO2oEOBF2XQlR5drlDK8NQ0RyKAnc,8032
+pixelarraythirdparty/unified_login/unified_login.py,sha256=q8_59HPEuD8YVBC-KCH9ozrVC5THdc-3xJqCr2-f5lU,11684
 pixelarraythirdparty/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/user/user.py,sha256=v018iisB5AQNs7AtrHIGfu8YIorX0vflDClsKrt3ZMU,5898
-pixelarraythirdparty-1.1.2.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
-pixelarraythirdparty-1.1.2.dist-info/METADATA,sha256=7wSIsvbQQ8pQdVKqhxquRxfSg4IdxVcJ8zK5Qa2QpCw,993
-pixelarraythirdparty-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pixelarraythirdparty-1.1.2.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
-pixelarraythirdparty-1.1.2.dist-info/RECORD,,
+pixelarraythirdparty-1.1.3.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
+pixelarraythirdparty-1.1.3.dist-info/METADATA,sha256=nfpYNkKb-71etMWL6O66GsIDVfbAyOT1p8VGuEV5ng8,993
+pixelarraythirdparty-1.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pixelarraythirdparty-1.1.3.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
+pixelarraythirdparty-1.1.3.dist-info/RECORD,,