Merge branch 'master' into feature/messages-via-ws

Author: odeimaiz

.github/prompts/update-user-messages.prompt.md

@@ -18,7 +18,7 @@ error_msg = user_message("Operation failed. Please try again later.")
 
 ## Guidelines for Updating User Messages
 
-When modifying user messages, follow these rules:
+When modifying user messages, follow **as close as possible** these rules:
 
 1. **Version Tracking**: Every modification to a user message must include an incremented `_version` parameter:
 
@@ -43,7 +43,7 @@ When modifying user messages, follow these rules:
    user_message("Unable to load project.", _version=1)
    ```
 
-3. **Message Style**: Follow *strictly* the guidelines in `${workspaceFolder}/docs/user-messages-guidelines.md`
+3. **Message Style**: Follow **strictly** the guidelines in `${workspaceFolder}/docs/user-messages-guidelines.md`
 
 4. **Preserve Context**: Ensure the modified message conveys the same meaning and context as the original.
 
@@ -56,17 +56,19 @@ When modifying user messages, follow these rules:
    # After
    user_message("Your session has expired. Please log in again.", _version=3)
    ```
+6. **Replace 'Study' by 'Project'**: If the message contains the word 'Study', replace it with 'Project' to align with our terminology.
+
 
 ## Examples
 
 ### Example 1: Simple Message Update
 
 ```python
 # Before
-error_dialog(user_message("Failed to save changes."))
+error_dialog(user_message("Failed to save changes in this study."))
 
 # After
-error_dialog(user_message("Unable to save your changes. Please try again.", _version=1))
+error_dialog(user_message("Unable to save your changes in this project.", _version=1))
 ```
 
 ### Example 2: F-string Message Update

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -36,7 +36,8 @@
 DEFAULT_API_VERSION = "v0"
 _FMSG_INTERNAL_ERROR_USER_FRIENDLY = user_message(
     "We apologize for the inconvenience. "
-    "The issue has been recorded, please report it if it persists."
+    "The issue has been recorded, please report it if it persists.",
+    _version=1,
 )
 
 

services/docker-compose.yml

@@ -888,10 +888,14 @@ services:
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky.rule=Path(`/v0/projects`) ||
           Path(`/v0/projects:clone`) ||
           PathRegexp(`^/v0/projects/[0-9a-fA-F-]+/nodes/[0-9a-fA-F-]+:stop`) ||
+          PathRegexp(`^/v0/projects/[0-9a-fA-F-]+/nodes/[0-9a-fA-F-]+:open`) ||
+          PathRegexp(`^/v0/projects/[0-9a-fA-F-]+/nodes/[0-9a-fA-F-]+:close`) ||
           PathRegexp(`^/v0/storage/locations/[0-9]+/paths/.+:size`) ||
           PathRegexp(`^/v0/storage/locations/[0-9]+/-/paths:batchDelete`) ||
           PathRegexp(`^/v0/storage/locations/[0-9]+/export-data`) ||
           PathRegexp(`^/v0/tasks-legacy/.+`)
+        # NOTE: the sticky router must have a higher priority than the webserver router but below dy-proxies
+        - traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky.priority=8
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky.entrypoints=http
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky.service=${SWARM_STACK_NAME}_webserver_sticky
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_retry

services/web/server/src/simcore_service_webserver/catalog/_constants.py

@@ -1,11 +1,14 @@
 from typing import Final
 
+from common_library.user_messages import user_message
+
 from ..constants import MSG_TRY_AGAIN_OR_SUPPORT
 
-MSG_CATALOG_SERVICE_UNAVAILABLE: Final[str] = (
+MSG_CATALOG_SERVICE_UNAVAILABLE: Final[str] = user_message(
     # Most likely the director service is down or misconfigured so the user is asked to try again later.
-    "This service is temporarily unavailable. The incident was logged and will be investigated. "
-    + MSG_TRY_AGAIN_OR_SUPPORT
+    "The catalog service is currently unavailable. This issue has been logged and will be investigated. "
+    + MSG_TRY_AGAIN_OR_SUPPORT,
+    _version=1,
 )
 
 

services/web/server/src/simcore_service_webserver/constants.py

@@ -1,5 +1,6 @@
 # pylint:disable=unused-import
 
+from sys import version
 from typing import Final
 
 from common_library.user_messages import user_message
@@ -39,7 +40,7 @@
 # main index route name = front-end
 INDEX_RESOURCE_NAME: Final[str] = "get_cached_frontend_index"
 
-MSG_UNDER_DEVELOPMENT: Final[str] = (
+MSG_UNDER_DEVELOPMENT: Final[str] = user_message(
     "Under development. Use WEBSERVER_DEV_FEATURES_ENABLED=1 to enable current implementation"
 )
 
@@ -48,7 +49,7 @@
 
 
 MSG_TRY_AGAIN_OR_SUPPORT: Final[str] = user_message(
-    "Please try again shortly. If the issue persists, contact support."
+    "Please try again shortly. If the issue persists, contact support.", _version=1
 )
 
 __all__: tuple[str, ...] = (

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

@@ -111,6 +111,7 @@ async def update_message(
 async def delete_message(
     app: web.Application,
     *,
+    user_id: UserID,
     project_id: ProjectID,
     conversation_id: ConversationID,
     message_id: ConversationMessageID,
@@ -121,9 +122,12 @@ async def delete_message(
         message_id=message_id,
     )
 
+    _user_group_id = await get_user_primary_group_id(app, user_id=user_id)
+
     await notify_conversation_message_deleted(
         app,
         recipients=await _get_recipients(app, project_id),
+        user_group_id=_user_group_id,
         project_id=project_id,
         conversation_id=conversation_id,
         message_id=message_id,

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

@@ -6,15 +6,17 @@
     ConversationID,
     ConversationMessageGetDB,
     ConversationMessageID,
+    ConversationMessageType,
 )
+from models_library.groups import GroupID
 from models_library.projects import ProjectID
 from models_library.socketio import SocketMessageDict
 from models_library.users import UserID
 from pydantic import AliasGenerator, BaseModel, ConfigDict
 from pydantic.alias_generators import to_camel
 from servicelib.utils import limited_as_completed
 
-from ..socketio.messages import send_message_to_standard_group
+from ..socketio.messages import send_message_to_user
 
 _MAX_CONCURRENT_SENDS: Final[int] = 3
 
@@ -32,6 +34,8 @@
 class BaseConversationMessage(BaseModel):
     conversation_id: ConversationID
     message_id: ConversationMessageID
+    user_group_id: GroupID
+    type: ConversationMessageType
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -42,13 +46,9 @@ class BaseConversationMessage(BaseModel):
     )
 
 
-class ConversationMessageCreated(BaseConversationMessage):
+class ConversationMessageCreatedOrUpdated(BaseConversationMessage):
     content: str
     created: datetime.datetime
-
-
-class ConversationMessageUpdated(BaseConversationMessage):
-    content: str
     modified: datetime.datetime
 
 
@@ -62,7 +62,9 @@ async def _send_message_to_recipients(
 ):
     async for _ in limited_as_completed(
         (
-            send_message_to_standard_group(app, recipient, notification_message)
+            send_message_to_user(
+                app, recipient, notification_message, ignore_queue=True
+            )
             for recipient in recipients
         ),
         limit=_MAX_CONCURRENT_SENDS,
@@ -81,7 +83,7 @@ async def notify_conversation_message_created(
         event_type=SOCKET_IO_CONVERSATION_MESSAGE_CREATED_EVENT,
         data={
             "projectId": project_id,
-            **ConversationMessageCreated(
+            **ConversationMessageCreatedOrUpdated(
                 **conversation_message.model_dump()
             ).model_dump(mode="json", by_alias=True),
         },
@@ -102,7 +104,7 @@ async def notify_conversation_message_updated(
         event_type=SOCKET_IO_CONVERSATION_MESSAGE_UPDATED_EVENT,
         data={
             "projectId": project_id,
-            **ConversationMessageUpdated(
+            **ConversationMessageCreatedOrUpdated(
                 **conversation_message.model_dump()
             ).model_dump(mode="json", by_alias=True),
         },
@@ -115,6 +117,7 @@ async def notify_conversation_message_deleted(
     app: web.Application,
     *,
     recipients: set[UserID],
+    user_group_id: GroupID,
     project_id: ProjectID,
     conversation_id: ConversationID,
     message_id: ConversationMessageID,
@@ -125,7 +128,10 @@ async def notify_conversation_message_deleted(
         data={
             "projectId": project_id,
             **ConversationMessageDeleted(
-                conversation_id=conversation_id, message_id=message_id
+                conversation_id=conversation_id,
+                message_id=message_id,
+                user_group_id=user_group_id,
+                type=ConversationMessageType.MESSAGE,
             ).model_dump(mode="json", by_alias=True),
         },
     )

services/web/server/src/simcore_service_webserver/director_v2/_controller/_rest_exceptions.py

@@ -87,11 +87,17 @@ async def _handler_director_service_error_as_503_or_4xx(
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
     UserDefaultWalletNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Default wallet not found but necessary for computations"),
+        user_message(
+            "A default wallet is required for running computations but could not be found.",
+            _version=1,
+        ),
     ),
     WalletNotEnoughCreditsError: HttpErrorInfo(
         status.HTTP_402_PAYMENT_REQUIRED,
-        user_message("Wallet does not have enough credits for computations. {reason}"),
+        user_message(
+            "Your wallet does not have sufficient credits to run this computation. {reason}",
+            _version=1,
+        ),
     ),
 }
 

services/web/server/src/simcore_service_webserver/folders/_common/exceptions_handlers.py

@@ -32,49 +32,56 @@
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
     FolderNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Folder was not found"),
+        user_message("The requested folder could not be found.", _version=1),
     ),
     WorkspaceNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Workspace was not found"),
+        user_message("The requested workspace could not be found.", _version=1),
     ),
     FolderAccessForbiddenError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        user_message("Does not have access to this folder"),
+        user_message("You do not have permission to access this folder.", _version=1),
     ),
     WorkspaceAccessForbiddenError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        user_message("Does not have access to this workspace"),
+        user_message(
+            "You do not have permission to access this workspace.", _version=1
+        ),
     ),
     WorkspaceFolderInconsistencyError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        user_message("This folder does not exist in this workspace"),
+        user_message(
+            "This folder is not available in the selected workspace.", _version=1
+        ),
     ),
     FolderValueNotPermittedError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        user_message("Provided folder value is not permitted: {reason}"),
+        user_message("The folder operation cannot be completed: {reason}", _version=1),
     ),
     FoldersValueError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        user_message("Invalid folder value set: {reason}"),
+        user_message("The folder configuration is invalid: {reason}", _version=1),
     ),
     ProjectInvalidRightsError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
         user_message(
-            "Access Denied: You do not have permission to move the project with UUID: {project_uuid}. Tip: Copy and paste the UUID into the search bar to locate the project."
+            "You do not have permission to move the project with UUID: {project_uuid}. To locate this project, copy and paste the UUID into the search bar.",
+            _version=1,
         ),
     ),
     # Trashing
     ProjectRunningConflictError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
         user_message(
-            "One or more studies in this folder are in use and cannot be trashed. Please stop all services first and try again"
+            "Cannot move folder to trash because it contains projects that are currently running. Please stop all running services first and try again.",
+            _version=2,
         ),
     ),
     ProjectStoppingError: HttpErrorInfo(
         status.HTTP_503_SERVICE_UNAVAILABLE,
         user_message(
-            "Something went wrong while stopping running services in studies within this folder before trashing. Aborting trash."
+            "Something went wrong while stopping running services in projects within this folder before trashing. Aborting trash.",
+            _version=2,
         ),
     ),
 }

services/web/server/src/simcore_service_webserver/groups/_common/exceptions_handlers.py

@@ -24,32 +24,40 @@
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
     UserNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("User {uid} or {email} not found"),
+        user_message(
+            "The user with ID {uid} or email {email} could not be found.", _version=1
+        ),
     ),
     GroupNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Group {gid} not found"),
+        user_message("The group with ID {gid} could not be found.", _version=1),
     ),
     UserInGroupNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("User not found in group {gid}"),
+        user_message("The user is not a member of group {gid}.", _version=1),
     ),
     UserAlreadyInGroupError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        user_message("User is already in group {gid}"),
+        user_message("The user is already a member of group {gid}.", _version=1),
     ),
     UserInsufficientRightsError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        user_message("Insufficient rights for {permission} access to group {gid}"),
+        user_message(
+            "You do not have sufficient rights for {permission} access to group {gid}.",
+            _version=1,
+        ),
     ),
     # scicrunch
     InvalidRRIDError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        user_message("Invalid RRID {rrid}"),
+        user_message("The RRID {rrid} is not valid.", _version=1),
     ),
     ScicrunchError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        user_message("Cannot get RRID since scicrunch.org service is not reachable."),
+        user_message(
+            "Unable to retrieve RRID information because the scicrunch.org service is currently unavailable.",
+            _version=1,
+        ),
     ),
 }