move to aiofiles @pcrespov

Author: bisgaard-itis

clients/python/setup.py

@@ -30,6 +30,7 @@
     "tenacity",
     "tqdm>=4.48.0",
     f"osparc_client=={VERSION}",
+    "aiofiles",
 ]
 
 SETUP = dict(

clients/python/src/osparc/_api_files_api.py

@@ -25,8 +25,8 @@
     FileUploadData,
     UploadedPart,
 )
-from tempfile import NamedTemporaryFile
 from urllib.parse import urljoin
+import aiofiles
 from ._utils import (
     DEFAULT_TIMEOUT_SECONDS,
     PaginationGenerator,
@@ -92,23 +92,26 @@ async def download_file_async(
             raise RuntimeError(
                 f"destination_folder: {destination_folder} must be a directory"
             )
-        downloaded_file = Path(
-            NamedTemporaryFile(dir=destination_folder, delete=False).name
-        )
-        async with AsyncHttpClient(
-            configuration=self.api_client.configuration, timeout=timeout_seconds
-        ) as session:
-            url = urljoin(
-                self.api_client.configuration.host, f"/v0/files/{file_id}/content"
-            )
-            async for response in await session.stream(
-                "GET", url=url, auth=self._auth, follow_redirects=True
-            ):
-                response.raise_for_status()
-                with open(downloaded_file, mode="wb") as f:
+        async with aiofiles.tempfile.NamedTemporaryFile(
+            mode="wb",
+            dir=f"{destination_folder.resolve()}"
+            if destination_folder is not None
+            else None,
+            delete=False,
+        ) as downloaded_file:
+            async with AsyncHttpClient(
+                configuration=self.api_client.configuration, timeout=timeout_seconds
+            ) as session:
+                url = urljoin(
+                    self.api_client.configuration.host, f"/v0/files/{file_id}/content"
+                )
+                async for response in await session.stream(
+                    "GET", url=url, auth=self._auth, follow_redirects=True
+                ):
+                    response.raise_for_status()
                     async for chunk in response.aiter_bytes():
-                        f.write(chunk)
-        return str(downloaded_file.resolve())
+                        await downloaded_file.write(chunk)
+            return f"{downloaded_file.name}"
 
     def upload_file(
         self,
@@ -130,7 +133,7 @@ async def upload_file_async(
             file = Path(file)
         if not file.is_file():
             raise RuntimeError(f"{file} is not a file")
-        checksum: str = compute_sha256(file)
+        checksum: str = await compute_sha256(file)
         for file_result in self._search_files(
             sha256_checksum=checksum, timeout_seconds=timeout_seconds
         ):

clients/python/src/osparc/_utils.py

@@ -16,7 +16,7 @@
     Solver,
     Study,
 )
-
+import aiofiles
 from ._exceptions import RequestError
 
 _KB = 1024  # in bytes
@@ -87,15 +87,15 @@ async def file_chunk_generator(
     bytes_read: int = 0
     file_size: int = file.stat().st_size
     while bytes_read < file_size:
-        with open(file, "rb") as f:
-            f.seek(bytes_read)
+        async with aiofiles.open(file, "rb") as f:
+            await f.seek(bytes_read)
             nbytes = (
                 chunk_size
                 if (bytes_read + chunk_size <= file_size)
                 else (file_size - bytes_read)
             )
             assert nbytes > 0
-            chunk = await asyncio.get_event_loop().run_in_executor(None, f.read, nbytes)
+            chunk = await f.read(nbytes)
             yield chunk, nbytes
             bytes_read += nbytes
 
@@ -109,16 +109,16 @@ async def _fcn_to_coro(callback: Callable[..., S], *args) -> S:
     return result
 
 
-def compute_sha256(file: Path) -> str:
+async def compute_sha256(file: Path) -> str:
     assert file.is_file()
     sha256 = hashlib.sha256()
-    with open(file, "rb") as f:
+    async with aiofiles.open(file, "rb") as f:
         while True:
-            data = f.read(100 * _KB)
+            data = await f.read(100 * _KB)
             if not data:
                 break
             sha256.update(data)
-        return sha256.hexdigest()
+    return sha256.hexdigest()
 
 
 def dev_features_enabled() -> bool: