fix: blocking in download_media

Author: New-dev0

swibots/api/chat/methods/download_media.py

@@ -42,7 +42,6 @@ async def download_media(
             directory=directory,
             file_name=file_name,
             in_memory=in_memory,
-            block=block,
             progress=progress,
             progress_args=progress_args,
         )

swibots/api/chat/models/message.py

@@ -549,6 +549,8 @@ async def download(
         progress: Callable = None,
         progress_args: tuple = (),
     ) -> Optional[Union[BinaryIO, bytes]]:
+        if not file_name and self.media_info:
+            file_name = self.media_info.description
         return await self.app.download_media(
             self, file_name, in_memory, block, progress, progress_args
         )

swibots/bot_app.py

@@ -8,6 +8,7 @@
 import swibots
 from contextlib import suppress
 from pathlib import Path
+from httpx import AsyncClient
 from signal import signal as signal_fn, SIGINT, SIGTERM, SIGABRT
 from io import BytesIO
 from swibots.bots import Bot
@@ -273,19 +274,17 @@ async def handle_download(
         file_name: str,
         directory="downloads/",
         in_memory: bool = False,
-        block: bool = True,
         progress: DownloadProgressCallback = None,
         progress_args: tuple = (),
     ):
         if directory is None or directory == "":
             directory = "downloads/"
         if not in_memory:
             os.makedirs(directory, exist_ok=True)
-        temp_file_path = (
+        file_path = (
             os.path.abspath(re.sub("\\\\", "/", os.path.join(directory, file_name)))
-            + ".temp"
         )
-        file = BytesIO() if in_memory else open(temp_file_path, "wb")
+        file = BytesIO() if in_memory else open(file_path, "wb")
 
         d_progress = DownloadProgress(
             total=0,
@@ -295,15 +294,13 @@ async def handle_download(
             url=url,
         )
 
-        if progress:
-            await progress(d_progress, *progress_args)
         try:
-            with httpx.stream("GET", url) as response:
+            async with AsyncClient().stream("GET", url) as response:
                 d_progress.total = int(response.headers["Content-Length"])
                 d_progress.downloaded = response.num_bytes_downloaded
                 d_progress.client = response
                 d_progress.started = True
-                for chunk in response.iter_bytes():
+                async for chunk in response.aiter_bytes():
                     file.write(chunk)
                     d_progress.downloaded += len(chunk)
                     if progress:
@@ -312,7 +309,7 @@ async def handle_download(
         except BaseException as e:
             if not in_memory:
                 file.close()
-                os.remove(temp_file_path)
+                os.remove(file_path)
             if isinstance(e, CancelError):
                 return None
             if isinstance(e, asyncio.CancelledError):
@@ -323,8 +320,6 @@ async def handle_download(
             return file
         else:
             file.close()
-            file_path = os.path.splitext(temp_file_path)[0]
-            shutil.move(temp_file_path, file_path)
             return file_path
 
     async def _on_app_stop(self):