Merge remote-tracking branch 'upstream/master' into pr-osparc-rabbit-replace-x-death

Author: Andrei Neagu

.env-devel

@@ -395,6 +395,7 @@ WEBSERVER_PROJECTS={}
 WEBSERVER_PROMETHEUS_API_VERSION=v1
 WEBSERVER_PROMETHEUS_URL=http://prometheus:9090
 WEBSERVER_PUBLICATIONS=1
+WEBSERVER_REALTIME_COLLABORATION='{"RTC_MAX_NUMBER_OF_USERS":3}'
 WEBSERVER_SCICRUNCH={}
 WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
 WEBSERVER_SOCKETIO=1

packages/postgres-database/docker/Dockerfile

@@ -55,11 +55,5 @@ COPY entrypoint.bash /home/entrypoint.bash
 
 RUN chmod +x /home/entrypoint.bash
 
-ENV POSTGRES_USER=scu \
-  POSTGRES_PASSWORD=adminadmin \
-  POSTGRES_HOST=postgres \
-  POSTGRES_PORT=5432 \
-  POSTGRES_DB=simcoredb
-
 ENTRYPOINT [ "/bin/bash", "/home/entrypoint.bash" ]
 CMD [ "sc-pg", "upgrade" ]

services/dask-sidecar/Dockerfile

@@ -5,7 +5,7 @@ ARG PYTHON_VERSION="3.11.9"
 ARG UV_VERSION="0.7"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
-FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-bookworm AS base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log

services/docker-compose.yml

@@ -673,6 +673,7 @@ services:
       SWARM_STACK_NAME: ${SWARM_STACK_NAME}
 
       WEBSERVER_DEV_FEATURES_ENABLED: ${WEBSERVER_DEV_FEATURES_ENABLED}
+      WEBSERVER_REALTIME_COLLABORATION: ${WEBSERVER_REALTIME_COLLABORATION}
 
       WEBSERVER_LOGLEVEL: ${WEBSERVER_LOGLEVEL}
       WEBSERVER_PROFILING: ${WEBSERVER_PROFILING}

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/outputs/_manager.py

@@ -118,6 +118,7 @@ def __init__(
 
         self._port_key_tracker = _PortKeyTracker()
         self._task_uploading: Task | None = None
+        self._task_uploading_followup: Task | None = None
         self._task_scheduler_worker: Task | None = None
         self._schedule_all_ports_for_upload: bool = False
 
@@ -171,14 +172,22 @@ def _remove_downloads(future: Future) -> None:
                 except Exception as e:  # pylint: disable=broad-except
                     self._last_upload_error_tracker[port_key] = e
 
-            create_task(self._port_key_tracker.remove_all_uploading())
+            self._task_uploading_followup = create_task(
+                self._port_key_tracker.remove_all_uploading()
+            )
 
         self._task_uploading.add_done_callback(_remove_downloads)
 
     async def _uploading_task_cancel(self) -> None:
         if self._task_uploading is not None:
             await _cancel_task(self._task_uploading, self.task_cancellation_timeout_s)
             await self._port_key_tracker.move_all_uploading_to_pending()
+            self._task_uploading = None
+        if self._task_uploading_followup is not None:
+            await _cancel_task(
+                self._task_uploading_followup, self.task_cancellation_timeout_s
+            )
+            self._task_uploading_followup = None
 
     async def _scheduler_worker(self) -> None:
         if await self._port_key_tracker.are_pending_ports_uploading():

services/migration/Dockerfile

@@ -84,14 +84,7 @@ FROM base AS production
 
 ENV PYTHONOPTIMIZE=TRUE
 
-# testing defaults
-ENV POSTGRES_USER=scu \
-  POSTGRES_PASSWORD=adminadmin \
-  POSTGRES_HOST=postgres \
-  POSTGRES_PORT=5432 \
-  POSTGRES_DB=simcoredb \
-  SC_DONE_MARK_FILE=migration.done
-
+ENV SC_DONE_MARK_FILE=migration.done
 
 WORKDIR /home/scu
 

services/static-webserver/client/Makefile

@@ -31,10 +31,10 @@ compile-dev: qx_packages source-output ## qx compiles host' 'source' -> host's '
 	# qx compile 'source' $(flags) --> 'source-output' [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]
 	$(docker_compose) run --detach --rm --name=$(container_name) qooxdoo-kit \
 		qx compile $(flags) \
+			--set-env osparc.vcsOriginUrl="${VCS_URL}" \
 			--set-env osparc.vcsRef="${VCS_REF}" \
 			--set-env osparc.vcsRefClient="${VCS_REF_CLIENT}" \
-			--set-env osparc.vcsStatusClient="${VCS_STATUS_CLIENT}" \
-			--set-env osparc.vcsOriginUrl="${VCS_URL}"
+			--set-env osparc.vcsStatusClient="${VCS_STATUS_CLIENT}"
 
 .PHONY: follow-dev-logs
 follow-dev-logs: ## follow the logs of the qx compiler
@@ -44,8 +44,10 @@ follow-dev-logs: ## follow the logs of the qx compiler
 .PHONY: compile touch upgrade
 compile: ## qx compiles host' 'source' -> image's 'build-output'
 	# qx compile 'source' within $(docker_image) image  [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]
-	@docker buildx build --file $(docker_file) --tag $(docker_image) \
+	@docker buildx build \
 		--load \
+		--file $(docker_file) \
+		--tag $(docker_image) \
 		--build-arg tag=${QOOXDOO_KIT_TAG} \
 		--build-arg VCS_REF=${VCS_REF} \
 		--build-arg VCS_REF_CLIENT=${VCS_REF_CLIENT} \
@@ -56,7 +58,13 @@ compile: ## qx compiles host' 'source' -> image's 'build-output'
 
 touch: ## minimal image build with /project/output-build inside
 	# touch /project/output-build such that multi-stage 'services/web/Dockerfile' can build development target (fixes #1097)
-	@docker buildx build --load --file $(docker_file) --tag $(docker_image) --build-arg tag=${QOOXDOO_KIT_TAG} --target=touch .
+	@docker buildx build \
+		--load \
+		--file $(docker_file) \
+		--tag $(docker_image) \
+		--build-arg tag=${QOOXDOO_KIT_TAG} \
+		--target=touch \
+		.
 
 upgrade: ## upgrade to official version of the tool
 	# upgrading to ${QOOXDOO_KIT_TAG}

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

@@ -24,6 +24,14 @@ qx.Class.define("osparc.dashboard.CardBase", {
   construct: function() {
     this.base(arguments);
 
+    if (osparc.utils.DisabledPlugins.isSimultaneousAccessEnabled()) {
+      // "IN_USE" is not a blocker anymore
+      const inUseIdx = qx.util.PropertyUtil.getProperties(osparc.dashboard.CardBase).blocked.check.indexOf("IN_USE");
+      if (inUseIdx > -1) {
+        qx.util.PropertyUtil.getProperties(osparc.dashboard.CardBase).blocked.check.splice(inUseIdx, 1);
+      }
+    }
+
     [
       "pointerover",
       "focus"
@@ -768,13 +776,22 @@ qx.Class.define("osparc.dashboard.CardBase", {
     },
 
     __applyState: function(state) {
-      let lockInUse = false;
+      let projectInUse = false;
       if ("locked" in state && "value" in state["locked"]) {
-        lockInUse = state["locked"]["value"];
+        projectInUse = state["locked"]["value"];
       }
-      this.setBlocked(lockInUse ? "IN_USE" : false);
-      if (lockInUse) {
-        this.__showBlockedCardFromStatus("IN_USE", state["locked"]);
+
+      if (osparc.utils.DisabledPlugins.isSimultaneousAccessEnabled()) {
+        if (projectInUse && state["locked"]["status"] === "OPENED") {
+          this.__showWhoIsIn(state["locked"]["owner"]);
+        } else {
+          this.__showWhoIsIn(null);
+        }
+      } else {
+        this.setBlocked(projectInUse ? "IN_USE" : false);
+        if (projectInUse) {
+          this.__showBlockedCardFromStatus("IN_USE", state["locked"]);
+        }
       }
 
       const pipelineState = ("state" in state) ? state["state"]["value"] : undefined;
@@ -854,6 +871,30 @@ qx.Class.define("osparc.dashboard.CardBase", {
       });
     },
 
+    __showWhoIsIn: function(whoIsIn) {
+      let users = [];
+      if (whoIsIn) {
+        // replace this once the backend returns a list of group__ids
+        const allUsers = [
+          { name: "Alice", avatar: "https://i.pravatar.cc/150?img=1" },
+          { name: "Bob", avatar: "https://i.pravatar.cc/150?img=2" },
+          { name: "Charlie", avatar: "https://i.pravatar.cc/150?img=3" },
+          { name: "Dana", avatar: "https://i.pravatar.cc/150?img=4" },
+          { name: "Eve", avatar: "https://i.pravatar.cc/150?img=5" },
+          { name: "Frank", avatar: "https://i.pravatar.cc/150?img=6" },
+        ];
+        // Random number of users between 1 and 6
+        const randomCount = Math.floor(Math.random() * 6) + 1;
+        // Shuffle the array and take the first randomCount users
+        const shuffled = allUsers.sort(() => 0.5 - Math.random());
+        users = shuffled.slice(0, randomCount);
+      }
+      if (osparc.utils.DisabledPlugins.isSimultaneousAccessEnabled() && this.getResourceType() === "study") {
+        const avatarGroup = this.getChildControl("avatar-group");
+        avatarGroup.setUsers(users);
+      }
+    },
+
     __showBlockedCardFromStatus: function(reason, moreInfo) {
       switch (reason) {
         case "IN_USE":