same in storage service

Author: pcrespov

services/storage/src/simcore_service_storage/constants.py

@@ -39,7 +39,7 @@
 MAX_CONCURRENT_REST_CALLS: Final[int] = 10
 
 # DATABASE ----------------------------
-APP_DB_ENGINE_KEY = f"{__name__}.db_engine"
+APP_AIOPG_ENGINE_KEY = f"{__name__}.aiopg_engine"
 MAX_CONCURRENT_DB_TASKS: Final[int] = 2
 
 # DATA STORAGE MANAGER ----------------------------------

services/storage/src/simcore_service_storage/db.py

@@ -3,6 +3,7 @@
 
 from aiohttp import web
 from aiopg.sa import Engine
+from aiopg.sa.engine import Engine
 from servicelib.aiohttp.aiopg_utils import is_pg_responsive
 from servicelib.common_aiopg_utils import DataSourceName, create_pg_engine
 from servicelib.retry_policies import PostgresRetryPolicyUponInitialization
@@ -13,7 +14,7 @@
 )
 from tenacity import retry
 
-from .constants import APP_CONFIG_KEY, APP_DB_ENGINE_KEY
+from .constants import APP_AIOPG_ENGINE_KEY, APP_CONFIG_KEY
 
 _logger = logging.getLogger(__name__)
 
@@ -46,7 +47,8 @@ async def postgres_cleanup_ctx(app: web.Application):
     ) as engine:
 
         assert engine  # nosec
-        app[APP_DB_ENGINE_KEY] = engine
+        app[APP_AIOPG_ENGINE_KEY] = engine
+
         _logger.info("Created pg engine for %s", dsn)
         yield  # ----------
         _logger.info("Deleting pg engine for %s", dsn)
@@ -55,19 +57,19 @@ async def postgres_cleanup_ctx(app: web.Application):
 
 async def is_service_responsive(app: web.Application) -> bool:
     """Returns true if the app can connect to db service"""
-    return await is_pg_responsive(engine=app[APP_DB_ENGINE_KEY])
+    return await is_pg_responsive(engine=app[APP_AIOPG_ENGINE_KEY])
 
 
 def get_engine_state(app: web.Application) -> dict[str, Any]:
-    engine: Engine | None = app.get(APP_DB_ENGINE_KEY)
+    engine: Engine | None = app.get(APP_AIOPG_ENGINE_KEY)
     if engine:
         engine_info: dict[str, Any] = get_pg_engine_stateinfo(engine)
         return engine_info
     return {}
 
 
 def setup_db(app: web.Application):
-    app[APP_DB_ENGINE_KEY] = None
+    app[APP_AIOPG_ENGINE_KEY] = None
 
     # app is created at this point but not yet started
     _logger.debug("Setting up %s [service: %s] ...", __name__, "postgres")

services/storage/src/simcore_service_storage/db_tokens.py

@@ -7,7 +7,7 @@
 from models_library.users import UserID
 from simcore_postgres_database.storage_models import tokens
 
-from .constants import APP_CONFIG_KEY, APP_DB_ENGINE_KEY
+from .constants import APP_AIOPG_ENGINE_KEY, APP_CONFIG_KEY
 
 log = logging.getLogger(__name__)
 
@@ -27,7 +27,7 @@ async def get_api_token_and_secret(
     app: web.Application, user_id: UserID
 ) -> tuple[str, str]:
     # from the client side together with the userid?
-    engine = app[APP_DB_ENGINE_KEY]
+    engine = app[APP_AIOPG_ENGINE_KEY]
 
     # defaults from config if any, othewise None
     api_token = app[APP_CONFIG_KEY].BF_API_KEY

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -38,8 +38,8 @@
 
 from . import db_file_meta_data, db_projects, db_tokens
 from .constants import (
+    APP_AIOPG_ENGINE_KEY,
     APP_CONFIG_KEY,
-    APP_DB_ENGINE_KEY,
     DATCORE_ID,
     EXPAND_DIR_MAX_ITEM_COUNT,
     MAX_CONCURRENT_S3_TASKS,
@@ -1084,7 +1084,7 @@ def create_simcore_s3_data_manager(app: web.Application) -> SimcoreS3DataManager
     cfg: Settings = app[APP_CONFIG_KEY]
     assert cfg.STORAGE_S3  # nosec
     return SimcoreS3DataManager(
-        engine=app[APP_DB_ENGINE_KEY],
+        engine=app[APP_AIOPG_ENGINE_KEY],
         simcore_bucket_name=parse_obj_as(S3BucketName, cfg.STORAGE_S3.S3_BUCKET_NAME),
         app=app,
         settings=cfg,