huace-aigc-auth-client 1.1.10__py3-none-any.whl → 1.1.15__py3-none-any.whl

huace_aigc_auth_client/__init__.py

@@ -67,16 +67,76 @@ from .legacy_adapter import (
     create_sync_config,
     create_default_field_mappings,
 )
+# fastapi 相关功能是可选的，如果未安装 fastapi 则跳过
+try:
+    from .webhook import (
+        register_webhook_router,
+        verify_webhook_signature,
+    )
+    _fastapi_available = True
+except ImportError:
+    _fastapi_available = False
+    # 提供占位符，避免 __all__ 导出时出错
+    register_webhook_router = None
+    verify_webhook_signature = None
 
-from .webhook import (
-    register_webhook_router,
-    verify_webhook_signature,
-)
+# Flask 相关功能是可选的，如果未安装 flask 则跳过
+try:
+    from .webhook_flask import (
+        create_flask_webhook_blueprint,
+        register_flask_webhook_routes,
+    )
+    _flask_available = True
+except ImportError:
+    _flask_available = False
+    # 提供占位符，避免 __all__ 导出时出错
+    create_flask_webhook_blueprint = None
+    register_flask_webhook_routes = None
+
+def setLogger(log):
+    """
+    统一设置所有模块的 logger
+    
+    Args:
+        log: logging.Logger 实例
+        
+    使用示例:
+        import logging
+        from huace_aigc_auth_client import setLogger
+        
+        logger = logging.getLogger("my_app")
+        logger.setLevel(logging.INFO)
+        
+        # 设置 SDK 所有模块使用该 logger
+        setLogger(logger)
+    """
+    try:
+        from .sdk import setLogger as sdk_setLogger
+        sdk_setLogger(log)
+    except Exception as e:
+        print(f"Failed to set logger for sdk module: {e}")
+    
+    try:
+        from .legacy_adapter import setLogger as legacy_setLogger
+        legacy_setLogger(log)
+    except Exception as e:
+        print(f"Failed to set logger for legacy_adapter module: {e}")
+    
+    if _fastapi_available:
+        try:
+            from .webhook import setLogger as webhook_setLogger
+            webhook_setLogger(log)
+        except Exception as e:
+            print(f"Failed to set logger for webhook module: {e}")
+    
+    # 只在 flask 可用时设置 flask 模块的 logger
+    if _flask_available:
+        try:
+            from .webhook_flask import setLogger as webhook_flask_setLogger
+            webhook_flask_setLogger(log)
+        except Exception as e:
+            print(f"Failed to set logger for webhook_flask module: {e}")
 
-from .webhook_flask import (
-    create_flask_webhook_blueprint,
-    register_flask_webhook_routes,
-)
 
 __all__ = [
     # 核心类
@@ -105,5 +165,7 @@ __all__ = [
     # Webhook 接收 (Flask)
     "create_flask_webhook_blueprint",
     "register_flask_webhook_routes",
+    # Logger 设置
+    "setLogger",
 ]
-__version__ = "1.1.10"
+__version__ = "1.1.15"

huace_aigc_auth_client/legacy_adapter.py

@@ -20,7 +20,9 @@ from enum import Enum
 from abc import ABC, abstractmethod
 
 logger = logging.getLogger(__name__)
-
+def setLogger(log):
+    global logger
+    logger = log
 
 class PasswordMode(Enum):
     """密码处理模式"""
@@ -274,7 +276,13 @@ class LegacySystemAdapter(ABC):
         
         for user in users:
             try:
-                result = await self.sync_user_to_auth(user)
+                # 将 dict 转换为 LegacyUserData 对象
+                if isinstance(user, dict):
+                    legacy_user = LegacyUserData(data=user)
+                else:
+                    legacy_user = user
+                    
+                result = await self.sync_user_to_auth(legacy_user)
                 logger.info(f"Sync result for user {user.get('username')}: {result}")
                 
                 if result.get("success"):
@@ -329,7 +337,7 @@ class LegacySystemAdapter(ABC):
             
             # 创建或更新用户
             logger.info(f"Handling {event} event for user: {legacy_data}")
-            result = await self.upsert_user_async(legacy_data)
+            result = await self.upsert_user_async(legacy_data, data)
             
             return {
                 "success": True,
@@ -420,7 +428,14 @@ class LegacySystemAdapter(ABC):
             return (self.config.unified_password, False)
         elif self.config.password_mode == PasswordMode.CUSTOM_MAPPING:
             if self.config.password_mapper and legacy_user:
-                password = self.config.password_mapper(legacy_user.data)
+                # 兼容 dict 和 LegacyUserData 两种类型
+                if isinstance(legacy_user, dict):
+                    user_data = legacy_user
+                elif isinstance(legacy_user, LegacyUserData):
+                    user_data = legacy_user.data
+                else:
+                    user_data = legacy_user
+                password = self.config.password_mapper(user_data)
                 return (password, self.config.password_is_hashed)
             return (self.config.unified_password, False)
         return (self.config.unified_password, False)
@@ -552,7 +567,7 @@ class UserSyncService:
         legacy_data["password"] = password
         
         # 使用 upsert 方法（存在则更新，不存在则创建）
-        result = await self.adapter.upsert_user_async(legacy_data)
+        result = await self.adapter.upsert_user_async(legacy_data, auth_data)
         
         return {
             "success": True,

huace_aigc_auth_client/sdk.py

@@ -19,6 +19,9 @@ from typing import Optional, List, Dict, Any, Callable, Tuple
 from dataclasses import dataclass
 
 logger = logging.getLogger(__name__)
+def setLogger(log):
+    global logger
+    logger = log
 
 # 尝试加载 .env 文件
 try:

huace_aigc_auth_client/webhook.py

@@ -13,7 +13,9 @@ from typing import Callable, Awaitable, Dict, Any, Optional
 from fastapi import APIRouter, Request, HTTPException
 
 logger = logging.getLogger(__name__)
-
+def setLogger(log):
+    global logger
+    logger = log
 
 def verify_webhook_signature(payload: bytes, signature: str, secret: str) -> bool:
     """

huace_aigc_auth_client/webhook_flask.py

@@ -14,7 +14,9 @@ from typing import Callable, Dict, Any, Optional
 from flask import Blueprint, request, jsonify
 
 logger = logging.getLogger(__name__)
-
+def setLogger(log):
+    global logger
+    logger = log
 
 def verify_webhook_signature(payload: bytes, signature: str, secret: str) -> bool:
     """

{huace_aigc_auth_client-1.1.10.dist-info → huace_aigc_auth_client-1.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: huace-aigc-auth-client
-Version: 1.1.10
+Version: 1.1.15
 Summary: 华策AIGC Auth Client - 提供 Token 验证、用户信息获取、权限检查、旧系统接入等功能
 Author-email: Huace <support@huace.com>
 License: MIT

huace_aigc_auth_client-1.1.15.dist-info/RECORD

@@ -0,0 +1,10 @@
+huace_aigc_auth_client/__init__.py,sha256=KYoil3pbho69Cs0nEPJz2Bli1L8tJ9NjDDBCOU9vWT0,4540
+huace_aigc_auth_client/legacy_adapter.py,sha256=f1_xH6huiPdCnJx1ko-2_kWTHjWKLBK2zyPXqnPiEaY,24049
+huace_aigc_auth_client/sdk.py,sha256=ypClZfQm4Ux4db8XDP51I5Cuk1Uc9F2VPgECpXXphkQ,23272
+huace_aigc_auth_client/webhook.py,sha256=XQZYEbMoqIdqZWCGSTcedeDKJpDbUVSq5g08g-6Qucg,4124
+huace_aigc_auth_client/webhook_flask.py,sha256=Iosu4dBtRhQZM_ytn-bn82MpVsyOiV28FBnt7Tfh31U,7225
+huace_aigc_auth_client-1.1.15.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
+huace_aigc_auth_client-1.1.15.dist-info/METADATA,sha256=lUBiUG93imjVSuLQBO4GVUZY-DW5xE8xvWwObY5KrGM,22971
+huace_aigc_auth_client-1.1.15.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+huace_aigc_auth_client-1.1.15.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
+huace_aigc_auth_client-1.1.15.dist-info/RECORD,,

{huace_aigc_auth_client-1.1.10.dist-info → huace_aigc_auth_client-1.1.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

huace_aigc_auth_client-1.1.10.dist-info/RECORD

@@ -1,10 +0,0 @@
-huace_aigc_auth_client/__init__.py,sha256=BKfCXzmYmlv8k4_PMWNLbNUrvrmeC5OIu7KAez4b24w,2550
-huace_aigc_auth_client/legacy_adapter.py,sha256=JQ9OIrzlPjd1JFronX5Ve4voZUbMBaBmGBZ_ThIl6eE,23401
-huace_aigc_auth_client/sdk.py,sha256=ha1e_MSzLCsIMrdgcKSh-V5hTVR1rqqrIMWcDmtVMKs,23217
-huace_aigc_auth_client/webhook.py,sha256=m-mjXNNqrUClrNpOHRBzty0XKFDBuZp4e_PgLd2t0aA,4070
-huace_aigc_auth_client/webhook_flask.py,sha256=JiIsAr6INjGNKVzamyHDWVl7tzdCPOR1WguMLAmt6iI,7171
-huace_aigc_auth_client-1.1.10.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
-huace_aigc_auth_client-1.1.10.dist-info/METADATA,sha256=1AgKalGR2m4melynA5ojDFJmsaDmhQcOBpa_Z8AZiWU,22971
-huace_aigc_auth_client-1.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-huace_aigc_auth_client-1.1.10.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
-huace_aigc_auth_client-1.1.10.dist-info/RECORD,,