uses new application-setup interface

Author: pcrespov

services/web/server/src/simcore_service_webserver/activity/plugin.py

@@ -1,15 +1,15 @@
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from . import _handlers
 from .settings import get_plugin_settings
 
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
+@app_setup_func(
     "simcore_service_webserver.activity",
     category=ModuleCategory.ADDON,
     settings_name="WEBSERVER_ACTIVITY",

services/web/server/src/simcore_service_webserver/announcements/plugin.py

@@ -1,12 +1,12 @@
 """
-    Plugin to broadcast announcements to all front-end users
+Plugin to broadcast announcements to all front-end users
 """
 
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from ..constants import APP_SETTINGS_KEY
 from ..products.plugin import setup_products
 from ..redis import setup_redis
@@ -15,7 +15,7 @@
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
+@app_setup_func(
     __name__,
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_ANNOUNCEMENTS",

services/web/server/src/simcore_service_webserver/api_keys/plugin.py

@@ -1,8 +1,8 @@
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from ..constants import APP_SETTINGS_KEY
 from ..db.plugin import setup_db
 from ..products.plugin import setup_products
@@ -13,7 +13,7 @@
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
+@app_setup_func(
     "simcore_service_webserver.api_keys",
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_API_KEYS",

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

@@ -1,16 +1,19 @@
 import functools
+from typing import TypeAlias
 
 import servicelib.aiohttp.application_setup
-from servicelib.aiohttp.application_setup import ModuleCategory, ensure_single_setup
 
 from .constants import APP_SETTINGS_KEY
 
 # models
-assert ModuleCategory  # nosec
+ModuleCategory: TypeAlias = servicelib.aiohttp.application_setup.ModuleCategory
 
 
+# free-functions
+is_setup_completed = servicelib.aiohttp.application_setup.is_setup_completed
+
 # decorators
-assert callable(ensure_single_setup)  # nosec
+ensure_single_setup = servicelib.aiohttp.application_setup.ensure_single_setup
 
 app_setup_func = functools.partial(
     servicelib.aiohttp.application_setup.app_module_setup,
@@ -21,4 +24,5 @@
     "ModuleCategory",
     "app_setup_func",
     "ensure_single_setup",
+    "is_setup_completed",
 )

services/web/server/src/simcore_service_webserver/catalog/plugin.py

@@ -5,16 +5,16 @@
 
 from aiohttp import web
 from pint import UnitRegistry
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from . import _controller_rest
 
 _logger = logging.getLogger(__name__)
 
 APP_CATALOG_CLIENT_KEY: Final = web.AppKey("APP_CATALOG_CLIENT_KEY", object)
 
 
-@app_module_setup(
+@app_setup_func(
     __name__,
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_CATALOG",

services/web/server/src/simcore_service_webserver/collaboration/bootstrap.py

@@ -1,12 +1,13 @@
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
+
+from ..application_setup import ModuleCategory, app_setup_func
 
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
+@app_setup_func(
     __name__,
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_REALTIME_COLLABORATION",

services/web/server/src/simcore_service_webserver/conversations/plugin.py

@@ -3,15 +3,15 @@
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from ..constants import APP_SETTINGS_KEY
 from ._controller import _conversations_messages_rest, _conversations_rest
 
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
+@app_setup_func(
     __name__,
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_CONVERSATIONS",

services/web/server/src/simcore_service_webserver/db/plugin.py

@@ -4,8 +4,8 @@
 from typing import Final
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from ..constants import APP_AIOPG_ENGINE_KEY
 from . import _aiopg, _asyncpg
 
@@ -27,7 +27,7 @@
 get_asyncpg_engine = _asyncpg.get_async_engine
 
 
-@app_module_setup(
+@app_setup_func(
     "simcore_service_webserver.db",
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_DB",

services/web/server/src/simcore_service_webserver/db_listener/plugin.py

@@ -6,8 +6,8 @@
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ..application_setup import ModuleCategory, app_setup_func
 from ..db.plugin import setup_db
 from ..projects._projects_repository_legacy import setup_projects_db
 from ..socketio.plugin import setup_socketio
@@ -16,7 +16,7 @@
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
+@app_setup_func(
     __name__,
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_DB_LISTENER",

services/web/server/src/simcore_service_webserver/diagnostics/_monitoring.py

@@ -5,11 +5,11 @@
 
 from aiohttp import web
 from servicelib.aiohttp import monitor_services
-from servicelib.aiohttp.application_setup import ensure_single_setup
 from servicelib.aiohttp.monitoring import get_collector_registry
 from servicelib.aiohttp.monitoring import setup_monitoring as service_lib_setup
 
 from ..application_settings import get_application_settings
+from ..application_setup import ensure_single_setup
 from ._healthcheck import HEALTH_LATENCY_PROBE, DelayWindowProbe, is_sensing_enabled
 
 _logger = logging.getLogger(__name__)