further corrections

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/services_rpc/async_jobs.py

@@ -40,12 +40,12 @@ class AsyncJobClient:
             JobSchedulerError: TaskSchedulerError,
         }
     )
-    async def cancel(self, *, job_id: AsyncJobId, job_id_data: AsyncJobFilter) -> None:
+    async def cancel(self, *, job_id: AsyncJobId, job_filter: AsyncJobFilter) -> None:
         return await async_jobs.cancel(
             self._rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id=job_id,
-            job_filter=job_id_data,
+            job_filter=job_filter,
         )
 
     @_exception_mapper(
@@ -54,13 +54,13 @@ async def cancel(self, *, job_id: AsyncJobId, job_id_data: AsyncJobFilter) -> No
         }
     )
     async def status(
-        self, *, job_id: AsyncJobId, job_id_data: AsyncJobFilter
+        self, *, job_id: AsyncJobId, job_filter: AsyncJobFilter
     ) -> AsyncJobStatus:
         return await async_jobs.status(
             self._rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id=job_id,
-            job_filter=job_id_data,
+            job_filter=job_filter,
         )
 
     @_exception_mapper(
@@ -72,13 +72,13 @@ async def status(
         }
     )
     async def result(
-        self, *, job_id: AsyncJobId, job_id_data: AsyncJobFilter
+        self, *, job_id: AsyncJobId, job_filter: AsyncJobFilter
     ) -> AsyncJobResult:
         return await async_jobs.result(
             self._rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id=job_id,
-            job_id_data=job_id_data,
+            job_filter=job_filter,
         )
 
     @_exception_mapper(
@@ -87,11 +87,11 @@ async def result(
         }
     )
     async def list_jobs(
-        self, *, filter_: str, job_id_data: AsyncJobFilter
+        self, *, filter_: str, job_filter: AsyncJobFilter
     ) -> list[AsyncJobGet]:
         return await async_jobs.list_jobs(
             self._rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             filter_=filter_,
-            job_filter=job_id_data,
+            job_filter=job_filter,
         )

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

@@ -16,16 +16,16 @@
 @router.expose(reraise_if_error_type=None)
 async def copy_folders_from_project(
     task_manager: TaskManager,
-    job_id_data: AsyncJobFilter,
+    job_filter: AsyncJobFilter,
     body: FoldersBody,
 ) -> AsyncJobGet:
     task_name = deep_copy_files_from_project.__name__
     task_uuid = await task_manager.submit_task(
         task_metadata=TaskMetadata(
             name=task_name,
         ),
-        task_filter=job_id_data.model_dump(),
-        user_id=job_id_data.user_id,
+        task_filter=job_filter,
+        user_id=job_filter.user_id,
         body=body,
     )
 
@@ -35,7 +35,7 @@ async def copy_folders_from_project(
 @router.expose()
 async def start_export_data(
     task_manager: TaskManager,
-    job_id_data: AsyncJobFilter,
+    job_filter: AsyncJobFilter,
     paths_to_export: list[PathToExport],
 ) -> AsyncJobGet:
     task_name = export_data.__name__
@@ -45,8 +45,8 @@ async def start_export_data(
             ephemeral=False,
             queue=TasksQueue.CPU_BOUND,
         ),
-        task_filter=job_id_data.model_dump(),
-        user_id=job_id_data.user_id,
+        task_filter=job_filter,
+        user_id=job_filter.user_id,
         paths_to_export=paths_to_export,
     )
     return AsyncJobGet(job_id=task_uuid, job_name=task_name)