|
4 | 4 | from typing import Final |
5 | 5 |
|
6 | 6 | from common_library.exclude import as_dict_exclude_none |
7 | | -from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobFilter |
8 | 7 | from models_library.functions import ( |
9 | 8 | FunctionClass, |
10 | 9 | FunctionID, |
|
31 | 30 | from models_library.rest_pagination import PageMetaInfoLimitOffset, PageOffsetInt |
32 | 31 | from models_library.rpc_pagination import PageLimitInt |
33 | 32 | from models_library.users import UserID |
34 | | -from servicelib.celery.models import TaskFilter, TaskMetadata, TasksQueue, TaskUUID |
| 33 | +from servicelib.celery.models import TaskMetadata, TasksQueue, TaskUUID |
35 | 34 | from servicelib.celery.task_manager import TaskManager |
| 35 | +from simcore_service_api_server.clients.celery_task_manager import get_task_filter |
36 | 36 | from sqlalchemy.ext.asyncio import AsyncEngine |
37 | 37 |
|
38 | 38 | from ._service_function_jobs import FunctionJobService |
39 | 39 | from ._service_functions import FunctionService |
40 | 40 | from ._service_jobs import JobService |
41 | 41 | from .api.dependencies.authentication import Identity |
42 | | -from .api.dependencies.celery import ASYNC_JOB_CLIENT_NAME |
43 | | -from .api.routes.tasks import _get_task_filter |
44 | 42 | from .exceptions.function_errors import ( |
45 | 43 | FunctionJobCacheNotFoundError, |
46 | 44 | ) |
@@ -359,12 +357,9 @@ async def create_function_job_creation_task( |
359 | 357 | ) |
360 | 358 |
|
361 | 359 | # run function in celery task |
362 | | - job_filter = AsyncJobFilter( |
363 | | - user_id=user_identity.user_id, |
364 | | - product_name=user_identity.product_name, |
365 | | - client_name=ASYNC_JOB_CLIENT_NAME, |
| 360 | + task_filter = get_task_filter( |
| 361 | + user_id=user_identity.user_id, product_name=user_identity.product_name |
366 | 362 | ) |
367 | | - task_filter = TaskFilter.model_validate(job_filter.model_dump()) |
368 | 363 |
|
369 | 364 | task_uuid = await self._celery_task_manager.submit_task( |
370 | 365 | TaskMetadata( |
|
0 commit comments