huace-aigc-auth-client 1.1.30__py3-none-any.whl → 1.1.32__py3-none-any.whl

huace_aigc_auth_client/__init__.py

@@ -54,7 +54,21 @@ from .sdk import (
     create_fastapi_auth_dependency
 )
 
-from .user_context import get_current_user
+from .user_context import (
+    get_current_user, add_to_request_context, clear_request_context, set_request_context, get_request_context, get_client_ip, get_user_agent, get_request_id, get_trace_id, get_request_token, get_request_app_id, get_request_app_secret
+)
+
+from .api_stats_collector import (
+    init_api_stats_collector,
+    get_api_stats_collector,
+    collect_api_stat,
+    stop_api_stats_collector
+)
+
+from .auth_request import (
+    auth_request,
+    async_auth_httpx_request
+)
 
 from .legacy_adapter import (
     LegacySystemAdapter,
@@ -130,6 +144,12 @@ def setLogger(log):
     except Exception as e:
         print(f"Failed to set logger for api_stats_collector module: {e}")
     
+    try:
+        from .auth_request import setLogger as auth_request_setLogger
+        auth_request_setLogger(log)
+    except Exception as e:
+        print(f"Failed to set logger for auth_request module: {e}")
+    
     if _fastapi_available:
         try:
             from .webhook import setLogger as webhook_setLogger
@@ -177,5 +197,24 @@ __all__ = [
     "setLogger",
     # 用户上下文
     "get_current_user",
+    "add_to_request_context",
+    "clear_request_context",
+    "set_request_context",
+    "get_request_context",
+    "get_client_ip",
+    "get_user_agent",
+    "get_request_id",
+    "get_trace_id",
+    "get_request_token",
+    "get_request_app_id",
+    "get_request_app_secret",
+    # API 统计收集器
+    "init_api_stats_collector",
+    "get_api_stats_collector",
+    "collect_api_stat",
+    "stop_api_stats_collector",
+    # 认证请求封装
+    "auth_request",
+    "async_auth_httpx_request",
 ]
-__version__ = "1.1.30"
+__version__ = "1.1.32"

huace_aigc_auth_client/auth_request.py

@@ -1,6 +1,6 @@
 """
 认证请求封装模块
-提供对 requests.request 的封装，自动添加认证信息和统计上报
+提供对 requests.request 和 httpx 的封装，自动添加认证信息和统计上报
 """
 import time
 import logging
@@ -8,11 +8,26 @@ from typing import Optional, Dict, Any, Union
 import requests
 from requests import Response
 
+try:
+    import httpx
+    HTTPX_AVAILABLE = True
+except ImportError:
+    HTTPX_AVAILABLE = False
+    httpx = None
+
 from .user_context import get_request_context
 from .api_stats_collector import get_api_stats_collector
 
 logger = logging.getLogger(__name__)
-
+def setLogger(log):
+    """
+    统一设置所有模块的 logger
+    
+    Args:
+        log: logging.Logger 实例
+    """
+    global logger
+    logger = log
 
 def auth_request(
     method: str,
@@ -232,6 +247,324 @@ def _report_stats(
         logger.debug(f"统计上报失败: {e}")
 
 
+# ============ HTTPX 异步请求封装 ============
+
+if HTTPX_AVAILABLE:
+    
+    async def async_auth_httpx_request(
+        method: str,
+        url: str,
+        params: Optional[Dict[str, Any]] = None,
+        data: Optional[Union[Dict[str, Any], str, bytes]] = None,
+        json: Optional[Dict[str, Any]] = None,
+        headers: Optional[Dict[str, str]] = None,
+        cookies: Optional[Dict[str, str]] = None,
+        files: Optional[Dict[str, Any]] = None,
+        auth: Optional[tuple] = None,
+        timeout: Optional[Union[float, httpx.Timeout]] = None,
+        follow_redirects: bool = True,
+        **kwargs
+    ) -> httpx.Response:
+        """
+        异步认证请求封装函数（httpx）
+        
+        基本参数与 httpx.request 一致，会自动从 request_context 中获取认证信息并添加到请求头
+        
+        Args:
+            method: HTTP 方法 (GET, POST, PUT, DELETE 等)
+            url: 请求 URL
+            params: URL 查询参数
+            data: 请求体数据 (form-data 或 raw)
+            json: JSON 请求体数据
+            headers: 请求头（会自动添加认证相关的头）
+            cookies: Cookies
+            files: 文件上传
+            auth: HTTP 认证元组
+            timeout: 超时时间（秒）
+            follow_redirects: 是否允许重定向
+            **kwargs: 其他 httpx.request 支持的参数
+        
+        Returns:
+            httpx.Response: 响应对象
+        
+        自动添加的请求头（如果在 request_context 中存在）：
+            - X-App-ID: 应用ID
+            - X-App-Secret: 应用密钥
+            - Authorization: Bearer token
+            - x-real-ip: 客户端真实IP
+            - user-agent: User Agent
+            - X-Trace-ID: 追踪ID
+        """
+        # 初始化 headers
+        if headers is None:
+            headers = {}
+        else:
+            headers = headers.copy()  # 避免修改原始 headers
+        
+        # 从 request_context 获取认证信息
+        request_context = get_request_context()
+        
+        if request_context:
+            # 添加应用ID
+            app_id = request_context.get('app_id')
+            if app_id is not None:
+                headers['X-App-ID'] = str(app_id)
+            
+            # 添加应用密钥
+            app_secret = request_context.get('app_secret')
+            if app_secret:
+                headers['X-App-Secret'] = app_secret
+            
+            # 添加认证令牌
+            token = request_context.get('token')
+            if token:
+                headers['Authorization'] = f'Bearer {token}'
+            
+            # 添加客户端IP
+            ip_address = request_context.get('ip_address')
+            if ip_address:
+                headers['x-real-ip'] = ip_address
+            
+            # 添加 User Agent
+            user_agent = request_context.get('user_agent')
+            if user_agent:
+                headers['user-agent'] = user_agent
+            
+            # 添加追踪ID
+            trace_id = request_context.get('trace_id')
+            if trace_id:
+                headers['X-Trace-ID'] = trace_id
+        
+        # 记录开始时间
+        start_time = time.time()
+        response = None
+        error_message = None
+        
+        try:
+            # 执行异步请求
+            logger.info(f"发起异步认证请求: {method} {url} with headers={headers} params={params} json={json} data={data}")
+            
+            async with httpx.AsyncClient(timeout=timeout) as client:
+                response = await client.request(
+                    method=method,
+                    url=url,
+                    params=params,
+                    data=data,
+                    json=json,
+                    headers=headers,
+                    cookies=cookies,
+                    files=files,
+                    auth=auth,
+                    follow_redirects=follow_redirects,
+                    **kwargs
+                )
+            
+            logger.info(f"异步认证请求响应: {method} {url} 状态码: {response.status_code}")
+            return response
+            
+        except Exception as e:
+            error_message = str(e)
+            logger.error(f"异步认证请求失败: {method} {url} 错误: {error_message}")
+            raise
+            
+        finally:
+            # 计算响应时间
+            response_time = time.time() - start_time
+            
+            # 上报统计信息
+            _report_stats(
+                url=url,
+                method=method,
+                response=response,
+                response_time=response_time,
+                error_message=error_message,
+                request_context=request_context,
+                headers=headers,
+                params=params,
+                json_data=json,
+                form_data=data
+            )
+    
+    
+    class AsyncAuthClient:
+        """
+        异步认证客户端（httpx.AsyncClient 包装）
+        
+        提供可复用的异步 HTTP 客户端，自动处理认证信息和统计上报
+        """
+        
+        def __init__(
+            self,
+            base_url: Optional[str] = None,
+            timeout: Optional[Union[float, httpx.Timeout]] = None,
+            follow_redirects: bool = True,
+            **kwargs
+        ):
+            """
+            初始化异步认证客户端
+            
+            Args:
+                base_url: 基础 URL
+                timeout: 超时配置
+                follow_redirects: 是否允许重定向
+                **kwargs: 其他 httpx.AsyncClient 支持的参数
+            """
+            self.base_url = base_url
+            self.timeout = timeout
+            self.follow_redirects = follow_redirects
+            self.client_kwargs = kwargs
+            self._client: Optional[httpx.AsyncClient] = None
+        
+        async def __aenter__(self):
+            """进入异步上下文"""
+            self._client = httpx.AsyncClient(
+                base_url=self.base_url,
+                timeout=self.timeout,
+                follow_redirects=self.follow_redirects,
+                **self.client_kwargs
+            )
+            return self
+        
+        async def __aexit__(self, exc_type, exc_val, exc_tb):
+            """退出异步上下文"""
+            if self._client:
+                await self._client.aclose()
+                self._client = None
+        
+        def _prepare_headers(self, headers: Optional[Dict[str, str]] = None) -> Dict[str, str]:
+            """准备请求头（添加认证信息）"""
+            # 初始化 headers
+            if headers is None:
+                headers = {}
+            else:
+                headers = headers.copy()
+            
+            # 从 request_context 获取认证信息
+            request_context = get_request_context()
+            
+            if request_context:
+                # 添加应用ID
+                app_id = request_context.get('app_id')
+                if app_id is not None:
+                    headers['X-App-ID'] = str(app_id)
+                
+                # 添加应用密钥
+                app_secret = request_context.get('app_secret')
+                if app_secret:
+                    headers['X-App-Secret'] = app_secret
+                
+                # 添加认证令牌
+                token = request_context.get('token')
+                if token:
+                    headers['Authorization'] = f'Bearer {token}'
+                
+                # 添加客户端IP
+                ip_address = request_context.get('ip_address')
+                if ip_address:
+                    headers['x-real-ip'] = ip_address
+                
+                # 添加 User Agent
+                user_agent = request_context.get('user_agent')
+                if user_agent:
+                    headers['user-agent'] = user_agent
+                
+                # 添加追踪ID
+                trace_id = request_context.get('trace_id')
+                if trace_id:
+                    headers['X-Trace-ID'] = trace_id
+            
+            return headers
+        
+        async def _request(
+            self,
+            method: str,
+            url: str,
+            **kwargs
+        ) -> httpx.Response:
+            """执行请求（内部方法）"""
+            if self._client is None:
+                raise RuntimeError("Client not initialized. Use 'async with AsyncAuthClient()' context manager.")
+            
+            # 准备 headers
+            headers = kwargs.pop('headers', None)
+            headers = self._prepare_headers(headers)
+            
+            # 提取参数用于统计
+            params = kwargs.get('params')
+            json_data = kwargs.get('json')
+            form_data = kwargs.get('data')
+            
+            # 记录开始时间
+            start_time = time.time()
+            response = None
+            error_message = None
+            request_context = get_request_context()
+            
+            try:
+                # 执行请求
+                logger.info(f"AsyncAuthClient 发起请求: {method} {url} with headers={headers}")
+                response = await self._client.request(
+                    method=method,
+                    url=url,
+                    headers=headers,
+                    **kwargs
+                )
+                logger.info(f"AsyncAuthClient 请求响应: {method} {url} 状态码: {response.status_code}")
+                return response
+                
+            except Exception as e:
+                error_message = str(e)
+                logger.error(f"AsyncAuthClient 请求失败: {method} {url} 错误: {error_message}")
+                raise
+                
+            finally:
+                # 计算响应时间
+                response_time = time.time() - start_time
+                
+                # 上报统计信息
+                full_url = str(self._client.build_request(method, url).url) if self._client else url
+                _report_stats(
+                    url=full_url,
+                    method=method,
+                    response=response,
+                    response_time=response_time,
+                    error_message=error_message,
+                    request_context=request_context,
+                    headers=headers,
+                    params=params,
+                    json_data=json_data,
+                    form_data=form_data
+                )
+        
+        async def get(self, url: str, **kwargs) -> httpx.Response:
+            """GET 请求"""
+            return await self._request('GET', url, **kwargs)
+        
+        async def post(self, url: str, **kwargs) -> httpx.Response:
+            """POST 请求"""
+            return await self._request('POST', url, **kwargs)
+        
+        async def put(self, url: str, **kwargs) -> httpx.Response:
+            """PUT 请求"""
+            return await self._request('PUT', url, **kwargs)
+        
+        async def delete(self, url: str, **kwargs) -> httpx.Response:
+            """DELETE 请求"""
+            return await self._request('DELETE', url, **kwargs)
+        
+        async def patch(self, url: str, **kwargs) -> httpx.Response:
+            """PATCH 请求"""
+            return await self._request('PATCH', url, **kwargs)
+        
+        async def head(self, url: str, **kwargs) -> httpx.Response:
+            """HEAD 请求"""
+            return await self._request('HEAD', url, **kwargs)
+        
+        async def options(self, url: str, **kwargs) -> httpx.Response:
+            """OPTIONS 请求"""
+            return await self._request('OPTIONS', url, **kwargs)
+
+
 # ============ 使用示例 ============
 """
 使用示例：
@@ -313,4 +646,44 @@ def _report_stats(
     
     # 发起请求（会自动上报统计）
     response = auth_request('GET', 'https://api.example.com/data')
+
+
+5. 使用 httpx 异步请求（需要安装 httpx）：
+    
+    from huace_aigc_auth_client.auth_request import async_auth_request, AsyncAuthClient
+    from huace_aigc_auth_client.user_context import set_request_context
+    import asyncio
+    
+    # 设置请求上下文
+    set_request_context(
+        app_id='your-app-id',
+        app_secret='your-app-secret',
+        token='user-access-token'
+    )
+    
+    # 方式1：使用 async_auth_request 函数
+    async def example1():
+        response = await async_auth_request('GET', 'https://api.example.com/data')
+        print(response.json())
+    
+    # 方式2：使用 AsyncAuthClient（推荐用于多个请求）
+    async def example2():
+        async with AsyncAuthClient(timeout=10.0) as client:
+            # POST 请求带 JSON
+            response = await client.post(
+                'https://api.example.com/users',
+                json={'name': 'John', 'email': 'john@example.com'}
+            )
+            print(response.json())
+            
+            # GET 请求带参数
+            response = await client.get(
+                'https://api.example.com/users',
+                params={'page': 1, 'size': 10}
+            )
+            print(response.json())
+    
+    # 运行
+    asyncio.run(example1())
+    asyncio.run(example2())
 """

{huace_aigc_auth_client-1.1.30.dist-info → huace_aigc_auth_client-1.1.32.dist-info}/METADATA

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

{huace_aigc_auth_client-1.1.30.dist-info → huace_aigc_auth_client-1.1.32.dist-info}/RECORD

@@ -1,13 +1,13 @@
-huace_aigc_auth_client/__init__.py,sha256=9wZM_9CM2SukN3pw2JpiXe-oVqXh0FD3h0y4S8ueckQ,4857
+huace_aigc_auth_client/__init__.py,sha256=t5GBEVaTo-vcjRWWbI-SG51-fR1AFzZK9Cuz3wQC5a8,6020
 huace_aigc_auth_client/api_stats_collector.py,sha256=ADpjpHXMqn80YI4UltWHbzAO_szykU9ZCvwXgBRWFIM,11046
-huace_aigc_auth_client/auth_request.py,sha256=f7KgmyamoEk1HWP-47nCxUBnOgRbQjYnnNZ7yRzb4j0,9285
+huace_aigc_auth_client/auth_request.py,sha256=lNIVytSpmbr2oYHEMuXX032cLo323IPhr7eK_KaCqVs,22564
 huace_aigc_auth_client/legacy_adapter.py,sha256=TVCBAKejE2z2HQFsEwDW8LMiaIkXNfz3Mxv6_E-UJFY,24102
 huace_aigc_auth_client/sdk.py,sha256=rproo913OAi37wz_rMYgxzP3F1YyY3nc5e35JS5WvoY,37751
 huace_aigc_auth_client/user_context.py,sha256=IqdX6Xd2jJwvij6Hc2qWAFWj5pn3wHqk0RBsaXKLP8g,6795
 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.30.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
-huace_aigc_auth_client-1.1.30.dist-info/METADATA,sha256=3rtqM-PxSFyXEc0l_UW2gy6R5rN-J81VpKfuMgVNfYI,23629
-huace_aigc_auth_client-1.1.30.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-huace_aigc_auth_client-1.1.30.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
-huace_aigc_auth_client-1.1.30.dist-info/RECORD,,
+huace_aigc_auth_client-1.1.32.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
+huace_aigc_auth_client-1.1.32.dist-info/METADATA,sha256=YdHV3D86QX4XloiBoP3ydX5Wmph2Wuscwx6mPUTUUBQ,23629
+huace_aigc_auth_client-1.1.32.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+huace_aigc_auth_client-1.1.32.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
+huace_aigc_auth_client-1.1.32.dist-info/RECORD,,