Merge branch 'master' into fix/orphan-study

Author: odeimaiz

api/specs/web-server/_storage.py

@@ -26,6 +26,7 @@
     StorageAsyncJobResult,
     StorageAsyncJobStatus,
     StorageLocationPathParams,
+    StoragePathComputeSizeParams,
 )
 from models_library.generics import Envelope
 from models_library.projects_nodes_io import LocationID
@@ -68,6 +69,15 @@ async def list_storage_paths(
     """Lists the files/directories in WorkingDirectory"""
 
 
+@router.post(
+    "/storage/locations/{location_id}/paths/{path}:size",
+    response_model=Envelope[StorageAsyncJobGet],
+    status_code=status.HTTP_202_ACCEPTED,
+)
+async def compute_path_size(_path: Annotated[StoragePathComputeSizeParams, Depends()]):
+    """Compute the size of a path"""
+
+
 @router.get(
     "/storage/locations/{location_id}/datasets",
     response_model=Envelope[list[DatasetMetaData]],

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

@@ -1,10 +1,6 @@
 from pathlib import Path
 from typing import Annotated, Any
 
-from models_library.api_schemas_storage.storage_schemas import (
-    DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
-    MAX_NUMBER_OF_PATHS_PER_PAGE,
-)
 from pydantic import BaseModel, Field
 
 from ..api_schemas_rpc_async_jobs.async_jobs import (
@@ -14,6 +10,10 @@
     AsyncJobStatus,
 )
 from ..api_schemas_storage.data_export_async_jobs import DataExportTaskStartInput
+from ..api_schemas_storage.storage_schemas import (
+    DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
+    MAX_NUMBER_OF_PATHS_PER_PAGE,
+)
 from ..progress_bar import ProgressReport
 from ..projects_nodes_io import LocationID, StorageFileID
 from ..rest_pagination import (
@@ -26,6 +26,10 @@ class StorageLocationPathParams(BaseModel):
     location_id: LocationID
 
 
+class StoragePathComputeSizeParams(StorageLocationPathParams):
+    path: Path
+
+
 class ListPathsQueryParams(InputSchema, CursorQueryParameters):
     file_filter: Path | None = None
 

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/async_jobs/async_jobs.py

@@ -23,7 +23,7 @@ async def abort(
     *,
     rpc_namespace: RPCNamespace,
     job_id: AsyncJobId,
-    job_id_data: AsyncJobNameData
+    job_id_data: AsyncJobNameData,
 ) -> AsyncJobAbort:
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
@@ -41,7 +41,7 @@ async def get_status(
     *,
     rpc_namespace: RPCNamespace,
     job_id: AsyncJobId,
-    job_id_data: AsyncJobNameData
+    job_id_data: AsyncJobNameData,
 ) -> AsyncJobStatus:
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
@@ -59,7 +59,7 @@ async def get_result(
     *,
     rpc_namespace: RPCNamespace,
     job_id: AsyncJobId,
-    job_id_data: AsyncJobNameData
+    job_id_data: AsyncJobNameData,
 ) -> AsyncJobResult:
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
@@ -77,7 +77,7 @@ async def list_jobs(
     *,
     rpc_namespace: RPCNamespace,
     filter_: str,
-    job_id_data: AsyncJobNameData
+    job_id_data: AsyncJobNameData,
 ) -> list[AsyncJobGet]:
     result: list[AsyncJobGet] = await rabbitmq_rpc_client.request(
         rpc_namespace,
@@ -95,7 +95,7 @@ async def submit_job(
     rpc_namespace: RPCNamespace,
     method_name: str,
     job_id_data: AsyncJobNameData,
-    **kwargs
+    **kwargs,
 ) -> AsyncJobGet:
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
@@ -104,5 +104,5 @@ async def submit_job(
         **kwargs,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
-    assert isinstance(result, AsyncJobGet)
+    assert isinstance(result, AsyncJobGet)  # nosec
     return result

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/__init__.py

@@ -0,0 +1,33 @@
+from pathlib import Path
+
+from models_library.api_schemas_rpc_async_jobs.async_jobs import (
+    AsyncJobNameData,
+)
+from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
+from models_library.api_schemas_webserver.storage import StorageAsyncJobGet
+from models_library.projects_nodes_io import LocationID
+from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.users import UserID
+
+from ..._client_rpc import RabbitMQRPCClient
+from ..async_jobs.async_jobs import submit_job
+
+
+async def compute_path_size(
+    client: RabbitMQRPCClient,
+    *,
+    user_id: UserID,
+    product_name: str,
+    location_id: LocationID,
+    path: Path,
+) -> tuple[StorageAsyncJobGet, AsyncJobNameData]:
+    job_id_data = AsyncJobNameData(user_id=user_id, product_name=product_name)
+    async_job_rpc_get = await submit_job(
+        rabbitmq_rpc_client=client,
+        rpc_namespace=STORAGE_RPC_NAMESPACE,
+        method_name=RPCMethodName("compute_path_size"),
+        job_id_data=job_id_data,
+        location_id=location_id,
+        path=path,
+    )
+    return StorageAsyncJobGet.from_rpc_schema(async_job_rpc_get), job_id_data

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/paths.py

@@ -140,6 +140,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           const hGrid = new qx.ui.layout.Grid().set({
             spacing: 6,
           });
+          hGrid.setRowFlex(0, 1);
           hGrid.setColumnFlex(1, 1);
           hGrid.setColumnAlign(0, "right", "middle");
           hGrid.setColumnAlign(1, "left", "middle");
@@ -149,6 +150,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
             paddingBottom: 6,
             paddingRight: 4,
             maxWidth: this.self().ITEM_WIDTH,
+            minHeight: 32 + 6,
             maxHeight: this.self().ITEM_HEIGHT
           });
           control.setLayout(hGrid);
@@ -283,18 +285,11 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
 
     // overridden
     _applyThumbnail: function(value, old) {
-      if (value.includes("@FontAwesome5Solid/")) {
+      if (qx.util.ResourceManager.getInstance().isFontUri(value)) {
         value += this.self().THUMBNAIL_SIZE;
-        const image = this.getChildControl("thumbnail").set({
+        this.getChildControl("thumbnail").set({
           source: value,
         });
-
-        [
-          "appear",
-          "loaded"
-        ].forEach(eventName => {
-          image.addListener(eventName, () => this.__fitThumbnailHeight(), this);
-        });
       } else {
         let source = osparc.product.Utils.getThumbnailUrl();
         osparc.utils.Utils.checkImageExists(value)

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

@@ -48,7 +48,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
     // overridden
     initResources: function() {
       this._resourcesList = [];
-      osparc.store.Services.getServicesLatest(false)
+      osparc.store.Services.getServicesLatest()
         .then(services => {
           // Show "Contact Us" message if services.length === 0
           // Most probably is a product-stranger user (it can also be that the catalog is down)

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

@@ -169,80 +169,83 @@ qx.Class.define("osparc.study.Utils", {
 
     createStudyFromTemplate: function(templateData, loadingPage, contextProps = {}) {
       return new Promise((resolve, reject) => {
-        const inaccessibleServices = osparc.store.Services.getInaccessibleServices(templateData["workbench"]);
-        if (inaccessibleServices.length) {
-          const msg = osparc.store.Services.getInaccessibleServicesMsg(inaccessibleServices, templateData["workbench"]);
-          reject({
-            message: msg
+        osparc.store.Services.getStudyServicesMetadata(templateData)
+          .finally(() => {
+            const inaccessibleServices = osparc.store.Services.getInaccessibleServices(templateData["workbench"]);
+            if (inaccessibleServices.length) {
+              const msg = osparc.store.Services.getInaccessibleServicesMsg(inaccessibleServices, templateData["workbench"]);
+              reject({
+                message: msg
+              });
+              return;
+            }
+            // context props, otherwise Study will be created in the root folder of my personal workspace
+            const minStudyData = Object.assign(osparc.data.model.Study.createMinStudyObject(), contextProps);
+            minStudyData["name"] = templateData["name"];
+            minStudyData["description"] = templateData["description"];
+            minStudyData["thumbnail"] = templateData["thumbnail"];
+            const params = {
+              url: {
+                templateId: templateData["uuid"]
+              },
+              data: minStudyData
+            };
+            const options = {
+              pollTask: true
+            };
+            const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudyFromTemplate", params, options);
+            const pollTasks = osparc.data.PollTasks.getInstance();
+            const interval = 1000;
+            pollTasks.createPollingTask(fetchPromise, interval)
+              .then(task => {
+                const title = qx.locale.Manager.tr("CREATING ") + osparc.product.Utils.getStudyAlias({allUpperCase: true}) + " ...";
+                const progressSequence = new osparc.widget.ProgressSequence(title).set({
+                  minHeight: 180 // four tasks
+                });
+                progressSequence.addOverallProgressBar();
+                loadingPage.clearMessages();
+                loadingPage.addWidgetToMessages(progressSequence);
+                task.addListener("updateReceived", e => {
+                  const updateData = e.getData();
+                  if ("task_progress" in updateData && loadingPage) {
+                    const progress = updateData["task_progress"];
+                    const message = progress["message"];
+                    const percent = progress["percent"] ? parseFloat(progress["percent"].toFixed(3)) : progress["percent"];
+                    progressSequence.setOverallProgress(percent);
+                    const existingTask = progressSequence.getTask(message);
+                    if (existingTask) {
+                      // update task
+                      osparc.widget.ProgressSequence.updateTaskProgress(existingTask, {
+                        value: percent,
+                        progressLabel: parseFloat((percent*100).toFixed(2)) + "%"
+                      });
+                    } else {
+                      // new task
+                      // all the previous steps to 100%
+                      progressSequence.getTasks().forEach(tsk => osparc.widget.ProgressSequence.updateTaskProgress(tsk, {
+                        value: 1,
+                        progressLabel: "100%"
+                      }));
+                      // and move to the next new task
+                      const subTask = progressSequence.addNewTask(message);
+                      osparc.widget.ProgressSequence.updateTaskProgress(subTask, {
+                        value: percent,
+                        progressLabel: "0%"
+                      });
+                    }
+                  }
+                }, this);
+                task.addListener("resultReceived", e => {
+                  const studyData = e.getData();
+                  resolve(studyData);
+                }, this);
+                task.addListener("pollingError", e => {
+                  const err = e.getData();
+                  reject(err);
+                }, this);
+              })
+              .catch(err => reject(err));
           });
-          return;
-        }
-        // context props, otherwise Study will be created in the root folder of my personal workspace
-        const minStudyData = Object.assign(osparc.data.model.Study.createMinStudyObject(), contextProps);
-        minStudyData["name"] = templateData["name"];
-        minStudyData["description"] = templateData["description"];
-        minStudyData["thumbnail"] = templateData["thumbnail"];
-        const params = {
-          url: {
-            templateId: templateData["uuid"]
-          },
-          data: minStudyData
-        };
-        const options = {
-          pollTask: true
-        };
-        const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudyFromTemplate", params, options);
-        const pollTasks = osparc.data.PollTasks.getInstance();
-        const interval = 1000;
-        pollTasks.createPollingTask(fetchPromise, interval)
-          .then(task => {
-            const title = qx.locale.Manager.tr("CREATING ") + osparc.product.Utils.getStudyAlias({allUpperCase: true}) + " ...";
-            const progressSequence = new osparc.widget.ProgressSequence(title).set({
-              minHeight: 180 // four tasks
-            });
-            progressSequence.addOverallProgressBar();
-            loadingPage.clearMessages();
-            loadingPage.addWidgetToMessages(progressSequence);
-            task.addListener("updateReceived", e => {
-              const updateData = e.getData();
-              if ("task_progress" in updateData && loadingPage) {
-                const progress = updateData["task_progress"];
-                const message = progress["message"];
-                const percent = progress["percent"] ? parseFloat(progress["percent"].toFixed(3)) : progress["percent"];
-                progressSequence.setOverallProgress(percent);
-                const existingTask = progressSequence.getTask(message);
-                if (existingTask) {
-                  // update task
-                  osparc.widget.ProgressSequence.updateTaskProgress(existingTask, {
-                    value: percent,
-                    progressLabel: parseFloat((percent*100).toFixed(2)) + "%"
-                  });
-                } else {
-                  // new task
-                  // all the previous steps to 100%
-                  progressSequence.getTasks().forEach(tsk => osparc.widget.ProgressSequence.updateTaskProgress(tsk, {
-                    value: 1,
-                    progressLabel: "100%"
-                  }));
-                  // and move to the next new task
-                  const subTask = progressSequence.addNewTask(message);
-                  osparc.widget.ProgressSequence.updateTaskProgress(subTask, {
-                    value: percent,
-                    progressLabel: "0%"
-                  });
-                }
-              }
-            }, this);
-            task.addListener("resultReceived", e => {
-              const studyData = e.getData();
-              resolve(studyData);
-            }, this);
-            task.addListener("pollingError", e => {
-              const err = e.getData();
-              reject(err);
-            }, this);
-          })
-          .catch(err => reject(err));
       });
     },
 

services/static-webserver/client/source/class/osparc/study/Utils.js

@@ -247,7 +247,10 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
           osparc.store.Services.populateVersionsSelectBox(key, selectBox)
             .then(() => {
               osparc.utils.Utils.growSelectBox(selectBox, 200);
-              selectBox.setSelection([latest]);
+              const idx = selectBox.getSelectables().indexOf(latest);
+              if (idx > -1) {
+                selectBox.setSelection([latest]);
+              }
             });
         }
       }