mark more messages

Author: pcrespov

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

@@ -1,8 +1,10 @@
 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

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

@@ -40,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"
 )
 

services/web/server/src/simcore_service_webserver/invitations/errors.py

@@ -1,16 +1,16 @@
 """
-    API plugin errors
+API plugin errors
 """
 
+from common_library.user_messages import user_message
 
 from ..errors import WebServerBaseError
 
-MSG_INVALID_INVITATION_URL = "Link seems corrupted or incomplete"
-MSG_INVITATION_ALREADY_USED = "This invitation was already used"
+MSG_INVALID_INVITATION_URL = user_message("Link seems corrupted or incomplete")
+MSG_INVITATION_ALREADY_USED = user_message("This invitation was already used")
 
 
-class InvitationsError(WebServerBaseError, ValueError):
-    ...
+class InvitationsError(WebServerBaseError, ValueError): ...
 
 
 class InvalidInvitationError(InvitationsError):

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

@@ -5,6 +5,7 @@
 
 import arrow
 from aiohttp import web
+from common_library.user_messages import user_message
 from models_library.api_schemas_webserver.wallets import (
     PaymentID,
     PaymentMethodID,
@@ -36,7 +37,9 @@
 _logger = logging.getLogger(__name__)
 
 
-MSG_WALLET_NO_ACCESS_ERROR = "User {user_id} does not have necessary permissions to do a payment into wallet {wallet_id}"
+MSG_WALLET_NO_ACCESS_ERROR = user_message(
+    "User {user_id} does not have necessary permissions to do a payment into wallet {wallet_id}"
+)
 _FAKE_PAYMENT_TRANSACTION_ID_PREFIX = "fpt"
 
 

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

@@ -1,9 +1,11 @@
 from typing import Final
 
+from common_library.user_messages import user_message
+
 APP_RABBITMQ_CONSUMERS_KEY: Final[str] = f"{__name__}.rabbit_consumers"
 
-MSG_RESOURCE_USAGE_TRACKER_SERVICE_UNAVAILABLE: Final[
-    str
-] = "Currently resource usage tracker service is unavailable, please try again later"
+MSG_RESOURCE_USAGE_TRACKER_SERVICE_UNAVAILABLE: Final[str] = user_message(
+    "Currently resource usage tracker service is unavailable, please try again later"
+)
 
-MSG_RESOURCE_USAGE_TRACKER_NOT_FOUND: Final[str] = "Not Found"
+MSG_RESOURCE_USAGE_TRACKER_NOT_FOUND: Final[str] = user_message("Not Found")

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

@@ -1,7 +1,8 @@
 from typing import Final
+
 from common_library.user_messages import user_message
 
-MSG_UNAUTHORIZED: Final[str] = "Unauthorized"
+MSG_UNAUTHORIZED: Final[str] = user_message("Unauthorized")
 MSG_AUTH_NOT_AVAILABLE: Final[str] = user_message(
     "Authentication service is temporary unavailable"
 )

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

@@ -1,33 +1,39 @@
 from typing import Final
 
+from common_library.user_messages import user_message
+
 #
 # NOTE: MSG_$(ERROR_CODE_NAME) strings MUST be human readable messages
 #       Please keep alphabetical order
 #
 
-MSG_PROJECT_NOT_FOUND: Final[str] = "Cannot find any study with ID '{project_id}'"
+MSG_PROJECT_NOT_FOUND: Final[str] = user_message(
+    "Cannot find any study with ID '{project_id}'"
+)
 
 # This error happens when the linked study ID does not exists OR is not shared with everyone
-MSG_PROJECT_NOT_PUBLISHED: Final[str] = "Cannot find any study with ID '{project_id}'"
+MSG_PROJECT_NOT_PUBLISHED: Final[str] = user_message(
+    "Cannot find any study with ID '{project_id}'"
+)
 
 # This error happens when the linked study ID does not exists OR is not shared with everyone OR is NOT public
-MSG_PUBLIC_PROJECT_NOT_PUBLISHED: Final[str] = (
+MSG_PUBLIC_PROJECT_NOT_PUBLISHED: Final[str] = user_message(
     "Only available for registered users.<br/><br/>"
     "Please login and try again.<br/><br/>"
     "If you don't have an account, please request one at {support_email}<br/><br/>"
 )
 
-MSG_GUESTS_NOT_ALLOWED: Final[str] = (
+MSG_GUESTS_NOT_ALLOWED: Final[str] = user_message(
     "Access restricted to registered users.<br/><br/>"
     "If you don't have an account, please email to support and request one<br/><br/>"
 )
 
-MSG_TOO_MANY_GUESTS: Final[str] = (
+MSG_TOO_MANY_GUESTS: Final[str] = user_message(
     "We have reached the maximum of anonymous users allowed the platform. "
     "Please try later or login with a registered account."
 )
 
-MSG_UNEXPECTED_DISPATCH_ERROR: Final[str] = (
+MSG_UNEXPECTED_DISPATCH_ERROR: Final[str] = user_message(
     "Sorry, but looks like something unexpected went wrong!"
     "We track these errors automatically, but if the problem persists feel free to contact us."
     "In the meantime, try refreshing."

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

@@ -6,6 +6,7 @@
 from typing import Final, NamedTuple
 
 from aiohttp.web_exceptions import HTTPTooManyRequests
+from common_library.user_messages import user_message
 from models_library.rest_error import EnvelopedError, ErrorGet
 from servicelib.aiohttp import status
 
@@ -15,7 +16,7 @@ class RateLimitSetup(NamedTuple):
     interval_seconds: float
 
 
-MSG_TOO_MANY_REQUESTS: Final[str] = (
+MSG_TOO_MANY_REQUESTS: Final[str] = user_message(
     "Requests are being made too frequently. Please wait a moment before trying again."
 )