huace-aigc-auth-client 1.1.9__tar.gz → 1.1.11__tar.gz

{huace_aigc_auth_client-1.1.9/huace_aigc_auth_client.egg-info → huace_aigc_auth_client-1.1.11}/PKG-INFO

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

{huace_aigc_auth_client-1.1.9 → huace_aigc_auth_client-1.1.11}/huace_aigc_auth_client/__init__.py

@@ -78,6 +78,48 @@ from .webhook_flask import (
     register_flask_webhook_routes,
 )
 
+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}")
+    
+    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}")
+    
+    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}")
+
+
 __all__ = [
     # 核心类
     "AigcAuthClient",
@@ -105,5 +147,7 @@ __all__ = [
     # Webhook 接收 (Flask)
     "create_flask_webhook_blueprint",
     "register_flask_webhook_routes",
+    # Logger 设置
+    "setLogger",
 ]
-__version__ = "1.1.9"
+__version__ = "1.1.11"

{huace_aigc_auth_client-1.1.9 → huace_aigc_auth_client-1.1.11}/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):
     """密码处理模式"""
@@ -214,6 +216,41 @@ class LegacySystemAdapter(ABC):
             user_id = await self._create_user_async(user_data)
             return {"created": True, "user_id": user_id}
     
+    async def sync_user_to_auth(self, legacy_user: LegacyUserData) -> Dict[str, Any]:
+        """同步单个旧系统用户到 aigc-auth（默认实现）
+        
+        子类可以选择性覆盖此方法以自定义同步逻辑。
+        
+        Args:
+            legacy_user: 旧系统用户数据
+        Returns:
+            Dict: 同步结果
+        """
+        if not self.auth_client:
+            logger.error("auth_client is required for sync_user_to_auth")
+            raise ValueError("auth_client is required for sync_user_to_auth. Please provide it in constructor.")
+        
+        logger.info(f"Syncing legacy user to auth: {legacy_user.to_dict()}")
+        auth_data = self.transform_legacy_to_auth(legacy_user)
+        
+        # 获取密码（支持新的元组返回格式）
+        password_result = self.get_password_for_sync(legacy_user)
+        if isinstance(password_result, tuple):
+            password, is_hashed = password_result
+        else:
+            password, is_hashed = password_result, False
+        
+        # 根据是否已加密选择不同的字段
+        if is_hashed:
+            auth_data["password_hashed"] = password
+        else:
+            auth_data["password"] = password
+        
+        result = await self.auth_client.sync_user_to_auth(auth_data)
+        logger.info(f"Sync result for user {legacy_user.get('username')}: {result}")
+        
+        return result
+    
     async def batch_sync_to_auth(self) -> Dict[str, Any]:
         """批量同步旧系统用户到 aigc-auth（默认实现）
         
@@ -239,22 +276,7 @@ class LegacySystemAdapter(ABC):
         
         for user in users:
             try:
-                auth_data = self.transform_legacy_to_auth(user)
-                
-                # 获取密码（支持新的元组返回格式）
-                password_result = self.get_password_for_sync(user)
-                if isinstance(password_result, tuple):
-                    password, is_hashed = password_result
-                else:
-                    password, is_hashed = password_result, False
-                
-                # 根据是否已加密选择不同的字段
-                if is_hashed:
-                    auth_data["password_hashed"] = password
-                else:
-                    auth_data["password"] = password
-                
-                result = self.auth_client.sync_user_to_auth(auth_data)
+                result = await self.sync_user_to_auth(user)
                 logger.info(f"Sync result for user {user.get('username')}: {result}")
                 
                 if result.get("success"):
@@ -297,12 +319,15 @@ class LegacySystemAdapter(ABC):
             legacy_data = self.transform_auth_to_legacy(data)
             
             # 获取密码
-            password_result = self.get_password_for_sync()
+            password_result = self.get_password_for_sync(legacy_data)
             if isinstance(password_result, tuple):
                 password, is_hashed = password_result
             else:
                 password, is_hashed = password_result, False
-            legacy_data["password"] = password
+            if is_hashed:
+                legacy_data["password_hashed"] = password
+            else:
+                legacy_data["password"] = password
             
             # 创建或更新用户
             logger.info(f"Handling {event} event for user: {legacy_data}")

{huace_aigc_auth_client-1.1.9 → huace_aigc_auth_client-1.1.11}/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-1.1.9 → huace_aigc_auth_client-1.1.11}/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-1.1.9 → huace_aigc_auth_client-1.1.11}/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.9 → huace_aigc_auth_client-1.1.11/huace_aigc_auth_client.egg-info}/PKG-INFO

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

{huace_aigc_auth_client-1.1.9 → huace_aigc_auth_client-1.1.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "huace-aigc-auth-client"
-version = "1.1.9"
+version = "1.1.11"
 description = "华策AIGC Auth Client - 提供 Token 验证、用户信息获取、权限检查、旧系统接入等功能"
 readme = "README.md"
 requires-python = ">=3.7"