Reworked InputFile sending (#1238)

* Reworked InputFile sending

* Added changelog

aiogram/client/session/aiohttp.py

@@ -6,6 +6,7 @@ from typing import (
     TYPE_CHECKING,
     Any,
     AsyncGenerator,
+    AsyncIterator,
     Dict,
     Iterable,
     List,
@@ -147,7 +148,11 @@ class AiohttpSession(BaseSession):
                 continue
             form.add_field(key, value)
         for key, value in files.items():
-            form.add_field(key, value, filename=value.filename or key)
+            form.add_field(
+                key,
+                value.read(bot),
+                filename=value.filename or key,
+            )
         return form
 
     async def make_request(

aiogram/types/input_file.py

@@ -41,13 +41,9 @@ class InputFile(ABC):
         self.chunk_size = chunk_size
 
     @abstractmethod
-    async def read(self, chunk_size: int) -> AsyncGenerator[bytes, None]:  # pragma: no cover
+    async def read(self, bot: "Bot") -> AsyncGenerator[bytes, None]:  # pragma: no cover
         yield b""
 
-    async def __aiter__(self) -> AsyncIterator[bytes]:
-        async for chunk in self.read(self.chunk_size):
-            yield chunk
-
 
 class BufferedInputFile(InputFile):
     def __init__(self, file: bytes, filename: str, chunk_size: int = DEFAULT_CHUNK_SIZE):
@@ -84,9 +80,9 @@ class BufferedInputFile(InputFile):
             data = f.read()
         return cls(data, filename=filename, chunk_size=chunk_size)
 
-    async def read(self, chunk_size: int) -> AsyncGenerator[bytes, None]:
+    async def read(self, bot: "Bot") -> AsyncGenerator[bytes, None]:
         buffer = io.BytesIO(self.data)
-        while chunk := buffer.read(chunk_size):
+        while chunk := buffer.read(self.chunk_size):
             yield chunk
 
 
@@ -111,9 +107,9 @@ class FSInputFile(InputFile):
 
         self.path = path
 
-    async def read(self, chunk_size: int) -> AsyncGenerator[bytes, None]:
+    async def read(self, bot: "Bot") -> AsyncGenerator[bytes, None]:
         async with aiofiles.open(self.path, "rb") as f:
-            while chunk := await f.read(chunk_size):
+            while chunk := await f.read(self.chunk_size):
                 yield chunk
 
 
@@ -121,11 +117,11 @@ class URLInputFile(InputFile):
     def __init__(
         self,
         url: str,
-        bot: "Bot",
         headers: Optional[Dict[str, Any]] = None,
         filename: Optional[str] = None,
         chunk_size: int = DEFAULT_CHUNK_SIZE,
         timeout: int = 30,
+        bot: Optional["Bot"] = None,
     ):
         """
         Represents object for streaming files from internet
@@ -136,7 +132,7 @@ class URLInputFile(InputFile):
         :param chunk_size: Uploading chunk size
         :param timeout: Timeout for downloading
         :param bot: Bot instance to use HTTP session from.
-                    If not specified, will be used current bot from context.
+                    If not specified, will be used current bot
         """
         super().__init__(filename=filename, chunk_size=chunk_size)
         if headers is None:
@@ -147,8 +143,9 @@ class URLInputFile(InputFile):
         self.timeout = timeout
         self.bot = bot
 
-    async def read(self, chunk_size: int) -> AsyncGenerator[bytes, None]:
-        stream = self.bot.session.stream_content(
+    async def read(self, bot: "Bot") -> AsyncGenerator[bytes, None]:
+        bot = self.bot or bot
+        stream = bot.session.stream_content(
             url=self.url,
             headers=self.headers,
             timeout=self.timeout,

aiogram/webhook/aiohttp_server.py

@@ -170,7 +170,7 @@ class BaseRequestHandler(ABC):
             payload.set_content_disposition("form-data", name=key)
 
         for key, value in files.items():
-            payload = writer.append(value)
+            payload = writer.append(value.read(bot))
             payload.set_content_disposition(
                 "form-data",
                 name=key,