uses api

Author: pcrespov

services/web/server/src/simcore_service_webserver/studies_dispatcher/_core.py

@@ -14,7 +14,7 @@
 )
 from sqlalchemy.dialects.postgresql import ARRAY, INTEGER
 
-from .._constants import APP_AIOPG_ENGINE_KEY
+from ..db.plugin import get_aiopg_engine
 from ._errors import FileToLarge, IncompatibleService
 from ._models import ViewerInfo
 from .settings import get_plugin_settings
@@ -41,7 +41,7 @@ async def list_viewers_info(
     #
     consumers: deque = deque()
 
-    async with app[APP_AIOPG_ENGINE_KEY].acquire() as conn:
+    async with get_aiopg_engine(app).acquire() as conn:
         # FIXME: ADD CONDITION: service MUST be shared with EVERYBODY!
         query = services_consume_filetypes.select()
         if file_type:
@@ -119,7 +119,7 @@ def _version(column_or_value):
         return await get_default_viewer(app, file_type, file_size)
 
     if service_key and service_version:
-        async with app[APP_AIOPG_ENGINE_KEY].acquire() as conn:
+        async with get_aiopg_engine(app).acquire() as conn:
             query = (
                 services_consume_filetypes.select()
                 .where(

services/web/server/src/simcore_service_webserver/tags/_handlers.py

@@ -3,7 +3,6 @@
 from aiohttp import web
 from aiopg.sa.engine import Engine
 from pydantic import parse_obj_as
-from servicelib.aiohttp.application_keys import APP_AIOPG_ENGINE_KEY
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
@@ -17,6 +16,7 @@
 )
 
 from .._meta import API_VTAG as VTAG
+from ..db.plugin import get_aiopg_engine
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
@@ -55,7 +55,7 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
 @permission_required("tag.crud.*")
 @_handle_tags_exceptions
 async def create_tag(request: web.Request):
-    engine: Engine = request.app[APP_AIOPG_ENGINE_KEY]
+    engine: Engine = get_aiopg_engine(request.app)
     req_ctx = TagRequestContext.parse_obj(request)
     new_tag = await parse_request_body_as(TagCreate, request)
 
@@ -77,7 +77,7 @@ async def create_tag(request: web.Request):
 @permission_required("tag.crud.*")
 @_handle_tags_exceptions
 async def list_tags(request: web.Request):
-    engine: Engine = request.app[APP_AIOPG_ENGINE_KEY]
+    engine: Engine = get_aiopg_engine(request.app)
     req_ctx = TagRequestContext.parse_obj(request)
 
     repo = TagsRepo(user_id=req_ctx.user_id)
@@ -93,7 +93,7 @@ async def list_tags(request: web.Request):
 @permission_required("tag.crud.*")
 @_handle_tags_exceptions
 async def update_tag(request: web.Request):
-    engine: Engine = request.app[APP_AIOPG_ENGINE_KEY]
+    engine: Engine = get_aiopg_engine(request.app)
     req_ctx = TagRequestContext.parse_obj(request)
     path_params = parse_request_path_parameters_as(TagPathParams, request)
     tag_updates = await parse_request_body_as(TagUpdate, request)
@@ -112,7 +112,7 @@ async def update_tag(request: web.Request):
 @permission_required("tag.crud.*")
 @_handle_tags_exceptions
 async def delete_tag(request: web.Request):
-    engine: Engine = request.app[APP_AIOPG_ENGINE_KEY]
+    engine: Engine = get_aiopg_engine(request.app)
     req_ctx = TagRequestContext.parse_obj(request)
     path_params = parse_request_path_parameters_as(TagPathParams, request)