cleanup

Author: bisgaard-itis

packages/celery-library/tests/unit/test_async_jobs.py

@@ -84,7 +84,7 @@ async def rpc_sync_job(
     task_name = sync_job.__name__
     task_filter = OwnerMetadata.model_validate(job_filter.model_dump())
     task_uuid = await task_manager.submit_task(
-        ExecutionMetadata(name=task_name), task_filter=task_filter, **kwargs
+        ExecutionMetadata(name=task_name), owner_metadata=task_filter, **kwargs
     )
 
     return AsyncJobGet(job_id=task_uuid, job_name=task_name)
@@ -97,7 +97,7 @@ async def rpc_async_job(
     task_name = async_job.__name__
     task_filter = OwnerMetadata.model_validate(job_filter.model_dump())
     task_uuid = await task_manager.submit_task(
-        ExecutionMetadata(name=task_name), task_filter=task_filter, **kwargs
+        ExecutionMetadata(name=task_name), owner_metadata=task_filter, **kwargs
     )
 
     return AsyncJobGet(job_id=task_uuid, job_name=task_name)

packages/service-library/src/servicelib/celery/task_manager.py

@@ -18,7 +18,7 @@ async def submit_task(
         self,
         execution_metadata: ExecutionMetadata,
         *,
-        task_filter: OwnerMetadata,
+        owner_metadata: OwnerMetadata,
         **task_param
     ) -> TaskUUID: ...
 

services/api-server/src/simcore_service_api_server/_service_function_jobs_task_client.py

@@ -389,7 +389,7 @@ async def create_function_job_creation_task(
                 ephemeral=False,
                 queue=TasksQueue.API_WORKER_QUEUE,
             ),
-            task_filter=task_filter,
+            owner_metadata=task_filter,
             user_identity=user_identity,
             function=function,
             pre_registered_function_job_data=pre_registered_function_job_data,

services/api-server/src/simcore_service_api_server/api/dependencies/celery.py

@@ -1,8 +1,9 @@
 from celery_library.task_manager import CeleryTaskManager
 from fastapi import FastAPI
+from servicelib.celery.task_manager import TaskManager
 
 
-def get_task_manager(app: FastAPI) -> CeleryTaskManager:
+def get_task_manager(app: FastAPI) -> TaskManager:
     assert hasattr(app.state, "task_manager")  # nosec
     task_manager = app.state.task_manager
     assert isinstance(task_manager, CeleryTaskManager)  # nosec

services/storage/src/simcore_service_storage/api/rest/_files.py

@@ -299,7 +299,7 @@ async def complete_upload_file(
         ExecutionMetadata(
             name=remote_complete_upload_file.__name__,
         ),
-        task_filter=task_filter,
+        owner_metadata=task_filter,
         user_id=query_params.user_id,
         location_id=location_id,
         file_id=file_id,

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

@@ -30,7 +30,7 @@ async def compute_path_size(
         execution_metadata=ExecutionMetadata(
             name=task_name,
         ),
-        task_filter=task_filter,
+        owner_metadata=task_filter,
         user_id=job_filter.user_id,
         location_id=location_id,
         path=path,
@@ -52,7 +52,7 @@ async def delete_paths(
         execution_metadata=ExecutionMetadata(
             name=task_name,
         ),
-        task_filter=task_filter,
+        owner_metadata=task_filter,
         user_id=job_filter.user_id,
         location_id=location_id,
         paths=paths,

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

@@ -35,7 +35,7 @@ async def copy_folders_from_project(
         execution_metadata=ExecutionMetadata(
             name=task_name,
         ),
-        task_filter=task_filter,
+        owner_metadata=task_filter,
         user_id=job_filter.user_id,
         body=body,
     )
@@ -63,7 +63,7 @@ async def start_export_data(
             ephemeral=False,
             queue=TasksQueue.CPU_BOUND,
         ),
-        task_filter=task_filter,
+        owner_metadata=task_filter,
         user_id=job_filter.user_id,
         paths_to_export=paths_to_export,
     )