moved imports to more appropriate places

Author: Andrei Neagu

packages/models-library/src/models_library/data_streams.py

@@ -3,7 +3,6 @@
 
 from pydantic import ByteSize
 
-FileNameInArchive: TypeAlias = str
 DataStream: TypeAlias = AsyncIterable[bytes]
 
 DataStreamCallable: TypeAlias = Callable[[], DataStream]

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

@@ -1,8 +1,8 @@
 from ._constants import DEFAULT_READ_CHUNK_SIZE
 from ._input import DiskStreamReader
-from ._models import ArchiveEntries, ArchiveFileEntry, StreamData
+from ._models import StreamData
 from ._output import DiskStreamWriter
-from ._zipper import get_zip_data_stream
+from ._stream_zip import ArchiveEntries, ArchiveFileEntry, get_zip_data_stream
 
 __all__: tuple[str, ...] = (
     "ArchiveEntries",

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

@@ -1,12 +1,6 @@
 from dataclasses import dataclass
-from typing import TypeAlias
 
-from models_library.data_streams import (
-    DataSize,
-    DataStream,
-    DataStreamCallable,
-    FileNameInArchive,
-)
+from models_library.data_streams import DataSize, DataStream, DataStreamCallable
 
 from ..progress_bar import ProgressBarData
 
@@ -22,7 +16,3 @@ async def with_progress_data_stream(
         async for chunk in self.data_stream_callable():
             await progress_bar.update(len(chunk))
             yield chunk
-
-
-ArchiveFileEntry: TypeAlias = tuple[FileNameInArchive, StreamData]
-ArchiveEntries: TypeAlias = list[ArchiveFileEntry]

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

@@ -1,12 +1,17 @@
 from collections.abc import AsyncIterable
 from datetime import UTC, datetime
 from stat import S_IFREG
+from typing import TypeAlias
 
 from models_library.data_streams import DataSize, DataStream
 from stream_zip import ZIP_32, AsyncMemberFile, async_stream_zip
 
 from ..progress_bar import ProgressBarData
-from ._models import ArchiveEntries
+from ._models import StreamData
+
+FileNameInArchive: TypeAlias = str
+ArchiveFileEntry: TypeAlias = tuple[FileNameInArchive, StreamData]
+ArchiveEntries: TypeAlias = list[ArchiveFileEntry]
 
 
 async def _member_files_iter(