hmm

Author: sanderegg

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

@@ -1,5 +1,6 @@
 import logging
 import ssl
+from typing import Any
 
 from celery import Celery  # type: ignore[import-untyped]
 from settings_library.celery import CelerySettings
@@ -8,24 +9,28 @@
 _logger = logging.getLogger(__name__)
 
 
+def _celery_configure(celery_settings: CelerySettings) -> dict[str, Any]:
+    base_config = {
+        "broker_connection_retry_on_startup": True,
+        "result_expires": celery_settings.CELERY_RESULT_EXPIRES,
+        "result_extended": True,
+        "result_serializer": "json",
+        "task_send_sent_event": True,
+        "task_track_started": True,
+        "worker_send_task_events": True,
+    }
+    if celery_settings.CELERY_REDIS_RESULT_BACKEND.REDIS_SECURE:
+        base_config["redis_backend_use_ssl"] = {"ssl_cert_reqs": ssl.CERT_NONE}
+    return base_config
+
+
 def create_app(celery_settings: CelerySettings) -> Celery:
     assert celery_settings
 
-    app = Celery(
+    return Celery(
         broker=celery_settings.CELERY_RABBIT_BROKER.dsn,
         backend=celery_settings.CELERY_REDIS_RESULT_BACKEND.build_redis_dsn(
             RedisDatabase.CELERY_TASKS,
         ),
+        **_celery_configure(celery_settings),
     )
-    app.conf.broker_connection_retry_on_startup = True
-    # NOTE: disable SSL cert validation (https://github.com/ITISFoundation/osparc-simcore/pull/7407)
-    if celery_settings.CELERY_REDIS_RESULT_BACKEND.REDIS_SECURE:
-        app.conf.redis_backend_use_ssl = {"ssl_cert_reqs": ssl.CERT_NONE}
-    app.conf.result_expires = celery_settings.CELERY_RESULT_EXPIRES
-    app.conf.result_extended = True  # original args are included in the results
-    app.conf.result_serializer = "json"
-    app.conf.task_send_sent_event = True
-    app.conf.task_track_started = True
-    app.conf.worker_send_task_events = True  # enable tasks monitoring
-
-    return app

services/storage/tests/conftest.py

@@ -976,10 +976,11 @@ def celery_config() -> dict[str, Any]:
 def mock_celery_app(mocker: MockFixture, celery_config: dict[str, Any]) -> None:
     celery_app = Celery(**celery_config)
 
-    mocker.patch(
+    for module in (
+        "simcore_service_storage.modules.celery._common.create_app",
         "simcore_service_storage.modules.celery.create_app",
-        return_value=celery_app,
-    )
+    ):
+        mocker.patch(module, return_value=celery_app)
 
 
 @pytest.fixture