importing user_services

Author: pcrespov

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

@@ -17,7 +17,7 @@
 from models_library.users import UserID
 
 # Import or define SocketMessageDict
-from ..users.api import get_user_primary_group_id
+from ..users import users_service
 from . import _conversation_message_repository
 from ._conversation_service import _get_recipients
 from ._socketio import (
@@ -39,7 +39,7 @@ async def create_message(
     content: str,
     type_: ConversationMessageType,
 ) -> ConversationMessageGetDB:
-    _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
+    _user_group_id = await users_service.get_user_primary_group_id(app, user_id=user_id)
 
     created_message = await _conversation_message_repository.create(
         app,
@@ -110,7 +110,7 @@ async def delete_message(
         message_id=message_id,
     )
 
-    _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
+    _user_group_id = await users_service.get_user_primary_group_id(app, user_id=user_id)
 
     await notify_conversation_message_deleted(
         app,

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

@@ -22,8 +22,8 @@
     notify_conversation_updated,
 )
 from ..projects._groups_repository import list_project_groups
+from ..users import users_service
 from ..users._users_service import get_users_in_group
-from ..users.api import get_user_primary_group_id
 from . import _conversation_repository
 
 _logger = logging.getLogger(__name__)
@@ -52,7 +52,7 @@ async def create_conversation(
     if project_uuid is None:
         raise NotImplementedError
 
-    _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
+    _user_group_id = await users_service.get_user_primary_group_id(app, user_id=user_id)
 
     created_conversation = await _conversation_repository.create(
         app,
@@ -121,7 +121,7 @@ async def delete_conversation(
         conversation_id=conversation_id,
     )
 
-    _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
+    _user_group_id = await users_service.get_user_primary_group_id(app, user_id=user_id)
 
     await notify_conversation_deleted(
         app,

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

@@ -18,7 +18,7 @@
 from ..projects._projects_service import create_user_notification_cb
 from ..redis import get_redis_lock_manager_client_sdk
 from ..security.decorators import permission_required
-from ..users.api import get_user_fullname
+from ..users.users_service import get_user_fullname
 from ._formatter.archive import get_sds_archive_path
 from .exceptions import SDSException
 from .utils import CleanupFileResponse

services/web/server/src/simcore_service_webserver/folders/_folders_service.py

@@ -13,7 +13,7 @@
 from pydantic import NonNegativeInt
 
 from ..projects._projects_service import delete_project_by_user
-from ..users.api import get_user
+from ..users.users_service import get_user
 from ..workspaces.api import check_user_workspace_access
 from ..workspaces.errors import (
     WorkspaceAccessForbiddenError,

services/web/server/src/simcore_service_webserver/folders/_workspaces_repository.py

@@ -12,7 +12,7 @@
 from ..projects import _groups_repository as projects_groups_repository
 from ..projects import _projects_repository as _projects_repository
 from ..projects._access_rights_service import check_user_project_permission
-from ..users.api import get_user
+from ..users import users_service
 from ..workspaces.api import check_user_workspace_access
 from . import _folders_repository
 
@@ -122,7 +122,7 @@ async def move_folder_into_workspace(
         )
 
         # 9. Remove all project permissions, leave only the user who moved the project
-        user = await get_user(app, user_id=user_id)
+        user = await users_service.get_user(app, user_id=user_id)
         for project_id in project_ids:
             await projects_groups_repository.delete_all_project_groups(
                 app, connection=conn, project_id=project_id

services/web/server/src/simcore_service_webserver/functions/_functions_repository.py

@@ -88,7 +88,7 @@
 
 from ..db.plugin import get_asyncpg_engine
 from ..groups.api import list_all_user_groups_ids
-from ..users.api import get_user_primary_group_id
+from ..users import users_service
 
 _FUNCTIONS_TABLE_COLS = get_columns_from_db_model(functions_table, RegisteredFunctionDB)
 _FUNCTION_JOBS_TABLE_COLS = get_columns_from_db_model(
@@ -148,7 +148,9 @@ async def create_function(  # noqa: PLR0913
 
         registered_function = RegisteredFunctionDB.model_validate(row)
 
-        user_primary_group_id = await get_user_primary_group_id(app, user_id=user_id)
+        user_primary_group_id = await users_service.get_user_primary_group_id(
+            app, user_id=user_id
+        )
         await set_group_permissions(
             app,
             connection=transaction,

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

@@ -19,13 +19,7 @@
 from ..projects.exceptions import ProjectDeleteError, ProjectNotFoundError
 from ..redis import get_redis_lock_manager_client
 from ..resource_manager.registry import RedisResourceRegistry
-from ..users import exceptions
-from ..users.api import (
-    delete_user_without_projects,
-    get_guest_user_ids_and_names,
-    get_user_primary_group_id,
-    get_user_role,
-)
+from ..users import exceptions, users_service
 from ..users.exceptions import UserNotFoundError
 from ._core_utils import get_new_project_owner_gid, replace_current_owner
 from .settings import GUEST_USER_RC_LOCK_FORMAT
@@ -48,7 +42,7 @@ async def _delete_all_projects_for_user(app: web.Application, user_id: int) -> N
     """
     # recover user's primary_gid
     try:
-        project_owner_primary_gid = await get_user_primary_group_id(
+        project_owner_primary_gid = await users_service.get_user_primary_group_id(
             app=app, user_id=user_id
         )
     except exceptions.UserNotFoundError:
@@ -149,7 +143,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_id)
+        user_role: UserRole = await users_service.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
@@ -165,7 +159,7 @@ async def remove_guest_user_with_all_its_resources(
             "Deleting user %s because it is a GUEST",
             f"{user_id=}",
         )
-        await delete_user_without_projects(app, user_id)
+        await users_service.delete_user_without_projects(app, user_id)
 
     except (
         DatabaseError,
@@ -205,8 +199,8 @@ async def remove_users_manually_marked_as_guests(
     }
 
     # Prevent creating this list if a guest user
-    guest_users: list[tuple[UserID, UserNameID]] = await get_guest_user_ids_and_names(
-        app
+    guest_users: list[tuple[UserID, UserNameID]] = (
+        await users_service.get_guest_user_ids_and_names(app)
     )
 
     for guest_user_id, guest_user_name in guest_users:
@@ -246,3 +240,8 @@ async def remove_users_manually_marked_as_guests(
             app=app,
             user_id=guest_user_id,
         )
+
+        await remove_guest_user_with_all_its_resources(
+            app=app,
+            user_id=guest_user_id,
+        )

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

@@ -21,7 +21,7 @@
 )
 from ..projects.api import has_user_project_access_rights
 from ..resource_manager.registry import RedisResourceRegistry
-from ..users.api import get_user_role
+from ..users import users_service
 from ..users.exceptions import UserNotFoundError
 
 _logger = logging.getLogger(__name__)
@@ -38,17 +38,21 @@ async def _remove_service(
         save_service_state = False
     else:
         try:
-            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(
+            user_role: UserRole = await users_service.get_user_role(
+                app, user_id=service.user_id
+            )
+        except (UserNotFoundError, ValueError):
+            save_service_state = False
+        else:
+            save_service_state = (
+                user_role > UserRole.GUEST
+                and await has_user_project_access_rights(
                     app,
                     project_id=service.project_id,
                     user_id=service.user_id,
                     permission="write",
                 )
-        except (UserNotFoundError, ValueError):
-            save_service_state = False
+            )
 
     with log_catch(_logger, reraise=False), log_context(
         _logger,

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

@@ -17,7 +17,7 @@
     delete_project_group_without_checking_permissions,
 )
 from ..projects.exceptions import ProjectNotFoundError
-from ..users.api import get_user, get_user_id_from_gid, get_users_in_group
+from ..users import users_service
 from ..users.exceptions import UserNotFoundError
 
 _logger = logging.getLogger(__name__)
@@ -34,15 +34,17 @@ async def _fetch_new_project_owner_from_groups(
     # go through user_to_groups table and fetch all uid for matching gid
     for group_gid in standard_groups:
         # remove the current owner from the bunch
-        target_group_users = await get_users_in_group(app=app, gid=int(group_gid)) - {
-            user_id
-        }
+        target_group_users = await users_service.get_users_in_group(
+            app=app, gid=int(group_gid)
+        ) - {user_id}
         _logger.info("Found group users '%s'", target_group_users)
 
         for possible_user_id in target_group_users:
             # check if the possible_user is still present in the db
             try:
-                possible_user = await get_user(app=app, user_id=possible_user_id)
+                possible_user = await users_service.get_user(
+                    app=app, user_id=possible_user_id
+                )
                 return int(possible_user["primary_gid"])
             except UserNotFoundError:  # noqa: PERF203
                 _logger.warning(
@@ -130,7 +132,7 @@ async def replace_current_owner(
     project: dict,
 ) -> None:
     try:
-        new_project_owner_id = await get_user_id_from_gid(
+        new_project_owner_id = await users_service.get_user_id_from_gid(
             app=app, primary_gid=new_project_owner_gid
         )
 

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

@@ -15,7 +15,7 @@
 
 from ..login import login_service
 from ..security import security_service
-from ..users.api import update_expired_users
+from ..users import users_service
 from ._tasks_utils import CleanupContextFunc, periodic_task_lifespan
 
 _logger = logging.getLogger(__name__)
@@ -45,7 +45,7 @@ async def notify_user_logout_all_sessions(
 
 async def _update_expired_users(app: web.Application):
 
-    if updated := await update_expired_users(app):
+    if updated := await users_service.update_expired_users(app):
         # expired users might be cached in the auth. If so, any request
         # with this user-id will get thru producing unexpected side-effects
         await security_service.clean_auth_policy_cache(app)