rename

Author: giancarloromeo

packages/celery-library/src/celery_library/signals.py

@@ -19,8 +19,8 @@
 from .task_manager import CeleryTaskManager
 from .utils import (
     get_fastapi_app,
-    set_celery_worker,
     set_fastapi_app,
+    set_task_manager,
 )
 
 _logger = logging.getLogger(__name__)
@@ -55,7 +55,7 @@ async def setup_task_worker():
 
             assert sender.app  # nosec
             assert isinstance(sender.app, Celery)  # nosec
-            set_celery_worker(
+            set_task_manager(
                 sender.app,
                 CeleryTaskManager(
                     sender.app,

packages/celery-library/src/celery_library/utils.py

@@ -7,11 +7,11 @@
 _FASTAPI_APP_KEY = "fastapi_app"
 
 
-def set_celery_worker(celery_app: Celery, worker: CeleryTaskManager) -> None:
+def set_task_manager(celery_app: Celery, worker: CeleryTaskManager) -> None:
     celery_app.conf[_WORKER_KEY] = worker
 
 
-def get_celery_worker(celery_app: Celery) -> CeleryTaskManager:
+def get_task_manager(celery_app: Celery) -> CeleryTaskManager:
     worker = celery_app.conf[_WORKER_KEY]
     assert isinstance(worker, CeleryTaskManager)
     return worker

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

@@ -5,7 +5,7 @@
 from aws_library.s3._models import S3ObjectKey
 from celery import Task  # type: ignore[import-untyped]
 from celery_library.models import TaskID
-from celery_library.utils import get_celery_worker, get_fastapi_app
+from celery_library.utils import get_fastapi_app, get_task_manager
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
 from models_library.api_schemas_webserver.storage import PathToExport
 from models_library.progress_bar import ProgressReport
@@ -24,7 +24,7 @@
 async def _task_progress_cb(
     task: Task, task_id: TaskID, report: ProgressReport
 ) -> None:
-    worker = get_celery_worker(task.app)
+    worker = get_task_manager(task.app)
     assert task.name  # nosec
     await worker.set_task_progress(
         task_id=task_id,
@@ -87,7 +87,7 @@ async def export_data(
 
         async def _progress_cb(report: ProgressReport) -> None:
             assert task.name  # nosec
-            await get_celery_worker(task.app).set_task_progress(task_id, report)
+            await get_task_manager(task.app).set_task_progress(task_id, report)
             _logger.debug("'%s' progress %s", task_id, report.percent_value)
 
         async with ProgressBarData(

services/storage/tests/conftest.py

@@ -28,7 +28,7 @@
 from celery.worker.worker import WorkController
 from celery_library.signals import on_worker_init, on_worker_shutdown
 from celery_library.task_manager import CeleryTaskManager
-from celery_library.utils import get_celery_worker
+from celery_library.utils import get_task_manager
 from faker import Faker
 from fakeredis.aioredis import FakeRedis
 from fastapi import FastAPI
@@ -1031,7 +1031,7 @@ def with_storage_celery_worker(
     with_storage_celery_worker_controller: TestWorkController,
 ) -> CeleryTaskManager:
     assert isinstance(with_storage_celery_worker_controller.app, Celery)
-    return get_celery_worker(with_storage_celery_worker_controller.app)
+    return get_task_manager(with_storage_celery_worker_controller.app)
 
 
 @pytest.fixture

services/storage/tests/unit/test_modules_celery.py

@@ -26,7 +26,7 @@
     register_task,
 )
 from celery_library.task_manager import CeleryTaskManager
-from celery_library.utils import get_celery_worker, get_fastapi_app
+from celery_library.utils import get_fastapi_app, get_task_manager
 from common_library.errors_classes import OsparcErrorMixin
 from fastapi import FastAPI
 from models_library.progress_bar import ProgressReport
@@ -50,7 +50,7 @@ def celery_client(
 async def _fake_file_processor(
     celery_app: Celery, task_name: str, task_id: str, files: list[str]
 ) -> str:
-    worker = get_celery_worker(celery_app)
+    worker = get_task_manager(celery_app)
 
     def sleep_for(seconds: float) -> None:
         time.sleep(seconds)