updating db in api module

Author: pcrespov

services/web/server/src/simcore_service_webserver/garbage_collector/_core_guests.py

@@ -145,7 +145,7 @@ async def remove_guest_user_with_all_its_resources(
     """Removes a GUEST user with all its associated projects and S3/MinIO files"""
 
     try:
-        user_role: UserRole = await get_user_role(app, user_id)
+        user_role: UserRole = await get_user_role(app, user_id=user_id)
         if user_role > UserRole.GUEST:
             # NOTE: This acts as a protection barrier to avoid removing resources to more
             # priviledge users

services/web/server/src/simcore_service_webserver/garbage_collector/_core_orphans.py

@@ -37,7 +37,7 @@ async def _remove_service(
         save_service_state = False
     else:
         try:
-            if await get_user_role(app, service.user_id) <= UserRole.GUEST:
+            if await get_user_role(app, user_id=service.user_id) <= UserRole.GUEST:
                 save_service_state = False
             else:
                 save_service_state = await has_user_project_access_rights(

services/web/server/src/simcore_service_webserver/projects/_nodes_handlers.py

@@ -377,7 +377,7 @@ async def stop_node(request: web.Request) -> web.Response:
         permission="write",
     )
 
-    user_role = await get_user_role(request.app, req_ctx.user_id)
+    user_role = await get_user_role(request.app, user_id=req_ctx.user_id)
     if user_role is None or user_role <= UserRole.GUEST:
         save_state = False
 

services/web/server/src/simcore_service_webserver/projects/_states_handlers.py

@@ -109,7 +109,9 @@ async def open_project(request: web.Request) -> web.Response:
         project_type: ProjectType = await projects_api.get_project_type(
             request.app, path_params.project_id
         )
-        user_role: UserRole = await api.get_user_role(request.app, req_ctx.user_id)
+        user_role: UserRole = await api.get_user_role(
+            request.app, user_id=req_ctx.user_id
+        )
         if project_type is ProjectType.TEMPLATE and user_role < UserRole.USER:
             # only USERS/TESTERS can do that
             raise web.HTTPForbidden(reason="Wrong user role to open/edit a template")

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -592,7 +592,7 @@ async def _start_dynamic_service(
         raise
 
     save_state = False
-    user_role: UserRole = await get_user_role(request.app, user_id)
+    user_role: UserRole = await get_user_role(request.app, user_id=user_id)
     if user_role > UserRole.GUEST:
         save_state = await has_user_project_access_rights(
             request.app, project_id=project_uuid, user_id=user_id, permission="write"
@@ -1715,7 +1715,7 @@ async def remove_project_dynamic_services(
 
     user_role: UserRole | None = None
     try:
-        user_role = await get_user_role(app, user_id)
+        user_role = await get_user_role(app, user_id=user_id)
     except UserNotFoundError:
         user_role = None
 

services/web/server/src/simcore_service_webserver/users/api.py

@@ -6,7 +6,6 @@
 """
 
 import logging
-from collections import deque
 from typing import Any, NamedTuple, TypedDict
 
 import simcore_postgres_database.errors as db_errors
@@ -27,10 +26,13 @@
 from simcore_postgres_database.utils_groups_extra_properties import (
     GroupExtraPropertiesNotFoundError,
 )
+from simcore_postgres_database.utils_repos import (
+    pass_or_acquire_connection,
+    transaction_context,
+)
 from simcore_postgres_database.utils_users import generate_alternative_username
 
-from ..db.plugin import get_database_engine
-from ..db.plugin import get_asyncpg_engine, get_database_engine
+from ..db.plugin import get_asyncpg_engine
 from ..login.storage import AsyncpgStorage, get_plugin_storage
 from ..security.api import clean_auth_policy_cache
 from . import _users_repository
@@ -81,23 +83,19 @@ def _parse_as_user(user_id: Any) -> UserID:
 
 
 async def get_user_profile(
-    app: web.Application, user_id: UserID, product_name: ProductName
+    app: web.Application, *, user_id: UserID, product_name: ProductName
 ) -> MyProfileGet:
     """
     :raises UserNotFoundError:
     :raises MissingGroupExtraPropertiesForProductError: when product is not properly configured
     """
-
-    engine = get_database_engine(app)
     user_profile: dict[str, Any] = {}
     user_primary_group = everyone_group = {}
     user_standard_groups = []
     user_id = _parse_as_user(user_id)
 
-    async with engine.acquire() as conn:
-        row: RowProxy
-
-        async for row in conn.execute(
+    async with pass_or_acquire_connection(engine=get_asyncpg_engine(app)) as conn:
+        result = await conn.stream(
             sa.select(users, groups, user_to_groups.c.access_rights)
             .select_from(
                 users.join(user_to_groups, users.c.id == user_to_groups.c.uid).join(
@@ -107,7 +105,9 @@ async def get_user_profile(
             .where(users.c.id == user_id)
             .order_by(sa.asc(groups.c.name))
             .set_label_style(sa.LABEL_STYLE_TABLENAME_PLUS_COL)
-        ):
+        )
+
+        async for row in result:
             if not user_profile:
                 user_profile = {
                     "id": row.users_id,
@@ -198,13 +198,12 @@ async def update_user_profile(
     user_id = _parse_as_user(user_id)
 
     if updated_values := ToUserUpdateDB.from_api(update).to_db():
-        async with get_database_engine(app).acquire() as conn:
+
+        async with transaction_context(engine=get_asyncpg_engine(app)) as conn:
             query = users.update().where(users.c.id == user_id).values(**updated_values)
 
             try:
-
-                resp = await conn.execute(query)
-                assert resp.rowcount == 1  # nosec
+                await conn.execute(query)
 
             except db_errors.UniqueViolation as err:
                 user_name = updated_values.get("name")
@@ -217,15 +216,14 @@ async def update_user_profile(
                 ) from err
 
 
-async def get_user_role(app: web.Application, user_id: UserID) -> UserRole:
+async def get_user_role(app: web.Application, *, user_id: UserID) -> UserRole:
     """
     :raises UserNotFoundError:
     """
     user_id = _parse_as_user(user_id)
 
-    engine = get_database_engine(app)
-    async with engine.acquire() as conn:
-        user_role: RowProxy | None = await conn.scalar(
+    async with pass_or_acquire_connection(engine=get_asyncpg_engine(app)) as conn:
+        user_role = await conn.scalar(
             sa.select(users.c.role).where(users.c.id == user_id)
         )
         if user_role is None:
@@ -288,14 +286,11 @@ async def get_user_display_and_id_names(
 
 
 async def get_guest_user_ids_and_names(app: web.Application) -> list[tuple[int, str]]:
-    engine = get_database_engine(app)
-    result: deque = deque()
-    async with engine.acquire() as conn:
-        async for row in conn.execute(
+    async with pass_or_acquire_connection(engine=get_asyncpg_engine(app)) as conn:
+        result = await conn.stream(
             sa.select(users.c.id, users.c.name).where(users.c.role == UserRole.GUEST)
-        ):
-            result.append(row.as_tuple())
-        return list(result)
+        )
+        return [(row.id, row.name) async for row in result]
 
 
 async def delete_user_without_projects(app: web.Application, user_id: UserID) -> None:
@@ -304,6 +299,7 @@ async def delete_user_without_projects(app: web.Application, user_id: UserID) ->
     # otherwise this function will raise asyncpg.exceptions.ForeignKeyViolationError
     # Consider "marking" users as deleted and havning a background job that
     # cleans it up
+    # TODO: upgrade!!!
     db: AsyncpgStorage = get_plugin_storage(app)
     user = await db.get_user({"id": user_id})
     if not user:
@@ -330,8 +326,8 @@ async def get_user_fullname(app: web.Application, user_id: UserID) -> FullNameDi
     """
     user_id = _parse_as_user(user_id)
 
-    async with get_database_engine(app).acquire() as conn:
-        result = await conn.execute(
+    async with pass_or_acquire_connection(engine=get_asyncpg_engine(app)) as conn:
+        result = await conn.stream(
             sa.select(users.c.first_name, users.c.last_name).where(
                 users.c.id == user_id
             )
@@ -353,12 +349,11 @@ async def get_user(app: web.Application, user_id: UserID) -> dict[str, Any]:
     row = await _users_repository.get_user_or_raise(
         engine=get_asyncpg_engine(app), user_id=user_id
     )
-    return dict(row)
+    return row._asdict()
 
 
 async def get_user_id_from_gid(app: web.Application, primary_gid: int) -> UserID:
-    engine = get_database_engine(app)
-    async with engine.acquire() as conn:
+    async with pass_or_acquire_connection(engine=get_asyncpg_engine(app)) as conn:
         user_id: UserID = await conn.scalar(
             sa.select(users.c.id).where(users.c.primary_gid == primary_gid)
         )

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py

@@ -365,15 +365,15 @@ async def test_access_cookie_of_expired_user(
     resp = await client.get(f"{me_url}")
 
     data, _ = await assert_status(resp, status.HTTP_200_OK)
-    assert await get_user_role(app, data["id"]) == UserRole.GUEST
+    assert await get_user_role(app, user_id=data["id"]) == UserRole.GUEST
 
     async def enforce_garbage_collect_guest(uid):
         # TODO: can be replaced now by actual GC
         # Emulates garbage collector:
         #   - GUEST user expired, cleaning it up
         #   - client still holds cookie with its identifier nonetheless
         #
-        assert await get_user_role(app, uid) == UserRole.GUEST
+        assert await get_user_role(app, user_id=uid) == UserRole.GUEST
         projects = await _get_user_projects(client)
         assert len(projects) == 1
 
@@ -401,7 +401,7 @@ async def enforce_garbage_collect_guest(uid):
     # as a guest user
     resp = await client.get(f"{me_url}")
     data, _ = await assert_status(resp, status.HTTP_200_OK)
-    assert await get_user_role(app, data["id"]) == UserRole.GUEST
+    assert await get_user_role(app, user_id=data["id"]) == UserRole.GUEST
 
     # But I am another user
     assert data["id"] != user_id