review @sanderegg

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_webserver/projects.py

@@ -302,6 +302,9 @@ class ProjectDocument(OutputSchema):
     model_config = ConfigDict(from_attributes=True, arbitrary_types_allowed=True)
 
 
+ProjectDocumentVersion: TypeAlias = int
+
+
 __all__: tuple[str, ...] = (
     "EmptyModel",
     "ProjectCopyOverride",

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

@@ -6,7 +6,10 @@
 from typing import cast
 
 from aiohttp import web
-from models_library.api_schemas_webserver.projects import ProjectDocument
+from models_library.api_schemas_webserver.projects import (
+    ProjectDocument,
+    ProjectDocumentVersion,
+)
 from models_library.projects import ProjectID, ProjectTemplateType
 from models_library.projects import ProjectType as ProjectTypeAPI
 from servicelib.redis import (
@@ -24,7 +27,7 @@
 
 async def build_project_document_and_increment_version(
     app: web.Application, project_uuid: ProjectID
-) -> tuple[ProjectDocument, int]:
+) -> tuple[ProjectDocument, ProjectDocumentVersion]:
     """Build project document and increment version with Redis lock protection.
 
     This function is protected by Redis exclusive lock because:

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

@@ -1449,6 +1449,35 @@ async def _clean_user_disconnected_clients(
                 await user_session.remove(PROJECT_ID_KEY)
 
 
+async def _leave_project_room(
+    *,
+    app: web.Application,
+    user_id: UserID,
+    client_session_id: str,
+    project_uuid: ProjectID,
+    user_session,
+) -> None:
+    """Helper function to leave a project room via socketio"""
+    socket_id = await user_session.get_socket_id()
+    if socket_id is not None:
+        _logger.debug(
+            "User %s/%s is leaving project room %s with socket_id %s",
+            user_id,
+            client_session_id,
+            project_uuid,
+            socket_id,
+        )
+        sio = get_socket_server(app)
+        await sio.leave_room(socket_id, SocketIORoomStr.from_project_id(project_uuid))
+    else:
+        _logger.error(
+            "User %s/%s has no socket_id, cannot leave project room %s",
+            user_id,
+            client_session_id,
+            project_uuid,
+        )
+
+
 def create_user_notification_cb(
     user_id: UserID, project_uuid: ProjectID, app: web.Application
 ):
@@ -1588,26 +1617,13 @@ async def close_project_for_user(
         await user_session.remove(key=PROJECT_ID_KEY)
 
         # remove the clent session from the project room
-        _socket_id = await user_session.get_socket_id()
-        if _socket_id is not None:
-            _logger.debug(
-                "User %s/%s is leaving project room %s with socket_id %s",
-                user_id,
-                client_session_id,
-                project_uuid,
-                _socket_id,
-            )
-            sio = get_socket_server(app)
-            await sio.leave_room(
-                _socket_id, SocketIORoomStr.from_project_id(project_uuid)
-            )
-        else:
-            _logger.warning(
-                "User %s/%s has no socket_id, cannot leave project room %s",
-                user_id,
-                client_session_id,
-                project_uuid,
-            )
+        await _leave_project_room(
+            app=app,
+            user_id=user_id,
+            client_session_id=client_session_id,
+            project_uuid=project_uuid,
+            user_session=user_session,
+        )
 
     # check it is not opened by someone else
     all_user_sessions_with_project.remove(current_user_session)