name change fixes

Author: bisgaard-itis

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

@@ -79,13 +79,13 @@ async def _celery_task_status(
 ) -> FunctionJobCreationTaskStatus:
     if job_creation_task_id is None:
         return FunctionJobCreationTaskStatus.NOT_YET_SCHEDULED
-    task_filter = ApiServerOwnerMetadata(
+    owner_metadata = ApiServerOwnerMetadata(
         user_id=user_id,
         product_name=product_name,
     )
     try:
         task_status = await task_manager.get_task_status(
-            task_uuid=TaskUUID(job_creation_task_id), owner_metadata=task_filter
+            task_uuid=TaskUUID(job_creation_task_id), owner_metadata=owner_metadata
         )
         return FunctionJobCreationTaskStatus[task_status.task_state]
     except TaskNotFoundError as err:
@@ -96,7 +96,7 @@ async def _celery_task_status(
                 error=err,
                 error_context={
                     "task_uuid": TaskUUID(job_creation_task_id),
-                    "task_filter": task_filter,
+                    "owner_metadata": owner_metadata,
                     "user_id": user_id,
                     "product_name": product_name,
                 },
@@ -379,7 +379,8 @@ async def create_function_job_creation_task(
         )
 
         # run function in celery task
-        task_filter = ApiServerOwnerMetadata(
+
+        owner_metadata = ApiServerOwnerMetadata(
             user_id=user_identity.user_id, product_name=user_identity.product_name
         )
 
@@ -389,7 +390,7 @@ async def create_function_job_creation_task(
                 ephemeral=False,
                 queue=TasksQueue.API_WORKER_QUEUE,
             ),
-            owner_metadata=task_filter,
+            owner_metadata=owner_metadata,
             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/routes/tasks.py

@@ -60,12 +60,12 @@ async def list_tasks(
     product_name: Annotated[ProductName, Depends(get_product_name)],
 ):
     task_manager = get_task_manager(app)
-    task_filter = ApiServerOwnerMetadata(
+    owner_metadata = ApiServerOwnerMetadata(
         user_id=user_id,
         product_name=product_name,
     )
     tasks = await task_manager.list_tasks(
-        owner_metadata=task_filter,
+        owner_metadata=owner_metadata,
     )
 
     app_router = app.router
@@ -105,12 +105,12 @@ async def get_task_status(
     product_name: Annotated[ProductName, Depends(get_product_name)],
 ):
     task_manager = get_task_manager(app)
-    task_filter = ApiServerOwnerMetadata(
+    owner_metadata = ApiServerOwnerMetadata(
         user_id=user_id,
         product_name=product_name,
     )
     task_status = await task_manager.get_task_status(
-        owner_metadata=task_filter,
+        owner_metadata=owner_metadata,
         task_uuid=TaskUUID(f"{task_id}"),
     )
 
@@ -143,12 +143,12 @@ async def cancel_task(
     product_name: Annotated[ProductName, Depends(get_product_name)],
 ):
     task_manager = get_task_manager(app)
-    task_filter = ApiServerOwnerMetadata(
+    owner_metadata = ApiServerOwnerMetadata(
         user_id=user_id,
         product_name=product_name,
     )
     await task_manager.cancel_task(
-        owner_metadata=task_filter,
+        owner_metadata=owner_metadata,
         task_uuid=TaskUUID(f"{task_id}"),
     )
 
@@ -178,13 +178,13 @@ async def get_task_result(
     product_name: Annotated[ProductName, Depends(get_product_name)],
 ):
     task_manager = get_task_manager(app)
-    task_filter = ApiServerOwnerMetadata(
+    owner_metadata = ApiServerOwnerMetadata(
         user_id=user_id,
         product_name=product_name,
     )
 
     task_status = await task_manager.get_task_status(
-        owner_metadata=task_filter,
+        owner_metadata=owner_metadata,
         task_uuid=TaskUUID(f"{task_id}"),
     )
 
@@ -195,7 +195,7 @@ async def get_task_result(
         )
 
     task_result = await task_manager.get_task_result(
-        owner_metadata=task_filter,
+        owner_metadata=owner_metadata,
         task_uuid=TaskUUID(f"{task_id}"),
     )