using correct namespaces to handle requests

Author: Andrei Neagu

services/docker-compose.yml

@@ -699,6 +699,8 @@ services:
       WEBSERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       WEBSERVER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
 
+      LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: webserver
+
       # WEBSERVER_SERVER_HOST
 
       WEBSERVER_HOST: ${WEBSERVER_HOST}
@@ -927,6 +929,8 @@ services:
       WEBSERVER_STATICWEB: "null"
       WEBSERVER_FUNCTIONS: ${WEBSERVER_FUNCTIONS} # needed for api-server
 
+      LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: wb-api-server
+
     networks: *webserver_networks
 
   wb-db-event-listener:
@@ -936,6 +940,8 @@ services:
     environment:
       WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL}
 
+      LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: wb-db-event-listener
+
       WEBSERVER_HOST: ${WEBSERVER_HOST}
       WEBSERVER_PORT: ${WEBSERVER_PORT}
 
@@ -1032,6 +1038,8 @@ services:
       LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
       LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
 
+      LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: wb-garbage-collector
+
       # WEBSERVER_DB
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
@@ -1124,6 +1132,8 @@ services:
       WEBSERVER_APP_FACTORY_NAME: WEBSERVER_AUTHZ_APP_FACTORY
       WEBSERVER_LOGLEVEL: ${WB_AUTH_LOGLEVEL}
 
+      LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: wb-auth
+
       GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
 
       # WEBSERVER_DB

services/web/server/src/simcore_service_webserver/application.py

@@ -40,7 +40,7 @@
 from .licenses.plugin import setup_licenses
 from .login.plugin import setup_login
 from .login_auth.plugin import setup_login_auth
-from .long_running_tasks import setup_long_running_tasks
+from .long_running_tasks.plugin import setup_long_running_tasks
 from .notifications.plugin import setup_notifications
 from .payments.plugin import setup_payments
 from .products.plugin import setup_products

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -40,6 +40,7 @@
 from .invitations.settings import InvitationsSettings
 from .licenses.settings import LicensesSettings
 from .login.settings import LoginSettings
+from .long_running_tasks.settings import LongRunningTasksSettings
 from .payments.settings import PaymentsSettings
 from .projects.settings import ProjectsSettings
 from .resource_manager.settings import ResourceManagerSettings
@@ -266,6 +267,14 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         ),
     ]
 
+    WEBSERVER_LONG_RUNNING_TASKS: Annotated[
+        LongRunningTasksSettings | None,
+        Field(
+            json_schema_extra={"auto_default_from_env": True},
+            description="login plugin",
+        ),
+    ]
+
     WEBSERVER_PAYMENTS: Annotated[
         PaymentsSettings | None,
         Field(

services/web/server/src/simcore_service_webserver/long_running_tasks/__init__.py

@@ -11,11 +11,12 @@
 from servicelib.aiohttp.long_running_tasks.server import setup
 from servicelib.aiohttp.typing_extension import Handler
 
-from . import rabbitmq_settings, redis
-from ._meta import API_VTAG
-from .login.decorators import login_required
-from .models import AuthenticatedRequestContext
-from .projects.plugin import register_projects_long_running_tasks
+from .. import rabbitmq_settings, redis
+from .._meta import API_VTAG
+from ..login.decorators import login_required
+from ..models import AuthenticatedRequestContext
+from ..projects.plugin import register_projects_long_running_tasks
+from . import settings as long_running_tasks_settings
 
 _logger = logging.getLogger(__name__)
 
@@ -45,14 +46,14 @@ def setup_long_running_tasks(app: web.Application) -> None:
     # register all long-running tasks from different modules
     register_projects_long_running_tasks(app)
 
-    namespace_suffix = "TODO"  # TODO recover from settings
+    settings = long_running_tasks_settings.get_plugin_settings(app)
 
     setup(
         app,
         redis_settings=redis.get_plugin_settings(app),
         rabbit_settings=rabbitmq_settings.get_plugin_settings(app),
-        redis_namespace=_get_namespace(namespace_suffix),
-        rabbit_namespace=_get_namespace(namespace_suffix),
+        redis_namespace=_get_namespace(settings.LONG_RUNNING_TASKS_NAMESPACE_SUFFIX),
+        rabbit_namespace=_get_namespace(settings.LONG_RUNNING_TASKS_NAMESPACE_SUFFIX),
         router_prefix=f"/{API_VTAG}/tasks-legacy",
         handler_check_decorator=login_required,
         task_request_context_decorator=webserver_request_context_decorator,

services/web/server/src/simcore_service_webserver/long_running_tasks.py renamed to services/web/server/src/simcore_service_webserver/long_running_tasks/plugin.py

@@ -0,0 +1,26 @@
+from typing import Annotated
+
+from aiohttp import web
+from pydantic import Field
+from settings_library.base import BaseCustomSettings
+
+from ..constants import APP_SETTINGS_KEY
+
+
+class LongRunningTasksSettings(BaseCustomSettings):
+    LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: Annotated[
+        str,
+        Field(
+            description=(
+                "suffic to distinguis the service inside "
+                "the long_running_tasks framework"
+            ),
+        ),
+    ]
+
+
+def get_plugin_settings(app: web.Application) -> LongRunningTasksSettings:
+    settings = app[APP_SETTINGS_KEY].WEBSERVER_LONG_RUNNING_TASKS
+    assert settings, "setup_settings not called?"  # nosec
+    assert isinstance(settings, LongRunningTasksSettings)  # nosec
+    return settings

services/web/server/src/simcore_service_webserver/long_running_tasks/settings.py

@@ -34,7 +34,7 @@
 from .._meta import API_VTAG
 from ..constants import ASYNC_JOB_CLIENT_NAME
 from ..login.decorators import login_required
-from ..long_running_tasks import webserver_request_context_decorator
+from ..long_running_tasks.plugin import webserver_request_context_decorator
 from ..models import AuthenticatedRequestContext
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..security.decorators import permission_required