aury-boot 0.0.39__py3-none-any.whl → 0.0.41__py3-none-any.whl

aury/boot/toolkit/http/__init__.py

@@ -7,14 +7,18 @@
 - 超时控制
 - 错误处理
 - 请求日志
+
+基于 aiohttp 实现，全异步无阻塞。
 """
 
 from __future__ import annotations
 
+import time
 from abc import ABC, abstractmethod
-from typing import Any, Optional, TypeVar
+from dataclasses import dataclass, field
+from typing import Any, TypeVar
 
-import httpx
+import aiohttp
 from pydantic import BaseModel
 from tenacity import (
     retry,
@@ -35,7 +39,6 @@ class RetryConfig(BaseModel):
     retry_delay: float = 1.0
     backoff_factor: float = 2.0
     retry_on_status: list[int] = [500, 502, 503, 504]
-    retry_on_exceptions: tuple = (httpx.TimeoutException, httpx.NetworkError)
 
 
 class HttpClientConfig(BaseModel):
@@ -50,16 +53,83 @@ class HttpClientConfig(BaseModel):
     retry: RetryConfig | None = None
 
 
+@dataclass
+class HttpRequest:
+    """请求对象（用于拦截器）。"""
+    
+    method: str
+    url: str
+    headers: dict[str, str] = field(default_factory=dict)
+    params: dict[str, Any] | None = None
+    json_data: Any = None
+    data: Any = None
+
+
+@dataclass
+class HttpResponse:
+    """响应对象（用于拦截器和返回）。"""
+    
+    status_code: int
+    url: str
+    headers: dict[str, str]
+    text: str
+    content: bytes
+    elapsed_seconds: float
+    
+    def json(self) -> Any:
+        """解析 JSON 响应。"""
+        import json
+        return json.loads(self.text)
+    
+    @property
+    def is_success(self) -> bool:
+        """是否成功响应。"""
+        return 200 <= self.status_code < 400
+    
+    def raise_for_status(self) -> None:
+        """如果状态码表示错误，抛出异常。"""
+        if self.status_code >= 400:
+            raise HttpStatusError(
+                f"HTTP {self.status_code}",
+                status_code=self.status_code,
+                response=self,
+            )
+
+
+class HttpError(Exception):
+    """HTTP 错误基类。"""
+    pass
+
+
+class HttpStatusError(HttpError):
+    """HTTP 状态码错误。"""
+    
+    def __init__(self, message: str, status_code: int, response: HttpResponse) -> None:
+        super().__init__(message)
+        self.status_code = status_code
+        self.response = response
+
+
+class HttpTimeoutError(HttpError):
+    """HTTP 超时错误。"""
+    pass
+
+
+class HttpNetworkError(HttpError):
+    """HTTP 网络错误。"""
+    pass
+
+
 class RequestInterceptor(ABC):
     """请求拦截器接口。"""
     
     @abstractmethod
-    async def before_request(self, request: httpx.Request) -> httpx.Request:
+    async def before_request(self, request: HttpRequest) -> HttpRequest:
         """请求前处理。"""
         pass
     
     @abstractmethod
-    async def after_response(self, response: httpx.Response) -> httpx.Response:
+    async def after_response(self, response: HttpResponse) -> HttpResponse:
         """响应后处理。"""
         pass
 
@@ -67,25 +137,25 @@ class RequestInterceptor(ABC):
 class LoggingInterceptor(RequestInterceptor):
     """日志拦截器。"""
     
-    async def before_request(self, request: httpx.Request) -> httpx.Request:
+    async def before_request(self, request: HttpRequest) -> HttpRequest:
         """记录请求日志。"""
         logger.debug(
             f"HTTP请求: {request.method} {request.url} | "
-            f"Headers: {dict(request.headers)}"
+            f"Headers: {request.headers}"
         )
         return request
     
-    async def after_response(self, response: httpx.Response) -> httpx.Response:
+    async def after_response(self, response: HttpResponse) -> HttpResponse:
         """记录响应日志。"""
         logger.debug(
             f"HTTP响应: {response.status_code} {response.url} | "
-            f"耗时: {response.elapsed.total_seconds():.3f}s"
+            f"耗时: {response.elapsed_seconds:.3f}s"
         )
         return response
 
 
 class HttpClient:
-    """企业级HTTP客户端。
+    """企业级HTTP客户端（基于 aiohttp）。
     
     特性：
     - 连接池管理
@@ -93,6 +163,7 @@ class HttpClient:
     - 拦截器支持
     - 超时控制
     - 错误处理
+    - 全异步无阻塞
     
     使用示例:
         # 基础使用
@@ -125,33 +196,39 @@ class HttpClient:
         Args:
             base_url: 基础URL
             timeout: 超时时间（秒）
-            follow_redirects: 是否跟随重定向
+            follow_redirects: 是否跟随重定向（aiohttp 默认不跟随）
             max_connections: 最大连接数
             retry_config: 重试配置
         """
-        self._base_url = base_url
-        self._timeout = timeout
+        self._base_url = base_url.rstrip("/") if base_url else ""
+        self._timeout = aiohttp.ClientTimeout(total=timeout)
         self._follow_redirects = follow_redirects
         self._max_connections = max_connections
         self._retry_config = retry_config or RetryConfig()
         self._interceptors: list[RequestInterceptor] = []
         
-        # 创建HTTP客户端（使用连接池）
-        limits = httpx.Limits(
-            max_connections=max_connections,
-            max_keepalive_connections=20,
-            keepalive_expiry=5.0,
+        # 创建连接器（连接池）
+        self._connector = aiohttp.TCPConnector(
+            limit=max_connections,
+            limit_per_host=max_connections // 4,
+            keepalive_timeout=30,
+            enable_cleanup_closed=True,
         )
         
-        self._client = httpx.AsyncClient(
-            base_url=base_url,
-            timeout=timeout,
-            follow_redirects=follow_redirects,
-            limits=limits,
-        )
+        # aiohttp 会话（延迟创建）
+        self._session: aiohttp.ClientSession | None = None
         
         logger.debug(f"HTTP客户端初始化: base_url={base_url}, timeout={timeout}")
     
+    async def _ensure_session(self) -> aiohttp.ClientSession:
+        """确保会话已创建。"""
+        if self._session is None or self._session.closed:
+            self._session = aiohttp.ClientSession(
+                connector=self._connector,
+                timeout=self._timeout,
+            )
+        return self._session
+    
     @classmethod
     def from_config(cls, config: HttpClientConfig) -> HttpClient:
         """从配置创建客户端。
@@ -181,9 +258,9 @@ class HttpClient:
     
     async def _apply_interceptors(
         self,
-        request: httpx.Request,
-        response: httpx.Response | None = None,
-    ) -> tuple[httpx.Request, httpx.Response | None]:
+        request: HttpRequest,
+        response: HttpResponse | None = None,
+    ) -> tuple[HttpRequest, HttpResponse | None]:
         """应用拦截器。"""
         # 请求前拦截
         for interceptor in self._interceptors:
@@ -196,28 +273,6 @@ class HttpClient:
         
         return request, response
     
-    async def _make_request(
-        self,
-        method: str,
-        url: str,
-        **kwargs: Any,
-    ) -> httpx.Response:
-        """执行HTTP请求（内部方法，使用tenacity重试）。"""
-        response = await self._client.request(method, url, **kwargs)
-        
-        # 检查状态码是否需要重试
-        if response.status_code in self._retry_config.retry_on_status:
-            logger.warning(
-                f"请求失败，状态码: {response.status_code}, 将重试"
-            )
-            raise httpx.HTTPStatusError(
-                f"HTTP {response.status_code}",
-                request=response.request,
-                response=response,
-            )
-        
-        return response
-    
     def _get_retry_decorator(self):
         """动态构建重试装饰器。"""
         return retry(
@@ -227,7 +282,7 @@ class HttpClient:
                 min=self._retry_config.retry_delay,
                 max=self._retry_config.retry_delay * (self._retry_config.backoff_factor ** self._retry_config.max_retries),
             ),
-            retry=retry_if_exception_type(*self._retry_config.retry_on_exceptions),
+            retry=retry_if_exception_type((HttpStatusError, aiohttp.ClientError)),
             reraise=True,
         )
     
@@ -240,9 +295,8 @@ class HttpClient:
         params: dict[str, Any] | None = None,
         json: Any = None,
         data: Any = None,
-        files: Any = None,
         **kwargs: Any,
-    ) -> httpx.Response:
+    ) -> HttpResponse:
         """发送HTTP请求。
         
         Args:
@@ -252,48 +306,79 @@ class HttpClient:
             params: 查询参数
             json: JSON数据
             data: 表单数据
-            files: 文件
-            **kwargs: 其他参数
+            **kwargs: 其他 aiohttp 参数
             
         Returns:
-            httpx.Response: 响应对象
+            HttpResponse: 响应对象
             
         Raises:
-            httpx.HTTPError: 请求失败
+            HttpError: 请求失败
         """
         # 构建完整URL
         full_url = f"{self._base_url}{url}" if self._base_url else url
         
         # 创建请求对象
-        request = self._client.build_request(
+        request = HttpRequest(
             method=method,
             url=full_url,
-            headers=headers,
+            headers=headers or {},
             params=params,
-            json=json,
+            json_data=json,
             data=data,
-            files=files,
-            **kwargs,
         )
         
         # 应用拦截器（请求前）
         request, _ = await self._apply_interceptors(request)
         
+        session = await self._ensure_session()
+        
+        async def _execute_request() -> HttpResponse:
+            start_time = time.perf_counter()
+            try:
+                async with session.request(
+                    method=request.method,
+                    url=request.url,
+                    headers=request.headers or None,
+                    params=request.params,
+                    json=request.json_data,
+                    data=request.data,
+                    allow_redirects=self._follow_redirects,
+                    **kwargs,
+                ) as resp:
+                    elapsed = time.perf_counter() - start_time
+                    content = await resp.read()
+                    text = content.decode("utf-8", errors="replace")
+                    
+                    response = HttpResponse(
+                        status_code=resp.status,
+                        url=str(resp.url),
+                        headers=dict(resp.headers),
+                        text=text,
+                        content=content,
+                        elapsed_seconds=elapsed,
+                    )
+                    
+                    # 检查是否需要重试
+                    if resp.status in self._retry_config.retry_on_status:
+                        logger.warning(f"请求失败，状态码: {resp.status}, 将重试")
+                        raise HttpStatusError(
+                            f"HTTP {resp.status}",
+                            status_code=resp.status,
+                            response=response,
+                        )
+                    
+                    return response
+                    
+            except aiohttp.ClientError as exc:
+                elapsed = time.perf_counter() - start_time
+                if isinstance(exc, aiohttp.ServerTimeoutError):
+                    raise HttpTimeoutError(f"请求超时: {request.url}") from exc
+                raise HttpNetworkError(f"网络错误: {exc}") from exc
+        
         try:
             # 使用tenacity重试装饰器
             retry_decorator = self._get_retry_decorator()
-            
-            @retry_decorator
-            async def _execute_request():
-                return await self._make_request(
-                    method=request.method,
-                    url=str(request.url),
-                    headers=request.headers,
-                    content=request.content,
-                    **kwargs,
-                )
-            
-            response = await _execute_request()
+            response = await retry_decorator(_execute_request)()
             
             # 应用拦截器（响应后）
             _, response = await self._apply_interceptors(request, response)
@@ -303,44 +388,49 @@ class HttpClient:
             
             return response
         
-        except httpx.HTTPError as exc:
+        except HttpError:
+            raise
+        except Exception as exc:
             logger.error(
                 f"HTTP请求失败: {method} {full_url} | "
                 f"错误: {type(exc).__name__}: {exc}"
             )
-            raise
+            raise HttpNetworkError(f"请求失败: {exc}") from exc
     
-    async def get(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def get(self, url: str, **kwargs: Any) -> HttpResponse:
         """GET请求。"""
         return await self.request("GET", url, **kwargs)
     
-    async def post(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def post(self, url: str, **kwargs: Any) -> HttpResponse:
         """POST请求。"""
         return await self.request("POST", url, **kwargs)
     
-    async def put(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def put(self, url: str, **kwargs: Any) -> HttpResponse:
         """PUT请求。"""
         return await self.request("PUT", url, **kwargs)
     
-    async def patch(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def patch(self, url: str, **kwargs: Any) -> HttpResponse:
         """PATCH请求。"""
         return await self.request("PATCH", url, **kwargs)
     
-    async def delete(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def delete(self, url: str, **kwargs: Any) -> HttpResponse:
         """DELETE请求。"""
         return await self.request("DELETE", url, **kwargs)
     
-    async def head(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def head(self, url: str, **kwargs: Any) -> HttpResponse:
         """HEAD请求。"""
         return await self.request("HEAD", url, **kwargs)
     
-    async def options(self, url: str, **kwargs: Any) -> httpx.Response:
+    async def options(self, url: str, **kwargs: Any) -> HttpResponse:
         """OPTIONS请求。"""
         return await self.request("OPTIONS", url, **kwargs)
     
     async def close(self) -> None:
         """关闭客户端。"""
-        await self._client.aclose()
+        if self._session and not self._session.closed:
+            await self._session.close()
+        if self._connector and not self._connector.closed:
+            await self._connector.close()
         logger.debug("HTTP客户端已关闭")
     
     async def __aenter__(self) -> HttpClient:
@@ -353,15 +443,20 @@ class HttpClient:
     
     def __repr__(self) -> str:
         """字符串表示。"""
-        return f"<HttpClient base_url={self._base_url} timeout={self._timeout}>"
+        return f"<HttpClient base_url={self._base_url} timeout={self._timeout.total}>"
 
 
 __all__ = [
     "HttpClient",
     "HttpClientConfig",
+    "HttpError",
+    "HttpNetworkError",
+    "HttpRequest",
+    "HttpResponse",
+    "HttpStatusError",
+    "HttpTimeoutError",
     "LoggingInterceptor",
     "RequestInterceptor",
     "RetryConfig",
 ]
 
-

{aury_boot-0.0.39.dist-info → aury_boot-0.0.41.dist-info}/METADATA

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.39
+Version: 0.0.41
 Summary: Aury Boot - 基于 FastAPI 生态的企业级 API 开发框架
 Requires-Python: >=3.13
+Requires-Dist: aiohttp>=3.11.0
 Requires-Dist: alembic>=1.17.2
 Requires-Dist: aury-sdk-storage[aws]>=0.0.6
 Requires-Dist: babel>=2.17.0
@@ -10,7 +11,6 @@ Requires-Dist: broadcaster[redis]>=0.3.1
 Requires-Dist: faker>=38.2.0
 Requires-Dist: fastapi>=0.122.0
 Requires-Dist: greenlet>=3.2.4
-Requires-Dist: httpx>=0.28.1
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: pydantic-settings>=2.12.0
 Requires-Dist: pydantic>=2.12.5
@@ -28,12 +28,18 @@ Requires-Dist: aiosqlite>=0.21.0; extra == 'all'
 Requires-Dist: apscheduler>=3.11.1; extra == 'all'
 Requires-Dist: asyncpg>=0.31.0; extra == 'all'
 Requires-Dist: aury-sdk-storage[aws]>=0.0.1; extra == 'all'
+Requires-Dist: coredis>=5.6.0; extra == 'all'
 Requires-Dist: dramatiq>=1.18.0; extra == 'all'
 Requires-Dist: pika>=1.3.2; extra == 'all'
+Requires-Dist: psutil>=7.0.0; extra == 'all'
+Requires-Dist: pyroscope-io>=0.8.7; extra == 'all'
 Requires-Dist: redis>=7.1.0; extra == 'all'
 Provides-Extra: broadcaster
 Requires-Dist: broadcaster[redis]>=0.3.1; extra == 'broadcaster'
+Provides-Extra: channel-cluster
+Requires-Dist: coredis>=5.6.0; extra == 'channel-cluster'
 Provides-Extra: dev
+Requires-Dist: httpx>=0.28.1; extra == 'dev'
 Requires-Dist: mypy>=1.19.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=1.3.0; extra == 'dev'
 Requires-Dist: pytest-cov>=7.0.0; extra == 'dev'
@@ -47,14 +53,17 @@ Provides-Extra: mysql
 Requires-Dist: aiomysql>=0.3.2; extra == 'mysql'
 Provides-Extra: otel
 Requires-Dist: opentelemetry-api>=1.25.0; extra == 'otel'
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client>=0.46b0; extra == 'otel'
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.46b0; extra == 'otel'
-Requires-Dist: opentelemetry-instrumentation-httpx>=0.46b0; extra == 'otel'
 Requires-Dist: opentelemetry-instrumentation-sqlalchemy>=0.46b0; extra == 'otel'
 Requires-Dist: opentelemetry-sdk>=1.25.0; extra == 'otel'
 Provides-Extra: otel-exporter
 Requires-Dist: opentelemetry-exporter-otlp>=1.25.0; extra == 'otel-exporter'
 Provides-Extra: postgres
 Requires-Dist: asyncpg>=0.31.0; extra == 'postgres'
+Provides-Extra: profiling
+Requires-Dist: psutil>=7.0.0; extra == 'profiling'
+Requires-Dist: pyroscope-io>=0.8.7; extra == 'profiling'
 Provides-Extra: rabbitmq
 Requires-Dist: amqp>=5.3.1; extra == 'rabbitmq'
 Provides-Extra: recommended
@@ -62,10 +71,11 @@ Requires-Dist: aiosqlite>=0.21.0; extra == 'recommended'
 Requires-Dist: apscheduler>=3.11.1; extra == 'recommended'
 Requires-Dist: asyncpg>=0.31.0; extra == 'recommended'
 Requires-Dist: aury-sdk-storage[aws]>=0.0.1; extra == 'recommended'
+Requires-Dist: coredis>=5.6.0; extra == 'recommended'
 Requires-Dist: dramatiq>=1.18.0; extra == 'recommended'
 Requires-Dist: opentelemetry-api>=1.25.0; extra == 'recommended'
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client>=0.46b0; extra == 'recommended'
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.46b0; extra == 'recommended'
-Requires-Dist: opentelemetry-instrumentation-httpx>=0.46b0; extra == 'recommended'
 Requires-Dist: opentelemetry-instrumentation-sqlalchemy>=0.46b0; extra == 'recommended'
 Requires-Dist: opentelemetry-sdk>=1.25.0; extra == 'recommended'
 Requires-Dist: redis>=7.1.0; extra == 'recommended'