Skip to content

Commit 4eaea73

Browse files
committed
@pcrespov decouple setup of celery task manager from dependencies submodule
1 parent b356c2b commit 4eaea73

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
11
from typing import Final
22

3-
from celery_library.common import create_app, create_task_manager
43
from celery_library.task_manager import CeleryTaskManager
5-
from celery_library.types import register_celery_types, register_pydantic_types
64
from fastapi import FastAPI
7-
from settings_library.celery import CelerySettings
8-
9-
from ...celery_worker.worker_tasks.tasks import pydantic_types_to_register
105

116
ASYNC_JOB_CLIENT_NAME: Final[str] = "API_SERVER"
127

138

14-
def setup_task_manager(app: FastAPI, celery_settings: CelerySettings) -> None:
15-
async def on_startup() -> None:
16-
app.state.task_manager = await create_task_manager(
17-
create_app(celery_settings), celery_settings
18-
)
19-
20-
register_celery_types()
21-
register_pydantic_types(*pydantic_types_to_register)
22-
23-
app.add_event_handler("startup", on_startup)
24-
25-
269
def get_task_manager(app: FastAPI) -> CeleryTaskManager:
2710
assert hasattr(app.state, "task_manager") # nosec
2811
task_manager = app.state.task_manager
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from celery_library.common import create_app, create_task_manager
2+
from celery_library.types import register_celery_types, register_pydantic_types
3+
from fastapi import FastAPI
4+
from settings_library.celery import CelerySettings
5+
6+
from ..celery_worker.worker_tasks.tasks import pydantic_types_to_register
7+
8+
9+
def setup_task_manager(app: FastAPI, celery_settings: CelerySettings) -> None:
10+
async def on_startup() -> None:
11+
app.state.task_manager = await create_task_manager(
12+
create_app(celery_settings), celery_settings
13+
)
14+
15+
register_celery_types()
16+
register_pydantic_types(*pydantic_types_to_register)
17+
18+
app.add_event_handler("startup", on_startup)

services/api-server/src/simcore_service_api_server/core/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
from .. import exceptions
1515
from .._meta import API_VERSION, API_VTAG, APP_NAME
16-
from ..api.dependencies.celery import setup_task_manager
1716
from ..api.root import create_router
1817
from ..api.routes.health import router as health_router
18+
from ..clients.celery_task_manager import setup_task_manager
1919
from ..clients.postgres import setup_postgres
2020
from ..services_http import director_v2, storage, webserver
2121
from ..services_http.rabbitmq import setup_rabbitmq

0 commit comments

Comments
 (0)