Merge branch 'is8159/fix-redis-client-lifecycle' of github.com:giancarloromeo/osparc-simcore into is8159/fix-redis-client-lifecycle

Author: giancarloromeo

packages/common-library/src/common_library/pydantic_fields_extension.py

@@ -1,22 +1,36 @@
 from types import UnionType
-from typing import Any, Literal, get_args, get_origin
+from typing import Annotated, Any, Literal, Union, get_args, get_origin
 
 from pydantic.fields import FieldInfo
 
+NoneType: type = type(None)
+
 
 def get_type(info: FieldInfo) -> Any:
     field_type = info.annotation
     if args := get_args(info.annotation):
-        field_type = next(a for a in args if a is not type(None))
+        field_type = next(a for a in args if a is not NoneType)
     return field_type
 
 
+def _unwrap_annotation(ann):
+    """Peel off Annotated wrappers until reaching the core type."""
+    while get_origin(ann) is Annotated:
+        ann = get_args(ann)[0]
+    return ann
+
+
 def is_literal(info: FieldInfo) -> bool:
-    return get_origin(info.annotation) is Literal
+    ann = _unwrap_annotation(info.annotation)
+    return get_origin(ann) is Literal
 
 
 def is_nullable(info: FieldInfo) -> bool:
-    origin = get_origin(info.annotation)  # X | None or Optional[X] will return Union
-    if origin is UnionType:
-        return any(x in get_args(info.annotation) for x in (type(None), Any))
-    return False
+    """Checks whether a field allows None as a value."""
+    ann = _unwrap_annotation(info.annotation)
+    origin = get_origin(ann)  # X | None or Optional[X] will return Union
+
+    if origin in (Union, UnionType):
+        return any(arg is NoneType or arg is Any for arg in get_args(ann))
+
+    return ann is NoneType or ann is Any

packages/common-library/tests/test_pydantic_fields_extension.py

@@ -1,9 +1,9 @@
 from collections.abc import Callable
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
 import pytest
 from common_library.pydantic_fields_extension import get_type, is_literal, is_nullable
-from pydantic import BaseModel
+from pydantic import BaseModel, PositiveInt
 
 
 class MyModel(BaseModel):
@@ -12,6 +12,11 @@ class MyModel(BaseModel):
     c: str = "bla"
     d: bool | None = None
     e: Literal["bla"]
+    f: Annotated[
+        PositiveInt | None,
+        "nullable inside Annotated (PositiveInt = Annotated[int, ...])",
+    ]
+    g: Annotated[Literal["foo", "bar"], "literal inside Annotated"]
 
 
 @pytest.mark.parametrize(
@@ -50,6 +55,8 @@ class MyModel(BaseModel):
         ),
         (is_literal, False, "d"),
         (is_literal, True, "e"),
+        (is_literal, False, "f"),
+        (is_literal, True, "g"),
         (
             is_nullable,
             False,
@@ -67,6 +74,11 @@ class MyModel(BaseModel):
         ),
         (is_nullable, True, "d"),
         (is_nullable, False, "e"),
+        (
+            is_nullable,
+            True,
+            "f",
+        ),
     ],
 )
 def test_field_fn(fn: Callable[[Any], Any], expected: Any, name: str):

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -24,7 +24,7 @@
 
 from ..basic_types import IDStr
 from ..emails import LowerCaseEmailStr
-from ..groups import AccessRightsDict, Group, GroupID, GroupsByTypeTuple
+from ..groups import AccessRightsDict, Group, GroupID, GroupsByTypeTuple, PrimaryGroupID
 from ..products import ProductName
 from ..rest_base import RequestParameters
 from ..users import (
@@ -381,14 +381,32 @@ class UserAccountGet(OutputSchema):
 
     # user status
     registered: bool
-    status: UserStatus | None
+    status: UserStatus | None = None
     products: Annotated[
         list[ProductName] | None,
         Field(
             description="List of products this users is included or None if fields is unset",
         ),
     ] = None
 
+    # user (if an account was created)
+    user_id: Annotated[
+        UserID | None,
+        Field(description="Unique identifier of the user if an account was created"),
+    ] = None
+    user_name: Annotated[
+        UserNameID | None,
+        Field(description="Username of the user if an account was created"),
+    ] = None
+    user_primary_group_id: Annotated[
+        PrimaryGroupID | None,
+        Field(
+            description="Primary group ID of the user if an account was created",
+            alias="groupId",
+            # SEE https://github.com/ITISFoundation/osparc-simcore/pull/8358#issuecomment-3279491740
+        ),
+    ] = None
+
     @field_validator("status")
     @classmethod
     def _consistency_check(cls, v, info: ValidationInfo):

packages/models-library/src/models_library/groups.py

@@ -15,12 +15,14 @@
 EVERYONE_GROUP_ID: Final[int] = 1
 
 GroupID: TypeAlias = PositiveInt
+PrimaryGroupID: TypeAlias = Annotated[GroupID, Field(gt=EVERYONE_GROUP_ID)]
+StandardGroupID: TypeAlias = Annotated[GroupID, Field(gt=EVERYONE_GROUP_ID)]
 
 __all__: tuple[str, ...] = ("GroupType",)
 
 
 class Group(BaseModel):
-    gid: PositiveInt
+    gid: GroupID
     name: str
     description: str
     group_type: Annotated[GroupType, Field(alias="type")]

services/static-webserver/client/source/class/osparc/NewRelease.js

@@ -73,7 +73,7 @@ qx.Class.define("osparc.NewRelease", {
       const releaseTag = osparc.utils.Utils.getReleaseTag();
       const releaseLink = osparc.utils.Utils.getReleaseLink();
       const linkLabel = new osparc.ui.basic.LinkLabel().set({
-        value: this.tr("What's new in ") + releaseTag,
+        value: this.tr("What's New in ") + releaseTag,
         url: releaseLink,
         font: "link-label-14"
       });

services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js

@@ -54,16 +54,12 @@ qx.Class.define("osparc.dashboard.Dashboard", {
     osparc.wrapper.JsonTreeViewer.getInstance().init();
     osparc.wrapper.JsonFormatter.getInstance().init();
     osparc.wrapper.DOMPurify.getInstance().init();
-    osparc.wrapper.RadialMenu.getInstance().init()
-      .then(loaded => {
-        if (loaded) {
-          // hack to trigger fonts loading
-          const menu = osparc.wrapper.RadialMenu.getInstance().createMenu();
-          menu.show();
-          menu.hide();
-        }
-      });
+    osparc.wrapper.RadialMenu.getInstance().init();
+
     this.__createMainViewLayout();
+
+
+    qx.event.message.Bus.getInstance().subscribe("showTab", msg => this.showTab(msg.getData()), this);
   },
 
   properties: {
@@ -99,6 +95,13 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       return this.__appBrowser;
     },
 
+    showTab: function(tabId) {
+      const tabFound = this.getSelectables().find(s => s.id === tabId);
+      if (tabFound) {
+        this.setSelection([tabFound]);
+      }
+    },
+
     __createMainViewLayout: function() {
       const permissions = osparc.data.Permissions.getInstance();
       const tabIconSize = 20;

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -356,20 +356,24 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
             }
           }
 
-          // Show Quick Start if there are no studies in the root folder of the personal workspace
-          const quickStartInfo = osparc.product.quickStart.Utils.getQuickStart();
-          if (quickStartInfo) {
-            const dontShowQuickStart = osparc.utils.Utils.localCache.getLocalStorageItem(quickStartInfo.localStorageStr);
-            if (dontShowQuickStart === "true" || this.__dontQuickStart) {
-              return;
-            }
-            const nStudies = "_meta" in resp ? resp["_meta"]["total"] : 0;
-            if (
-              nStudies === 0 &&
-              this.getCurrentContext() === osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS &&
-              this.getCurrentWorkspaceId() === null &&
-              this.getCurrentFolderId() === null
-            ) {
+          // Check if this is the first time the user logged in
+          const nStudies = "_meta" in resp ? resp["_meta"]["total"] : 0;
+          if (
+            nStudies === 0 &&
+            this.getCurrentContext() === osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS &&
+            this.getCurrentWorkspaceId() === null &&
+            this.getCurrentFolderId() === null
+          ) {
+            // It is!
+            // Open Support Center
+            osparc.support.SupportCenter.openWindow();
+            // and open the Introductory Quick Start if any
+            const quickStartInfo = osparc.product.quickStart.Utils.getQuickStart();
+            if (quickStartInfo) {
+              const dontShowQuickStart = osparc.utils.Utils.localCache.getLocalStorageItem(quickStartInfo.localStorageStr);
+              if (dontShowQuickStart === "true" || this.__dontQuickStart) {
+                return;
+              }
               const quickStartWindow = quickStartInfo.tutorial();
               quickStartWindow.center();
               quickStartWindow.open();

services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js

@@ -116,6 +116,9 @@ qx.Class.define("osparc.data.model.IframeHandler", {
 
     __initIFrame: function() {
       const iframe = new osparc.widget.PersistentIframe();
+      if (this.getNode().getKey().includes("s4l-ui")) {
+        iframe.getIframe().setAppearance("iframe-no-border");
+      }
       osparc.utils.Utils.setIdToWidget(iframe.getIframe(), "iframe_"+this.getNode().getNodeId());
       this.self().evalShowToolbar(iframe, this.getStudy());
       iframe.addListener("restart", () => this.restartIFrame(), this);

services/static-webserver/client/source/class/osparc/desktop/account/ProfilePage.js

@@ -58,7 +58,7 @@ qx.Class.define("osparc.desktop.account.ProfilePage", {
     },
 
     createSectionBox: function(title) {
-      const box = osparc.ui.window.TabbedView.createSectionBox(title).set({
+      const box = new osparc.widget.SectionBox(title).set({
         alignX: "left",
         maxWidth: 500
       });
@@ -337,9 +337,7 @@ qx.Class.define("osparc.desktop.account.ProfilePage", {
       const privacyModel = this.__userPrivacyModel = qx.data.marshal.Json.createModel(defaultModel, true);
 
       const box = this.self().createSectionBox(this.tr("Privacy"));
-
-      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("Choose what others see."));
-      box.add(label);
+      box.addHelper(this.tr("Choose what others see."));
 
       const hideUserName = new qx.ui.form.CheckBox().set({
         value: defaultModel.hideUserName
@@ -453,9 +451,7 @@ qx.Class.define("osparc.desktop.account.ProfilePage", {
 
     __create2FASection: function() {
       const box = this.self().createSectionBox(this.tr("Two-Factor Authentication"));
-
-      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("Set your preferred method to use for two-factor authentication when signing in:"));
-      box.add(label);
+      box.addHelper(this.tr("Set your preferred method to use for two-factor authentication when signing in:"));
 
       const form = new qx.ui.form.Form();
 
@@ -659,9 +655,7 @@ qx.Class.define("osparc.desktop.account.ProfilePage", {
     __createDeleteAccount: function() {
       // layout
       const box = this.self().createSectionBox(this.tr("Delete Account"));
-
-      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("Request the deletion of your account."));
-      box.add(label);
+      box.addHelper(this.tr("Request the deletion of your account."));
 
       const deleteBtn = new qx.ui.form.Button(this.tr("Delete Account")).set({
         appearance: "danger-button",

services/static-webserver/client/source/class/osparc/desktop/credits/BuyCreditsStepper.js

@@ -68,7 +68,7 @@ qx.Class.define("osparc.desktop.credits.BuyCreditsStepper", {
               const { paymentId, paymentFormUrl } = data;
               this.setPaymentId(paymentId)
               this.__iframe = new qx.ui.embed.Iframe(paymentFormUrl).set({
-                decorator: "no-border-2"
+                decorator: "no-border-0"
               });
               this.add(this.__iframe);
               this.setSelection([this.__iframe])