renaming and refactoring

Author: sanderegg

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

@@ -24,7 +24,6 @@
 from models_library.services import ServicePortKey
 from models_library.users import UserID
 from pydantic import NonNegativeInt
-from pydantic.types import PositiveInt
 from servicelib.progress_bar import ProgressBarData
 from servicelib.rabbitmq import RabbitMQClient, RPCServerError
 from servicelib.rabbitmq.rpc_interfaces.dynamic_scheduler import services
@@ -94,13 +93,13 @@ async def stop_dynamic_service(
 
 async def _post_progress_message(
     rabbitmq_client: RabbitMQClient,
-    user_id: PositiveInt,
-    project_id: str,
+    user_id: UserID,
+    project_id: ProjectID,
     report: ProgressReport,
 ) -> None:
     progress_message = ProgressRabbitMessageProject(
         user_id=user_id,
-        project_id=ProjectID(project_id),
+        project_id=project_id,
         progress_type=ProgressType.PROJECT_CLOSING,
         report=report,
     )
@@ -111,14 +110,14 @@ async def _post_progress_message(
 async def stop_dynamic_services_in_project(
     app: web.Application,
     *,
-    user_id: PositiveInt,
-    project_id: str,
+    user_id: UserID,
+    project_id: ProjectID,
     simcore_user_agent: str,
     save_state: bool,
 ) -> None:
     """Stops all dynamic services in the project"""
     running_dynamic_services = await list_dynamic_services(
-        app, user_id=user_id, project_id=ProjectID(project_id)
+        app, user_id=user_id, project_id=project_id
     )
 
     async with AsyncExitStack() as stack:

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

@@ -1,6 +1,8 @@
 import logging
 
 from aiohttp import web
+from models_library.projects import ProjectID
+from pydantic import TypeAdapter
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from servicelib.utils import logged_gather
 
@@ -84,9 +86,9 @@ async def remove_disconnected_user_resources(
                     _logger.info(
                         "Closing project '%s' of user %s", resource_value, user_id
                     )
-                    await _projects_service.try_close_project_for_user(
+                    await _projects_service.close_project_for_user(
                         user_id,
-                        f"{resource_value}",
+                        TypeAdapter(ProjectID).validate_python(f"{resource_value}"),
                         dead_session["client_session_id"],
                         app,
                         simcore_user_agent=UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,

services/web/server/src/simcore_service_webserver/projects/_controller/projects_states_rest.py

@@ -174,9 +174,9 @@ async def open_project(request: web.Request) -> web.Response:
     except DirectorV2ServiceError as exc:
         # there was an issue while accessing the director-v2/director-v0
         # ensure the project is closed again
-        await _projects_service.try_close_project_for_user(
+        await _projects_service.close_project_for_user(
             user_id=req_ctx.user_id,
-            project_uuid=f"{path_params.project_id}",
+            project_uuid=path_params.project_id,
             client_session_id=client_session_id,
             app=request.app,
             simcore_user_agent=request.headers.get(
@@ -214,9 +214,9 @@ async def close_project(request: web.Request) -> web.Response:
         user_id=req_ctx.user_id,
         include_state=False,
     )
-    await _projects_service.try_close_project_for_user(
+    await _projects_service.close_project_for_user(
         req_ctx.user_id,
-        f"{path_params.project_id}",
+        path_params.project_id,
         client_session_id,
         request.app,
         simcore_user_agent=request.headers.get(

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

@@ -18,7 +18,6 @@
 from ..director_v2 import director_v2_service
 from ..storage.api import delete_data_folders_of_project
 from ..users.exceptions import UserNotFoundError
-from ..users.users_service import FullNameDict
 from . import _projects_repository
 from ._access_rights_service import check_user_project_permission
 from ._projects_repository_legacy import ProjectDBAPI
@@ -40,13 +39,12 @@ class RemoveProjectServicesCallable(Protocol):
     # NOTE: this function was tmp added here to avoid refactoring all projects_api in a single PR
     async def __call__(
         self,
-        user_id: int,
-        project_uuid: str,
+        user_id: UserID,
+        project_uuid: ProjectID,
         app: web.Application,
         simcore_user_agent: str,
         *,
         notify_users: bool = True,
-        user_name: FullNameDict | None = None,
     ) -> None: ...
 
 
@@ -109,7 +107,7 @@ async def delete_project(
         # - raises ProjectNotFoundError, UserNotFoundError, ProjectLockError
         await remove_project_dynamic_services(
             user_id=user_id,
-            project_uuid=f"{project_uuid}",
+            project_uuid=project_uuid,
             app=app,
             simcore_user_agent=simcore_user_agent,
             notify_users=False,

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

@@ -1580,9 +1580,9 @@ async def _open_project() -> bool:
         return False
 
 
-async def try_close_project_for_user(
-    user_id: int,
-    project_uuid: str,
+async def close_project_for_user(
+    user_id: UserID,
+    project_uuid: ProjectID,
     client_session_id: str,
     app: web.Application,
     simcore_user_agent: str,
@@ -1592,18 +1592,12 @@ async def try_close_project_for_user(
     with managed_resource(user_id, client_session_id, app) as user_session:
         current_user_session = user_session.get_id()
         all_user_sessions_with_project = await user_session.find_users_of_resource(
-            app, key=PROJECT_ID_KEY, value=project_uuid
+            app, key=PROJECT_ID_KEY, value=f"{project_uuid}"
         )
 
         # first check whether other sessions registered this project
         if current_user_session not in all_user_sessions_with_project:
             # nothing to do, I do not have this project registered
-            log.warning(
-                "%s is not registered as resource of %s. Skipping close project",
-                f"{project_uuid=}",
-                f"{user_id}",
-                extra=get_log_record_extra(user_id=user_id),
-            )
             return
 
         # remove the project from our list of opened ones
@@ -1629,7 +1623,7 @@ async def try_close_project_for_user(
     # notify users that project is now closed
     project = await get_project_for_user(
         app,
-        project_uuid,
+        f"{project_uuid}",
         user_id,
         include_state=True,
     )
@@ -1973,8 +1967,8 @@ async def run_project_dynamic_services(
 
 
 async def remove_project_dynamic_services(
-    user_id: int,
-    project_uuid: str,
+    user_id: UserID,
+    project_uuid: ProjectID,
     app: web.Application,
     simcore_user_agent: str,
     *,
@@ -2001,7 +1995,7 @@ async def remove_project_dynamic_services(
         user_role = None
 
     save_state = await has_user_project_access_rights(
-        app, project_id=ProjectID(project_uuid), user_id=user_id, permission="write"
+        app, project_id=project_uuid, user_id=user_id, permission="write"
     )
     if user_role is None or user_role <= UserRole.GUEST:
         save_state = False
@@ -2013,7 +2007,7 @@ async def remove_project_dynamic_services(
         status=ProjectStatus.CLOSING,
         owner=Owner(user_id=user_id),
         notification_cb=(
-            create_user_notification_cb(user_id, ProjectID(project_uuid), app)
+            create_user_notification_cb(user_id, project_uuid, app)
             if notify_users
             else None
         ),

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

@@ -48,7 +48,7 @@ async def batch_stop_services_in_project(
         ),
         _projects_service.remove_project_dynamic_services(
             user_id=user_id,
-            project_uuid=f"{project_uuid}",
+            project_uuid=project_uuid,
             app=app,
             simcore_user_agent=UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
             notify_users=False,