Merge branch 'master' into add-listing-of-comp-runs

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_rpc_async_jobs/async_jobs.py

@@ -1,12 +1,16 @@
-from typing import Any, TypeAlias
+from typing import Annotated, Any, TypeAlias
 from uuid import UUID
 
-from models_library.users import UserID
-from pydantic import BaseModel
+from pydantic import BaseModel, StringConstraints
 
+from ..products import ProductName
 from ..progress_bar import ProgressReport
+from ..users import UserID
 
 AsyncJobId: TypeAlias = UUID
+AsyncJobName: TypeAlias = Annotated[
+    str, StringConstraints(strip_whitespace=True, min_length=1)
+]
 
 
 class AsyncJobStatus(BaseModel):
@@ -21,6 +25,7 @@ class AsyncJobResult(BaseModel):
 
 class AsyncJobGet(BaseModel):
     job_id: AsyncJobId
+    job_name: AsyncJobName
 
 
 class AsyncJobAbort(BaseModel):
@@ -31,5 +36,5 @@ class AsyncJobAbort(BaseModel):
 class AsyncJobNameData(BaseModel):
     """Data for controlling access to an async job"""
 
+    product_name: ProductName
     user_id: UserID
-    product_name: str

packages/service-library/tests/rabbitmq/test_rabbitmq_rpc_interfaces_async_jobs.py

@@ -108,7 +108,8 @@ async def list_jobs(
 
             return [
                 AsyncJobGet(
-                    job_id=TypeAdapter(AsyncJobId).validate_python(t.get_name())
+                    job_id=TypeAdapter(AsyncJobId).validate_python(t.get_name()),
+                    job_name="fake_job_name",
                 )
                 for t in self.tasks
             ]
@@ -117,7 +118,7 @@ async def submit(self, job_id_data: AsyncJobNameData) -> AsyncJobGet:
             assert job_id_data
             job_id = faker.uuid4(cast_to=None)
             self.tasks.append(asyncio.create_task(_slow_task(), name=f"{job_id}"))
-            return AsyncJobGet(job_id=job_id)
+            return AsyncJobGet(job_id=job_id, job_name="fake_job_name")
 
         async def setup(self) -> None:
             for m in (self.status, self.cancel, self.result):

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

@@ -30,8 +30,9 @@ qx.Class.define("osparc.data.PollTask", {
     if (taskData && "task_id" in taskData) {
       this.set({
         taskId: taskData["task_id"],
+        taskName: taskData["task_name"] || "",
         statusHref: taskData["status_href"],
-        resultHref: taskData["result_href"]
+        resultHref: taskData["result_href"],
       });
 
       if ("abort_href" in taskData) {
@@ -64,6 +65,11 @@ qx.Class.define("osparc.data.PollTask", {
       nullable: false
     },
 
+    taskName: {
+      check: "String",
+      nullable: true
+    },
+
     statusHref: {
       check: "String",
       nullable: false

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

@@ -79,6 +79,7 @@ qx.Class.define("osparc.desktop.MainPage", {
           flex: 1
         });
 
+        this.__attachTasks();
         this.__listenToWalletSocket();
         this.__attachHandlers();
       });
@@ -90,6 +91,14 @@ qx.Class.define("osparc.desktop.MainPage", {
     __loadingPage: null,
     __studyEditor: null,
 
+    __attachTasks: function() {
+      const pollTasks = osparc.store.PollTasks.getInstance();
+      const exportDataTasks = pollTasks.getExportDataTasks();
+      exportDataTasks.forEach(task => {
+        osparc.task.ExportData.exportDataTaskReceived(task, false);
+      });
+    },
+
     __listenToWalletSocket: function() {
       const socket = osparc.wrapper.WebSocket.getInstance();
       if (!socket.slotExists("walletOsparcCreditsUpdated")) {

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

@@ -180,7 +180,7 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
       const fetchPromise = dataStore.exportData(paths);
       const pollTasks = osparc.store.PollTasks.getInstance();
       pollTasks.createPollingTask(fetchPromise)
-        .then(task => this.__exportDataTaskReceived(task))
+        .then(task => osparc.task.ExportData.exportDataTaskReceived(task))
         .catch(err => osparc.FlashMessenger.logError(err, this.tr("Unsuccessful files download")));
     },
 
@@ -245,71 +245,6 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
       }
     },
 
-    __exportDataTaskReceived: function(task) {
-      const exportDataTaskUI = new osparc.task.ExportData();
-      exportDataTaskUI.setTask(task);
-      osparc.task.TasksContainer.getInstance().addTaskUI(exportDataTaskUI);
-
-      const progressWindow = new osparc.ui.window.Progress(
-        this.tr("Downloading files"),
-        "@FontAwesome5Solid/download/14",
-        this.tr("Downloading files..."),
-      );
-      if (task.getAbortHref()) {
-        const cancelButton = progressWindow.addCancelButton();
-        cancelButton.setLabel(this.tr("Ignore"));
-        const abortButton = new qx.ui.form.Button().set({
-          label: this.tr("Cancel"),
-          center: true,
-          minWidth: 100,
-        });
-        abortButton.addListener("execute", () => task.abortRequested());
-        progressWindow.addButton(abortButton);
-        abortButton.set({
-          appearance: "danger-button",
-        });
-      }
-      progressWindow.open();
-
-      task.addListener("updateReceived", e => {
-        const data = e.getData();
-        if (data["task_progress"]) {
-          if ("message" in data["task_progress"] && data["task_progress"]["message"]) {
-            progressWindow.setMessage(data["task_progress"]["message"]);
-          }
-          progressWindow.setProgress(osparc.data.PollTask.extractProgress(data) * 100);
-        }
-      }, this);
-      task.addListener("resultReceived", e => {
-        const taskData = e.getData();
-        if (taskData["result"]) {
-          const params = {
-            url: {
-              locationId: 0,
-              fileUuid: encodeURIComponent(taskData["result"]),
-            }
-          };
-          osparc.data.Resources.fetch("storageLink", "getOne", params)
-            .then(data => {
-              if (data && data.link) {
-                const fileName = taskData["result"].split("/").pop();
-                osparc.utils.Utils.downloadLink(data.link, "GET", fileName);
-              }
-            })
-        }
-        progressWindow.close();
-      });
-      task.addListener("taskAborted", () => {
-        osparc.FlashMessenger.logAs(this.tr("Download aborted"), "WARNING");
-        progressWindow.close();
-      });
-      task.addListener("pollingError", e => {
-        const err = e.getData();
-        osparc.FlashMessenger.logError(err);
-        progressWindow.close();
-      });
-    },
-
     __deleteTaskReceived: function(task, paths) {
       const taskUI = new osparc.task.TaskUI();
       taskUI.setIcon("@FontAwesome5Solid/trash/14");

services/static-webserver/client/source/class/osparc/store/PollTasks.js

@@ -83,6 +83,10 @@ qx.Class.define("osparc.store.PollTasks", {
       return this.getTasks().filter(task => task.getTaskId().includes("from_study") && task.getTaskId().includes("as_template"));
     },
 
+    getExportDataTasks: function() {
+      return this.getTasks().filter(task => task.getTaskName() && task.getTaskName() === "export_data");
+    },
+
     removeTasks: function() {
       const tasks = this.getTasks();
       tasks.forEach(task => task.dispose());

services/static-webserver/client/source/class/osparc/task/ExportData.js

@@ -26,6 +26,77 @@ qx.Class.define("osparc.task.ExportData", {
   },
 
   statics: {
-    ICON: "@FontAwesome5Solid/download"
+    ICON: "@FontAwesome5Solid/download",
+
+    exportDataTaskReceived: function(task, popUpProgressWindow = true) {
+      const exportDataTaskUI = new osparc.task.ExportData();
+      exportDataTaskUI.setTask(task);
+      osparc.task.TasksContainer.getInstance().addTaskUI(exportDataTaskUI);
+
+      if (popUpProgressWindow) {
+        const progressWindow = new osparc.ui.window.Progress(
+          qx.locale.Manager.tr("Downloading files"),
+          osparc.task.ExportData+"/14",
+          qx.locale.Manager.tr("Compressing files..."),
+        );
+
+        if (task.getAbortHref()) {
+          const cancelButton = progressWindow.addCancelButton();
+          cancelButton.setLabel(qx.locale.Manager.tr("Ignore"));
+          const abortButton = new qx.ui.form.Button().set({
+            label: qx.locale.Manager.tr("Cancel"),
+            center: true,
+            minWidth: 100,
+          });
+          abortButton.addListener("execute", () => task.abortRequested());
+          progressWindow.addButton(abortButton);
+          abortButton.set({
+            appearance: "danger-button",
+          });
+        }
+
+        task.addListener("updateReceived", e => {
+          const data = e.getData();
+          if (data["task_progress"]) {
+            if ("message" in data["task_progress"] && data["task_progress"]["message"]) {
+              progressWindow.setMessage(data["task_progress"]["message"]);
+            }
+            progressWindow.setProgress(osparc.data.PollTask.extractProgress(data) * 100);
+          }
+        });
+
+        task.addListener("resultReceived", () => progressWindow.close());
+        task.addListener("taskAborted", () => progressWindow.close());
+        task.addListener("pollingError", () => progressWindow.close());
+
+        progressWindow.open();
+      }
+
+      task.addListener("resultReceived", e => {
+        const taskData = e.getData();
+        if (taskData["result"]) {
+          const params = {
+            url: {
+              locationId: 0,
+              fileUuid: encodeURIComponent(taskData["result"]),
+            }
+          };
+          osparc.data.Resources.fetch("storageLink", "getOne", params)
+            .then(data => {
+              if (data && data.link) {
+                const fileName = taskData["result"].split("/").pop();
+                osparc.utils.Utils.downloadLink(data.link, "GET", fileName);
+              }
+            })
+        }
+      });
+      task.addListener("taskAborted", () => {
+        osparc.FlashMessenger.logAs(qx.locale.Manager.tr("Download aborted"), "WARNING");
+      });
+      task.addListener("pollingError", e => {
+        const err = e.getData();
+        osparc.FlashMessenger.logError(err);
+      });
+    }
   },
 });

services/static-webserver/client/source/class/osparc/ui/window/Progress.js

@@ -44,6 +44,9 @@ qx.Class.define("osparc.ui.window.Progress", {
           control.getChildControl("progress").set({
             backgroundColor: "strong-main"
           });
+          control.getContentElement().setStyles({
+            "border-radius": "4px"
+          });
           this.addAt(control, 1);
           break;
       }

services/storage/src/simcore_service_storage/api/_worker_tasks/_simcore_s3.py

@@ -26,7 +26,7 @@ async def _task_progress_cb(
 ) -> None:
     worker = get_celery_worker(task.app)
     assert task.name  # nosec
-    await worker.set_progress(
+    await worker.set_task_progress(
         task_id=task_id,
         report=report,
     )
@@ -87,7 +87,7 @@ async def export_data(
 
         async def _progress_cb(report: ProgressReport) -> None:
             assert task.name  # nosec
-            await get_celery_worker(task.app).set_progress(task_id, report)
+            await get_celery_worker(task.app).set_task_progress(task_id, report)
             _logger.debug("'%s' progress %s", task_id, report.percent_value)
 
         async with ProgressBarData(

services/storage/src/simcore_service_storage/api/rest/_files.py

@@ -35,7 +35,7 @@
     UploadLinks,
 )
 from ...modules.celery.client import CeleryTaskClient
-from ...modules.celery.models import TaskUUID
+from ...modules.celery.models import TaskMetadata, TaskUUID
 from ...simcore_s3_dsm import SimcoreS3DataManager
 from .._worker_tasks._files import complete_upload_file as remote_complete_upload_file
 from .dependencies.celery import get_celery_client
@@ -284,8 +284,10 @@ async def complete_upload_file(
         user_id=query_params.user_id,
         product_name=_UNDEFINED_PRODUCT_NAME_FOR_WORKER_TASKS,  # NOTE: I would need to change the API here
     )
-    task_uuid = await celery_client.send_task(
-        remote_complete_upload_file.__name__,
+    task_uuid = await celery_client.submit_task(
+        TaskMetadata(
+            name=remote_complete_upload_file.__name__,
+        ),
         task_context=async_job_name_data.model_dump(),
         user_id=async_job_name_data.user_id,
         location_id=location_id,