mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
[3.x] Check status code when downloading file (#1079)
* Check status code when downloading file and raise an error if someting bad happends * Style fixes * Add doc * Use "towncrier create <issue>.<type>" for creating file
This commit is contained in:
parent
94e11ce8e9
commit
184ee1fbf8
7 changed files with 45 additions and 7 deletions
|
|
@ -304,7 +304,12 @@ class Bot(ContextInstanceMixin["Bot"]):
|
|||
close_stream = True
|
||||
else:
|
||||
url = self.session.api.file_url(self.__token, file_path)
|
||||
stream = self.session.stream_content(url=url, timeout=timeout, chunk_size=chunk_size)
|
||||
stream = self.session.stream_content(
|
||||
url=url,
|
||||
timeout=timeout,
|
||||
chunk_size=chunk_size,
|
||||
raise_for_status=True,
|
||||
)
|
||||
|
||||
try:
|
||||
if isinstance(destination, (str, pathlib.Path)):
|
||||
|
|
|
|||
|
|
@ -162,11 +162,11 @@ class AiohttpSession(BaseSession):
|
|||
return cast(TelegramType, response.result)
|
||||
|
||||
async def stream_content(
|
||||
self, url: str, timeout: int, chunk_size: int
|
||||
self, url: str, timeout: int, chunk_size: int, raise_for_status: bool
|
||||
) -> AsyncGenerator[bytes, None]:
|
||||
session = await self.create_session()
|
||||
|
||||
async with session.get(url, timeout=timeout) as resp:
|
||||
async with session.get(url, timeout=timeout, raise_for_status=raise_for_status) as resp:
|
||||
async for chunk in resp.content.iter_chunked(chunk_size):
|
||||
yield chunk
|
||||
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ class BaseSession(abc.ABC):
|
|||
|
||||
@abc.abstractmethod
|
||||
async def stream_content(
|
||||
self, url: str, timeout: int, chunk_size: int
|
||||
self, url: str, timeout: int, chunk_size: int, raise_for_status: bool
|
||||
) -> AsyncGenerator[bytes, None]: # pragma: no cover
|
||||
"""
|
||||
Stream reader
|
||||
|
|
|
|||
|
|
@ -135,7 +135,10 @@ class URLInputFile(InputFile):
|
|||
|
||||
bot = Bot.get_current(no_error=False)
|
||||
stream = bot.session.stream_content(
|
||||
url=self.url, timeout=self.timeout, chunk_size=self.chunk_size
|
||||
url=self.url,
|
||||
timeout=self.timeout,
|
||||
chunk_size=self.chunk_size,
|
||||
raise_for_status=True,
|
||||
)
|
||||
|
||||
async for chunk in stream:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue