mirror of
https://github.com/nonebot/nonebot2.git
synced 2025-09-07 12:36:47 +00:00
✨ Feature: 为 HTTPClient
等内置驱动器添加流式请求方法 (#3560)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
@ -125,6 +125,51 @@ class Session(HTTPClientSession):
|
||||
request=setup,
|
||||
)
|
||||
|
||||
@override
|
||||
async def stream_request(
|
||||
self,
|
||||
setup: Request,
|
||||
*,
|
||||
chunk_size: int = 1024,
|
||||
) -> AsyncGenerator[Response, None]:
|
||||
if self._params:
|
||||
url = setup.url.with_query({**self._params, **setup.url.query})
|
||||
else:
|
||||
url = setup.url
|
||||
|
||||
data = setup.data
|
||||
if setup.files:
|
||||
data = aiohttp.FormData(data or {}, quote_fields=False)
|
||||
for name, file in setup.files:
|
||||
data.add_field(name, file[1], content_type=file[2], filename=file[0])
|
||||
|
||||
cookies = (
|
||||
(cookie.name, cookie.value)
|
||||
for cookie in setup.cookies
|
||||
if cookie.value is not None
|
||||
)
|
||||
|
||||
timeout = aiohttp.ClientTimeout(setup.timeout)
|
||||
|
||||
async with self.client.request(
|
||||
setup.method,
|
||||
url,
|
||||
data=setup.content or data,
|
||||
json=setup.json,
|
||||
cookies=cookies,
|
||||
headers=setup.headers,
|
||||
proxy=setup.proxy or self._proxy,
|
||||
timeout=timeout,
|
||||
) as response:
|
||||
response_headers = response.headers.copy()
|
||||
async for chunk in response.content.iter_chunked(chunk_size):
|
||||
yield Response(
|
||||
response.status,
|
||||
headers=response_headers,
|
||||
content=chunk,
|
||||
request=setup,
|
||||
)
|
||||
|
||||
@override
|
||||
async def setup(self) -> None:
|
||||
if self._client is not None:
|
||||
@ -160,6 +205,17 @@ class Mixin(HTTPClientMixin, WebSocketClientMixin):
|
||||
async with self.get_session() as session:
|
||||
return await session.request(setup)
|
||||
|
||||
@override
|
||||
async def stream_request(
|
||||
self,
|
||||
setup: Request,
|
||||
*,
|
||||
chunk_size: int = 1024,
|
||||
) -> AsyncGenerator[Response, None]:
|
||||
async with self.get_session() as session:
|
||||
async for response in session.stream_request(setup, chunk_size=chunk_size):
|
||||
yield response
|
||||
|
||||
@override
|
||||
@asynccontextmanager
|
||||
async def websocket(self, setup: Request) -> AsyncGenerator["WebSocket", None]:
|
||||
|
Reference in New Issue
Block a user