huace-aigc-auth-client 1.1.24__py3-none-any.whl → 1.1.26__py3-none-any.whl

huace_aigc_auth_client/__init__.py

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

huace_aigc_auth_client/sdk.py

@@ -687,7 +687,17 @@ class AuthMiddleware:
             elif "multipart/form-data" in content_type:
                 # 文件上传请求，不读取 body，避免损坏文件流
                 # 只收集表单字段（非文件字段）
-                pass
+                try:
+                    form = await request.form()
+                    form_params = {}
+                    for k, v in form.items():
+                        if hasattr(v, "filename"):
+                            # 跳过文件字段
+                            continue
+                        form_params[k] = v
+                    params["form_params"] = form_params
+                except Exception:
+                    pass
             elif content_type.startswith('text/'):
                 # 只读取文本类型的请求体，且限制大小避免内存问题
                 try:
@@ -750,9 +760,83 @@ class AuthMiddleware:
             return None
         return authorization[7:]
 
+    def get_fastapi_middleware_class(self, user_info_callback: Callable = None):
+        """
+        获取 FastAPI 中间件类（推荐使用，避免请求体读取问题）
+        
+        使用方法:
+            from starlette.middleware.base import BaseHTTPMiddleware
+            app.add_middleware(auth_middleware.get_fastapi_middleware_class())
+        
+        Returns:
+            继承于 BaseHTTPMiddleware 的中间件类
+        """
+        from fastapi.responses import JSONResponse
+        from starlette.middleware.base import BaseHTTPMiddleware
+        
+        auth_middleware_instance = self
+        
+        class AuthHTTPMiddleware(BaseHTTPMiddleware):
+            async def dispatch(self, request, call_next):
+                path = request.url.path
+                start_time = time.time()
+                
+                # 收集请求参数
+                request_params = await auth_middleware_instance._collect_fastapi_request_params(request) if auth_middleware_instance.enable_stats else None
+
+                # 检查是否跳过
+                if auth_middleware_instance._should_skip(path):
+                    return await call_next(request)
+
+                # 获取 Authorization header
+                authorization = request.headers.get("Authorization")
+                token = auth_middleware_instance._extract_token(authorization)
+
+                if not token:
+                    logger.warning("AuthMiddleware未提供认证信息")
+                    response_time = time.time() - start_time
+                    auth_middleware_instance._collect_stats(path, request.method, 401, response_time, "", "未提供认证信息", request_params)
+                    return JSONResponse(
+                        status_code=401,
+                        content={"code": 401, "message": "未提供认证信息", "data": None}
+                    )
+
+                # 验证 token
+                try:
+                    user_info = auth_middleware_instance.client.get_user_info(token)
+                    # 将用户信息存储到 request.state
+                    request.state.user_info = user_info
+                    # 设置上下文
+                    set_current_user(dataclasses.asdict(user_info))
+                    if user_info_callback:
+                        await user_info_callback(request, user_info)
+                except AigcAuthError as e:
+                    logger.error(f"AuthMiddleware认证失败: {e.message}")
+                    response_time = time.time() - start_time
+                    auth_middleware_instance._collect_stats(path, request.method, 401, response_time, token, e.message, request_params)
+                    return JSONResponse(
+                        status_code=401,
+                        content={"code": e.code, "message": e.message, "data": None}
+                    )
+                
+                # 处理请求
+                try:
+                    response = await call_next(request)
+                    response_time = time.time() - start_time
+                    auth_middleware_instance._collect_stats(path, request.method, response.status_code, response_time, token, None, request_params)
+                    return response
+                except Exception as e:
+                    response_time = time.time() - start_time
+                    auth_middleware_instance._collect_stats(path, request.method, 500, response_time, token, str(e), request_params)
+                    raise
+                finally:
+                    clear_current_user()
+        
+        return AuthHTTPMiddleware
+
     async def fastapi_middleware(self, request, call_next, user_info_callback: Callable = None):
         """
-        FastAPI 中间件
+        FastAPI 中间件（旧方法，推荐使用 get_fastapi_middleware_class）
 
         使用方法:
             @app.middleware("http")
@@ -768,9 +852,6 @@ 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):
@@ -783,6 +864,8 @@ class AuthMiddleware:
         if not token:
             logger.warning("AuthMiddleware未提供认证信息")
             response_time = time.time() - start_time
+            # 收集请求参数
+            request_params = await self._collect_fastapi_request_params(request) if self.enable_stats else None
             self._collect_stats(path, request.method, 401, response_time, "", "未提供认证信息", request_params)
             return JSONResponse(
                 status_code=401,
@@ -801,6 +884,8 @@ class AuthMiddleware:
         except AigcAuthError as e:
             logger.error(f"AuthMiddleware认证失败: {e.message}")
             response_time = time.time() - start_time
+            # 收集请求参数
+            request_params = await self._collect_fastapi_request_params(request) if self.enable_stats else None
             self._collect_stats(path, request.method, 401, response_time, token, e.message, request_params)
             return JSONResponse(
                 status_code=401,
@@ -811,9 +896,13 @@ class AuthMiddleware:
         try:
             response = await call_next(request)
             response_time = time.time() - start_time
+            # 收集请求参数
+            request_params = await self._collect_fastapi_request_params(request) if self.enable_stats else None
             self._collect_stats(path, request.method, response.status_code, response_time, token, None, request_params)
             return response
         except Exception as e:
+            # 收集请求参数
+            request_params = await self._collect_fastapi_request_params(request) if self.enable_stats else None
             response_time = time.time() - start_time
             self._collect_stats(path, request.method, 500, response_time, token, str(e), request_params)
             raise

{huace_aigc_auth_client-1.1.24.dist-info → huace_aigc_auth_client-1.1.26.dist-info}/METADATA

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

{huace_aigc_auth_client-1.1.24.dist-info → huace_aigc_auth_client-1.1.26.dist-info}/RECORD

@@ -1,12 +1,12 @@
-huace_aigc_auth_client/__init__.py,sha256=ZmJouQkB-fPBeBjouEH3dUf4zZv1DSPX7P9XiUo6gZw,4630
+huace_aigc_auth_client/__init__.py,sha256=UvYxKO3l-WAdwb8Is69IZROn4xJtTzmxOZprp4d_dQg,4630
 huace_aigc_auth_client/api_stats_collector.py,sha256=UCUu2CHWsJyiAM58-XLQtfxWK0fjZ8TTdw90gv_Gx04,10347
 huace_aigc_auth_client/legacy_adapter.py,sha256=TVCBAKejE2z2HQFsEwDW8LMiaIkXNfz3Mxv6_E-UJFY,24102
-huace_aigc_auth_client/sdk.py,sha256=BZ8jDDQBwSopK6uvSI3JknB1mpofoDFj0u0r1xK1Q_g,32728
+huace_aigc_auth_client/sdk.py,sha256=79n-CRyUY6Q7TVS_a5I-U39BB_WA_P_dLiFdAJjZmiE,37255
 huace_aigc_auth_client/user_context.py,sha256=KzevYLsLv1hv8rlvRw83FT-HugeoBJSJ1Pi56iLWyTE,5592
 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.24.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
-huace_aigc_auth_client-1.1.24.dist-info/METADATA,sha256=Egs2H3j2JDqCCjjmvHfo-neg4Nj1r_f8atrYt8GXUl4,23629
-huace_aigc_auth_client-1.1.24.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-huace_aigc_auth_client-1.1.24.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
-huace_aigc_auth_client-1.1.24.dist-info/RECORD,,
+huace_aigc_auth_client-1.1.26.dist-info/licenses/LICENSE,sha256=z7dgC7KljhBLNvKjN15391nMj3aLt0gbud8-Yf1F8EQ,1063
+huace_aigc_auth_client-1.1.26.dist-info/METADATA,sha256=n8tmSxO9LtOYxmNvmrkZShMNTjwi8zM9mPsxk3s9efI,23629
+huace_aigc_auth_client-1.1.26.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+huace_aigc_auth_client-1.1.26.dist-info/top_level.txt,sha256=kbv0nQ6PQ0JVneWPH7O2AbtlJnP7AjvFJ6JjM6ZEBxo,23
+huace_aigc_auth_client-1.1.26.dist-info/RECORD,,