fix: address follow-up async io review comments

Author: zouyonghe

astrbot/core/message/components.py

@@ -203,7 +203,7 @@ async def convert_to_base64(self) -> str:
         else:
             try:
                 bs64_data = await file_to_base64(self.file)
-            except OSError as exc:
+            except (FileNotFoundError, IsADirectoryError) as exc:
                 raise Exception(f"not a valid file: {self.file}") from exc
         bs64_data = bs64_data.removeprefix("base64://")
         return bs64_data
@@ -500,7 +500,7 @@ async def convert_to_base64(self) -> str:
         else:
             try:
                 bs64_data = await file_to_base64(url)
-            except OSError as exc:
+            except (FileNotFoundError, IsADirectoryError) as exc:
                 raise Exception(f"not a valid file: {url}") from exc
         bs64_data = bs64_data.removeprefix("base64://")
         return bs64_data

astrbot/core/utils/io.py

@@ -191,43 +191,35 @@ async def _stream_to_file(
     total_size: int,
     start_time: float,
     show_progress: bool,
-    chunk_size: int = 8192,
-    flush_threshold: int = 256 * 1024,
 ) -> None:
-    """Stream HTTP response into file with buffered thread-offloaded writes."""
+    """Stream HTTP response into file with thread-offloaded writes."""
     downloaded_size = 0
-    buffered = bytearray()
-    progress_total = total_size if total_size > 0 else None
+    known_total = total_size if total_size > 0 else None
 
     while True:
-        chunk = await stream.read(chunk_size)
+        chunk = await stream.read(8192)
         if not chunk:
             break
-        buffered.extend(chunk)
+        await asyncio.to_thread(file_obj.write, chunk)
+
         downloaded_size += len(chunk)
+        if show_progress:
+            _print_download_progress(downloaded_size, known_total, start_time)
 
-        if len(buffered) >= flush_threshold:
-            chunk_to_write = bytes(buffered)
-            buffered.clear()
-            await asyncio.to_thread(file_obj.write, chunk_to_write)
 
-        if show_progress:
-            elapsed_time = max(time.time() - start_time, 1e-6)
-            speed = downloaded_size / 1024 / elapsed_time  # KB/s
-            if progress_total:
-                percent = downloaded_size / progress_total
-                print(
-                    f"\r下载进度: {percent:.2%} 速度: {speed:.2f} KB/s",
-                    end="",
-                )
-            else:
-                print(
-                    f"\r已下载: {downloaded_size} 字节 速度: {speed:.2f} KB/s",
-                    end="",
-                )
+def _print_download_progress(
+    downloaded_size: int, total_size: int | None, start_time: float
+) -> None:
+    elapsed_time = max(time.time() - start_time, 1e-6)
+    speed = downloaded_size / 1024 / elapsed_time  # KB/s
+
+    if total_size:
+        percent = downloaded_size / total_size
+        msg = f"\r下载进度: {percent:.2%} 速度: {speed:.2f} KB/s"
+    else:
+        msg = f"\r已下载: {downloaded_size} 字节 速度: {speed:.2f} KB/s"
 
-    if buffered:
-        await asyncio.to_thread(file_obj.write, bytes(buffered))
+    print(msg, end="")
 
 
 async def file_to_base64(file_path: str) -> str:

tests/fixtures/helpers.py

@@ -7,6 +7,7 @@
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Callable
+from urllib.parse import urlparse
 from unittest.mock import AsyncMock, MagicMock
 
 from astrbot.core.message.components import BaseMessageComponent
@@ -24,6 +25,20 @@ def __await__(self):
         return None
 
 
+def get_bound_tcp_port(site: Any) -> int:
+    """Resolve bound aiohttp TCP site port with public API first."""
+    parsed = urlparse(getattr(site, "name", ""))
+    if parsed.port is not None and parsed.port > 0:
+        return parsed.port
+
+    server = getattr(site, "_server", None)
+    sockets = getattr(server, "sockets", None) if server else None
+    if sockets:
+        return sockets[0].getsockname()[1]
+
+    raise RuntimeError("Unable to resolve bound TCP port from aiohttp site")
+
+
 # ============================================================
 # 平台配置工厂
 # ============================================================

tests/performance/test_benchmarks.py

@@ -26,6 +26,7 @@
 from astrbot.core.backup.exporter import AstrBotExporter
 from astrbot.core.message.components import File, Image, Record
 from astrbot.core.utils.io import download_file, file_to_base64
+from tests.fixtures.helpers import get_bound_tcp_port
 
 
 @dataclass(slots=True)
@@ -155,9 +156,7 @@ async def handle_download(_request):
     await runner.setup()
     site = web.TCPSite(runner, "127.0.0.1", 0)
     await site.start()
-    sockets = site._server.sockets  # noqa: SLF001
-    assert sockets
-    port = sockets[0].getsockname()[1]
+    port = get_bound_tcp_port(site)
     download_url = f"http://127.0.0.1:{port}/download.bin"
 
     async def bench_file_to_base64() -> None:

tests/unit/test_io_download_file.py

@@ -2,6 +2,7 @@
 import pytest
 
 from astrbot.core.utils.io import download_file
+from tests.fixtures.helpers import get_bound_tcp_port
 
 
 @pytest.mark.asyncio
@@ -19,9 +20,7 @@ async def handle(_request):
     await site.start()
 
     try:
-        sockets = site._server.sockets  # noqa: SLF001
-        assert sockets
-        port = sockets[0].getsockname()[1]
+        port = get_bound_tcp_port(site)
         url = f"http://127.0.0.1:{port}/file.bin"
 
         out = tmp_path / "downloaded.bin"