refactor completion fcn into two

Author: bisgaard-itis

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

@@ -41,22 +41,34 @@
 _logger = logging.getLogger(__name__)
 
 
+async def complete_directory_upload(
+    uploaded_parts: list[UploadedPart],
+    upload_completion_link: AnyUrl,
+    client_session: ClientSession | None = None,
+) -> None:
+    async with ClientSessionContextManager(client_session) as session:
+        await _filemanager_utils.complete_upload(
+            session=session,
+            upload_completion_link=upload_completion_link,
+            parts=uploaded_parts,
+            is_directory=True,
+        )
+
+
 async def complete_file_upload(
     uploaded_parts: list[UploadedPart],
     upload_completion_link: AnyUrl,
-    is_directory: bool,
     client_session: ClientSession | None = None,
 ) -> ETag | None:
     async with ClientSessionContextManager(client_session) as session:
         e_tag: ETag | None = await _filemanager_utils.complete_upload(
             session=session,
             upload_completion_link=upload_completion_link,
             parts=uploaded_parts,
-            is_directory=is_directory,
+            is_directory=False,
         )
     # should not be None because a file is being uploaded
-    if not is_directory:
-        assert e_tag is not None  # nosec
+    assert e_tag is not None  # nosec
     return e_tag
 
 

services/api-server/src/simcore_service_api_server/api/routes/files.py

@@ -426,7 +426,6 @@ async def complete_multipart_upload(
     e_tag: ETag | None = await complete_file_upload(
         uploaded_parts=uploaded_parts.parts,
         upload_completion_link=TypeAdapter(AnyUrl).validate_python(f"{complete_link}"),
-        is_directory=False,
     )
     assert e_tag is not None  # nosec
 

services/api-server/src/simcore_service_api_server/api/routes/programs.py

@@ -14,7 +14,7 @@
 from servicelib.fastapi.dependencies import get_reverse_url_mapper
 from simcore_sdk.node_ports_common.constants import SIMCORE_LOCATION
 from simcore_sdk.node_ports_common.filemanager import (
-    complete_file_upload,
+    complete_directory_upload,
     get_upload_links_from_s3,
 )
 from simcore_service_api_server._service import create_solver_or_program_job
@@ -148,9 +148,8 @@ async def create_program_job(
         is_directory=True,
         sha256_checksum=None,
     )
-    await complete_file_upload(
+    await complete_directory_upload(
         uploaded_parts=[],
         upload_completion_link=file_upload_schema.links.complete_upload,
-        is_directory=True,
     )
     return job