Merge branch 'master' into fix/reevaluate-study-menu-buttons

mergify[bot] · web-flow · commit afed37044108 · 2025-06-05T07:59:23.000Z
diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/file_io_utils.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/file_io_utils.py
@@ -10,6 +10,7 @@
 from aiohttp import (
     ClientConnectionError,
     ClientError,
+    ClientPayloadError,
     ClientResponse,
     ClientResponseError,
     ClientSession,
@@ -31,11 +32,7 @@
 from tenacity.after import after_log
 from tenacity.asyncio import AsyncRetrying
 from tenacity.before_sleep import before_sleep_log
-from tenacity.retry import (
-    retry_if_exception,
-    retry_if_exception_type,
-    retry_if_not_exception_type,
-)
+from tenacity.retry import retry_if_exception, retry_if_exception_type
 from tenacity.stop import stop_after_attempt
 from tenacity.wait import wait_exponential
 from tqdm import tqdm
@@ -157,7 +154,7 @@ async def _file_chunk_writer(
     progress_bar: ProgressBarData,
 ):
     async with aiofiles.open(file, "wb") as file_pointer:
-        async for chunk in response.content.iter_chunked(CHUNK_SIZE):
+        while chunk := await response.content.read(CHUNK_SIZE):
             await file_pointer.write(chunk)
             if io_log_redirect_cb and pbar.update(len(chunk)):
                 with log_catch(_logger, reraise=False):
@@ -184,28 +181,25 @@ async def download_link_to_file(
     progress_bar: ProgressBarData,
 ):
     _logger.debug("Downloading from %s to %s", url, file_path)
-    try:
-        async for attempt in AsyncRetrying(
-            reraise=True,
-            wait=wait_exponential(min=1, max=10),
-            stop=stop_after_attempt(num_retries),
-            retry=retry_if_not_exception_type(
-                (exceptions.InvalidDownloadLinkError, exceptions.TransferError)
-            ),
-            before_sleep=before_sleep_log(_logger, logging.WARNING, exc_info=True),
-            after=after_log(_logger, log_level=logging.ERROR),
-        ):
-            with attempt:
-                async with AsyncExitStack() as stack:
-                    response = await stack.enter_async_context(session.get(url))
-                    if response.status == status.HTTP_404_NOT_FOUND:
-                        raise exceptions.InvalidDownloadLinkError(url)
-                    if response.status > _VALID_HTTP_STATUS_CODES:
-                        raise exceptions.TransferError(url)
-                    file_path.parent.mkdir(parents=True, exist_ok=True)
-                    # SEE https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Length
-                    file_size = int(response.headers.get("Content-Length", 0)) or None
-
+    async for attempt in AsyncRetrying(
+        reraise=True,
+        wait=wait_exponential(min=1, max=10),
+        stop=stop_after_attempt(num_retries),
+        retry=retry_if_exception_type(ClientConnectionError),
+        before_sleep=before_sleep_log(_logger, logging.WARNING, exc_info=True),
+        after=after_log(_logger, log_level=logging.ERROR),
+    ):
+        with attempt:
+            async with AsyncExitStack() as stack:
+                response = await stack.enter_async_context(session.get(url))
+                if response.status == status.HTTP_404_NOT_FOUND:
+                    raise exceptions.InvalidDownloadLinkError(url)
+                if response.status > _VALID_HTTP_STATUS_CODES:
+                    raise exceptions.TransferError(url)
+                file_path.parent.mkdir(parents=True, exist_ok=True)
+                # SEE https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Length
+                file_size = int(response.headers.get("Content-Length", 0)) or None
+                try:
                     tqdm_progress = stack.enter_context(
                         tqdm_logging_redirect(
                             desc=f"downloading {url.path} --> {file_path.name}\n",
@@ -237,8 +231,8 @@ async def download_link_to_file(
                         sub_progress,
                     )
                     _logger.debug("Download complete")
-    except Exception as exc:
-        raise exceptions.TransferError(url) from exc
+                except ClientPayloadError as exc:
+                    raise exceptions.TransferError(url) from exc
 
 
 def _check_for_aws_http_errors(exc: BaseException) -> bool:
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
@@ -1385,10 +1385,12 @@ services:
       - "--metrics.prometheus.entryPoint=metrics"
       - "--entryPoints.http.address=:80"
       - "--entryPoints.http.forwardedHeaders.insecure"
-      - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805      - "--entryPoints.simcore_api.address=:10081"
+      - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file uploads
+      - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file downloads
       - "--entryPoints.simcore_api.address=:10081"
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
-      - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
+      - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file uploads
+      - "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805 large file downloads
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
       - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
@@ -1401,6 +1403,14 @@ services:
       - "--tracing.addinternals"
       - "--tracing.otlp=true"
       - "--tracing.otlp.http=true"
+    healthcheck:
+      # NOTE: this healthcheck to check if traefik is up and running must be run on the ping entrypoint defined in command!
+      test: traefik healthcheck --ping --ping.entryPoint=ping --entryPoints.ping.address=:9082
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+      start_interval: 1s
     volumes:
       # So that Traefik can listen to the Docker events
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/services/static-webserver/client/source/class/osparc/editor/HtmlEditor.js b/services/static-webserver/client/source/class/osparc/editor/HtmlEditor.js
@@ -26,8 +26,7 @@ qx.Class.define("osparc.editor.HtmlEditor", {
 
     this.getChildControl("preview-html");
     this.getChildControl("subtitle").set({
-      value: this.tr("Supports HTML"),
-      url: "https://en.wikipedia.org/wiki/HTML",
+      value: this.tr("Supports HTML")
     });
   },
 
diff --git a/services/static-webserver/client/source/class/osparc/editor/MarkdownEditor.js b/services/static-webserver/client/source/class/osparc/editor/MarkdownEditor.js
@@ -31,8 +31,7 @@ qx.Class.define("osparc.editor.MarkdownEditor", {
 
     this.getChildControl("preview-markdown");
     this.getChildControl("subtitle").set({
-      value: this.tr("Markdown supported"),
-      url: "https://en.wikipedia.org/wiki/Markdown",
+      value: this.tr("Markdown supported")
     });
   },
 
diff --git a/services/static-webserver/client/source/class/osparc/editor/TextEditor.js b/services/static-webserver/client/source/class/osparc/editor/TextEditor.js
@@ -81,13 +81,15 @@ qx.Class.define("osparc.editor.TextEditor", {
           writePage.add(control, {
             flex: 1
           });
-          const subtitle = this.getChildControl("subtitle");
+          const subtitle = this.getChildControl("subtitle").set({
+            value: this.tr("Supports HTML")
+          });
           writePage.add(subtitle);
           tabs.add(writePage);
           break;
         }
         case "subtitle":
-          control = new osparc.ui.basic.LinkLabel().set({
+          control = new qx.ui.basic.Label().set({
             font: "text-12"
           });
           this._add(control);
diff --git a/services/static-webserver/client/source/class/osparc/info/CommentUI.js b/services/static-webserver/client/source/class/osparc/info/CommentUI.js
@@ -113,8 +113,10 @@ qx.Class.define("osparc.info.CommentUI", {
 
     __buildLayout: function() {
       const thumbnail = this.getChildControl("thumbnail");
+      thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail("", "", 32));
 
       const userName = this.getChildControl("user-name");
+      userName.setValue("Unknown");
 
       const date = new Date(this.__comment["modified"]);
       const date2 = osparc.utils.Utils.formatDateAndTime(date);
@@ -129,14 +131,7 @@ qx.Class.define("osparc.info.CommentUI", {
           if (user) {
             thumbnail.setSource(user.getThumbnail());
             userName.setValue(user.getLabel());
-          } else {
-            thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
-            userName.setValue("Unknown user");
           }
-        })
-        .catch(() => {
-            thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
-            userName.setValue("Unknown user");
         });
 
       this.getChildControl("spacer");
diff --git a/services/static-webserver/client/source/class/osparc/utils/Avatar.js b/services/static-webserver/client/source/class/osparc/utils/Avatar.js
@@ -34,7 +34,12 @@ qx.Class.define("osparc.utils.Avatar", {
   type: "static",
 
   statics: {
-    emailToThumbnail: function(email = "", username = "??", size = 32) {
+    emailToThumbnail: function(email, username) {
+      return this.__getUrl(email, username, 32);
+    },
+
+    __getUrl: function(email, username, size = 100) {
+      email = email || "";
       // MD5 (Message-Digest Algorithm) by WebToolkit
       const MD5 = function(s) {
         function L(k, d) {
diff --git a/services/static-webserver/client/source/resource/osparc/ui_config.json b/services/static-webserver/client/source/resource/osparc/ui_config.json
@@ -156,11 +156,6 @@
         "title": "${replace_me_product_name}",
         "newStudyLabel": "New Project",
         "idToWidget": "startS4LButton"
-      }, {
-        "resourceType": "service",
-        "expectedKey": "simcore/services/dynamic/s4l-ui-framework",
-        "title": "Sim4Life.framework",
-        "newStudyLabel": "Sim4Life.framework"
       }]
     }
   },
diff --git a/services/web/server/src/simcore_service_webserver/catalog/_catalog_rest_client_service.py b/services/web/server/src/simcore_service_webserver/catalog/_catalog_rest_client_service.py
@@ -21,13 +21,15 @@
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from pydantic import TypeAdapter
-from servicelib.aiohttp import status
 from servicelib.aiohttp.client_session import get_client_session
 from servicelib.rest_constants import X_PRODUCT_NAME_HEADER
+from simcore_service_webserver.catalog.errors import (
+    CatalogConnectionError,
+    CatalogResponseError,
+)
 from yarl import URL
 
 from .._meta import api_version_prefix
-from ._constants import MSG_CATALOG_SERVICE_NOT_FOUND, MSG_CATALOG_SERVICE_UNAVAILABLE
 from .settings import CatalogSettings, get_plugin_settings
 
 _logger = logging.getLogger(__name__)
@@ -51,16 +53,17 @@ def _handle_client_exceptions(app: web.Application) -> Iterator[ClientSession]:
         yield session
 
     except ClientResponseError as err:
-        if err.status == status.HTTP_404_NOT_FOUND:
-            raise web.HTTPNotFound(text=MSG_CATALOG_SERVICE_NOT_FOUND) from err
-        raise web.HTTPServiceUnavailable(
-            reason=MSG_CATALOG_SERVICE_UNAVAILABLE
+        raise CatalogResponseError(
+            status=err.status,
+            message=err.message,
+            headers=err.headers,
+            request_info=err.request_info,
         ) from err
 
     except (TimeoutError, ClientConnectionError) as err:
-        _logger.debug("Request to catalog service failed: %s", err)
-        raise web.HTTPServiceUnavailable(
-            reason=MSG_CATALOG_SERVICE_UNAVAILABLE
+        raise CatalogConnectionError(
+            message=str(err),
+            request_info=getattr(err, "request_info", None),
         ) from err
 
 
diff --git a/services/web/server/src/simcore_service_webserver/catalog/_constants.py b/services/web/server/src/simcore_service_webserver/catalog/_constants.py
@@ -1,7 +1,12 @@
 from typing import Final
 
-MSG_CATALOG_SERVICE_UNAVAILABLE: Final[
-    str
-] = "Currently catalog service is unavailable, please try again later"
+from ..constants import MSG_TRY_AGAIN_OR_SUPPORT
+
+MSG_CATALOG_SERVICE_UNAVAILABLE: Final[str] = (
+    # 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
+)
+
 
 MSG_CATALOG_SERVICE_NOT_FOUND: Final[str] = "Not Found"
diff --git a/services/web/server/src/simcore_service_webserver/catalog/_controller_rest_exceptions.py b/services/web/server/src/simcore_service_webserver/catalog/_controller_rest_exceptions.py
@@ -1,26 +1,96 @@
 """Defines the different exceptions that may arise in the catalog subpackage"""
 
+import logging
+
+from aiohttp import web
+from common_library.error_codes import create_error_code
+from models_library.rest_error import ErrorGet
 from servicelib.aiohttp import status
+from servicelib.logging_errors import create_troubleshotting_log_kwargs
+from servicelib.rabbitmq._errors import RemoteMethodNotRegisteredError
 from servicelib.rabbitmq.rpc_interfaces.catalog.errors import (
     CatalogForbiddenError,
     CatalogItemNotFoundError,
 )
 
 from ..exception_handling import (
+    ExceptionHandlersMap,
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
+    create_error_context_from_request,
+    create_error_response,
     exception_handling_decorator,
     to_exceptions_handlers_map,
 )
 from ..resource_usage.errors import DefaultPricingPlanNotFoundError
-from .errors import DefaultPricingUnitForServiceNotFoundError
+from ._constants import MSG_CATALOG_SERVICE_NOT_FOUND, MSG_CATALOG_SERVICE_UNAVAILABLE
+from .errors import (
+    CatalogConnectionError,
+    CatalogResponseError,
+    DefaultPricingUnitForServiceNotFoundError,
+)
 
 # mypy: disable-error-code=truthy-function
 assert CatalogForbiddenError  # nosec
 assert CatalogItemNotFoundError  # nosec
 
 
+_logger = logging.getLogger(__name__)
+
+
+async def _handler_catalog_client_errors(
+    request: web.Request, exception: Exception
+) -> web.Response:
+
+    assert isinstance(  # nosec
+        exception, CatalogResponseError | CatalogConnectionError
+    ), f"check mapping, got {exception=}"
+
+    if (
+        isinstance(exception, CatalogResponseError)
+        and exception.status == status.HTTP_404_NOT_FOUND
+    ):
+        error = ErrorGet(
+            status=status.HTTP_404_NOT_FOUND,
+            message=MSG_CATALOG_SERVICE_NOT_FOUND,
+        )
+
+    else:
+        # NOTE: The remaining errors are mapped to 503
+        status_code = status.HTTP_503_SERVICE_UNAVAILABLE
+        user_msg = MSG_CATALOG_SERVICE_UNAVAILABLE
+
+        # Log for further investigation
+        oec = create_error_code(exception)
+        _logger.exception(
+            **create_troubleshotting_log_kwargs(
+                user_msg,
+                error=exception,
+                error_code=oec,
+                error_context={
+                    **create_error_context_from_request(request),
+                    "error_code": oec,
+                },
+            )
+        )
+        error = ErrorGet.model_construct(
+            message=user_msg,
+            support_id=oec,
+            status=status_code,
+        )
+
+    return create_error_response(error, status_code=error.status)
+
+
 _TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
+    RemoteMethodNotRegisteredError: HttpErrorInfo(
+        status.HTTP_503_SERVICE_UNAVAILABLE,
+        MSG_CATALOG_SERVICE_UNAVAILABLE,
+    ),
+    CatalogForbiddenError: HttpErrorInfo(
+        status.HTTP_403_FORBIDDEN,
+        "Forbidden catalog access",
+    ),
     CatalogItemNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND,
         "Catalog item not found",
@@ -32,13 +102,17 @@
     DefaultPricingUnitForServiceNotFoundError: HttpErrorInfo(
         status.HTTP_404_NOT_FOUND, "Default pricing unit not found"
     ),
-    CatalogForbiddenError: HttpErrorInfo(
-        status.HTTP_403_FORBIDDEN, "Forbidden catalog access"
-    ),
 }
 
+
+_exceptions_handlers_map: ExceptionHandlersMap = {
+    CatalogResponseError: _handler_catalog_client_errors,
+    CatalogConnectionError: _handler_catalog_client_errors,
+}
+_exceptions_handlers_map.update(to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP))
+
 handle_plugin_requests_exceptions = exception_handling_decorator(
-    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
+    _exceptions_handlers_map
 )
 
 
diff --git a/services/web/server/src/simcore_service_webserver/catalog/errors.py b/services/web/server/src/simcore_service_webserver/catalog/errors.py
