fix storage

Author: giancarloromeo

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

@@ -67,7 +67,5 @@ def register_worker_signals(
             )
             worker_process_shutdown.connect(_worker_shutdown_wrapper(app), weak=False)
         case _:
-            worker_init.connect(
-                _worker_init_wrapper(app, app_server_factory), weak=False
-            )
-            worker_shutdown.connect(_worker_shutdown_wrapper(app), weak=False)
+            worker_init.connect(_worker_init_wrapper(app, app_server_factory))
+            worker_shutdown.connect(_worker_shutdown_wrapper(app))

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

@@ -7,14 +7,14 @@
 from ....core.application import create_app
 from ....core.settings import ApplicationSettings
 
-_settings = ApplicationSettings.create_from_envs()
-_tracing_config = TracingConfig.create(
-    tracing_settings=_settings.STORAGE_TRACING,
-    service_name="storage-celery-worker",
-)
-
 
 def get_app():
+    _settings = ApplicationSettings.create_from_envs()
+    _tracing_config = TracingConfig.create(
+        tracing_settings=_settings.STORAGE_TRACING,
+        service_name="storage-celery-worker",
+    )
+
     setup_loggers(
         log_format_local_dev_enabled=_settings.STORAGE_LOG_FORMAT_LOCAL_DEV_ENABLED,
         logger_filter_mapping=_settings.STORAGE_LOG_FILTER_MAPPING,

services/storage/tests/conftest.py

@@ -1007,27 +1007,39 @@ def _(celery_app: Celery) -> None: ...
     return _
 
 
+@pytest.fixture
+def worker_app_settings(
+    app_settings: ApplicationSettings,
+) -> ApplicationSettings:
+    worker_test_app_settings = app_settings.model_copy(
+        update={"STORAGE_WORKER_MODE": True}, deep=True
+    )
+    print(f"{worker_test_app_settings.model_dump_json(indent=2)=}")
+    return worker_test_app_settings
+
+
+_logger = logging.getLogger(__name__)
+
+
 @pytest.fixture
 async def with_storage_celery_worker(
-    app_environment: EnvVarsDict,
     celery_app: Celery,
+    worker_app_settings: ApplicationSettings,
     monkeypatch: pytest.MonkeyPatch,
     register_celery_tasks: Callable[[Celery], None],
 ) -> AsyncIterator[TestWorkController]:
     # Signals must be explicitily connected
-    monkeypatch.setenv("STORAGE_WORKER_MODE", "true")
-    app_settings = ApplicationSettings.create_from_envs()
     tracing_config = TracingConfig.create(
         tracing_settings=None,  # disable tracing in tests
         service_name="storage-api",
     )
 
-    app_server = FastAPIAppServer(app=create_app(app_settings, tracing_config))
+    app_server = FastAPIAppServer(app=create_app(worker_app_settings, tracing_config))
 
-    worker_init.connect(
-        _worker_init_wrapper(celery_app, lambda: app_server), weak=False
-    )
-    worker_shutdown.connect(_worker_shutdown_wrapper(celery_app), weak=False)
+    init_wrapper = _worker_init_wrapper(celery_app, lambda: app_server)
+    worker_init.connect(init_wrapper, weak=False)
+    shutdown_wrapper = _worker_shutdown_wrapper(celery_app)
+    worker_shutdown.connect(shutdown_wrapper, weak=False)
 
     register_worker_tasks(celery_app)
     register_celery_tasks(celery_app)
@@ -1042,6 +1054,9 @@ async def with_storage_celery_worker(
     ) as worker:
         yield worker
 
+    worker_init.disconnect(init_wrapper)
+    worker_shutdown.disconnect(shutdown_wrapper)
+
 
 @pytest.fixture
 async def storage_rabbitmq_rpc_client(