Merge branch 'master' into is6201/catalog-history-alternative

Author: pcrespov

api/specs/web-server/_storage.py

@@ -8,7 +8,6 @@
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, Query, status
-from fastapi_pagination.cursor import CursorPage
 from models_library.api_schemas_storage.storage_schemas import (
     FileLocation,
     FileMetaDataGet,
@@ -32,6 +31,7 @@
 from models_library.projects_nodes_io import LocationID
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize
+from servicelib.fastapi.rest_pagination import CustomizedPathsCursorPage
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.storage.schemas import DatasetMetaData, FileMetaData
 
@@ -59,7 +59,7 @@ async def list_storage_locations():
 
 @router.get(
     "/storage/locations/{location_id}/paths",
-    response_model=CursorPage[PathMetaDataGet],
+    response_model=CustomizedPathsCursorPage[PathMetaDataGet],
 )
 async def list_storage_paths(
     _path: Annotated[StorageLocationPathParams, Depends()],

packages/models-library/src/models_library/api_schemas_storage/storage_schemas.py

@@ -9,7 +9,7 @@
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
-from typing import Annotated, Any, Literal, Self, TypeAlias
+from typing import Annotated, Any, Final, Literal, Self, TypeAlias
 from uuid import UUID
 
 from pydantic import (
@@ -404,6 +404,10 @@ class SoftCopyBody(BaseModel):
     link_id: SimcoreS3FileID
 
 
+DEFAULT_NUMBER_OF_PATHS_PER_PAGE: Final[int] = 50
+MAX_NUMBER_OF_PATHS_PER_PAGE: Final[int] = 1000
+
+
 class PathMetaDataGet(BaseModel):
     path: Annotated[Path, Field(description="the path to the current path")]
     display_path: Annotated[

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

@@ -1,8 +1,12 @@
 from datetime import datetime
 from pathlib import Path
-from typing import Any
+from typing import Annotated, Any
 
-from pydantic import BaseModel
+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 (
     AsyncJobGet,
@@ -13,7 +17,9 @@
 from ..api_schemas_storage.data_export_async_jobs import DataExportTaskStartInput
 from ..progress_bar import ProgressReport
 from ..projects_nodes_io import LocationID, StorageFileID
-from ..rest_pagination import CursorQueryParameters
+from ..rest_pagination import (
+    CursorQueryParameters,
+)
 from ._base import InputSchema, OutputSchema
 
 
@@ -24,6 +30,15 @@ class StorageLocationPathParams(BaseModel):
 class ListPathsQueryParams(InputSchema, CursorQueryParameters):
     file_filter: Path | None = None
 
+    size: Annotated[
+        int,
+        Field(
+            description="maximum number of items to return (pagination)",
+            ge=1,
+            lt=MAX_NUMBER_OF_PATHS_PER_PAGE,
+        ),
+    ] = DEFAULT_NUMBER_OF_PATHS_PER_PAGE
+
 
 class DataExportPost(InputSchema):
     paths: list[StorageFileID]

packages/service-library/src/servicelib/fastapi/rest_pagination.py

@@ -0,0 +1,28 @@
+from typing import TypeAlias, TypeVar
+
+from fastapi import Query
+from fastapi_pagination.cursor import CursorPage  # type: ignore[import-not-found]
+from fastapi_pagination.customization import (  # type: ignore[import-not-found]
+    CustomizedPage,
+    UseParamsFields,
+)
+from models_library.api_schemas_storage.storage_schemas import (
+    DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
+    MAX_NUMBER_OF_PATHS_PER_PAGE,
+)
+
+_T = TypeVar("_T")
+
+CustomizedPathsCursorPage = CustomizedPage[
+    CursorPage[_T],
+    # Customizes the maximum value to fit frontend needs
+    UseParamsFields(
+        size=Query(
+            DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
+            ge=1,
+            le=MAX_NUMBER_OF_PATHS_PER_PAGE,
+            description="Page size",
+        )
+    ),
+]
+CustomizedPathsCursorPageParams: TypeAlias = CustomizedPathsCursorPage.__params_type__  # type: ignore

services/api-server/openapi.json

@@ -805,9 +805,9 @@
             "required": false,
             "schema": {
               "type": "integer",
-              "maximum": 100,
+              "maximum": 50,
               "minimum": 1,
-              "default": 50,
+              "default": 20,
               "title": "Limit"
             }
           },
@@ -3352,9 +3352,9 @@
             "required": false,
             "schema": {
               "type": "integer",
-              "maximum": 100,
+              "maximum": 50,
               "minimum": 1,
-              "default": 50,
+              "default": 20,
               "title": "Limit"
             }
           },
@@ -4164,9 +4164,9 @@
             "required": false,
             "schema": {
               "type": "integer",
-              "maximum": 100,
+              "maximum": 50,
               "minimum": 1,
-              "default": 50,
+              "default": 20,
               "title": "Limit"
             }
           },
@@ -5351,9 +5351,9 @@
             "required": false,
             "schema": {
               "type": "integer",
-              "maximum": 100,
+              "maximum": 50,
               "minimum": 1,
-              "default": 50,
+              "default": 20,
               "title": "Limit"
             }
           },
@@ -5648,9 +5648,9 @@
             "required": false,
             "schema": {
               "type": "integer",
-              "maximum": 100,
+              "maximum": 50,
               "minimum": 1,
-              "default": 50,
+              "default": 20,
               "title": "Limit"
             }
           },

services/api-server/src/simcore_service_api_server/models/pagination.py

@@ -1,4 +1,4 @@
-""" Overrides models in fastapi_pagination
+"""Overrides models in fastapi_pagination
 
 Usage:
     from fastapi_pagination.api import create_page
@@ -11,7 +11,6 @@
 
 from fastapi import Query
 from fastapi_pagination.customization import CustomizedPage, UseName, UseParamsFields
-from fastapi_pagination.limit_offset import LimitOffsetParams as _LimitOffsetParams
 from fastapi_pagination.links import LimitOffsetPage as _LimitOffsetPage
 from models_library.rest_pagination import (
     DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
@@ -43,7 +42,7 @@
     UseName(name="Page"),
 ]
 
-PaginationParams: TypeAlias = _LimitOffsetParams
+PaginationParams: TypeAlias = Page.__params_type__  # type: ignore
 
 
 class OnePage(BaseModel, Generic[T]):

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

@@ -225,7 +225,7 @@ qx.Class.define("osparc.desktop.account.ProfilePage", {
         maxWidth: 500
       });
 
-      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("For Privacy reasons, you might want to hide your Full Name and/or the email to other users"));
+      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("For Privacy reasons, you might want to hide your First and Last Names and/or the Email to other users"));
       box.add(label);
 
       const hideFullname = new qx.ui.form.CheckBox().set({
@@ -237,7 +237,7 @@ qx.Class.define("osparc.desktop.account.ProfilePage", {
 
       const form = new qx.ui.form.Form();
       form.add(hideFullname, "Hide Full Name", null, "hideFullname");
-      form.add(hideEmail, "Hide email", null, "hideEmail");
+      form.add(hideEmail, "Hide Email", null, "hideEmail");
       box.add(new qx.ui.form.renderer.Single(form));
 
       // binding to a model

services/static-webserver/client/source/class/osparc/desktop/preferences/pages/ConfirmationsPage.js

@@ -114,7 +114,7 @@ qx.Class.define("osparc.desktop.preferences.pages.ConfirmationsPage", {
         cbConfirmStopNode.addListener("changeValue", e => osparc.Preferences.patchPreferenceField("confirmStopNode", cbConfirmStopNode, e.getData()));
         box.add(cbConfirmStopNode);
 
-        const cbSnapNodeToGrid = new qx.ui.form.CheckBox(this.tr("Snap Node to grid"));
+        const cbSnapNodeToGrid = new qx.ui.form.CheckBox(this.tr("Snap Node to Grid"));
         preferencesSettings.bind("snapNodeToGrid", cbSnapNodeToGrid, "value");
         cbSnapNodeToGrid.addListener("changeValue", e => osparc.Preferences.patchPreferenceField("snapNodeToGrid", cbSnapNodeToGrid, e.getData()));
         box.add(cbSnapNodeToGrid);

services/static-webserver/client/source/class/osparc/desktop/preferences/pages/GeneralPage.js

@@ -137,7 +137,7 @@ qx.Class.define("osparc.desktop.preferences.pages.GeneralPage", {
 
     __addLowDiskSpaceSetting: function() {
       const box = osparc.ui.window.TabbedView.createSectionBox(this.tr("Low Disk Space Threshold"));
-      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("Set the warning Threshold for low Disk Space availability."), "text-13-italic");
+      const label = osparc.ui.window.TabbedView.createHelpLabel(this.tr("Set the warning Threshold for Low Disk Space availability"), "text-13-italic");
       box.add(label);
       const form = new qx.ui.form.Form();
       const diskUsageSpinner = new qx.ui.form.Spinner().set({

services/static-webserver/client/source/class/osparc/product/AboutProduct.js

@@ -49,10 +49,8 @@ qx.Class.define("osparc.product.AboutProduct", {
     __buildLayout: function() {
       switch (osparc.product.Utils.getProductName()) {
         case "s4l":
-          this.__buildS4LLayout();
-          break;
         case "s4lacad":
-          this.__buildS4LAcademicLayout();
+          this.__buildS4LLayout();
           break;
         case "s4llite":
           this.__buildS4LLiteLayout();
@@ -73,11 +71,11 @@ qx.Class.define("osparc.product.AboutProduct", {
     __buildS4LLayout: function() {
       const licenseUrl = osparc.store.Support.getLicenseURL();
       const text = this.tr(`
-        sim4life.io is a native implementation of the most advanced simulation platform, Sim4Life, in the cloud. \
+        Sim4Life.web is a native implementation of the most advanced simulation platform, Sim4Life, in the cloud. \
         The platform empowers users to simulate, analyze, and predict complex, multifaceted, and dynamic biological interactions within the full anatomical complexity of the human body. \
         It provides the ability to set up and run complex simulations directly within any browser, utilizing cloud technology.
         <br><br>
-        sim4life.io makes use of technologies developed by our research partner for the o<sup>2</sup>S<sup>2</sup>PARC platform, the IT’IS Foundation, and co-funded by the U.S. National Institutes of Health’s SPARC initiative.\
+        Sim4Life.web makes use of technologies developed by our research partner for the o<sup>2</sup>S<sup>2</sup>PARC platform, the IT’IS Foundation, and co-funded by the U.S. National Institutes of Health’s SPARC initiative.\
         <br><br>
         For more information about Sim4Life, please visit ${osparc.utils.Utils.createHTMLLink("sim4life.swiss", "https://sim4life.swiss/")}.
         <br><br>
@@ -90,26 +88,6 @@ qx.Class.define("osparc.product.AboutProduct", {
       this.add(label);
     },
 
-    __buildS4LAcademicLayout: function() {
-      const licenseUrl = osparc.store.Support.getLicenseURL();
-      const text = this.tr(`
-        sim4life.science is a native implementation of the most advanced simulation platform, Sim4Life, in the cloud. \
-        The platform empowers users to simulate, analyze, and predict complex, multifaceted, and dynamic biological interactions within the full anatomical complexity of the human body. \
-        It provides the ability to set up and run complex simulations directly within any browser, utilizing cloud technology.
-        <br><br>
-        sim4life.science makes use of technologies developed by our research partner for the o<sup>2</sup>S<sup>2</sup>PARC platform, the IT’IS Foundation, and co-funded by the U.S. National Institutes of Health’s SPARC initiative.\
-        <br><br>
-        For more information about Sim4Life, please visit ${osparc.utils.Utils.createHTMLLink("sim4life.swiss", "href='https://sim4life.swiss/")}.
-        <br><br>
-        To review license agreements, click ${osparc.utils.Utils.createHTMLLink("here", licenseUrl)}.
-        <br><br>
-        Send us an email ${this.__getMailTo()}
-      `);
-
-      const label = osparc.product.quickStart.Utils.createLabel(text);
-      this.add(label);
-    },
-
     __buildS4LLiteLayout: function() {
       // https://zurichmedtech.github.io/s4l-lite-manual/#/docs/what_is_s4l_lite
       const introText = "Sim4Life.lite is a powerful web-based simulation platform that allows you to model and analyze real-world phenomena and to design complex technical devices in a validated environment. With its intuitive interface and advanced tools, Sim4Life.lite makes it easy to develop your simulation project, wherever you are.";