mv api -> service

Author: pcrespov

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

@@ -49,7 +49,7 @@ async def export_project(request: web.Request):
             project_uuid,
             ProjectStatus.EXPORTING,
             user_id,
-            await get_user_fullname(request.app, user_id),
+            await get_user_fullname(request.app, user_id=user_id),
         ):
             await retrieve_and_notify_project_locked_state(
                 user_id, project_uuid, request.app

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

@@ -5,6 +5,7 @@
 import asyncpg.exceptions
 from aiohttp import web
 from models_library.projects import ProjectID
+from models_library.users import UserID, UserNameID
 from redis.asyncio import Redis
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from simcore_postgres_database.errors import DatabaseError
@@ -201,7 +202,9 @@ async def remove_users_manually_marked_as_guests(
     }
 
     # Prevent creating this list if a guest user
-    guest_users: list[tuple[int, str]] = await get_guest_user_ids_and_names(app)
+    guest_users: list[tuple[UserID, UserNameID]] = await get_guest_user_ids_and_names(
+        app
+    )
 
     for guest_user_id, guest_user_name in guest_users:
         # Prevents removing GUEST users that were automatically (NOT manually) created

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

@@ -171,7 +171,7 @@ async def _copy_files_from_source_project(
                     source_project["uuid"],
                     ProjectStatus.CLONING,
                     user_id,
-                    await get_user_fullname(app, user_id),
+                    await get_user_fullname(app, user_id=user_id),
                 )
             )
         starting_value = task_progress.percent

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

@@ -448,7 +448,8 @@ async def delete_project(request: web.Request):
             )
         if project_users:
             other_user_names = {
-                await get_user_fullname(request.app, uid) for uid in project_users
+                await get_user_fullname(request.app, user_id=uid)
+                for uid in project_users
             }
             raise web.HTTPForbidden(
                 reason=f"Project is open by {other_user_names}. "

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

@@ -1243,7 +1243,7 @@ async def try_open_project_for_user(
             project_uuid,
             ProjectStatus.OPENING,
             user_id,
-            await get_user_fullname(app, user_id),
+            await get_user_fullname(app, user_id=user_id),
             notify_users=False,
         ):
             with managed_resource(user_id, client_session_id, app) as user_session:
@@ -1413,22 +1413,23 @@ async def _get_project_lock_state(
         f"{set_user_ids=}",
     )
     usernames: list[FullNameDict] = [
-        await get_user_fullname(app, uid) for uid in set_user_ids
+        await get_user_fullname(app, user_id=uid) for uid in set_user_ids
     ]
     # let's check if the project is opened by the same user, maybe already opened or closed in a orphaned session
-    if set_user_ids.issubset({user_id}):
-        if not await _user_has_another_client_open(user_session_id_list, app):
-            # in this case the project is re-openable by the same user until it gets closed
-            log.debug(
-                "project [%s] is in use by the same user [%s] that is currently disconnected, so it is unlocked for this specific user and opened",
-                f"{project_uuid=}",
-                f"{set_user_ids=}",
-            )
-            return ProjectLocked(
-                value=False,
-                owner=Owner(user_id=next(iter(set_user_ids)), **usernames[0]),
-                status=ProjectStatus.OPENED,
-            )
+    if set_user_ids.issubset({user_id}) and not await _user_has_another_client_open(
+        user_session_id_list, app
+    ):
+        # in this case the project is re-openable by the same user until it gets closed
+        log.debug(
+            "project [%s] is in use by the same user [%s] that is currently disconnected, so it is unlocked for this specific user and opened",
+            f"{project_uuid=}",
+            f"{set_user_ids=}",
+        )
+        return ProjectLocked(
+            value=False,
+            owner=Owner(user_id=next(iter(set_user_ids)), **usernames[0]),
+            status=ProjectStatus.OPENED,
+        )
     # the project is opened in another tab or browser, or by another user, both case resolves to the project being locked, and opened
     log.debug(
         "project [%s] is in use by another user [%s], so it is locked",
@@ -1712,7 +1713,9 @@ async def remove_project_dynamic_services(
         user_id,
     )
 
-    user_name_data: FullNameDict = user_name or await get_user_fullname(app, user_id)
+    user_name_data: FullNameDict = user_name or await get_user_fullname(
+        app, user_id=user_id
+    )
 
     user_role: UserRole | None = None
     try:

services/web/server/src/simcore_service_webserver/users/_common/models.py

@@ -1,7 +1,30 @@
-from typing import Annotated, Any, NamedTuple, Self
+from typing import Annotated, Any, NamedTuple, Self, TypedDict
 
+from models_library.basic_types import IDStr
 from models_library.emails import LowerCaseEmailStr
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, EmailStr, Field
+
+
+class FullNameDict(TypedDict):
+    first_name: str | None
+    last_name: str | None
+
+
+class UserDisplayAndIdNamesTuple(NamedTuple):
+    name: str
+    email: EmailStr
+    first_name: IDStr
+    last_name: IDStr
+
+    @property
+    def full_name(self) -> IDStr:
+        return IDStr.concatenate(self.first_name, self.last_name)
+
+
+class UserIdNamesTuple(NamedTuple):
+    name: str
+    email: str
+
 
 #
 # DB models