renamed

Author: Andrei Neagu

packages/aws-library/src/aws_library/s3/_client.py

@@ -19,7 +19,7 @@
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.data_streams import DEFAULT_READ_CHUNK_SIZE, StreamData
 from servicelib.logging_utils import log_catch, log_context
-from servicelib.s3_utils import FileLikeFileStreamReader
+from servicelib.s3_utils import FileLikeDataStreamReader
 from servicelib.utils import limited_gather
 from settings_library.s3 import S3Settings
 from types_aiobotocore_s3 import S3Client
@@ -522,7 +522,7 @@ async def upload_object_from_file_stream(
         file_stream: DataStream,
     ) -> None:
         """streams write an object in S3 from an AsyncIterable[bytes]"""
-        await self._client.upload_fileobj(FileLikeFileStreamReader(file_stream), bucket_name, object_key)  # type: ignore[arg-type]
+        await self._client.upload_fileobj(FileLikeDataStreamReader(file_stream), bucket_name, object_key)  # type: ignore[arg-type]
 
     @staticmethod
     def is_multipart(file_size: ByteSize) -> bool:

packages/service-library/src/servicelib/data_streams/_output.py

@@ -3,7 +3,7 @@
 import aiofiles
 from models_library.data_streams import DataStream
 
-from ..s3_utils import FileLikeFileStreamReader
+from ..s3_utils import FileLikeDataStreamReader
 
 
 class DiskStreamWriter:
@@ -17,7 +17,7 @@ async def write_from_stream(self, stream: DataStream) -> None:
                 await f.flush()
 
     async def write_from_file_like(
-        self, file_like_reader: FileLikeFileStreamReader
+        self, file_like_reader: FileLikeDataStreamReader
     ) -> None:
         async with aiofiles.open(self.destination_path, "wb") as f:
             while True:

packages/service-library/src/servicelib/s3_utils.py

@@ -1,14 +1,14 @@
 from models_library.data_streams import DataStream
 
 
-class FileLikeFileStreamReader:
-    def __init__(self, file_stream: DataStream):
-        self.file_stream = file_stream
+class FileLikeDataStreamReader:
+    def __init__(self, data_stream: DataStream):
+        self._data_stream = data_stream
         self._buffer = bytearray()
         self._async_iterator = self._get_iterator()
 
     async def _get_iterator(self):
-        async for chunk in self.file_stream:
+        async for chunk in self._data_stream:
             yield chunk
 
     async def read(self, size: int) -> bytes:

packages/service-library/tests/test_data_streams.py

@@ -23,7 +23,7 @@
 )
 from servicelib.file_utils import remove_directory
 from servicelib.progress_bar import ProgressBarData
-from servicelib.s3_utils import FileLikeFileStreamReader
+from servicelib.s3_utils import FileLikeDataStreamReader
 
 
 def _ensure_dir(path: Path) -> Path:
@@ -121,7 +121,7 @@ async def test_get_zip_data_stream(
         )
 
         if use_file_like:
-            await writer.write_from_file_like(FileLikeFileStreamReader(file_stream))
+            await writer.write_from_file_like(FileLikeDataStreamReader(file_stream))
         else:
             await writer.write_from_stream(file_stream)