client settings

Author: pcrespov

packages/service-library/src/servicelib/aiohttp/application_keys.py

@@ -11,7 +11,7 @@
 
 from typing import Final
 
-from aiohttp import web
+from aiohttp import ClientSession, web
 
 # APPLICATION's CONTEXT KEYS
 
@@ -25,7 +25,8 @@
 
 APP_AIOPG_ENGINE_KEY: Final[str] = f"{__name__ }.aiopg_engine"
 
-APP_CLIENT_SESSION_KEY: Final[str] = f"{__name__ }.session"
+APP_CLIENT_SESSION_KEY: web.AppKey[ClientSession] = web.AppKey("APP_CLIENT_SESSION_KEY")
+
 
 APP_FIRE_AND_FORGET_TASKS_KEY: Final[str] = f"{__name__}.tasks"
 

packages/service-library/src/servicelib/aiohttp/client_session.py

@@ -8,8 +8,7 @@
     get_http_client_request_aiohttp_sock_connect_timeout,
     get_http_client_request_total_timeout,
 )
-
-APP_CLIENT_SESSION_KEY: web.AppKey[ClientSession] = web.AppKey("APP_CLIENT_SESSION_KEY")
+from .application_keys import APP_CLIENT_SESSION_KEY
 
 
 async def persistent_client_session(app: web.Application) -> AsyncGenerator[None, None]:
@@ -45,6 +44,7 @@ def get_client_session(app: web.Application) -> ClientSession:
 
 
 __all__: tuple[str, ...] = (
+    "APP_CLIENT_SESSION_KEY",
     "get_client_session",
     "persistent_client_session",
 )

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

@@ -6,6 +6,7 @@
 from common_library.user_messages import user_message
 from servicelib.aiohttp.application_keys import (
     APP_AIOPG_ENGINE_KEY,
+    APP_CLIENT_SESSION_KEY,
     APP_CONFIG_KEY,
     APP_FIRE_AND_FORGET_TASKS_KEY,
 )
@@ -24,6 +25,9 @@
     APP_SETTINGS_KEY: web.AppKey = web.AppKey("APP_SETTINGS_KEY", None)
 
 
+assert APP_CLIENT_SESSION_KEY  # nosec
+assert APP_CONFIG_KEY  # nosec
+
 # Application storage keys
 APP_PRODUCTS_KEY: Final[str] = f"{__name__ }.APP_PRODUCTS_KEY"
 
@@ -67,7 +71,7 @@
 
 __all__: tuple[str, ...] = (
     "APP_AIOPG_ENGINE_KEY",
-    "APP_CONFIG_KEY",
+    "APP_CLIENT_SESSION_KEY" "APP_CONFIG_KEY",
     "APP_FIRE_AND_FORGET_TASKS_KEY",
     "APP_SETTINGS_KEY",
     "FRONTEND_APPS_AVAILABLE",

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

@@ -1,18 +1,16 @@
 """director v2 susystem configuration"""
 
 from functools import cached_property
-from typing import cast
 
 from aiohttp import ClientSession, ClientTimeout, web
 from models_library.basic_types import VersionTag
 from pydantic import AliasChoices, Field, PositiveInt
-from servicelib.aiohttp.application_keys import APP_CLIENT_SESSION_KEY
 from settings_library.base import BaseCustomSettings
 from settings_library.basic_types import PortInt
 from settings_library.utils_service import DEFAULT_FASTAPI_PORT, MixinServiceSettings
 from yarl import URL
 
-from ..constants import APP_SETTINGS_KEY
+from ..constants import APP_CLIENT_SESSION_KEY, APP_SETTINGS_KEY
 
 _MINUTE = 60
 _HOUR = 60 * _MINUTE
@@ -61,4 +59,4 @@ def get_plugin_settings(app: web.Application) -> DirectorV2Settings:
 
 
 def get_client_session(app: web.Application) -> ClientSession:
-    return cast(ClientSession, app[APP_CLIENT_SESSION_KEY])
+    return app[APP_CLIENT_SESSION_KEY]