Merge remote-tracking branch 'upstream/master' into pr-osparc-long-running-tasks-refactor-6

Author: Andrei Neagu

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

@@ -1,18 +1,18 @@
 # mypy: disable-error-code=truthy-function
 from typing import Annotated, Any, Literal, TypeAlias
 
-from models_library.groups import GroupID
-from models_library.projects import ProjectID
-from models_library.services_history import ServiceRelease
 from pydantic import ConfigDict, Field
 
 from ..access_rights import ExecutableAccessRights
 from ..api_schemas_directorv2.dynamic_services import RetrieveDataOut
 from ..basic_types import PortInt
+from ..groups import GroupID
+from ..projects import ProjectID
 from ..projects_nodes import InputID, InputsDict, PartialNode
 from ..projects_nodes_io import NodeID
 from ..services import ServiceKey, ServicePortKey, ServiceVersion
 from ..services_enums import ServiceState
+from ..services_history import ServiceRelease
 from ..services_resources import ServiceResourcesDict
 from ._base import InputSchemaWithoutCamelCase, OutputSchema
 

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

@@ -1,18 +1,17 @@
 """
-    Ownership and access rights
+Ownership and access rights
 """
 
 from enum import Enum
+from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict, Field
-from pydantic.types import PositiveInt
 
 from .basic_types import IDStr
-from .users import FirstNameStr, LastNameStr
+from .users import UserID
 
 
-class GroupIDStr(IDStr):
-    ...
+class GroupIDStr(IDStr): ...
 
 
 class AccessEnum(str, Enum):
@@ -22,26 +21,23 @@ class AccessEnum(str, Enum):
 
 
 class AccessRights(BaseModel):
-    read: bool = Field(..., description="has read access")
-    write: bool = Field(..., description="has write access")
-    delete: bool = Field(..., description="has deletion rights")
+    read: Annotated[bool, Field(description="has read access")]
+    write: Annotated[bool, Field(description="has write access")]
+    delete: Annotated[bool, Field(description="has deletion rights")]
 
     model_config = ConfigDict(extra="forbid")
 
 
 class Owner(BaseModel):
-    user_id: PositiveInt = Field(..., description="Owner's user id")
-    first_name: FirstNameStr | None = Field(..., description="Owner's first name")
-    last_name: LastNameStr | None = Field(..., description="Owner's last name")
+    user_id: Annotated[UserID, Field(description="Owner's user id")]
 
     model_config = ConfigDict(
         extra="forbid",
         json_schema_extra={
             "examples": [
-                # NOTE: None and empty string are both defining an undefined value
-                {"user_id": 1, "first_name": None, "last_name": None},
-                {"user_id": 2, "first_name": "", "last_name": ""},
-                {"user_id": 3, "first_name": "John", "last_name": "Smith"},
+                {"user_id": 1},
+                {"user_id": 42},
+                {"user_id": 666},
             ]
         },
     )

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

@@ -195,8 +195,6 @@ class ProjectLocked(BaseModel):
                     "status": ProjectStatus.OPENED,
                     "owner": {
                         "user_id": 123,
-                        "first_name": "Johnny",
-                        "last_name": "Cash",
                     },
                 },
             ]

packages/pytest-simcore/src/pytest_simcore/socketio_client.py

@@ -9,6 +9,7 @@
 import pytest
 import socketio
 from aiohttp.test_utils import TestClient
+from pytest_simcore.helpers.logging_tools import log_context
 from servicelib.aiohttp import status
 from yarl import URL
 
@@ -56,18 +57,19 @@ async def create_socketio_connection(
     security_cookie_factory: Callable[[TestClient | None], Awaitable[str]],
     client_session_id_factory: Callable[[], str],
 ) -> AsyncIterable[
-    Callable[[str | None, TestClient | None], Awaitable[socketio.AsyncClient]]
+    Callable[
+        [str | None, TestClient | None], Awaitable[tuple[socketio.AsyncClient, str]]
+    ]
 ]:
     clients: list[socketio.AsyncClient] = []
 
     async def _connect(
         client_session_id: str | None = None, client: TestClient | None = None
-    ) -> socketio.AsyncClient:
+    ) -> tuple[socketio.AsyncClient, str]:
         if client_session_id is None:
             client_session_id = client_session_id_factory()
 
         sio = socketio.AsyncClient(ssl_verify=False)
-        # enginio 3.10.0 introduced ssl verification
         assert client_session_id
         url = str(
             URL(socketio_url_factory(client)).with_query(
@@ -80,21 +82,27 @@ async def _connect(
             # WARNING: engineio fails with empty cookies. Expects "key=value"
             headers.update({"Cookie": cookie})
 
-        print(f"--> Connecting socketio client to {url} ...")
-        await sio.connect(url, headers=headers, wait_timeout=10)
-        assert sio.sid
-        print("... connection done")
+        with log_context(logging.INFO, f"socketio_client: connecting to {url}"):
+            print(f"--> Connecting socketio client to {url} ...")
+            sio.on(
+                "connect",
+                handler=lambda: logger.info("Connected successfully with %s", sio.sid),
+            )
+            sio.on(
+                "disconnect",
+                handler=lambda: logger.info("Disconnected from %s", sio.sid),
+            )
+            await sio.connect(url, headers=headers, wait_timeout=10)
+            assert sio.sid
         clients.append(sio)
-        return sio
+        return sio, client_session_id
 
     yield _connect
 
     # cleans up clients produce by _connect(*) calls
     for sio in clients:
         if sio.connected:
-            print(f"<--Disconnecting socketio client {sio}")
-            await sio.disconnect()
-            await sio.wait()
-            print(f"... disconnection from {sio} done.")
-            assert not sio.connected
-        assert not sio.sid
+            with log_context(logging.INFO, f"socketio_client: disconnecting {sio}"):
+                await sio.disconnect()
+                await sio.wait()
+        assert not sio.connected

services/static-webserver/client/source/class/osparc/conversation/Conversation.js

@@ -64,6 +64,7 @@ qx.Class.define("osparc.conversation.Conversation", {
     __messages: null,
     __nextRequestParams: null,
     __messagesTitle: null,
+    __messageScroll: null,
     __messagesList: null,
     __loadMoreMessages: null,
 
@@ -147,10 +148,15 @@ qx.Class.define("osparc.conversation.Conversation", {
       this.__messagesTitle = new qx.ui.basic.Label();
       this._add(this.__messagesTitle);
 
+      // add spacer to keep the messages list at the bottom
+      this._add(new qx.ui.core.Spacer(), {
+        flex: 100 // high number to keep even a one message list at the bottom
+      });
+
       this.__messagesList = new qx.ui.container.Composite(new qx.ui.layout.VBox(5)).set({
         alignY: "middle"
       });
-      const scrollView = new qx.ui.container.Scroll();
+      const scrollView = this.__messageScroll = new qx.ui.container.Scroll();
       scrollView.add(this.__messagesList);
       this._add(scrollView, {
         flex: 1
@@ -197,7 +203,8 @@ qx.Class.define("osparc.conversation.Conversation", {
 
     __reloadMessages: function(removeMessages = true) {
       if (this.getConversationId() === null) {
-        this.__messagesTitle.setValue(this.tr("No messages yet"));
+        // temporary conversation page
+        this.__messagesTitle.setValue(this.tr("No Messages yet"));
         this.__messagesList.hide();
         this.__loadMoreMessages.hide();
         return;
@@ -217,7 +224,7 @@ qx.Class.define("osparc.conversation.Conversation", {
           const messages = resp["data"];
           messages.forEach(message => this.addMessage(message));
           this.__nextRequestParams = resp["_links"]["next"];
-          if (this.__nextRequestParams === null) {
+          if (this.__nextRequestParams === null && this.__loadMoreMessages) {
             this.__loadMoreMessages.exclude();
           }
         })
@@ -226,7 +233,9 @@ qx.Class.define("osparc.conversation.Conversation", {
 
     __updateMessagesNumber: function() {
       const nMessages = this.__messages.filter(msg => msg["type"] === "MESSAGE").length;
-      if (nMessages === 1) {
+      if (nMessages === 0) {
+        this.__messagesTitle.setValue(this.tr("No Messages yet"));
+      } else if (nMessages === 1) {
         this.__messagesTitle.setValue(this.tr("1 Message"));
       } else if (nMessages > 1) {
         this.__messagesTitle.setValue(nMessages + this.tr(" Messages"));
@@ -243,9 +252,9 @@ qx.Class.define("osparc.conversation.Conversation", {
         return;
       }
 
-      // determine insertion index for most‐recent‐first order
+      // determine insertion index for latest‐first order
       const newTime = new Date(message["created"]);
-      let insertAt = this.__messages.findIndex(m => new Date(m["created"]) < newTime);
+      let insertAt = this.__messages.findIndex(m => new Date(m["created"]) > newTime);
       if (insertAt === -1) {
         insertAt = this.__messages.length;
       }
@@ -270,6 +279,12 @@ qx.Class.define("osparc.conversation.Conversation", {
         this.__messagesList.addAt(control, insertAt);
       }
 
+      // scroll to bottom
+      // add timeout to ensure the scroll happens after the UI is updated
+      setTimeout(() => {
+        this.__messageScroll.scrollToY(this.__messageScroll.getChildControl("pane").getScrollMaxY());
+      }, 50);
+
       this.__updateMessagesNumber();
     },
 

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

@@ -718,7 +718,7 @@ qx.Class.define("osparc.data.model.Node", {
         });
       } else {
         this.fireDataEvent("projectDocumentChanged", {
-          "op": "delete",
+          "op": "remove",
           "path": `/ui/workbench/${this.getNodeId()}/marker`,
           "osparc-resource": "ui",
         });

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

@@ -573,19 +573,21 @@ qx.Class.define("osparc.data.model.Study", {
       // Do not listen to output related backend updates if the node is a frontend node.
       // The frontend controls its output values, progress and states.
       // If a File Picker is uploading a file, the backend could override the current state with some older state.
-      if (node && nodeData && !osparc.data.model.Node.isFrontend(node.getMetaData())) {
-        node.setOutputData(nodeData.outputs);
-        if ("progress" in nodeData) {
-          const progress = Number.parseInt(nodeData["progress"]);
-          node.getStatus().setProgress(progress);
+      if (node) {
+        if (nodeData && !osparc.data.model.Node.isFrontend(node.getMetaData())) {
+          node.setOutputData(nodeData.outputs);
+          if ("progress" in nodeData) {
+            const progress = Number.parseInt(nodeData["progress"]);
+            node.getStatus().setProgress(progress);
+          }
+          node.populateStates(nodeData);
+        }
+        if ("errors" in nodeUpdatedData) {
+          const errors = nodeUpdatedData["errors"];
+          node.setErrors(errors);
+        } else {
+          node.setErrors([]);
         }
-        node.populateStates(nodeData);
-      }
-      if (node && "errors" in nodeUpdatedData) {
-        const errors = nodeUpdatedData["errors"];
-        node.setErrors(errors);
-      } else {
-        node.setErrors([]);
       }
     },
 

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

@@ -143,7 +143,7 @@ qx.Class.define("osparc.data.model.StudyUI", {
       if (annotationId in this.getAnnotations()) {
         const annotation = this.getAnnotations()[annotationId]
         this.fireDataEvent("projectDocumentChanged", {
-          "op": "delete",
+          "op": "remove",
           "path": `/ui/annotations/${annotation.getId()}`,
           "osparc-resource": "study-ui",
         });

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

@@ -320,7 +320,7 @@ qx.Class.define("osparc.data.model.Workbench", {
         this.__addNode(node);
 
         node.populateNodeData();
-        this.giveUniqueNameToNode(node, node.getLabel());
+        this.__giveUniqueNameToNode(node, node.getLabel());
         node.checkState();
 
         return node;
@@ -653,15 +653,15 @@ qx.Class.define("osparc.data.model.Workbench", {
       return false;
     },
 
-    giveUniqueNameToNode: function(node, label, suffix = 2) {
+    __giveUniqueNameToNode: function(node, label, suffix = 2) {
       const newLabel = label + "_" + suffix;
       const allModels = this.getNodes();
       const nodes = Object.values(allModels);
       for (const node2 of nodes) {
         if (node2.getNodeId() !== node.getNodeId() &&
             node2.getLabel().localeCompare(node.getLabel()) === 0) {
           node.setLabel(newLabel);
-          this.giveUniqueNameToNode(node, label, suffix+1);
+          this.__giveUniqueNameToNode(node, label, suffix+1);
         }
       }
     },
@@ -720,7 +720,7 @@ qx.Class.define("osparc.data.model.Workbench", {
 
           nodeIds.forEach(nodeId => {
             const node = this.getNode(nodeId);
-            this.giveUniqueNameToNode(node, node.getLabel());
+            this.__giveUniqueNameToNode(node, node.getLabel());
           });
         });
     },

services/static-webserver/client/source/class/osparc/study/Conversations.js

@@ -221,6 +221,12 @@ qx.Class.define("osparc.study.Conversations", {
 
     __addToPages: function(conversationPage) {
       const conversationsLayout = this.getChildControl("conversations-layout");
+      if (conversationsLayout.getChildren().length === 1) {
+        // remove the temporary conversation page
+        if (conversationsLayout.getChildren()[0].getConversationId() === null) {
+          conversationsLayout.remove(conversationsLayout.getChildren()[0]);
+        }
+      }
       conversationsLayout.add(conversationPage);
 
       if (this.__newConversationButton === null) {
@@ -246,8 +252,11 @@ qx.Class.define("osparc.study.Conversations", {
         conversationsLayout.getChildControl("bar").add(newConversationButton);
       }
       // remove and add to move to last position
-      conversationsLayout.getChildControl("bar").remove(this.__newConversationButton);
-      conversationsLayout.getChildControl("bar").add(this.__newConversationButton);
+      const bar = conversationsLayout.getChildControl("bar");
+      if (bar.indexOf(this.__newConversationButton) > -1) {
+        bar.remove(this.__newConversationButton);
+      }
+      bar.add(this.__newConversationButton);
     },
 
     __removeConversationPage: function(conversationId, changeSelection = false) {