Merge branch 'master' into fix/ui-pre-registration

Author: pcrespov

packages/service-library/tests/deferred_tasks/test_deferred_tasks.py

@@ -9,7 +9,7 @@
 import random
 import sys
 from collections.abc import AsyncIterable, AsyncIterator, Awaitable, Callable
-from contextlib import AbstractAsyncContextManager, AsyncExitStack
+from contextlib import AbstractAsyncContextManager, AsyncExitStack, suppress
 from pathlib import Path
 from typing import Any, Protocol
 
@@ -60,10 +60,12 @@ async def stop(self, *, graceful: bool = False):
             assert self.process is not None
             assert self.pid is not None
 
-        parent = psutil.Process(self.pid)
-        children = parent.children(recursive=True)
-        for child_pid in [child.pid for child in children]:
-            psutil.Process(child_pid).kill()
+        with suppress(psutil.NoSuchProcess):
+            parent = psutil.Process(self.pid)
+            children = parent.children(recursive=True)
+            for child_pid in [child.pid for child in children]:
+                with suppress(psutil.NoSuchProcess):
+                    psutil.Process(child_pid).kill()
 
         self.process = None
         self.pid = None

services/static-webserver/client/source/class/osparc/announcement/AnnouncementUIFactory.js

@@ -30,7 +30,7 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
   },
 
   statics: {
-    createLoginAnnouncement: function(title, text) {
+    createLoginAnnouncement: function(title, description) {
       const loginAnnouncement = new qx.ui.container.Composite(new qx.ui.layout.VBox(5)).set({
         backgroundColor: "strong-main",
         alignX: "center",
@@ -46,22 +46,20 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
         const titleLabel = new qx.ui.basic.Label().set({
           value: title,
           font: "text-16",
-          textColor: "white",
           alignX: "center",
-          rich: true,
-          wrap: true
+          textAlign: "center",
+          rich: true
         });
         loginAnnouncement.add(titleLabel);
       }
 
-      if (text) {
+      if (description) {
         const descriptionLabel = new qx.ui.basic.Label().set({
-          value: text,
+          value: description,
           font: "text-14",
-          textColor: "white",
           alignX: "center",
-          rich: true,
-          wrap: true
+          textAlign: "center",
+          rich: true
         });
         loginAnnouncement.add(descriptionLabel);
       }
@@ -75,16 +73,12 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
 
     __isValid: function(widgetType) {
       const announcement = this.getAnnouncement();
-
-      const now = new Date();
-      if (
-        announcement &&
-        announcement.getProducts().includes(osparc.product.Utils.getProductName()) &&
-        announcement.getWidgets().includes(widgetType) &&
-        now > announcement.getStart() &&
-        now < announcement.getEnd()
-      ) {
-        return true;
+      if (announcement) {
+        const now = new Date();
+        const validPeriod = now > announcement.getStart() && now < announcement.getEnd();
+        const validProduct = announcement.getProducts().includes(osparc.product.Utils.getProductName());
+        const validWidgetType = widgetType ? announcement.getWidgets().includes(widgetType) : true;
+        return validPeriod && validProduct && validWidgetType;
       }
       return false;
     },
@@ -124,8 +118,10 @@ qx.Class.define("osparc.announcement.AnnouncementUIFactory", {
         return;
       }
 
-      let text = announcement.getTitle() + ": ";
-      text += announcement.getDescription();
+      let text = announcement.getTitle();
+      if (announcement.getDescription()) {
+        text += ": " + announcement.getDescription();
+      }
 
       const ribbonAnnouncement = this.__ribbonAnnouncement = new osparc.notification.RibbonNotification(text, "announcement", true);
       ribbonAnnouncement.announcementId = announcement.getId();

services/static-webserver/client/source/class/osparc/auth/ui/LoginView.js

@@ -45,8 +45,7 @@ qx.Class.define("osparc.auth.ui.LoginView", {
         this.addAt(announcementUIFactory.createLoginAnnouncement(), 0);
       } else {
         announcementUIFactory.addListenerOnce("changeAnnouncement", e => {
-          const announcement = e.getData();
-          if (announcement) {
+          if (announcementUIFactory.hasLoginAnnouncement()) {
             this.addAt(announcementUIFactory.createLoginAnnouncement(), 0);
           }
         });

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

@@ -370,6 +370,7 @@ async def get_service_resources(request: Request):
 )
 @login_required
 @permission_required("services.catalog.*")
+@_handlers_errors.reraise_catalog_exceptions_as_http_errors
 async def get_service_pricing_plan(request: Request):
     ctx = CatalogRequestContext.create(request)
     path_params = parse_request_path_parameters_as(ServicePathParams, request)

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

@@ -3,6 +3,7 @@
 from aiohttp import web
 from servicelib.aiohttp.typing_extension import Handler
 
+from ..resource_usage.errors import DefaultPricingPlanNotFoundError
 from .exceptions import (
     CatalogForbiddenError,
     CatalogItemNotFoundError,
@@ -19,6 +20,7 @@ async def _wrapper(request: web.Request) -> web.StreamResponse:
 
         except (
             CatalogItemNotFoundError,
+            DefaultPricingPlanNotFoundError,
             DefaultPricingUnitForServiceNotFoundError,
         ) as exc:
             raise web.HTTPNotFound(reason=f"{exc}") from exc

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

@@ -68,6 +68,7 @@
 from ..groups.exceptions import GroupNotFoundError
 from ..login.decorators import login_required
 from ..projects.api import has_user_project_access_rights
+from ..resource_usage.errors import DefaultPricingPlanNotFoundError
 from ..security.decorators import permission_required
 from ..users.api import get_user_id_from_gid, get_user_role
 from ..users.exceptions import UserDefaultWalletNotFoundError
@@ -101,6 +102,7 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
             ProjectNotFoundError,
             NodeNotFoundError,
             UserDefaultWalletNotFoundError,
+            DefaultPricingPlanNotFoundError,
             DefaultPricingUnitNotFoundError,
             GroupNotFoundError,
             CatalogItemNotFoundError,

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

@@ -29,6 +29,7 @@
 from ..login.decorators import login_required
 from ..notifications import project_logs
 from ..products.api import Product, get_current_product
+from ..resource_usage.errors import DefaultPricingPlanNotFoundError
 from ..security.decorators import permission_required
 from ..users import api
 from ..users.exceptions import UserDefaultWalletNotFoundError
@@ -37,6 +38,7 @@
 from . import projects_api
 from ._common_models import ProjectPathParams, RequestContext
 from .exceptions import (
+    DefaultPricingUnitNotFoundError,
     ProjectInvalidRightsError,
     ProjectNotFoundError,
     ProjectStartsTooManyDynamicNodesError,
@@ -57,7 +59,12 @@ async def _wrapper(request: web.Request) -> web.StreamResponse:
         try:
             return await handler(request)
 
-        except (ProjectNotFoundError, UserDefaultWalletNotFoundError) as exc:
+        except (
+            ProjectNotFoundError,
+            UserDefaultWalletNotFoundError,
+            DefaultPricingPlanNotFoundError,
+            DefaultPricingUnitNotFoundError,
+        ) as exc:
             raise web.HTTPNotFound(reason=f"{exc}") from exc
 
         except ProjectInvalidRightsError as exc:

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

@@ -23,11 +23,13 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import NonNegativeInt, parse_obj_as
+from servicelib.aiohttp import status
 from servicelib.aiohttp.client_session import get_client_session
 from settings_library.resource_usage_tracker import ResourceUsageTrackerSettings
 from yarl import URL
 
 from ._utils import handle_client_exceptions
+from .errors import DefaultPricingPlanNotFoundError
 from .settings import get_plugin_settings
 
 _logger = logging.getLogger(__name__)
@@ -95,10 +97,15 @@ async def get_default_service_pricing_plan(
         }
     )
     with handle_client_exceptions(app) as session:
-        async with session.get(url) as response:
-            response.raise_for_status()
-            body: dict = await response.json()
-            return parse_obj_as(PricingPlanGet, body)
+        try:
+            async with session.get(url) as response:
+                response.raise_for_status()
+                body: dict = await response.json()
+                return parse_obj_as(PricingPlanGet, body)
+        except ClientResponseError as e:
+            if e.status == status.HTTP_404_NOT_FOUND:
+                raise DefaultPricingPlanNotFoundError from e
+            raise
 
 
 async def get_pricing_plan_unit(

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

@@ -0,0 +1,9 @@
+from ..errors import WebServerBaseError
+
+
+class ResourceUsageValueError(WebServerBaseError, ValueError):
+    ...
+
+
+class DefaultPricingPlanNotFoundError(ResourceUsageValueError):
+    msg_template = "Default pricing plan not found"