repalced with simpler implementation

Author: Andrei Neagu

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

@@ -20,6 +20,7 @@
 from servicelib.progress_bar import ProgressBarData
 from servicelib.utils import limited_gather
 from servicelib.zip_stream import DEFAULT_READ_CHUNK_SIZE, FileSize, FileStream
+from servicelib.zip_stream._file_like import FileLikeFileStreamReader
 from servicelib.zip_stream._types import StreamData
 from settings_library.s3 import S3Settings
 from types_aiobotocore_s3 import S3Client
@@ -516,42 +517,9 @@ async def upload_object_from_file_stream(
         self,
         bucket_name: S3BucketName,
         object_key: S3ObjectKey,
-        file_stream: FileStream,
+        file_like_reader: FileLikeFileStreamReader,
     ) -> None:
-        # Create a multipart upload
-        multipart_response = await self._client.create_multipart_upload(
-            Bucket=bucket_name, Key=object_key
-        )
-        upload_id = multipart_response["UploadId"]
-
-        try:
-            parts = []
-            part_number = 1
-
-            async for chunk in file_stream:
-                part_response = await self._client.upload_part(
-                    Bucket=bucket_name,
-                    Key=object_key,
-                    PartNumber=part_number,
-                    UploadId=upload_id,
-                    Body=chunk,
-                )
-                parts.append({"ETag": part_response["ETag"], "PartNumber": part_number})
-                part_number += 1
-
-            # Complete the multipart upload
-            await self._client.complete_multipart_upload(
-                Bucket=bucket_name,
-                Key=object_key,
-                UploadId=upload_id,
-                MultipartUpload={"Parts": parts},  # type: ignore[typeddict-item]
-            )
-        except Exception:
-            # Abort the multipart upload if something goes wrong
-            await self._client.abort_multipart_upload(
-                Bucket=bucket_name, Key=object_key, UploadId=upload_id
-            )
-            raise
+        await self._client.upload_fileobj(file_like_reader, bucket_name, object_key)  # type: ignore[arg-type]
 
     @staticmethod
     def is_multipart(file_size: ByteSize) -> bool:

packages/aws-library/tests/test_s3_client.py

@@ -64,6 +64,7 @@
     DiskStreamReader,
     get_zip_archive_stream,
 )
+from servicelib.zip_stream._file_like import FileLikeFileStreamReader
 from settings_library.s3 import S3Settings
 from types_aiobotocore_s3 import S3Client
 from types_aiobotocore_s3.literals import BucketLocationConstraintType
@@ -1436,8 +1437,9 @@ async def test_upload_object_from_file_stream(
     _, file_stream = await simcore_s3_api.get_object_file_stream(
         with_s3_bucket, with_uploaded_file_on_s3.s3_key
     )
+
     await simcore_s3_api.upload_object_from_file_stream(
-        with_s3_bucket, object_key, file_stream(AsyncMock())
+        with_s3_bucket, object_key, FileLikeFileStreamReader(file_stream(AsyncMock()))
     )
 
     await simcore_s3_api.delete_object(bucket=with_s3_bucket, object_key=object_key)
@@ -1587,8 +1589,11 @@ async def test_workflow_compress_s3_objects_and_local_files_in_a_single_archive_
         await simcore_s3_api.upload_object_from_file_stream(
             with_s3_bucket,
             archive_s3_object_key,
-            get_zip_archive_stream(archive_file_entries, progress_bar=progress_bar),
+            FileLikeFileStreamReader(
+                get_zip_archive_stream(archive_file_entries, progress_bar=progress_bar)
+            ),
         )
+
     duration = time.time() - started
     print(f"Zip created on S3 in {duration:.2f} seconds")