Merge branch 'master' into pr-osparc-add-disk-stats-at-boot

Author: mergify[bot]

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

@@ -74,16 +74,16 @@ class WalletGetPermissions(WalletGet):
     )
 
 
-class CreateWalletBodyParams(OutputSchema):
+class CreateWalletBodyParams(InputSchema):
     name: str
     description: str | None = None
     thumbnail: str | None = None
 
 
-class PutWalletBodyParams(OutputSchema):
+class PutWalletBodyParams(InputSchema):
     name: str
     description: str | None
-    thumbnail: str | None
+    thumbnail: str | None = None
     status: WalletStatus
 
 

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

@@ -13,8 +13,10 @@
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
 from servicelib.utils import limited_gather
-from simcore_service_director_v2.models.comp_tasks import ComputationTaskForRpcDBGet
 
+from ...core.errors import ComputationalRunNotFoundError
+from ...models.comp_runs import CompRunsAtDB
+from ...models.comp_tasks import ComputationTaskForRpcDBGet
 from ...modules.db.repositories.comp_runs import CompRunsRepository
 from ...modules.db.repositories.comp_tasks import CompTasksRepository
 from ...utils import dask as dask_utils
@@ -95,6 +97,19 @@ async def _fetch_task_log(
     return None
 
 
+async def _get_latest_run_or_none(
+    comp_runs_repo: CompRunsRepository,
+    user_id: UserID,
+    project_uuid: ProjectID,
+) -> CompRunsAtDB | None:
+    try:
+        return await comp_runs_repo.get(
+            user_id=user_id, project_id=project_uuid, iteration=None
+        )
+    except ComputationalRunNotFoundError:
+        return None
+
+
 @router.expose(reraise_if_error_type=())
 async def list_computations_latest_iteration_tasks_page(
     app: FastAPI,
@@ -127,13 +142,15 @@ async def list_computations_latest_iteration_tasks_page(
     # Fetch latest run for each project concurrently
     latest_runs = await limited_gather(
         *[
-            comp_runs_repo.get(user_id=user_id, project_id=project_uuid, iteration=None)
+            _get_latest_run_or_none(comp_runs_repo, user_id, project_uuid)
             for project_uuid in unique_project_uuids
         ],
         limit=20,
     )
     # Build a dict: project_uuid -> iteration
-    project_uuid_to_iteration = {run.project_uuid: run.iteration for run in latest_runs}
+    project_uuid_to_iteration = {
+        run.project_uuid: run.iteration for run in latest_runs if run is not None
+    }
 
     # Run all log fetches concurrently
     log_files = await limited_gather(

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

@@ -221,9 +221,7 @@ async def list_for_user__only_latest_iterations(
         if order_by is None:
             order_by = OrderBy(field=IDStr("run_id"))  # default ordering
 
-        base_select_query = sa.select(
-            *self._COMPUTATION_RUNS_RPC_GET_COLUMNS
-        ).select_from(
+        _latest_runs = (
             sa.select(
                 comp_runs.c.project_uuid,
                 sa.func.max(comp_runs.c.iteration).label(
@@ -235,26 +233,28 @@ 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")
-            .join(
+        )
+        if filter_only_running:
+            _latest_runs = _latest_runs.where(
+                comp_runs.c.result.in_(
+                    [
+                        RUNNING_STATE_TO_DB[item]
+                        for item in RunningState.list_running_states()
+                    ]
+                )
+            )
+        _latest_runs_subquery = _latest_runs.subquery().alias("latest_runs")
+
+        base_select_query = sa.select(
+            *self._COMPUTATION_RUNS_RPC_GET_COLUMNS
+        ).select_from(
+            _latest_runs_subquery.join(
                 comp_runs,
                 sa.and_(
-                    comp_runs.c.project_uuid
-                    == literal_column("latest_runs.project_uuid"),
-                    comp_runs.c.iteration
-                    == literal_column("latest_runs.latest_iteration"),
+                    comp_runs.c.project_uuid == _latest_runs_subquery.c.project_uuid,
+                    comp_runs.c.iteration == _latest_runs_subquery.c.latest_iteration,
                 ),
             )
         )

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

@@ -352,7 +352,7 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPageLatest: {
             method: "GET",
-            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&filter_only_running={runningOnly}"
+            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&filter_only_running={runningOnly}&filters={filters}"
           },
           getPageHistory: {
             method: "GET",

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

@@ -69,7 +69,7 @@ qx.Class.define("osparc.desktop.MainPage", {
     preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
     preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
     preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
-    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsActive());
+    preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsLatest());
     Promise.all(preloadPromises)
       .then(() => {
         const mainStack = this.__createMainStack();

services/static-webserver/client/source/class/osparc/jobs/JobsButton.js

@@ -34,7 +34,7 @@ qx.Class.define("osparc.jobs.JobsButton", {
 
     const jobsStore = osparc.store.Jobs.getInstance();
     jobsStore.addListener("changeJobsActive", e => this.__updateJobsButton(e.getData()), this);
-    jobsStore.fetchJobsActive();
+    jobsStore.fetchJobsLatest();
   },
 
   members: {

services/static-webserver/client/source/class/osparc/jobs/RunsBrowser.js

@@ -57,6 +57,10 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
             allowStretchX: true,
             margin: 0
           });
+          control.getChildControl("textfield").set({
+            placeholder: qx.locale.Manager.tr("Filter by name or ID"),
+          });
+          control.hide(); // @matusdrobuliak66: remove this when the backend is ready
           this.getChildControl("header-filter").add(control, {
             flex: 1
           });

services/static-webserver/client/source/class/osparc/jobs/RunsTableModel.js

@@ -75,6 +75,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
       nullable: true,
       check : "String",
       init: "",
+      apply: "reloadData",
     },
   },
 
@@ -95,7 +96,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
       if (this.getProjectUuid()) {
         promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy, resolveWResponse);
       } else {
-        promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, resolveWResponse);
+        const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
+        promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters, resolveWResponse);
       }
       promise
         .then(resp => {
@@ -118,7 +120,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
         if (this.getProjectUuid()) {
           promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy);
         } else {
-          promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy);
+          const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
+          promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters);
         }
         return promise
           .then(jobs => {

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

@@ -37,14 +37,15 @@ qx.Class.define("osparc.store.Jobs", {
   },
 
   members: {
-    fetchJobsActive: function(
+    fetchJobsLatest: function(
       runningOnly = true,
       offset = 0,
       limit = this.self().SERVER_MAX_LIMIT,
       orderBy = {
         field: "submitted_at",
         direction: "desc"
       },
+      filters = null,
       resolveWResponse = false
     ) {
       const params = {
@@ -53,6 +54,7 @@ qx.Class.define("osparc.store.Jobs", {
           offset,
           limit,
           orderBy: JSON.stringify(orderBy),
+          filters: JSON.stringify(filters ? filters : {}),
         }
       };
       const options = {

services/web/server/setup.cfg

@@ -13,13 +13,13 @@ commit_args = --no-verify
 addopts = --strict-markers
 asyncio_mode = auto
 asyncio_default_fixture_loop_scope = function
-markers = 
+markers =
 	slow: marks tests as slow (deselect with '-m "not slow"')
 	acceptance_test: "marks tests as 'acceptance tests' i.e. does the system do what the user expects? Typically those are workflows."
 	testit: "marks test to run during development"
 	heavy_load: "mark tests that require large amount of data"
 
 [mypy]
-plugins = 
+plugins =
 	pydantic.mypy
 	sqlalchemy.ext.mypy.plugin