Merge remote-tracking branch 'origin/main' into add-gpio-list

Author: JakubAndrysek

src/wokwi_client/client.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+import base64
 from pathlib import Path
 from typing import Any, Optional, Union, cast
 
@@ -15,7 +16,7 @@
 from .constants import DEFAULT_WS_URL
 from .control import set_control
 from .event_queue import EventQueue
-from .file_ops import download, download_file, upload, upload_file
+from .file_ops import download, upload, upload_file
 from .pins import gpio_list, pin_listen, pin_read
 from .protocol_types import EventMessage, ResponseMessage
 from .serial import monitor_lines, write_serial
@@ -92,17 +93,18 @@ async def upload_file(
         """
         return await upload_file(self._transport, filename, local_path)
 
-    async def download(self, name: str) -> ResponseMessage:
+    async def download(self, name: str) -> bytes:
         """
         Download a file from the simulator.
 
         Args:
             name: The name of the file to download.
 
         Returns:
-            The response message from the server.
+            The downloaded file content as bytes.
         """
-        return await download(self._transport, name)
+        result = await download(self._transport, name)
+        return base64.b64decode(result["result"]["binary"])
 
     async def download_file(self, name: str, local_path: Optional[Path] = None) -> None:
         """
@@ -112,7 +114,12 @@ async def download_file(self, name: str, local_path: Optional[Path] = None) -> N
             name: The name of the file to download.
             local_path: The local path to save the downloaded file. If not provided, uses the name as the path.
         """
-        await download_file(self._transport, name, local_path)
+        if local_path is None:
+            local_path = Path(name)
+
+        result = await self.download(name)
+        with open(local_path, "wb") as f:
+            f.write(result)
 
     async def start_simulation(
         self,

src/wokwi_client/file_ops.py

@@ -26,12 +26,3 @@ async def upload(transport: Transport, name: str, content: bytes) -> ResponseMes
 
 async def download(transport: Transport, name: str) -> ResponseMessage:
     return await transport.request("file:download", {"name": name})
-
-
-async def download_file(transport: Transport, name: str, local_path: Optional[Path] = None) -> None:
-    if local_path is None:
-        local_path = Path(name)
-
-    result = await download(transport, name)
-    with open(local_path, "wb") as f:
-        f.write(base64.b64decode(result["result"]["binary"]))