futher bugfixes

Author: bisgaard-itis

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

@@ -329,13 +329,17 @@ async def get_function_job_logs_task(
         async_job_get = await job_service.start_log_export(
             job_id=function_job.project_job_id,
         )
-        _task_id = f"{async_job_get.job_id}"
+        _task_uuid = f"{async_job_get.job_id}"
         return TaskGet(
-            task_id=_task_id,
+            task_id=_task_uuid,
             task_name=async_job_get.job_name,
-            status_href=app_router.url_path_for("get_task_status", task_id=_task_id),
-            abort_href=app_router.url_path_for("cancel_task", task_id=_task_id),
-            result_href=app_router.url_path_for("get_task_result", task_id=_task_id),
+            status_href=app_router.url_path_for(
+                "get_task_status", task_uuid=_task_uuid
+            ),
+            abort_href=app_router.url_path_for("cancel_task", task_uuid=_task_uuid),
+            result_href=app_router.url_path_for(
+                "get_task_result", task_uuid=_task_uuid
+            ),
         )
 
     if (
@@ -350,12 +354,16 @@ async def get_function_job_logs_task(
         async_job_get = await job_service.start_log_export(
             job_id=function_job.solver_job_id,
         )
-        _task_id = f"{async_job_get.job_id}"
+        _task_uuid = f"{async_job_get.job_id}"
         return TaskGet(
-            task_id=_task_id,
+            task_id=_task_uuid,
             task_name=async_job_get.job_name,
-            status_href=app_router.url_path_for("get_task_status", task_id=_task_id),
-            abort_href=app_router.url_path_for("cancel_task", task_id=_task_id),
-            result_href=app_router.url_path_for("get_task_result", task_id=_task_id),
+            status_href=app_router.url_path_for(
+                "get_task_status", task_uuid=_task_uuid
+            ),
+            abort_href=app_router.url_path_for("cancel_task", task_uuid=_task_uuid),
+            result_href=app_router.url_path_for(
+                "get_task_result", task_uuid=_task_uuid
+            ),
         )
     raise UnsupportedFunctionClassError(function_class=function.function_class)

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

@@ -86,11 +86,11 @@ async def list_tasks(
             task_id=f"{task.uuid}",
             task_name=task.metadata.name,
             status_href=app_router.url_path_for(
-                "get_task_status", task_id=f"{task.uuid}"
+                "get_task_status", task_uuid=f"{task.uuid}"
             ),
-            abort_href=app_router.url_path_for("cancel_task", task_id=f"{task.uuid}"),
+            abort_href=app_router.url_path_for("cancel_task", task_uuid=f"{task.uuid}"),
             result_href=app_router.url_path_for(
-                "get_task_result", task_id=f"{task.uuid}"
+                "get_task_result", task_uuid=f"{task.uuid}"
             ),
         )
         for task in tasks

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

@@ -108,7 +108,7 @@ async def _progress_cb(report: ProgressReport) -> None:
 
 async def export_data_as_download_link(
     task: Task,
-    task_id: TaskKey,
+    task_key: TaskKey,
     *,
     user_id: UserID,
     paths_to_export: list[PathToExport],
@@ -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_key=task_id, user_id=user_id, paths_to_export=paths_to_export
+        task=task, task_key=task_key, user_id=user_id, paths_to_export=paths_to_export
     )
 
     dsm = get_dsm_provider(get_app_server(task.app).app).get(