task_id -> task_key in all celery tasks

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/celery_worker/worker_tasks/functions_tasks.py

@@ -103,7 +103,7 @@ async def _assemble_function_job_service(
 
 async def run_function(
     task: Task,
-    task_id: TaskKey,
+    task_key: TaskKey,
     *,
     user_identity: Identity,
     function: RegisteredFunction,
@@ -113,7 +113,7 @@ async def run_function(
     x_simcore_parent_project_uuid: ProjectID | None,
     x_simcore_parent_node_id: NodeID | None,
 ) -> RegisteredFunctionJob:
-    assert task_id  # nosec
+    assert task_key  # nosec
     app = get_app_server(task.app).app
     function_job_service = await _assemble_function_job_service(
         app=app, user_identity=user_identity

services/storage/src/simcore_service_storage/api/_worker_tasks/_paths.py

@@ -17,9 +17,9 @@
 
 
 async def compute_path_size(
-    task: Task, task_id: TaskKey, user_id: UserID, location_id: LocationID, path: Path
+    task: Task, task_key: TaskKey, user_id: UserID, location_id: LocationID, path: Path
 ) -> ByteSize:
-    assert task_id  # nosec
+    assert task_key  # nosec
     with log_context(
         _logger,
         logging.INFO,
@@ -31,12 +31,12 @@ async def compute_path_size(
 
 async def delete_paths(
     task: Task,
-    task_id: TaskKey,
+    task_key: TaskKey,
     user_id: UserID,
     location_id: LocationID,
     paths: set[Path],
 ) -> None:
-    assert task_id  # nosec
+    assert task_key  # nosec
     with log_context(
         _logger,
         logging.INFO,

services/storage/src/simcore_service_storage/api/_worker_tasks/_simcore_s3.py

@@ -26,18 +26,18 @@
 
 
 async def _task_progress_cb(
-    task: Task, task_id: TaskKey, report: ProgressReport
+    task: Task, task_key: TaskKey, report: ProgressReport
 ) -> None:
     worker = get_app_server(task.app).task_manager
     assert task.name  # nosec
     await worker.set_task_progress(
-        task_key=task_id,
+        task_key=task_key,
         report=report,
     )
 
 
 async def deep_copy_files_from_project(
-    task: Task, task_id: TaskKey, user_id: UserID, body: FoldersBody
+    task: Task, task_key: TaskKey, user_id: UserID, body: FoldersBody
 ) -> dict[str, Any]:
     with log_context(
         _logger,
@@ -51,7 +51,7 @@ async def deep_copy_files_from_project(
         async with ProgressBarData(
             num_steps=1,
             description="copying files",
-            progress_report_cb=functools.partial(_task_progress_cb, task, task_id),
+            progress_report_cb=functools.partial(_task_progress_cb, task, task_key),
         ) as task_progress:
             await dsm.deep_copy_project_simcore_s3(
                 user_id,
@@ -66,7 +66,7 @@ async def deep_copy_files_from_project(
 
 async def export_data(
     task: Task,
-    task_id: TaskKey,
+    task_key: TaskKey,
     *,
     user_id: UserID,
     paths_to_export: list[PathToExport],
@@ -77,7 +77,7 @@ async def export_data(
     with log_context(
         _logger,
         logging.INFO,
-        f"'{task_id}' export data (for {user_id=}) fom selection: {paths_to_export}",
+        f"'{task_key}' export data (for {user_id=}) fom selection: {paths_to_export}",
     ):
         dsm = get_dsm_provider(get_app_server(task.app).app).get(
             SimcoreS3DataManager.get_location_id()
@@ -92,13 +92,13 @@ async def export_data(
         async def _progress_cb(report: ProgressReport) -> None:
             assert task.name  # nosec
             await get_app_server(task.app).task_manager.set_task_progress(
-                task_id, report
+                task_key, report
             )
-            _logger.debug("'%s' progress %s", task_id, report.percent_value)
+            _logger.debug("'%s' progress %s", task_key, report.percent_value)
 
         async with ProgressBarData(
             num_steps=1,
-            description=f"'{task_id}' export data",
+            description=f"'{task_key}' export data",
             progress_report_cb=_progress_cb,
         ) as progress_bar:
             return await dsm.create_s3_export(
@@ -117,7 +117,7 @@ async def export_data_as_download_link(
     AccessRightError: in case user can't access project
     """
     s3_object = await export_data(
-        task=task, task_id=task_id, user_id=user_id, paths_to_export=paths_to_export
+        task=task, task_key=task_id, user_id=user_id, paths_to_export=paths_to_export
     )
 
     dsm = get_dsm_provider(get_app_server(task.app).app).get(