Merge branch 'master' into is7528/add-name-when-listing-tasks

Author: giancarloromeo

packages/models-library/src/models_library/rpc/webserver/projects.py

@@ -0,0 +1,41 @@
+from datetime import datetime
+from typing import Annotated, TypeAlias
+
+from models_library.projects import ProjectID
+from models_library.rpc_pagination import PageRpc
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class ProjectRpcGet(BaseModel):
+    """
+    Minimal information about a project that (for now) will fullfill
+    the needs of the api-server. Specifically, the fields needed in
+    project to call create_job_from_project
+    """
+
+    uuid: Annotated[
+        ProjectID,
+        Field(description="project unique identifier"),
+    ]
+    name: Annotated[
+        str,
+        Field(description="project display name"),
+    ]
+    description: str
+
+    # timestamps
+    creation_date: datetime
+    last_change_date: datetime
+
+    model_config = ConfigDict(
+        extra="forbid",
+        populate_by_name=True,
+    )
+
+
+PageRpcProjectRpcGet: TypeAlias = PageRpc[
+    # WARNING: keep this definition in models_library and not in the RPC interface
+    # otherwise the metaclass PageRpc[*] will create *different* classes in server/client side
+    # and will fail to serialize/deserialize these parameters when transmitted/received
+    ProjectRpcGet
+]

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py

@@ -1,9 +1,16 @@
 import logging
+from typing import cast
 
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.rest_pagination import PageOffsetInt
+from models_library.rpc.webserver.projects import PageRpcProjectRpcGet
+from models_library.rpc_pagination import (
+    DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
+    PageLimitInt,
+)
 from models_library.users import UserID
 from pydantic import TypeAdapter, validate_call
 from servicelib.logging_utils import log_decorator
@@ -32,3 +39,29 @@ async def mark_project_as_job(
         job_parent_resource_name=job_parent_resource_name,
     )
     assert result is None
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+@validate_call(config={"arbitrary_types_allowed": True})
+async def list_projects_marked_as_jobs(
+    rpc_client: RabbitMQRPCClient,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    # pagination
+    offset: PageOffsetInt = 0,
+    limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
+    # filters
+    job_parent_resource_name_filter: str | None = None,
+) -> PageRpcProjectRpcGet:
+    result = await rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("list_projects_marked_as_jobs"),
+        product_name=product_name,
+        user_id=user_id,
+        offset=offset,
+        limit=limit,
+        job_parent_resource_name_filter=job_parent_resource_name_filter,
+    )
+    assert TypeAdapter(PageRpcProjectRpcGet).validate_python(result)  # nosec
+    return cast(PageRpcProjectRpcGet, result)

services/director-v2/openapi.json

@@ -66,7 +66,7 @@
           "computations"
         ],
         "summary": "Create Computation",
-        "description": "Create and optionally starts it",
+        "description": "Create and optionally start a new computation",
         "operationId": "create_computation_v2_computations_post",
         "requestBody": {
           "content": {

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

@@ -384,7 +384,12 @@ qx.Class.define("osparc.dashboard.CardBase", {
     },
 
     uiMode: {
-      check: ["workbench", "guided", "app", "standalone"], // "guided" is no longer used
+      check: [
+        "workbench", // =auto, the frontend decides the icon and default view
+        "app", "guided", // "guided" is no longer used
+        "standalone",
+        "pipeline",
+      ],
       nullable: true,
       apply: "__applyUiMode"
     },

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

@@ -481,7 +481,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       if (
         osparc.utils.Resources.isService(resourceData) ||
         !osparc.product.Utils.showStudyPreview() ||
-        !(osparc.study.Utils.getUiMode(resourceData) === "workbench")
+        ["app", "guided", "standalone"].includes(osparc.study.Utils.getUiMode(resourceData))
       ) {
         // there is no pipelining or don't show it
         return null;

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

@@ -1789,17 +1789,52 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       convertToPipelineButton["convertToPipelineButton"] = true;
       const uiMode = osparc.study.Utils.getUiMode(studyData);
       convertToPipelineButton.setVisibility(uiMode === "standalone" ? "visible" : "excluded");
-      convertToPipelineButton.addListener("execute", () => {
-        this.__updateUIMode(studyData, "workbench")
-          .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while converting to pipeline")));
-      }, this);
+      convertToPipelineButton.addListener("execute", () => this.__convertToPipelineClicked(studyData), this);
       return convertToPipelineButton;
     },
 
+    __convertToPipelineClicked: function(studyData) {
+      let message = this.tr("Would you like to convert this project to a pipeline?");
+      message += "<br>" + this.tr("Alternatively, you can create a copy of the project and convert the copy instead.");
+      const confirmationWin = new osparc.ui.window.Confirmation();
+      confirmationWin.set({
+        caption: this.tr("Convert to Pipeline"),
+        confirmText: this.tr("Convert"),
+        confirmAction: "create",
+        message,
+      });
+      confirmationWin.getChildControl("cancel-button").exclude();
+      const copyOptionButton = new qx.ui.form.Button().set({
+        appearance: "form-button-text",
+        label: this.tr("Create a copy and convert it"),
+      });
+      confirmationWin.getChildControl("buttons-layout").addAt(copyOptionButton, 0);
+      confirmationWin.addListener("close", () => {
+        if (confirmationWin.getConfirmed()) {
+          this.__updateUIMode(studyData, "pipeline")
+            .then(() => osparc.FlashMessenger.logAs(this.tr("Project converted to pipeline"), "INFO"))
+            .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while converting to pipeline")));
+        }
+      });
+      copyOptionButton.addListener("execute", () => {
+        confirmationWin.close();
+        this.__duplicateStudy(studyData)
+          .then(task => {
+            task.addListener("resultReceived", e => {
+              const copiedStudy = e.getData();
+              this.__updateUIMode(copiedStudy, "pipeline")
+                .then(() => osparc.FlashMessenger.logAs(this.tr("Project's copy converted to pipeline"), "INFO"))
+                .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while converting the copy to pipeline")));
+            }, this);
+          });
+      }, this);
+      confirmationWin.open();
+    },
+
     __updateUIMode: function(studyData, uiMode) {
       const studyUI = osparc.utils.Utils.deepCloneObject(studyData["ui"]);
       studyUI["mode"] = uiMode;
-      return osparc.info.StudyUtils.patchStudyData(studyData, "ui", studyUI)
+      return osparc.store.Study.patchStudyData(studyData, "ui", studyUI)
         .then(() => this._updateStudyData(studyData))
     },
 
@@ -1889,21 +1924,11 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __duplicateStudy: function(studyData) {
-      const text = this.tr("Duplicate process started and added to the background tasks");
-      osparc.FlashMessenger.logAs(text, "INFO");
-
-      const params = {
-        url: {
-          "studyId": studyData["uuid"]
-        }
-      };
-      const options = {
-        pollTask: true
-      };
-      const fetchPromise = osparc.data.Resources.fetch("studies", "duplicate", params, options);
-      const pollTasks = osparc.store.PollTasks.getInstance();
-      pollTasks.createPollingTask(fetchPromise)
-        .then(task => this.__taskDuplicateReceived(task, studyData["name"]))
+      osparc.study.Utils.duplicateStudy(studyData)
+        .then(task => {
+          this.__taskDuplicateReceived(task, studyData["name"]);
+          return task;
+        })
         .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while duplicating")));
     },
 

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

@@ -102,9 +102,13 @@ qx.Class.define("osparc.data.PollTask", {
     },
 
     extractProgress: function(updateData) {
+      const toNumberWithMaxTwoDecimals = value => {
+        return Math.round(Number(value) * 100) / 100;
+      };
+
       if ("task_progress" in updateData) {
         const taskProgress = updateData["task_progress"];
-        const percent = taskProgress["percent"] ? parseFloat(taskProgress["percent"].toFixed(3)) : taskProgress["percent"];
+        const percent = taskProgress["percent"] ? toNumberWithMaxTwoDecimals(taskProgress["percent"]) : taskProgress["percent"];
         return percent;
       }
       return 0;

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

@@ -63,7 +63,12 @@ qx.Class.define("osparc.data.model.StudyUI", {
     },
 
     mode: {
-      check: ["workbench", "guided", "app", "standalone"], // "guided" is no longer used
+      check: [
+        "workbench", // =auto, the frontend decides the icon and default view
+        "app", "guided", // "guided" is no longer used
+        "standalone",
+        "pipeline",
+      ],
       init: "workbench",
       nullable: true,
       event: "changeMode",

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

@@ -72,7 +72,7 @@ qx.Class.define("osparc.desktop.SlideshowView", {
       const nodeId = e.getData();
       this.__hideNode(nodeId);
     }, this);
-    slideshowToolbar.addListener("slidesStop", () => this.getStudy().getUi().setMode("workbench"), this);
+    slideshowToolbar.addListener("slidesStop", () => this.getStudy().getUi().setMode("pipeline"), this);
     this._add(slideshowToolbar);
 
     const mainView = this.__mainView = new qx.ui.container.Composite(new qx.ui.layout.HBox().set({

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

@@ -707,14 +707,19 @@ qx.Class.define("osparc.desktop.StudyEditor", {
           this.__viewsStack.setSelection([this.__slideshowView]);
           this.__slideshowView.startSlides();
           break;
-        case "standalone": {
+        case "standalone":
           this.__viewsStack.setSelection([this.__workbenchView]);
           this.__workbenchView.openFirstNode();
           break;
-        }
+        case "pipeline":
+          this.__viewsStack.setSelection([this.__workbenchView]);
+          this.__workbenchView.setMaximized(false);
+          this.__workbenchView.showPipeline();
+          break;
         case "workbench":
         default: {
           this.__viewsStack.setSelection([this.__workbenchView]);
+          // OM: Is this needed?
           if (oldUIMode === "standalone") {
             // in this transition, show workbenchUI
             this.__workbenchView.setMaximized(false);