Merge branch 'master' into is1988/upgrading-director-to-fastapi

Author: pcrespov

.env-devel

@@ -97,7 +97,7 @@ COMPUTATIONAL_BACKEND_DEFAULT_FILE_LINK_TYPE=PRESIGNED
 COMPUTATIONAL_BACKEND_ON_DEMAND_CLUSTERS_FILE_LINK_TYPE=PRESIGNED
 DIRECTOR_V2_DEV_FEATURES_ENABLED=0
 DIRECTOR_V2_DYNAMIC_SCHEDULER_CLOSE_SERVICES_VIA_FRONTEND_WHEN_CREDITS_LIMIT_REACHED=1
-DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL=0
+DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL=PT0S
 DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
 DIRECTOR_V2_HOST=director-v2
 DIRECTOR_V2_LOGLEVEL=INFO
@@ -117,7 +117,7 @@ DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=3600
 # DIRECTOR_V2 ----
 DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
 DYNAMIC_SCHEDULER_PROFILING=1
-DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=3600
+DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=PT1H
 
 FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
 

scripts/maintenance/computational-clusters/autoscaled_monitor/cli.py

@@ -13,6 +13,7 @@
     DEFAULT_COMPUTATIONAL_EC2_FORMAT_WORKERS,
     DEFAULT_DYNAMIC_EC2_FORMAT,
     DEPLOY_SSH_KEY_PARSER,
+    UNIFIED_SSH_KEY_PARSE,
     wallet_id_spec,
 )
 from .ec2 import autoscaling_ec2_client, cluster_keeper_ec2_client
@@ -78,16 +79,12 @@ def main(
 
     # locate ssh key path
     for file_path in deploy_config.glob("**/*.pem"):
-        if any(_ in file_path.name for _ in ["license", "pkcs8"]):
-            continue
-        # very bad HACK where the license file contain openssh in the name
-        if (
-            any(_ in f"{file_path}" for _ in ("sim4life.io", "osparc-master"))
-            and "openssh" not in f"{file_path}"
-        ):
+        if any(_ in file_path.name for _ in ["license", "pkcs8", "dask"]):
             continue
 
-        if DEPLOY_SSH_KEY_PARSER.parse(f"{file_path.name}") is not None:
+        if DEPLOY_SSH_KEY_PARSER.parse(
+            f"{file_path.name}"
+        ) is not None or UNIFIED_SSH_KEY_PARSE.parse(f"{file_path.name}"):
             rich.print(
                 f"will be using following ssh_key_path: {file_path}. "
                 "TIP: if wrong adapt the code or manually remove some of them."

scripts/maintenance/computational-clusters/autoscaled_monitor/constants.py

@@ -22,6 +22,7 @@ def wallet_id_spec(text) -> None | int:
 DEPLOY_SSH_KEY_PARSER: Final[parse.Parser] = parse.compile(
     r"{prefix}-{random_name}.pem"
 )
+UNIFIED_SSH_KEY_PARSE: Final[parse.Parser] = parse.compile("sshkey.pem")
 
 MINUTE: Final[int] = 60
 HOUR: Final[int] = 60 * MINUTE

services/agent/src/simcore_service_agent/core/settings.py

@@ -53,14 +53,14 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     AGENT_VOLUMES_CLEANUP_INTERVAL: timedelta = Field(
         timedelta(minutes=1), description="interval for running volumes removal"
     )
-    AGENT_VOLUMES_CLENUP_BOOK_KEEPING_INTERVAL: timedelta = Field(
+    AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL: timedelta = Field(
         timedelta(minutes=1),
         description=(
             "interval at which to scan for unsued volumes and keep track since "
             "they were detected as being unused"
         ),
     )
-    AGENT_VOLUMES_CLENUP_REMOVE_VOLUMES_INACTIVE_FOR: timedelta = Field(
+    AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR: timedelta = Field(
         timedelta(minutes=65),
         description=(
             "if a volume is unused for more than this interval it can be removed. "

services/agent/src/simcore_service_agent/services/volumes_manager.py

@@ -174,9 +174,9 @@ async def _on_startup() -> None:
 
         volumes_manager = VolumesManager(
             app=app,
-            book_keeping_interval=settings.AGENT_VOLUMES_CLENUP_BOOK_KEEPING_INTERVAL,
+            book_keeping_interval=settings.AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL,
             volume_cleanup_interval=settings.AGENT_VOLUMES_CLEANUP_INTERVAL,
-            remove_volumes_inactive_for=settings.AGENT_VOLUMES_CLENUP_REMOVE_VOLUMES_INACTIVE_FOR.total_seconds(),
+            remove_volumes_inactive_for=settings.AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR.total_seconds(),
         )
         volumes_manager.set_to_app_state(app)
         await volumes_manager.setup()

services/static-webserver/client/source/class/osparc/file/FileDrop.js

@@ -102,7 +102,9 @@ qx.Class.define("osparc.file.FileDrop", {
         }
       }
       return files;
-    }
+    },
+
+    ONE_FILE_ONLY: qx.locale.Manager.tr("Only one file at a time is accepted.") + "<br>" + qx.locale.Manager.tr("Please zip all files together."),
   },
 
   events: {
@@ -299,7 +301,7 @@ qx.Class.define("osparc.file.FileDrop", {
               pos: this.__pointerFileEventToScreenPos(e)
             });
           } else {
-            osparc.FlashMessenger.getInstance().logAs(this.tr("Only one file at a time is accepted."), "ERROR");
+            osparc.FlashMessenger.getInstance().logAs(osparc.file.FileDrop.ONE_FILE_ONLY, "ERROR");
           }
         } else {
           osparc.FlashMessenger.getInstance().logAs(this.tr("Folders are not accepted. You might want to upload a zip file."), "ERROR");

services/static-webserver/client/source/class/osparc/file/FilePicker.js

@@ -417,7 +417,7 @@ qx.Class.define("osparc.file.FilePicker", {
     },
 
     uploadPendingFiles: function(files) {
-      if (files.length > 0) {
+      if (files.length) {
         if (files.length === 1) {
           const fileUploader = new osparc.file.FileUploader(this.getNode());
           fileUploader.addListener("uploadAborted", () => this.__resetOutput());
@@ -428,7 +428,7 @@ qx.Class.define("osparc.file.FilePicker", {
           fileUploader.retrieveUrlAndUpload(files[0]);
           return true;
         }
-        osparc.FlashMessenger.getInstance().logAs(this.tr("Only one file is accepted"), "ERROR");
+        osparc.FlashMessenger.getInstance().logAs(osparc.file.FileDrop.ONE_FILE_ONLY, "ERROR");
       }
       return false;
     },

services/static-webserver/client/source/class/osparc/form/renderer/PropForm.js

@@ -36,6 +36,7 @@ qx.Class.define("osparc.form.renderer.PropForm", {
   },
 
   events: {
+    "highlightEdge": "qx.event.type.Data",
     "linkFieldModified": "qx.event.type.Data",
     "fileRequested": "qx.event.type.Data",
     "filePickerRequested": "qx.event.type.Data",
@@ -928,6 +929,17 @@ qx.Class.define("osparc.form.renderer.PropForm", {
         nodeUuid: fromNodeId,
         output: fromPortId
       };
+      const highlightEdgeUI = highlight => {
+        this.fireDataEvent("highlightEdge", {
+          highlight,
+          toNodeId: this.getNode().getNodeId(),
+          toPortId,
+          fromNodeId,
+          fromPortId,
+        });
+      };
+      ctrlLink.addListener("mouseover", () => highlightEdgeUI(true));
+      ctrlLink.addListener("mouseout", () => highlightEdgeUI(false));
 
       const workbench = study.getWorkbench();
       const fromNode = workbench.getNode(fromNodeId);

services/static-webserver/client/source/class/osparc/info/StudyMedium.js

@@ -162,7 +162,9 @@ qx.Class.define("osparc.info.StudyMedium", {
       const title = this.tr("Study Information");
       const width = osparc.info.CardLarge.WIDTH;
       const height = osparc.info.CardLarge.HEIGHT;
-      osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height);
+      osparc.ui.window.Window.popUpInWindow(studyDetails, title, width, height).set({
+        maxHeight: height
+      });
     }
   }
 });

services/static-webserver/client/source/class/osparc/metadata/ServicesInStudy.js

@@ -150,7 +150,9 @@ qx.Class.define("osparc.metadata.ServicesInStudy", {
           const title = this.tr("Service information");
           const width = osparc.info.CardLarge.WIDTH;
           const height = osparc.info.CardLarge.HEIGHT;
-          osparc.ui.window.Window.popUpInWindow(serviceDetails, title, width, height);
+          osparc.ui.window.Window.popUpInWindow(serviceDetails, title, width, height).set({
+            maxHeight: height
+          });
         }, this);
         this._servicesGrid.add(infoButton, {
           row: i,