Merge branch 'master' into fix-api-base-url-generation

Author: giancarloromeo

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

@@ -81,7 +81,11 @@ class ComputationStarted(OutputSchemaWithoutCamelCase):
 class ComputationRunListQueryParams(
     PageQueryParameters,
     ComputationRunListOrderParams,  # type: ignore[misc, valid-type]
-): ...
+):
+    filter_only_running: bool = Field(
+        default=False,
+        description="If true, only running computations are returned",
+    )
 
 
 class ComputationRunRestGet(OutputSchema):
@@ -92,6 +96,8 @@ class ComputationRunRestGet(OutputSchema):
     submitted_at: datetime
     started_at: datetime | None
     ended_at: datetime | None
+    root_project_name: str
+    project_custom_metadata: dict[str, Any]
 
 
 ### Computation Task

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

@@ -22,3 +22,17 @@ class ComputationTaskWithAttributes(BaseModel):
     # Attributes added by the webserver
     node_name: str
     osparc_credits: Decimal | None
+
+
+class ComputationRunWithAttributes(BaseModel):
+    project_uuid: ProjectID
+    iteration: int
+    state: RunningState
+    info: dict[str, Any]
+    submitted_at: datetime
+    started_at: datetime | None
+    ended_at: datetime | None
+
+    # Attributes added by the webserver
+    root_project_name: str
+    project_custom_metadata: dict[str, Any]

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

@@ -35,14 +35,18 @@ class RunningState(str, Enum):
     ABORTED = "ABORTED"
     WAITING_FOR_CLUSTER = "WAITING_FOR_CLUSTER"
 
-    def is_running(self) -> bool:
-        return self in (
+    @staticmethod
+    def list_running_states() -> list["RunningState"]:
+        return [
             RunningState.PUBLISHED,
             RunningState.PENDING,
             RunningState.WAITING_FOR_RESOURCES,
             RunningState.STARTED,
             RunningState.WAITING_FOR_CLUSTER,
-        )
+        ]
+
+    def is_running(self) -> bool:
+        return self in self.list_running_states()
 
 
 @unique

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/computations.py

@@ -33,6 +33,8 @@ async def list_computations_latest_iteration_page(
     *,
     product_name: ProductName,
     user_id: UserID,
+    # filters
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
@@ -46,6 +48,7 @@ async def list_computations_latest_iteration_page(
         ),
         product_name=product_name,
         user_id=user_id,
+        filter_only_running=filter_only_running,
         offset=offset,
         limit=limit,
         order_by=order_by,

services/director-v2/src/simcore_service_director_v2/api/rpc/_computations.py

@@ -28,6 +28,8 @@ async def list_computations_latest_iteration_page(
     *,
     product_name: ProductName,
     user_id: UserID,
+    # filters
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
@@ -39,6 +41,7 @@ async def list_computations_latest_iteration_page(
         await comp_runs_repo.list_for_user__only_latest_iterations(
             product_name=product_name,
             user_id=user_id,
+            filter_only_running=filter_only_running,
             offset=offset,
             limit=limit,
             order_by=order_by,

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_runs.py

@@ -195,6 +195,8 @@ async def list_for_user__only_latest_iterations(
         *,
         product_name: str,
         user_id: UserID,
+        # filters
+        filter_only_running: bool,
         # pagination
         offset: int,
         limit: int,
@@ -229,6 +231,16 @@ async def list_for_user__only_latest_iterations(
                 & (
                     comp_runs.c.metadata["product_name"].astext == product_name
                 )  # <-- NOTE: We might create a separate column for this for fast retrieval
+                & (
+                    comp_runs.c.result.in_(
+                        [
+                            RUNNING_STATE_TO_DB[item]
+                            for item in RunningState.list_running_states()
+                        ]
+                    )
+                )
+                if filter_only_running
+                else True
             )
             .group_by(comp_runs.c.project_uuid)
             .subquery("latest_runs")

services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js renamed to services/static-webserver/client/source/class/osparc/dashboard/AppBrowser.js

@@ -22,7 +22,7 @@
  * @ignore(fetch)
  */
 
-qx.Class.define("osparc.dashboard.ServiceBrowser", {
+qx.Class.define("osparc.dashboard.AppBrowser", {
   extend: osparc.dashboard.ResourceBrowserBase,
 
   construct: function() {
@@ -43,8 +43,12 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
       this._resourcesInitialized = true;
 
       this._resourcesList = [];
-      osparc.store.Services.getServicesLatest()
-        .then(services => {
+      Promise.all([
+        osparc.store.Services.getServicesLatest(),
+        osparc.store.Templates.getTemplatesHypertools(),
+      ])
+        .then(resps => {
+          const services = resps[0];
           // Show "Contact Us" message if services.length === 0
           // Most probably is a product-stranger user (it can also be that the catalog is down)
           if (Object.keys(services).length === 0) {
@@ -65,30 +69,52 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
 
     reloadResources: function() {
       this.__loadServices();
+      this.__loadHypertools();
     },
 
     __loadServices: function() {
       const excludeFrontend = true;
       const excludeDeprecated = true
       osparc.store.Services.getServicesLatestList(excludeFrontend, excludeDeprecated)
-        .then(servicesList => this.__setServicesToList(servicesList.filter(service => service !== null)));
+        .then(servicesList => {
+          servicesList.forEach(service => service["resourceType"] = "service");
+          this._resourcesList.push(...servicesList.filter(service => service !== null));
+          this.__sortAndReload();
+        });
+    },
+
+    __loadHypertools: function() {
+      osparc.store.Templates.getTemplatesHypertools()
+        .then(hypertoolsList => {
+          hypertoolsList.forEach(hypertool => hypertool["resourceType"] = "hypertool");
+          this._resourcesList.push(...hypertoolsList.filter(hypertool => hypertool !== null));
+          this.__sortAndReload();
+        });
+    },
+
+    __sortAndReload: function() {
+      osparc.service.Utils.sortObjectsBasedOn(this._resourcesList, this.__sortBy);
+      this._reloadCards();
     },
 
     _updateServiceData: function(serviceData) {
       serviceData["resourceType"] = "service";
-      const servicesList = this._resourcesList;
-      const index = servicesList.findIndex(service => service["key"] === serviceData["key"] && service["version"] === serviceData["version"]);
+      const appsList = this._resourcesList;
+      const index = appsList.findIndex(service => service["key"] === serviceData["key"] && service["version"] === serviceData["version"]);
       if (index !== -1) {
-        servicesList[index] = serviceData;
+        appsList[index] = serviceData;
         this._reloadCards();
       }
     },
 
-    __setServicesToList: function(servicesList) {
-      servicesList.forEach(service => service["resourceType"] = "service");
-      osparc.service.Utils.sortObjectsBasedOn(servicesList, this.__sortBy);
-      this._resourcesList = servicesList;
-      this._reloadCards();
+    _updateHypertoolData: function(hypertoolData) {
+      hypertoolData["resourceType"] = "hypertool";
+      const appsList = this._resourcesList;
+      const index = appsList.findIndex(service => service["uuid"] === hypertoolData["uuid"]);
+      if (index !== -1) {
+        appsList[index] = hypertoolData;
+        this._reloadCards();
+      }
     },
 
     _reloadCards: function() {
@@ -103,8 +129,8 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
     },
 
     __itemClicked: function(card) {
-      const serviceData = card.getResourceData();
-      this._openResourceDetails(serviceData);
+      const appData = card.getResourceData();
+      this._openResourceDetails(appData);
       this.resetSelection();
     },
 
@@ -126,6 +152,28 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
       return this._resourcesContainer;
     },
 
+    __addSortingButtons: function() {
+      const containerSortButtons = new osparc.service.SortServicesButtons();
+      containerSortButtons.set({
+        appearance: "form-button-outlined"
+      });
+      containerSortButtons.addListener("sortBy", e => {
+        this.__sortBy = e.getData();
+        this.__sortAndReload();
+      }, this);
+      this._toolbar.add(containerSortButtons);
+    },
+
+    _populateCardMenu: function(card) {
+      const menu = card.getMenu();
+      const appData = card.getResourceData();
+
+      const openButton = this._getOpenMenuButton(appData);
+      if (openButton) {
+        menu.add(openButton);
+      }
+    },
+
     __addNewServiceButtons: function() {
       const platformName = osparc.store.StaticInfo.getInstance().getPlatformName();
       const hasRights = osparc.data.Permissions.getInstance().canDo("studies.template.create.productAll");
@@ -140,7 +188,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
         this._toolbar.add(testDataButton);
       }
 
-      const addServiceButton = new qx.ui.form.Button(this.tr("Submit new service"), "@FontAwesome5Solid/plus-circle/14");
+      const addServiceButton = new qx.ui.form.Button(this.tr("Submit new app"), "@FontAwesome5Solid/plus-circle/14");
       addServiceButton.set({
         appearance: "form-button-outlined",
         visibility: hasRights ? "visible" : "excluded"
@@ -149,30 +197,8 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
       this._toolbar.add(addServiceButton);
     },
 
-    __addSortingButtons: function() {
-      const containerSortButtons = new osparc.service.SortServicesButtons();
-      containerSortButtons.set({
-        appearance: "form-button-outlined"
-      });
-      containerSortButtons.addListener("sortBy", e => {
-        this.__sortBy = e.getData();
-        this.__setServicesToList(this._resourcesList);
-      }, this);
-      this._toolbar.add(containerSortButtons);
-    },
-
-    _populateCardMenu: function(card) {
-      const menu = card.getMenu();
-      const serviceData = card.getResourceData();
-
-      const openButton = this._getOpenMenuButton(serviceData);
-      if (openButton) {
-        menu.add(openButton);
-      }
-    },
-
     __displayServiceSubmissionForm: function(formData) {
-      const addServiceWindow = new osparc.ui.window.Window(this.tr("Submit a new service")).set({
+      const addServiceWindow = new osparc.ui.window.Window(this.tr("Submit a new app")).set({
         modal: true,
         autoDestroy: true,
         showMinimize: false,