reshuffled imports

Author: Andrei Neagu

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

@@ -21,7 +21,6 @@
 from servicelib.utils import limited_gather
 from servicelib.zip_stream import (
     DEFAULT_READ_CHUNK_SIZE,
-    MULTIPART_UPLOADS_MIN_TOTAL_SIZE,
     FileSize,
     FileStream,
     FileStreamCallable,
@@ -31,7 +30,7 @@
 from types_aiobotocore_s3.literals import BucketLocationConstraintType
 from types_aiobotocore_s3.type_defs import ObjectIdentifierTypeDef
 
-from ._constants import MULTIPART_COPY_THRESHOLD
+from ._constants import MULTIPART_UPLOADS_MIN_TOTAL_SIZE
 from ._error_handler import s3_exception_handler, s3_exception_handler_async_gen
 from ._errors import S3DestinationNotEmptyError, S3KeyNotFoundError
 from ._models import (

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

@@ -6,9 +6,9 @@
 MIN_MULTIPART_UPLOAD_CHUNK_SIZE: Final[int] = TypeAdapter(ByteSize).validate_python(
     "5MiB"
 )
-MULTIPART_COPY_THRESHOLD: Final[ByteSize] = TypeAdapter(ByteSize).validate_python(
-    "100MiB"
-)
+MULTIPART_UPLOADS_MIN_TOTAL_SIZE: Final[ByteSize] = TypeAdapter(
+    ByteSize
+).validate_python("100MiB")
 
 PRESIGNED_LINK_MAX_SIZE: Final[ByteSize] = TypeAdapter(ByteSize).validate_python("5GiB")
 S3_MAX_FILE_SIZE: Final[ByteSize] = TypeAdapter(ByteSize).validate_python("5TiB")

packages/aws-library/tests/test_s3_client.py

@@ -24,6 +24,7 @@
 import pytest
 from aiohttp import ClientSession
 from aws_library.s3._client import S3ObjectKey, SimcoreS3API
+from aws_library.s3._constants import MULTIPART_UPLOADS_MIN_TOTAL_SIZE
 from aws_library.s3._errors import (
     S3BucketInvalidError,
     S3DestinationNotEmptyError,
@@ -59,7 +60,6 @@
 from servicelib.progress_bar import ProgressBarData
 from servicelib.utils import limited_as_completed
 from servicelib.zip_stream import (
-    MULTIPART_UPLOADS_MIN_TOTAL_SIZE,
     ArchiveEntries,
     DiskStreamReader,
     get_zip_archive_stream,

packages/service-library/src/servicelib/zip_stream/__init__.py

@@ -1,4 +1,4 @@
-from ._constants import DEFAULT_READ_CHUNK_SIZE, MULTIPART_UPLOADS_MIN_TOTAL_SIZE
+from ._constants import DEFAULT_READ_CHUNK_SIZE, MIN_MULTIPART_UPLOAD_CHUNK_SIZE
 from ._input import DiskStreamReader
 from ._output import DiskStreamWriter
 from ._types import (
@@ -20,5 +20,5 @@
     "FileStream",
     "FileStreamCallable",
     "get_zip_archive_stream",
-    "MULTIPART_UPLOADS_MIN_TOTAL_SIZE",
+    "MIN_MULTIPART_UPLOAD_CHUNK_SIZE",
 )

packages/service-library/src/servicelib/zip_stream/_constants.py

@@ -3,6 +3,6 @@
 from pydantic import ByteSize, TypeAdapter
 
 DEFAULT_READ_CHUNK_SIZE: Final[int] = TypeAdapter(ByteSize).validate_python("1MiB")
-MULTIPART_UPLOADS_MIN_TOTAL_SIZE: Final[ByteSize] = TypeAdapter(
-    ByteSize
-).validate_python("100MiB")
+MIN_MULTIPART_UPLOAD_CHUNK_SIZE: Final[int] = TypeAdapter(ByteSize).validate_python(
+    "5MiB"
+)

packages/service-library/src/servicelib/zip_stream/_zipper.py

@@ -5,7 +5,7 @@
 from stream_zip import ZIP_32, AsyncMemberFile, async_stream_zip
 
 from ..progress_bar import ProgressBarData
-from ._constants import MULTIPART_UPLOADS_MIN_TOTAL_SIZE
+from ._constants import MIN_MULTIPART_UPLOAD_CHUNK_SIZE
 from ._types import ArchiveEntries, FileSize, FileStream
 
 
@@ -26,7 +26,7 @@ async def get_zip_archive_stream(
     archive_files: ArchiveEntries,
     *,
     progress_bar: ProgressBarData | None = None,
-    chunk_size: int = MULTIPART_UPLOADS_MIN_TOTAL_SIZE,
+    chunk_size: int = MIN_MULTIPART_UPLOAD_CHUNK_SIZE,
 ) -> FileStream:
     # NOTE: this is CPU bound task, even though the loop is not blocked,
     # the CPU is still used for compressing the content.