python(refactor): refactor files using run_in_executor to use the int… (#518)

Author: wei-qlu

python/lib/sift_client/_internal/low_level_wrappers/remote_files.py

@@ -1,9 +1,7 @@
 from __future__ import annotations
 
-import asyncio
 from typing import TYPE_CHECKING, Any, cast
 
-import requests
 from sift.remote_files.v1.remote_files_pb2 import (
     BatchDeleteRemoteFilesRequest,
     DeleteRemoteFileRequest,
@@ -182,24 +180,3 @@ async def get_remote_file_download_url(self, remote_file_id: str) -> str:
             request
         )
         return response.download_url
-
-    async def download_remote_file(self, file_attachment: FileAttachment) -> bytes:
-        """Download a remote file.
-
-        Args:
-            file_attachment: The FileAttachment to download.
-
-        Returns:
-            The downloaded file.
-        """
-        url = await self.get_remote_file_download_url(file_attachment._id_or_error)
-
-        # Run the synchronous requests.get in a thread pool to avoid blocking
-        def _download():
-            response = requests.get(url)
-            response.raise_for_status()
-            return response.content
-
-        # Use run_in_executor for Python 3.8 compatibility (asyncio.to_thread was added in 3.9)
-        loop = asyncio.get_event_loop()
-        return await loop.run_in_executor(None, _download)

python/lib/sift_client/_internal/low_level_wrappers/upload.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import asyncio
 import logging
 import mimetypes
 from pathlib import Path
@@ -9,6 +8,7 @@
 from requests_toolbelt import MultipartEncoder
 
 from sift_client._internal.low_level_wrappers.base import LowLevelClientBase
+from sift_client._internal.util.executor import run_sync_function
 from sift_client.transport import WithRestClient
 
 if TYPE_CHECKING:
@@ -100,9 +100,7 @@ async def upload_attachment(
                 mimetype = "application/octet-stream"  # fallback to generic 'binary data' MIME type
 
         # Run the synchronous file upload in a thread pool to avoid blocking the event loop
-        loop = asyncio.get_event_loop()
-        return await loop.run_in_executor(
-            None,
+        return await run_sync_function(
             self._upload_file_sync,
             posix_path,
             file_name,

python/lib/sift_client/resources/file_attachments.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
 
+from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from sift_client._internal.low_level_wrappers.remote_files import RemoteFilesLowLevelClient
 from sift_client._internal.low_level_wrappers.upload import UploadLowLevelClient
+from sift_client._internal.util.executor import run_sync_function
+from sift_client._internal.util.file import download_file
 from sift_client.resources._base import ResourceBase
 from sift_client.util import cel_utils as cel
 
 if TYPE_CHECKING:
     import re
-    from pathlib import Path
 
     from sift_client.client import SiftClient
     from sift_client.sift_types.asset import Asset
@@ -247,9 +249,12 @@ async def download(
         """
         if isinstance(file_attachment, str):
             file_attachment = await self.get(file_attachment_id=file_attachment)
-        content = await self._low_level_client.download_remote_file(file_attachment=file_attachment)
-        with open(output_path, "wb") as f:
-            f.write(content)
+        url = await self._low_level_client.get_remote_file_download_url(
+            file_attachment._id_or_error
+        )
+        await run_sync_function(
+            lambda: download_file(url, Path(output_path), rest_client=self.client.rest_client)
+        )
 
     async def upload(
         self,