rename

Author: Andrei Neagu

services/storage/src/simcore_service_storage/modules/celery/signals.py

@@ -16,7 +16,7 @@
     set_celery_worker_client,
     set_fastapi_app,
 )
-from ...modules.celery.worker import CeleryWorkerClient
+from ...modules.celery.worker import CeleryTaskQueueWorker
 
 _logger = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ async def lifespan():
         set_event_loop(fastapi_app, loop)
 
         set_fastapi_app(sender.app, fastapi_app)
-        set_celery_worker_client(sender.app, CeleryWorkerClient(sender.app))
+        set_celery_worker_client(sender.app, CeleryTaskQueueWorker(sender.app))
 
         loop.run_forever()
 

services/storage/src/simcore_service_storage/modules/celery/utils.py

@@ -1,19 +1,19 @@
 from celery import Celery  # type: ignore[import-untyped]
 from fastapi import FastAPI
 
-from .worker import CeleryWorkerClient
+from .worker import CeleryTaskQueueWorker
 
 _WORKER_KEY = "celery_worker_client"
 _FASTAPI_APP_KEY = "fastapi_app"
 
 
-def set_celery_worker_client(celery_app: Celery, worker: CeleryWorkerClient) -> None:
+def set_celery_worker_client(celery_app: Celery, worker: CeleryTaskQueueWorker) -> None:
     celery_app.conf[_WORKER_KEY] = worker
 
 
-def get_celery_worker_client(celery_app: Celery) -> CeleryWorkerClient:
+def get_celery_worker_client(celery_app: Celery) -> CeleryTaskQueueWorker:
     worker = celery_app.conf[_WORKER_KEY]
-    assert isinstance(worker, CeleryWorkerClient)
+    assert isinstance(worker, CeleryTaskQueueWorker)
     return worker
 
 

services/storage/src/simcore_service_storage/modules/celery/worker.py

@@ -10,7 +10,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class CeleryWorkerClient:
+class CeleryTaskQueueWorker:
     def __init__(self, celery_app: Celery) -> None:
         self.celery_app = celery_app
 

services/storage/tests/unit/api/_worker_tasks/conftest.py

@@ -7,15 +7,15 @@
     set_celery_worker_client,
     set_fastapi_app,
 )
-from simcore_service_storage.modules.celery.worker import CeleryWorkerClient
+from simcore_service_storage.modules.celery.worker import CeleryTaskQueueWorker
 
 
 @pytest.fixture
 def fake_celery_task(celery_app: Celery, initialized_app: FastAPI) -> Task:
     celery_task = Task()
     celery_task.app = celery_app
     set_fastapi_app(celery_app, initialized_app)
-    set_celery_worker_client(celery_app, CeleryWorkerClient(celery_app))
+    set_celery_worker_client(celery_app, CeleryTaskQueueWorker(celery_app))
     return celery_task
 
 

services/storage/tests/unit/modules/celery/conftest.py

@@ -16,7 +16,7 @@
     on_worker_init,
     on_worker_shutdown,
 )
-from simcore_service_storage.modules.celery.worker import CeleryWorkerClient
+from simcore_service_storage.modules.celery.worker import CeleryTaskQueueWorker
 
 
 @pytest.fixture
@@ -100,6 +100,6 @@ def celery_worker_controller(
 @pytest.fixture
 def celery_worker(
     celery_worker_controller: TestWorkController,
-) -> CeleryWorkerClient:
+) -> CeleryTaskQueueWorker:
     assert isinstance(celery_worker_controller.app, Celery)
-    return CeleryWorkerClient(celery_worker_controller.app)
+    return CeleryTaskQueueWorker(celery_worker_controller.app)