File tree Expand file tree Collapse file tree 8 files changed +16
-16
lines changed
src/servicelib/data_streams Expand file tree Collapse file tree 8 files changed +16
-16
lines changed Original file line number Diff line number Diff line change 6060)
6161from pytest_simcore .helpers .typing_env import EnvVarsDict
6262from servicelib .archiving_utils import unarchive_dir
63- from servicelib .file_utils import remove_directory
64- from servicelib .progress_bar import ProgressBarData
65- from servicelib .utils import limited_as_completed , limited_gather
66- from servicelib .zip_stream import (
63+ from servicelib .data_streams import (
6764 ArchiveEntries ,
6865 DiskStreamReader ,
69- get_zip_archive_file_stream ,
66+ get_zip_data_stream ,
7067)
71- from servicelib .zip_stream ._models import DataSize
68+ from servicelib .data_streams ._models import DataSize
69+ from servicelib .file_utils import remove_directory
70+ from servicelib .progress_bar import ProgressBarData
71+ from servicelib .utils import limited_as_completed , limited_gather
7272from settings_library .s3 import S3Settings
7373from types_aiobotocore_s3 import S3Client
7474from types_aiobotocore_s3 .literals import BucketLocationConstraintType
@@ -1596,7 +1596,7 @@ async def test_workflow_compress_s3_objects_and_local_files_in_a_single_archive_
15961596 await simcore_s3_api .upload_object_from_file_stream (
15971597 with_s3_bucket ,
15981598 archive_s3_object_key ,
1599- get_zip_archive_file_stream (
1599+ get_zip_data_stream (
16001600 archive_file_entries ,
16011601 progress_bar = progress_bar ,
16021602 chunk_size = MULTIPART_COPY_THRESHOLD ,
Original file line number Diff line number Diff line change 22from ._input import DiskStreamReader
33from ._models import ArchiveEntries , ArchiveFileEntry , StreamData
44from ._output import DiskStreamWriter
5- from ._zipper import get_zip_archive_file_stream
5+ from ._zipper import get_zip_data_stream
66
77__all__ : tuple [str , ...] = (
88 "ArchiveEntries" ,
99 "ArchiveFileEntry" ,
1010 "DEFAULT_READ_CHUNK_SIZE" ,
1111 "DiskStreamReader" ,
1212 "DiskStreamWriter" ,
13- "get_zip_archive_file_stream " ,
13+ "get_zip_data_stream " ,
1414 "StreamData" ,
1515)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ async def _member_files_iter(
2222 )
2323
2424
25- async def get_zip_archive_file_stream (
25+ async def get_zip_data_stream (
2626 archive_files : ArchiveEntries ,
2727 * ,
2828 progress_bar : ProgressBarData | None = None ,
Original file line number Diff line number Diff line change 1515 get_relative_to ,
1616)
1717from servicelib .archiving_utils import unarchive_dir
18- from servicelib .file_utils import remove_directory
19- from servicelib .progress_bar import ProgressBarData
20- from servicelib .s3_utils import FileLikeFileStreamReader
21- from servicelib .zip_stream import (
18+ from servicelib .data_streams import (
2219 ArchiveEntries ,
2320 DiskStreamReader ,
2421 DiskStreamWriter ,
25- get_zip_archive_file_stream ,
22+ get_zip_data_stream ,
2623)
24+ from servicelib .file_utils import remove_directory
25+ from servicelib .progress_bar import ProgressBarData
26+ from servicelib .s3_utils import FileLikeFileStreamReader
2727
2828
2929def _ensure_dir (path : Path ) -> Path :
@@ -116,7 +116,7 @@ async def test_get_zip_archive_file_stream(
116116 progress_report_cb = mocked_progress_bar_cb ,
117117 description = "root_bar" ,
118118 ) as root :
119- file_stream = get_zip_archive_file_stream (
119+ file_stream = get_zip_data_stream (
120120 archive_files , progress_bar = root , chunk_size = 1024
121121 )
122122
You can’t perform that action at this time.
0 commit comments