updates proejcts

Author: pcrespov

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

@@ -6,8 +6,9 @@
 
 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/invitations/errors.py

@@ -6,8 +6,12 @@
 
 from ..errors import WebServerBaseError
 
-MSG_INVALID_INVITATION_URL = user_message("Link seems corrupted or incomplete")
-MSG_INVITATION_ALREADY_USED = user_message("This invitation was already used")
+MSG_INVALID_INVITATION_URL = user_message(
+    "The invitation link appears to be corrupted or incomplete.", _version=1
+)
+MSG_INVITATION_ALREADY_USED = user_message(
+    "This invitation has already been used and cannot be used again.", _version=1
+)
 
 
 class InvitationsError(WebServerBaseError, ValueError): ...

services/web/server/src/simcore_service_webserver/payments/_onetime_api.py

@@ -38,8 +38,10 @@
 
 
 MSG_WALLET_NO_ACCESS_ERROR = user_message(
-    "User {user_id} does not have necessary permissions to do a payment into wallet {wallet_id}"
+    "You do not have the necessary permissions to make payments to wallet {wallet_id}.",
+    _version=1,
 )
+
 _FAKE_PAYMENT_TRANSACTION_ID_PREFIX = "fpt"
 
 

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

@@ -55,158 +55,210 @@
 _FOLDER_ERRORS: ExceptionToHttpErrorMap = {
     FolderAccessForbiddenError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        user_message("Access to folder forbidden"),
+        user_message("Access to this folder is forbidden.", _version=1),
     ),
     FolderNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Folder not found: {reason}"),
+        user_message("The requested folder could not be found: {reason}", _version=1),
     ),
 }
 
 
 _NODE_ERRORS: ExceptionToHttpErrorMap = {
     NodeNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Node '{node_uuid}' not found in project '{project_uuid}'"),
+        user_message(
+            "Node '{node_uuid}' was not found in project '{project_uuid}'.", _version=1
+        ),
     ),
     ParentNodeNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        user_message("Parent node '{node_uuid}' not found"),
+        user_message("Parent node '{node_uuid}' was not found.", _version=1),
     ),
     ProjectNodeRequiredInputsNotSetError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        user_message("Project node is required but input is not set"),
+        user_message(
+            "Required input values for this project node have not been set.", _version=1
+        ),
     ),
 }
 
 
 _PROJECT_ERRORS: ExceptionToHttpErrorMap = {
     ProjectDeleteError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        "Failed to complete deletion of '{project_uuid}': {reason}",
+        user_message(
+            "Unable to complete deletion of project '{project_uuid}': {reason}",
+            _version=1,
+        ),
     ),
     ProjectGroupNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Project group not found: {reason}",
+        user_message(
+            "The requested project group could not be found: {reason}", _version=1
+        ),
     ),
     ProjectInvalidRightsError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        "Do not have sufficient access rights on project {project_uuid} for this action",
+        user_message(
+            "You do not have sufficient access rights to perform this action on project {project_uuid}.",
+            _version=1,
+        ),
     ),
     InsufficientRoleForProjectTemplateTypeUpdateError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        "Do not have sufficient access rights on updating project template type",
+        user_message(
+            "You do not have sufficient permissions to update the project template type.",
+            _version=1,
+        ),
     ),
     ProjectInvalidUsageError: HttpErrorInfo(
         status.HTTP_422_UNPROCESSABLE_ENTITY,
-        "Invalid usage for project",
+        user_message("The project cannot be used in this way.", _version=1),
     ),
     ProjectNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Project {project_uuid} not found",
+        user_message("Project {project_uuid} could not be found.", _version=1),
     ),
     ProjectOwnerNotFoundInTheProjectAccessRightsError: HttpErrorInfo(
         status.HTTP_400_BAD_REQUEST,
-        "Project owner identifier was not found in the project's access-rights field",
+        user_message(
+            "The project owner could not be found in the project's access rights.",
+            _version=1,
+        ),
     ),
     ProjectTooManyProjectOpenedError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        "You cannot open more than {max_num_projects} study/ies at once. Please close another study and retry.",
+        user_message(
+            "You cannot open more than {max_num_projects} project/s at once. Please close another study and retry.",
+            _version=1,
+        ),
     ),
     ProjectStartsTooManyDynamicNodesError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        "The maximal amount of concurrently running dynamic services was reached. Please manually stop a service and retry.",
+        user_message(
+            "The maximum number of concurrently running dynamic services has been reached. Please manually stop a service and retry.",
+            _version=1,
+        ),
     ),
     ProjectWalletPendingTransactionError: HttpErrorInfo(
         status.HTTP_409_CONFLICT,
-        "Project has currently pending transactions. It is forbidden to change wallet.",
+        user_message(
+            "This project has pending transactions. Changing the wallet is currently not allowed.",
+            _version=1,
+        ),
     ),
     ProjectInDebtCanNotChangeWalletError: HttpErrorInfo(
         status.HTTP_402_PAYMENT_REQUIRED,
-        "Unable to change the credit account linked to the project. The project is embargoed because the last transaction of {debt_amount} resulted in the credit account going negative.",
+        user_message(
+            "Unable to change the credit account linked to the project. The project is embargoed because the last transaction of {debt_amount} resulted in the credit account going negative.",
+            _version=1,
+        ),
     ),
     ProjectInDebtCanNotOpenError: HttpErrorInfo(
         status.HTTP_402_PAYMENT_REQUIRED,
-        "Unable to open the project. The project is embargoed because the last transaction of {debt_amount} resulted in the credit account going negative.",
+        user_message(
+            "Unable to open the project. The project is embargoed because the last transaction of {debt_amount} resulted in the credit account going negative.",
+            _version=1,
+        ),
     ),
     WrongTagIdsInQueryError: HttpErrorInfo(
         status.HTTP_400_BAD_REQUEST,
-        "Wrong tag IDs in query",
+        user_message("Invalid tag IDs were provided in the request.", _version=1),
     ),
     ProjectTypeAndTemplateIncompatibilityError: HttpErrorInfo(
         status.HTTP_400_BAD_REQUEST,
-        "Wrong project type and template type combination: {reason}",
+        user_message(
+            "The project type and template type combination is not valid: {reason}",
+            _version=1,
+        ),
     ),
 }
 
 
 _WORKSPACE_ERRORS: ExceptionToHttpErrorMap = {
     WorkspaceAccessForbiddenError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        "Access to workspace forbidden: {reason}",
+        user_message("Access to this workspace is forbidden: {reason}", _version=1),
     ),
     WorkspaceNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Workspace not found: {reason}",
+        user_message(
+            "The requested workspace could not be found: {reason}", _version=1
+        ),
     ),
 }
 
 
 _WALLET_ERRORS: ExceptionToHttpErrorMap = {
     UserDefaultWalletNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Wallet not found: {reason}",
+        user_message("The requested wallet could not be found: {reason}", _version=1),
     ),
     WalletAccessForbiddenError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        "Payment required, but the user lacks access to the project's linked wallet: Wallet access forbidden. {reason}",
+        user_message(
+            "Payment is required, but you do not have access to the project's linked wallet: {reason}",
+            _version=1,
+        ),
     ),
     WalletNotEnoughCreditsError: HttpErrorInfo(
         status.HTTP_402_PAYMENT_REQUIRED,
-        "Wallet does not have enough credits. {reason}",
+        user_message(
+            "The wallet does not have enough credits to complete this operation: {reason}",
+            _version=1,
+        ),
     ),
 }
 
 
 _PRICING_ERRORS: ExceptionToHttpErrorMap = {
     DefaultPricingPlanNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Default pricing plan not found",
+        user_message("The default pricing plan could not be found.", _version=1),
     ),
     DefaultPricingUnitNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Default pricing unit not found",
+        user_message("The default pricing unit could not be found.", _version=1),
     ),
 }
 
 
 _CONVERSATION_ERRORS: ExceptionToHttpErrorMap = {
     ConversationErrorNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Conversation not found",
+        user_message("The requested conversation could not be found.", _version=1),
     ),
     ConversationMessageErrorNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
-        "Conversation message not found",
+        user_message(
+            "The requested conversation message could not be found.", _version=1
+        ),
     ),
 }
 
 
 _OTHER_ERRORS: ExceptionToHttpErrorMap = {
     CatalogNotAvailableError: HttpErrorInfo(
         status.HTTP_503_SERVICE_UNAVAILABLE,
-        "This service is currently not available",
+        user_message("The catalog service is currently unavailable.", _version=1),
     ),
     ClustersKeeperNotAvailableError: HttpErrorInfo(
         status.HTTP_503_SERVICE_UNAVAILABLE,
-        "Clusters-keeper service is not available",
+        user_message(
+            "The clusters-keeper service is currently unavailable.", _version=1
+        ),
     ),
     CatalogForbiddenError: HttpErrorInfo(
         status.HTTP_403_FORBIDDEN,
-        "Catalog forbidden: Insufficient access rights for {name}",
+        user_message(
+            "Access denied: You do not have sufficient permissions for {name}.",
+            _version=1,
+        ),
     ),
     CatalogItemNotFoundError: HttpErrorInfo(
-        status.HTTP_404_NOT_FOUND, "{name} was not found"
+        status.HTTP_404_NOT_FOUND,
+        user_message("The requested item '{name}' was not found.", _version=1),
     ),
 }