huace-aigc-auth-client 1.1.19__tar.gz → 1.1.21__tar.gz

{huace_aigc_auth_client-1.1.19/huace_aigc_auth_client.egg-info → huace_aigc_auth_client-1.1.21}/PKG-INFO

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

{huace_aigc_auth_client-1.1.19 → huace_aigc_auth_client-1.1.21}/huace_aigc_auth_client/__init__.py

@@ -172,4 +172,4 @@ __all__ = [
     # 用户上下文
     "get_current_user",
 ]
-__version__ = "1.1.19"
+__version__ = "1.1.21"

{huace_aigc_auth_client-1.1.19 → huace_aigc_auth_client-1.1.21}/huace_aigc_auth_client/api_stats_collector.py

@@ -16,6 +16,7 @@ class ApiStatsCollector:
     def __init__(
         self,
         api_url: str,
+        app_id: str,
         app_secret: str,
         token: str,
         batch_size: int = 10,
@@ -27,6 +28,7 @@ class ApiStatsCollector:
         
         Args:
             api_url: 统计接口 URL（如：http://auth.example.com/api/sdk/stats/report/batch）
+            app_id: 应用 ID
             app_secret: 应用密钥
             token: 用户访问令牌
             batch_size: 批量提交大小
@@ -34,6 +36,7 @@ class ApiStatsCollector:
             enabled: 是否启用
         """
         self.api_url = api_url.rstrip('/')
+        self.app_id = app_id
         self.app_secret = app_secret
         self.token = token
         self.batch_size = batch_size
@@ -66,8 +69,8 @@ class ApiStatsCollector:
         api_method: str,
         status_code: int,
         response_time: float,
-        query_string: Optional[str] = None,
-        error_message: Optional[str] = None
+        error_message: Optional[str] = None,
+        request_params: Optional[Dict[str, Any]] = None
     ):
         """
         收集接口统计数据
@@ -77,8 +80,8 @@ class ApiStatsCollector:
             api_method: 请求方法
             status_code: 状态码
             response_time: 响应时间（秒）
-            query_string: 查询字符串
             error_message: 错误信息
+            request_params: 请求参数（包含 headers, query_params, view_params, request_body, form_params）
         """
         if not self.enabled:
             return
@@ -89,8 +92,8 @@ class ApiStatsCollector:
                 'api_method': api_method,
                 'status_code': status_code,
                 'response_time': response_time,
-                'query_string': query_string,
                 'error_message': error_message,
+                'request_params': request_params,
                 'timestamp': datetime.utcnow().isoformat()
             }
             self.queue.put_nowait(stat_data)
@@ -138,6 +141,7 @@ class ApiStatsCollector:
         
         try:
             headers = {
+                'X-App-Id': self.app_id,
                 'X-App-Secret': self.app_secret,
                 'Authorization': f'Bearer {self.token}',
                 'Content-Type': 'application/json'
@@ -167,6 +171,7 @@ _global_collector: Optional[ApiStatsCollector] = None
 
 def init_api_stats_collector(
     api_url: str,
+    app_id: str,
     app_secret: str,
     token: str,
     batch_size: int = 10,
@@ -178,6 +183,7 @@ def init_api_stats_collector(
     
     Args:
         api_url: 统计接口 URL
+        app_id: 应用 ID
         app_secret: 应用密钥
         token: 用户访问令牌
         batch_size: 批量提交大小
@@ -190,6 +196,7 @@ def init_api_stats_collector(
     global _global_collector
     _global_collector = ApiStatsCollector(
         api_url=api_url,
+        app_id=app_id,
         app_secret=app_secret,
         token=token,
         batch_size=batch_size,
@@ -217,8 +224,8 @@ def collect_api_stat(
     api_method: str,
     status_code: int,
     response_time: float,
-    query_string: Optional[str] = None,
-    error_message: Optional[str] = None
+    error_message: Optional[str] = None,
+    request_params: Optional[Dict[str, Any]] = None
 ):
     """
     快捷方法：收集接口统计数据
@@ -232,8 +239,8 @@ def collect_api_stat(
             api_method=api_method,
             status_code=status_code,
             response_time=response_time,
-            query_string=query_string,
-            error_message=error_message
+            error_message=error_message,
+            request_params=request_params
         )
 
 
@@ -274,8 +281,7 @@ def collect_api_stat(
                 api_path=request.url.path,
                 api_method=request.method,
                 status_code=response.status_code,
-                response_time=response_time,
-                query_string=str(request.url.query)
+                response_time=response_time
             )
             
             return response

{huace_aigc_auth_client-1.1.19 → huace_aigc_auth_client-1.1.21}/huace_aigc_auth_client/sdk.py

@@ -585,6 +585,7 @@ class AuthMiddleware:
             from .api_stats_collector import init_api_stats_collector
             self.stats_collector = init_api_stats_collector(
                 api_url=self.stats_api_url,
+                app_id=self.client.app_id,
                 app_secret=self.client.app_secret,
                 token=token,
                 batch_size=10,
@@ -594,14 +595,103 @@ class AuthMiddleware:
         except Exception as e:
             logger.warning(f"初始化统计收集器失败: {e}")
     
+    @staticmethod
+    def _collect_flask_request_params(request) -> Dict[str, Any]:
+        """
+        收集 Flask 请求的所有参数
+        
+        Args:
+            request: Flask request 对象
+            
+        Returns:
+            包含 headers, query_params, view_params, request_body, form_params 的字典
+        """
+        try:
+            params = {
+                "headers": dict(request.headers),
+                "query_params": request.args.to_dict(flat=False),
+                "view_params": request.view_args or {},
+                "request_body": None,
+                "form_params": None
+            }
+            
+            # 获取请求体（JSON 或文本）
+            if request.is_json:
+                try:
+                    params["request_body"] = request.get_json(silent=True)
+                except Exception:
+                    pass
+            elif request.data:
+                try:
+                    params["request_body"] = request.data.decode('utf-8')
+                except Exception:
+                    params["request_body"] = str(request.data)
+            
+            # 获取表单数据
+            if request.form:
+                params["form_params"] = request.form.to_dict(flat=False)
+            
+            return params
+        except Exception as e:
+            logger.warning(f"收集Flask请求参数失败: {e}")
+            return {}
+    
+    @staticmethod
+    async def _collect_fastapi_request_params(request) -> Dict[str, Any]:
+        """
+        收集 FastAPI 请求的所有参数
+        
+        Args:
+            request: FastAPI Request 对象
+            
+        Returns:
+            包含 headers, query_params, view_params, request_body, form_params 的字典
+        """
+        try:
+            params = {
+                "headers": dict(request.headers),
+                "query_params": dict(request.query_params),
+                "view_params": dict(request.path_params),
+                "request_body": None,
+                "form_params": None
+            }
+            
+            # 获取请求体
+            content_type = request.headers.get("content-type", "")
+            
+            if "application/json" in content_type:
+                try:
+                    params["request_body"] = await request.json()
+                except Exception:
+                    pass
+            elif "application/x-www-form-urlencoded" in content_type or "multipart/form-data" in content_type:
+                try:
+                    form = await request.form()
+                    params["form_params"] = {k: v for k, v in form.items()}
+                except Exception:
+                    pass
+            else:
+                # 尝试读取原始body
+                try:
+                    body = await request.body()
+                    if body:
+                        params["request_body"] = body.decode('utf-8')
+                except Exception:
+                    pass
+            
+            return params
+        except Exception as e:
+            logger.warning(f"收集FastAPI请求参数失败: {e}")
+            return {}
+    
     def _collect_stats(
         self,
         api_path: str,
         api_method: str,
         status_code: int,
         response_time: float,
-        query_string: Optional[str] = None,
-        error_message: Optional[str] = None
+        error_message: Optional[str] = None,
+        request_params: Optional[Dict[str, Any]] = None
     ):
         """收集接口统计"""
         if not self.enable_stats or not self.stats_collector:
@@ -613,8 +703,8 @@ class AuthMiddleware:
                 api_method=api_method,
                 status_code=status_code,
                 response_time=response_time,
-                query_string=query_string,
-                error_message=error_message
+                error_message=error_message,
+                request_params=request_params
             )
         except Exception:
             pass  # 静默失败
@@ -649,6 +739,9 @@ class AuthMiddleware:
 
         path = request.url.path
         start_time = time.time()
+        
+        # 收集请求参数
+        request_params = await self._collect_fastapi_request_params(request) if self.enable_stats else None
 
         # 检查是否跳过
         if self._should_skip(path):
@@ -661,7 +754,7 @@ class AuthMiddleware:
         if not token:
             logger.warning("AuthMiddleware未提供认证信息")
             response_time = time.time() - start_time
-            self._collect_stats(path, request.method, 401, response_time, str(request.url.query), "未提供认证信息")
+            self._collect_stats(path, request.method, 401, response_time, "未提供认证信息", request_params)
             return JSONResponse(
                 status_code=401,
                 content={"code": 401, "message": "未提供认证信息", "data": None}
@@ -687,7 +780,7 @@ class AuthMiddleware:
         except AigcAuthError as e:
             logger.error(f"AuthMiddleware认证失败: {e.message}")
             response_time = time.time() - start_time
-            self._collect_stats(path, request.method, 401, response_time, str(request.url.query), e.message)
+            self._collect_stats(path, request.method, 401, response_time, e.message, request_params)
             return JSONResponse(
                 status_code=401,
                 content={"code": e.code, "message": e.message, "data": None}
@@ -697,11 +790,11 @@ class AuthMiddleware:
         try:
             response = await call_next(request)
             response_time = time.time() - start_time
-            self._collect_stats(path, request.method, response.status_code, response_time, str(request.url.query))
+            self._collect_stats(path, request.method, response.status_code, response_time, None, request_params)
             return response
         except Exception as e:
             response_time = time.time() - start_time
-            self._collect_stats(path, request.method, 500, response_time, str(request.url.query), str(e))
+            self._collect_stats(path, request.method, 500, response_time, str(e), request_params)
             raise
         finally:
             clear_current_user()
@@ -720,6 +813,9 @@ class AuthMiddleware:
         path = request.path
         # 记录开始时间到 g 对象
         g.start_time = time.time()
+        
+        # 收集请求参数
+        g.request_params = self._collect_flask_request_params(request) if self.enable_stats else None
 
         # 检查是否跳过
         if self._should_skip(path):
@@ -732,7 +828,7 @@ class AuthMiddleware:
         if not token:
             logger.warning("AuthMiddleware未提供认证信息")
             response_time = time.time() - g.start_time
-            self._collect_stats(path, request.method, 401, response_time, request.query_string.decode(), "未提供认证信息")
+            self._collect_stats(path, request.method, 401, response_time, "未提供认证信息", g.request_params)
             return jsonify({
                 "code": 401,
                 "message": "未提供认证信息",
@@ -754,7 +850,7 @@ class AuthMiddleware:
         except AigcAuthError as e:
             logger.error(f"AuthMiddleware认证失败: {e.message}")
             response_time = time.time() - g.start_time
-            self._collect_stats(path, request.method, 401, response_time, request.query_string.decode(), e.message)
+            self._collect_stats(path, request.method, 401, response_time, e.message, g.request_params)
             return jsonify({
                 "code": e.code,
                 "message": e.message,
@@ -779,12 +875,14 @@ class AuthMiddleware:
         
         if hasattr(g, 'start_time'):
             response_time = time.time() - g.start_time
+            request_params = getattr(g, 'request_params', None)
             self._collect_stats(
                 request.path,
                 request.method,
                 response.status_code,
                 response_time,
-                request.query_string.decode()
+                None,
+                request_params
             )
         
         return response

{huace_aigc_auth_client-1.1.19 → huace_aigc_auth_client-1.1.21/huace_aigc_auth_client.egg-info}/PKG-INFO

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

{huace_aigc_auth_client-1.1.19 → huace_aigc_auth_client-1.1.21}/pyproject.toml

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