Merge branch 'master' into improve-efs-4

Author: matusdrobuliak66

packages/pytest-simcore/src/pytest_simcore/helpers/playwright_sim4life.py

@@ -19,6 +19,7 @@
     wait_for_service_running,
 )
 
+_S4L_STREAMING_ESTABLISHMENT_MIN_WAITING_TIME: Final[int] = 5 * SECOND
 _S4L_STREAMING_ESTABLISHMENT_MAX_TIME: Final[int] = 30 * SECOND
 _S4L_SOCKETIO_REGEX: Final[re.Pattern] = re.compile(
     r"^(?P<protocol>[^:]+)://(?P<node_id>[^\.]+)\.services\.(?P<hostname>[^\/]+)\/socket\.io\/.+$"
@@ -47,7 +48,7 @@ def __call__(self, new_websocket: WebSocket) -> bool:
 
 @dataclass(kw_only=True)
 class _S4LSocketIOCheckBitRateIncreasesMessagePrinter:
-    observation_time: datetime.timedelta
+    min_waiting_time_before_checking_bitrate: datetime.timedelta
     logger: logging.Logger
     _initial_bit_rate: float = 0
     _initial_bit_rate_time: datetime.datetime = arrow.utcnow().datetime
@@ -59,9 +60,9 @@ def __call__(self, message: str) -> bool:
                 decoded_message.name == "server.video_stream.bitrate_data"
                 and "bitrate" in decoded_message.obj
             ):
-                current_bitrate = decoded_message.obj["bitrate"]
+                current_bit_rate = decoded_message.obj["bitrate"]
                 if self._initial_bit_rate == 0:
-                    self._initial_bit_rate = current_bitrate
+                    self._initial_bit_rate = current_bit_rate
                     self._initial_bit_rate_time = arrow.utcnow().datetime
                     self.logger.info(
                         "%s",
@@ -71,16 +72,21 @@ def __call__(self, message: str) -> bool:
 
                 # NOTE: MaG says the value might also go down, but it shall definitely change,
                 # if this code proves unsafe we should change it.
+                if "bitrate" in decoded_message.obj:
+                    self.logger.info(
+                        "bitrate: %s",
+                        f"{TypeAdapter(ByteSize).validate_python(current_bit_rate).human_readable()}/s",
+                    )
                 elapsed_time = arrow.utcnow().datetime - self._initial_bit_rate_time
                 if (
-                    elapsed_time > self.observation_time
+                    elapsed_time > self.min_waiting_time_before_checking_bitrate
                     and "bitrate" in decoded_message.obj
                 ):
-                    current_bitrate = decoded_message.obj["bitrate"]
-                    bitrate_test = bool(self._initial_bit_rate != current_bitrate)
+                    current_bit_rate = decoded_message.obj["bitrate"]
+                    bitrate_test = bool(self._initial_bit_rate != current_bit_rate)
                     self.logger.info(
                         "%s",
-                        f"{TypeAdapter(ByteSize).validate_python(current_bitrate).human_readable()}/s after {elapsed_time=}: {'good!' if bitrate_test else 'failed! bitrate did not change! TIP: talk with MaG about underwater cables!'}",
+                        f"{TypeAdapter(ByteSize).validate_python(current_bit_rate).human_readable()}/s after {elapsed_time=}: {'good!' if bitrate_test else 'failed! bitrate did not change! TIP: talk with MaG about underwater cables!'}",
                     )
                     return bitrate_test
 
@@ -144,10 +150,14 @@ def interact_with_s4l(page: Page, s4l_iframe: FrameLocator) -> None:
 def check_video_streaming(
     page: Page, s4l_iframe: FrameLocator, s4l_websocket: WebSocket
 ) -> None:
+    assert (
+        _S4L_STREAMING_ESTABLISHMENT_MIN_WAITING_TIME
+        < _S4L_STREAMING_ESTABLISHMENT_MAX_TIME
+    )
     with log_context(logging.INFO, "Check videostreaming works") as ctx:
         waiter = _S4LSocketIOCheckBitRateIncreasesMessagePrinter(
-            observation_time=datetime.timedelta(
-                milliseconds=_S4L_STREAMING_ESTABLISHMENT_MAX_TIME / 2.0,
+            min_waiting_time_before_checking_bitrate=datetime.timedelta(
+                milliseconds=_S4L_STREAMING_ESTABLISHMENT_MIN_WAITING_TIME,
             ),
             logger=ctx.logger,
         )

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

@@ -115,7 +115,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {
       const nodeStatus = node.getStatus();
       const sequenceWidget = nodeStatus.getProgressSequence().getWidgetForLoadingPage();
       nodeStatus.bind("interactive", sequenceWidget, "visibility", {
-        converter: state => ["starting", "pulling", "pending", "connecting"].includes(state) ? "visible" : "excluded"
+        converter: state => ["pending", "pulling", "starting", "connecting"].includes(state) ? "visible" : "excluded"
       });
       loadingPage.addExtraWidget(sequenceWidget);
 
@@ -189,6 +189,8 @@ qx.Class.define("osparc.data.model.IframeHandler", {
       const nodeId = data["service_uuid"];
       const node = this.getNode();
       const status = node.getStatus();
+      const loadingPage = this.getLoadingPage();
+      loadingPage.clearMessages();
       switch (serviceState) {
         case "idle": {
           status.setInteractive(serviceState);
@@ -200,8 +202,14 @@ qx.Class.define("osparc.data.model.IframeHandler", {
         }
         case "pending": {
           if (data["service_message"]) {
-            const serviceName = node.getLabel();
             const serviceMessage = data["service_message"];
+            loadingPage.setMessages([serviceMessage]);
+            // show pending messages only after 10"
+            loadingPage.getMessageLabels().forEach(label => label.exclude());
+            setTimeout(() => {
+              loadingPage.getMessageLabels().forEach(label => label.show());
+            }, 10000);
+            const serviceName = node.getLabel();
             const msg = `The service "${serviceName}" is waiting for available ` +
               `resources. Please inform support and provide the following message ` +
               `in case this does not resolve in a few minutes: "${nodeId}" ` +

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

@@ -1108,6 +1108,11 @@ qx.Class.define("osparc.data.model.Node", {
       if (nodeStatus.getProgressSequence()) {
         nodeStatus.getProgressSequence().addProgressMessage(progressType, progressReport);
       }
+      // there might be some pending ``service_message`` still shown, remove it
+      if (this.getIframeHandler()) {
+        const loadingPage = this.getIframeHandler().getLoadingPage();
+        loadingPage.clearMessages();
+      }
     },
 
     attachHandlersToStartButton: function(startButton) {

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

@@ -22,6 +22,7 @@
  * [CLUSTER_UP_SCALING]
  * [SIDECARS_PULLING]
  * [SERVICE_OUTPUTS_PULLING, SERVICE_STATE_PULLING, SERVICE_IMAGES_PULLING] (notice the parallelism here)
+ * [SERVICE_CONTAINERS_STARTING]
  * [SERVICE_INPUTS_PULLING] (when this happens, the frontend has already loaded the service and is displaying it to the user) I would still keep it as is, when we decide to make inputs pulling part of the boot sequence this will be helpful.
  *
  * This class provides different widgets that render the progress status

services/static-webserver/client/source/class/osparc/ui/message/Loading.js

@@ -93,7 +93,7 @@ qx.Class.define("osparc.ui.message.Loading", {
     __mainLayout: null,
     __thumbnail: null,
     __header: null,
-    __messages: null,
+    __messagesContainer: null,
     __extraWidgets: null,
     __maxButton: null,
 
@@ -162,7 +162,7 @@ qx.Class.define("osparc.ui.message.Loading", {
         row: this.self().GRID_POS.WAITING
       });
 
-      const messages = this.__messages = new qx.ui.container.Composite(new qx.ui.layout.VBox(10).set({
+      const messages = this.__messagesContainer = new qx.ui.container.Composite(new qx.ui.layout.VBox(10).set({
         alignX: "center"
       }));
       mainLayout.addAt(messages, {
@@ -236,24 +236,28 @@ qx.Class.define("osparc.ui.message.Loading", {
             rich: true,
             wrap: true
           });
-          this.__messages.add(text);
+          this.__messagesContainer.add(text);
         });
-        this.__messages.show();
+        this.__messagesContainer.show();
       } else {
-        this.__messages.exclude();
+        this.__messagesContainer.exclude();
       }
     },
 
     clearMessages: function() {
-      this.__messages.removeAll();
+      this.__messagesContainer.removeAll();
+    },
+
+    getMessageLabels: function() {
+      return this.__messagesContainer.getChildren();
     },
 
     addWidgetToMessages: function(widget) {
       if (widget) {
-        this.__messages.add(widget);
-        this.__messages.show();
+        this.__messagesContainer.add(widget);
+        this.__messagesContainer.show();
       } else {
-        this.__messages.exclude();
+        this.__messagesContainer.exclude();
       }
     },