huace-aigc-auth-client 1.1.34__py3-none-any.whl → 1.1.35__py3-none-any.whl

huace_aigc_auth_client/__init__.py

@@ -67,7 +67,13 @@ from .api_stats_collector import (
 
 from .auth_request import (
     auth_request,
-    async_auth_httpx_request
+    auth_request_get,
+    auth_request_post,
+    AuthSession,
+    async_auth_httpx_request,
+    async_auth_httpx_request_get,
+    async_auth_httpx_request_post,
+    AsyncAuthClient,
 )
 
 from .legacy_adapter import (
@@ -215,6 +221,12 @@ __all__ = [
     "stop_api_stats_collector",
     # 认证请求封装
     "auth_request",
+    "auth_request_get",
+    "auth_request_post",
+    "AuthSession",
     "async_auth_httpx_request",
+    "async_auth_httpx_request_get",
+    "async_auth_httpx_request_post",
+    "AsyncAuthClient",
 ]
-__version__ = "1.1.34"
+__version__ = "1.1.35"

huace_aigc_auth_client/auth_request.py

@@ -29,6 +29,80 @@ def setLogger(log):
     global logger
     logger = log
 
+def _report_stats(
+    url: str,
+    method: str,
+    response: Optional[Response],
+    response_time: float,
+    error_message: Optional[str],
+    request_context: Optional[Dict[str, Any]],
+    headers: Optional[Dict[str, str]],
+    params: Optional[Dict[str, Any]],
+    json_data: Optional[Dict[str, Any]],
+    form_data: Optional[Union[Dict[str, Any], str, bytes]]
+):
+    """
+    上报统计信息到远程服务
+    
+    Args:
+        url: 请求 URL
+        method: HTTP 方法
+        response: 响应对象
+        response_time: 响应时间
+        error_message: 错误信息
+        request_context: 请求上下文
+        params: 查询参数
+        json_data: JSON 数据
+        form_data: 表单数据
+    """
+    try:
+        # 获取统计收集器
+        collector = get_api_stats_collector()
+        if not collector:
+            return
+        
+        # 获取 token
+        token = request_context.get('token') if request_context else None
+        if not token:
+            return
+        
+        # 解析 URL 获取路径
+        from urllib.parse import urlparse
+        parsed_url = urlparse(url)
+        api_path = parsed_url.path or '/'
+        # 带上协议和域名
+        api_path = f"{parsed_url.scheme}://{parsed_url.netloc}{parsed_url.path or '/'}"
+        
+        # 获取状态码
+        status_code = response.status_code if response else 500
+        
+        # 构建请求参数（与 api_stats_collector 格式一致）
+        request_params = {
+            'query_params': params or {},
+            'headers': headers
+        }
+        
+        # 添加请求体数据
+        if json_data:
+            request_params['request_body'] = json_data
+        elif isinstance(form_data, dict):
+            request_params['form_params'] = form_data
+        
+        # 收集统计
+        collector.collect(
+            api_path=api_path,
+            api_method=method.upper(),
+            status_code=status_code,
+            response_time=response_time,
+            token=token,
+            error_message=error_message,
+            request_params=request_params
+        )
+        
+    except Exception as e:
+        # 静默失败，不影响主流程
+        logger.debug(f"统计上报失败: {e}")
+
 def auth_request(
     method: str,
     url: str,
@@ -173,80 +247,195 @@ def auth_request(
             form_data=data
         )
 
+def auth_request_get(
+    url: str,
+    params: Optional[Dict[str, Any]] = None,
+    headers: Optional[Dict[str, str]] = None,
+    **kwargs
+) -> Response:
+    """
+    GET 请求快捷方法
+    
+    Args:
+        url: 请求 URL
+        params: URL 查询参数
+        headers: 请求头
+        **kwargs: 其他 auth_request 支持的参数
+    
+    Returns:
+        Response: 响应对象
+    """
+    return auth_request('GET', url, params=params, headers=headers, **kwargs)
 
-def _report_stats(
+def auth_request_post(
     url: str,
-    method: str,
-    response: Optional[Response],
-    response_time: float,
-    error_message: Optional[str],
-    request_context: Optional[Dict[str, Any]],
-    headers: Optional[Dict[str, str]],
-    params: Optional[Dict[str, Any]],
-    json_data: Optional[Dict[str, Any]],
-    form_data: Optional[Union[Dict[str, Any], str, bytes]]
-):
+    data: Optional[Union[Dict[str, Any], str, bytes]] = None,
+    json: Optional[Dict[str, Any]] = None,
+    params: Optional[Dict[str, Any]] = None,
+    headers: Optional[Dict[str, str]] = None,
+    **kwargs
+) -> Response:
     """
-    上报统计信息到远程服务
+    POST 请求快捷方法
     
     Args:
         url: 请求 URL
-        method: HTTP 方法
-        response: 响应对象
-        response_time: 响应时间
-        error_message: 错误信息
-        request_context: 请求上下文
-        params: 查询参数
-        json_data: JSON 数据
-        form_data: 表单数据
+        data: 请求体数据 (form-data 或 raw)
+        json: JSON 请求体数据
+        params: URL 查询参数
+        headers: 请求头
+        **kwargs: 其他 auth_request 支持的参数
+    
+    Returns:
+        Response: 响应对象
     """
-    try:
-        # 获取统计收集器
-        collector = get_api_stats_collector()
-        if not collector:
-            return
-        
-        # 获取 token
-        token = request_context.get('token') if request_context else None
-        if not token:
-            return
-        
-        # 解析 URL 获取路径
-        from urllib.parse import urlparse
-        parsed_url = urlparse(url)
-        api_path = parsed_url.path or '/'
-        # 带上协议和域名
-        api_path = f"{parsed_url.scheme}://{parsed_url.netloc}{parsed_url.path or '/'}"
+    return auth_request('POST', url, data=data, json=json, params=params, headers=headers, **kwargs)
+
+
+# ============ Session 封装（支持连接池） ============
+
+class AuthSession(requests.Session):
+    """
+    认证 Session 类（支持连接池）
+    
+    继承 requests.Session，自动添加认证信息和统计上报
+    支持连接池，提升性能
+    
+    使用示例：
+        from huace_aigc_auth_client import AuthSession, set_request_context
+        
+        # 设置请求上下文
+        set_request_context(
+            app_id='your-app-id',
+            app_secret='your-app-secret',
+            token='user-token'
+        )
         
-        # 获取状态码
-        status_code = response.status_code if response else 500
+        # 创建 Session（自动启用连接池）
+        with AuthSession() as session:
+            # GET 请求
+            response = session.get('https://api.example.com/users')
+            
+            # POST 请求
+            response = session.post(
+                'https://api.example.com/users',
+                json={'name': 'John'}
+            )
+    """
+    
+    def request(
+        self,
+        method: str,
+        url: str,
+        params: Optional[Dict[str, Any]] = None,
+        data: Optional[Union[Dict[str, Any], str, bytes]] = 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, tuple]] = None,
+        allow_redirects: bool = True,
+        proxies: Optional[Dict[str, str]] = None,
+        hooks: Optional[Dict[str, Any]] = None,
+        stream: bool = False,
+        verify: Optional[Union[bool, str]] = None,
+        cert: Optional[Union[str, tuple]] = None,
+        json: Optional[Dict[str, Any]] = None,
+    ) -> Response:
+        """
+        重写 request 方法，添加认证信息和统计上报
+        """
+        # 初始化 headers
+        if headers is None:
+            headers = {}
+        else:
+            headers = headers.copy()
         
-        # 构建请求参数（与 api_stats_collector 格式一致）
-        request_params = {
-            'query_params': params or {},
-            'headers': headers
-        }
+        # 从 request_context 获取认证信息
+        request_context = get_request_context()
         
-        # 添加请求体数据
-        if json_data:
-            request_params['request_body'] = json_data
-        elif isinstance(form_data, dict):
-            request_params['form_params'] = form_data
+        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
         
-        # 收集统计
-        collector.collect(
-            api_path=api_path,
-            api_method=method.upper(),
-            status_code=status_code,
-            response_time=response_time,
-            token=token,
-            error_message=error_message,
-            request_params=request_params
-        )
+        # 记录开始时间
+        start_time = time.time()
+        response = None
+        error_message = None
         
-    except Exception as e:
-        # 静默失败，不影响主流程
-        logger.debug(f"统计上报失败: {e}")
+        try:
+            # 调用父类的 request 方法
+            logger.info(f"AuthSession 发起请求: {method} {url} with headers={headers}")
+            response = super().request(
+                method=method,
+                url=url,
+                params=params,
+                data=data,
+                headers=headers,
+                cookies=cookies,
+                files=files,
+                auth=auth,
+                timeout=timeout,
+                allow_redirects=allow_redirects,
+                proxies=proxies,
+                hooks=hooks,
+                stream=stream,
+                verify=verify,
+                cert=cert,
+                json=json,
+            )
+            logger.info(f"AuthSession 请求响应: {method} {url} 状态码: {response.status_code}")
+            return response
+            
+        except Exception as e:
+            error_message = str(e)
+            logger.error(f"AuthSession 请求失败: {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
+            )
 
 
 # ============ HTTPX 异步请求封装 ============
@@ -387,7 +576,50 @@ if HTTPX_AVAILABLE:
                 form_data=data
             )
     
+    async def async_auth_httpx_request_get(
+        url: str,
+        params: Optional[Dict[str, Any]] = None,
+        headers: Optional[Dict[str, str]] = None,
+        **kwargs
+    ) -> httpx.Response:
+        """
+        异步 GET 请求快捷方法
+        
+        Args:
+            url: 请求 URL
+            params: URL 查询参数
+            headers: 请求头
+            **kwargs: 其他 async_auth_httpx_request 支持的参数
+        
+        Returns:
+            httpx.Response: 响应对象
+        """
+        return await async_auth_httpx_request('GET', url, params=params, headers=headers, **kwargs)
     
+    async def async_auth_httpx_request_post(
+        url: str,
+        data: Optional[Union[Dict[str, Any], str, bytes]] = None,
+        json: Optional[Dict[str, Any]] = None,
+        params: Optional[Dict[str, Any]] = None,
+        headers: Optional[Dict[str, str]] = None,
+        **kwargs
+    ) -> httpx.Response:
+        """
+        异步 POST 请求快捷方法
+        
+        Args:
+            url: 请求 URL
+            data: 请求体数据 (form-data 或 raw)
+            json: JSON 请求体数据
+            params: URL 查询参数
+            headers: 请求头
+            **kwargs: 其他 async_auth_httpx_request 支持的参数
+        
+        Returns:
+            httpx.Response: 响应对象
+        """
+        return await async_auth_httpx_request('POST', url, data=data, json=json, params=params, headers=headers, **kwargs)
+     
     class AsyncAuthClient:
         """
         异步认证客户端（httpx.AsyncClient 包装）
@@ -591,7 +823,51 @@ if HTTPX_AVAILABLE:
     print(response.json())
 
 
-2. 带参数的请求：
+2. 使用 AuthSession（支持连接池，推荐）：
+    
+    from huace_aigc_auth_client.auth_request import AuthSession
+    from huace_aigc_auth_client.user_context import set_request_context
+    
+    # 设置请求上下文
+    set_request_context(
+        app_id='your-app-id',
+        app_secret='your-app-secret',
+        token='user-access-token'
+    )
+    
+    # 使用 AuthSession（自动启用连接池）
+    with AuthSession() as session:
+        # GET 请求
+        response = session.get('https://api.example.com/users', params={'page': 1})
+        print(response.json())
+        
+        # POST 请求
+        response = session.post(
+            'https://api.example.com/users',
+            json={'name': 'John', 'email': 'john@example.com'}
+        )
+        print(response.json())
+        
+        # 多个请求复用同一个连接池，性能更好
+        for i in range(10):
+            response = session.get(f'https://api.example.com/items/{i}')
+
+
+3. 不使用上下文管理器的 AuthSession：
+    
+    from huace_aigc_auth_client.auth_request import AuthSession
+    
+    # 创建 Session
+    session = AuthSession()
+    
+    try:
+        response = session.get('https://api.example.com/users')
+        print(response.json())
+    finally:
+        session.close()  # 手动关闭
+
+
+4. 带参数的请求：
     
     # GET 请求带查询参数
     response = auth_request(
@@ -615,7 +891,7 @@ if HTTPX_AVAILABLE:
     )
 
 
-3. 覆盖默认 headers：
+5. 覆盖默认 headers：
     
     # 可以手动指定 headers，会与自动添加的 headers 合并
     response = auth_request(

{huace_aigc_auth_client-1.1.34.dist-info → huace_aigc_auth_client-1.1.35.dist-info}/METADATA

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

{huace_aigc_auth_client-1.1.34.dist-info → huace_aigc_auth_client-1.1.35.dist-info}/RECORD

@@ -1,13 +1,13 @@
-huace_aigc_auth_client/__init__.py,sha256=ZrHUpyhR2qKqo9RJ39C2s7C3PeriyYvNvQMxtH7N6C8,6020
+huace_aigc_auth_client/__init__.py,sha256=d1YC-9M_saTbdMEaMvDtzT-gDHc5wep2667pZsCKrag,6337
 huace_aigc_auth_client/api_stats_collector.py,sha256=ADpjpHXMqn80YI4UltWHbzAO_szykU9ZCvwXgBRWFIM,11046
-huace_aigc_auth_client/auth_request.py,sha256=wc23_Lz0ounJ0HSN0e49lfTKNEio80FbWXTKFaOrw8g,22684
+huace_aigc_auth_client/auth_request.py,sha256=Xlg1hq5jgXv5gUhOeh2ks0GtE05d4D9lrGZigxfB1o0,31486
 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.34.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
-huace_aigc_auth_client-1.1.34.dist-info/METADATA,sha256=8AlHIfXy0YxAZ9Z20Qcsq5sv7svOHjGY0rJp6cmJRvg,32415
-huace_aigc_auth_client-1.1.34.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-huace_aigc_auth_client-1.1.34.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
-huace_aigc_auth_client-1.1.34.dist-info/RECORD,,
+huace_aigc_auth_client-1.1.35.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
+huace_aigc_auth_client-1.1.35.dist-info/METADATA,sha256=5eRkyxueBTCBuqUI-IAx22mcnL8-_eOe_mnaZuC09ZE,32415
+huace_aigc_auth_client-1.1.35.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+huace_aigc_auth_client-1.1.35.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
+huace_aigc_auth_client-1.1.35.dist-info/RECORD,,