rename module

Author: Andrei Neagu

packages/simcore-sdk/src/simcore_sdk/node_ports_common/filemanager.py

@@ -30,8 +30,7 @@
 from yarl import URL
 
 from ..node_ports_common.client_session_manager import ClientSessionContextManager
-from . import aws_s3_cli, exceptions, r_clone, storage_client
-from ._filemanager import _abort_upload, _complete_upload, _resolve_location_id
+from . import aws_s3_cli, exceptions, filemanager_utils, r_clone, storage_client
 from .file_io_utils import (
     LogRedirectCB,
     UploadableFileObject,
@@ -48,7 +47,7 @@ async def complete_file_upload(
     client_session: ClientSession | None = None,
 ) -> ETag:
     async with ClientSessionContextManager(client_session) as session:
-        e_tag: ETag | None = await _complete_upload(
+        e_tag: ETag | None = await filemanager_utils.complete_upload(
             session=session,
             upload_completion_link=upload_completion_link,
             parts=uploaded_parts,
@@ -75,7 +74,9 @@ async def get_download_link_from_s3(
     :raises exceptions.StorageServerIssue
     """
     async with ClientSessionContextManager(client_session) as session:
-        store_id = await _resolve_location_id(session, user_id, store_name, store_id)
+        store_id = await filemanager_utils.resolve_location_id(
+            session, user_id, store_name, store_id
+        )
         file_link = await storage_client.get_download_file_link(
             session=session,
             file_id=s3_object,
@@ -99,7 +100,9 @@ async def get_upload_links_from_s3(
     sha256_checksum: SHA256Str | None,
 ) -> tuple[LocationID, FileUploadSchema]:
     async with ClientSessionContextManager(client_session) as session:
-        store_id = await _resolve_location_id(session, user_id, store_name, store_id)
+        store_id = await filemanager_utils.resolve_location_id(
+            session, user_id, store_name, store_id
+        )
         file_links = await storage_client.get_upload_file_links(
             session=session,
             file_id=s3_object,
@@ -144,7 +147,9 @@ async def download_path_from_s3(
     )
 
     async with ClientSessionContextManager(client_session) as session:
-        store_id = await _resolve_location_id(session, user_id, store_name, store_id)
+        store_id = await filemanager_utils.resolve_location_id(
+            session, user_id, store_name, store_id
+        )
         file_meta_data: FileMetaDataGet = await _get_file_meta_data(
             user_id=user_id,
             s3_object=s3_object,
@@ -259,7 +264,7 @@ async def abort_upload(
 
     """
     async with ClientSessionContextManager(client_session) as session:
-        await _abort_upload(
+        await filemanager_utils.abort_upload(
             session=session,
             abort_upload_link=abort_upload_link,
             reraise_exceptions=True,
@@ -425,13 +430,13 @@ async def _upload_path(  # pylint: disable=too-many-arguments
         ) as exc:
             _logger.exception("The upload failed with an unexpected error:")
             if upload_links:
-                await _abort_upload(
+                await filemanager_utils.abort_upload(
                     session, upload_links.links.abort_upload, reraise_exceptions=False
                 )
             raise exceptions.S3TransferError from exc
         except CancelledError:
             if upload_links:
-                await _abort_upload(
+                await filemanager_utils.abort_upload(
                     session, upload_links.links.abort_upload, reraise_exceptions=False
                 )
             raise
@@ -485,7 +490,7 @@ async def _upload_to_s3(
             progress_bar=progress_bar,
         )
     # complete the upload
-    e_tag = await _complete_upload(
+    e_tag = await filemanager_utils.complete_upload(
         session,
         upload_links.links.complete_upload,
         uploaded_parts,

packages/simcore-sdk/src/simcore_sdk/node_ports_common/_filemanager.py renamed to packages/simcore-sdk/src/simcore_sdk/node_ports_common/filemanager_utils.py

@@ -54,7 +54,7 @@ def _get_https_link_if_storage_secure(url: str) -> str:
     return url
 
 
-async def _complete_upload(
+async def complete_upload(
     session: ClientSession,
     upload_completion_link: AnyUrl,
     parts: list[UploadedPart],
@@ -118,7 +118,7 @@ async def _complete_upload(
     raise exceptions.S3TransferError(msg)
 
 
-async def _resolve_location_id(
+async def resolve_location_id(
     client_session: ClientSession,
     user_id: UserID,
     store_name: LocationName | None,
@@ -136,7 +136,7 @@ async def _resolve_location_id(
     return store_id
 
 
-async def _abort_upload(
+async def abort_upload(
     session: ClientSession, abort_upload_link: AnyUrl, *, reraise_exceptions: bool
 ) -> None:
     # abort the upload correctly, so it can revert back to last version

packages/simcore-sdk/tests/unit/test_storage_client.py

@@ -24,7 +24,9 @@
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from servicelib.aiohttp import status
 from simcore_sdk.node_ports_common import exceptions
-from simcore_sdk.node_ports_common._filemanager import _get_https_link_if_storage_secure
+from simcore_sdk.node_ports_common.filemanager_utils import (
+    _get_https_link_if_storage_secure,
+)
 from simcore_sdk.node_ports_common.storage_client import (
     LinkType,
     delete_file,