merge master into 7197-add-zipping-endpoints-in-storage

Author: bisgaard-itis

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

@@ -141,17 +141,13 @@ def from_domain_model(cls, item: LicensedItem) -> Self:
                     exclude_unset=True,
                 ),
                 "licensed_resources": [
-                    _ItisVipResourceRestData(**x)
-                    for x in sorted(
-                        item.licensed_resources,
-                        key=lambda x: datetime.strptime(
-                            x["source"]["features"]["date"], "%Y-%m-%d"
-                        ),
-                        reverse=True,
-                    )
+                    _ItisVipResourceRestData(**x) for x in item.licensed_resources
                 ],
                 "category_id": item.licensed_resources[0]["category_id"],
                 "category_display": item.licensed_resources[0]["category_display"],
+                "terms_of_use_url": item.licensed_resources[0].get(
+                    "terms_of_use_url", None
+                ),
             }
         )
 

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

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 from enum import auto
 from typing import Annotated, Any, NamedTuple, NewType, NotRequired, TypeAlias, cast
 from uuid import UUID
@@ -47,7 +47,7 @@ class FeaturesDict(TypedDict):
     age: NotRequired[str]
     weight: NotRequired[str]
     height: NotRequired[str]
-    date: str
+    date: date
     ethnicity: NotRequired[str]
     functionality: NotRequired[str]
 
@@ -102,6 +102,7 @@ class LicensedResourceDB(BaseModel):
     licensed_resource_name: str
     licensed_resource_type: LicensedResourceType
     licensed_resource_data: dict[str, Any] | None
+    priority: int
 
     # states
     created: datetime

packages/postgres-database/src/simcore_postgres_database/migration/versions/5e43b5ec7604_licensed_resources_add_priority_column.py

@@ -0,0 +1,30 @@
+"""licensed_resources add priority column
+
+Revision ID: 5e43b5ec7604
+Revises: e8ffc0c96336
+Create Date: 2025-02-18 12:24:49.105989+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "5e43b5ec7604"
+down_revision = "e8ffc0c96336"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "licensed_resources",
+        sa.Column("priority", sa.SmallInteger(), server_default="0", nullable=False),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("licensed_resources", "priority")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/licensed_resources.py

@@ -47,6 +47,13 @@
         nullable=True,
         doc="Resource metadata. Used for read-only purposes",
     ),
+    sa.Column(
+        "priority",
+        sa.SmallInteger,
+        nullable=False,
+        server_default="0",
+        doc="Used for sorting 0 (first) > 1 (second) > 2 (third) (ex. if we want to manually adjust how it is presented in the Market)",
+    ),
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     column_trashed_datetime("licensed_resources"),

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -488,7 +488,7 @@ def random_itis_vip_available_download_item(
         f"name: {fake.name()} Right Hand,"  # w/o spaces
         f" version: V{fake.pyint()}.0,   "  # w/ x2 spaces
         f"sex: Male, age: 8 years,"  # w/o spaces
-        f"date: {fake.date()}, "  # w/ x1 spaces
+        f"date:  {fake.date()} , "  # w/ x2 spaces prefix, x1 space suffix
         f"ethnicity: Caucasian, functionality: {features_functionality}  "
         "}"
     )

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -10109,6 +10109,7 @@ components:
           title: Height
         date:
           type: string
+          format: date
           title: Date
         ethnicity:
           type: string

services/web/server/src/simcore_service_webserver/folders/_trash_service.py

@@ -3,17 +3,23 @@
 
 import arrow
 from aiohttp import web
-from models_library.folders import FolderID
+from common_library.pagination_tools import iter_pagination_params
+from models_library.access_rights import AccessRights
+from models_library.basic_types import IDStr
+from models_library.folders import FolderDB, FolderID
 from models_library.products import ProductName
 from models_library.projects import ProjectID
+from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.rest_pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
 from models_library.users import UserID
 from simcore_postgres_database.utils_repos import transaction_context
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from ..db.plugin import get_asyncpg_engine
 from ..projects._trash_service import trash_project, untrash_project
 from ..workspaces.api import check_user_workspace_access
-from . import _folders_repository
+from . import _folders_repository, _folders_service
+from .errors import FolderNotTrashedError
 
 _logger = logging.getLogger(__name__)
 
@@ -186,3 +192,89 @@ async def untrash_folder(
         await untrash_project(
             app, product_name=product_name, user_id=user_id, project_id=project_id
         )
+
+
+def _can_delete(
+    folder_db: FolderDB,
+    my_access_rights: AccessRights,
+    user_id: UserID,
+    until_equal_datetime: datetime | None,
+) -> bool:
+    return bool(
+        folder_db.trashed
+        and (until_equal_datetime is None or folder_db.trashed < until_equal_datetime)
+        and my_access_rights.delete
+        and folder_db.trashed_by == user_id
+        and folder_db.trashed_explicitly
+    )
+
+
+async def list_explicitly_trashed_folders(
+    app: web.Application,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    until_equal_datetime: datetime | None = None,
+) -> list[FolderID]:
+    trashed_folder_ids: list[FolderID] = []
+
+    for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
+        (
+            folders,
+            page_params.total_number_of_items,
+        ) = await _folders_service.list_folders_full_depth(
+            app,
+            user_id=user_id,
+            product_name=product_name,
+            text=None,
+            trashed=True,
+            offset=page_params.offset,
+            limit=page_params.limit,
+            order_by=OrderBy(field=IDStr("trashed"), direction=OrderDirection.ASC),
+        )
+
+        # NOTE: Applying POST-FILTERING
+        trashed_folder_ids.extend(
+            [
+                f.folder_db.folder_id
+                for f in folders
+                if _can_delete(
+                    f.folder_db,
+                    my_access_rights=f.my_access_rights,
+                    user_id=user_id,
+                    until_equal_datetime=until_equal_datetime,
+                )
+            ]
+        )
+    return trashed_folder_ids
+
+
+async def delete_trashed_folder(
+    app: web.Application,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    folder_id: FolderID,
+    until_equal_datetime: datetime | None = None,
+) -> None:
+
+    folder = await _folders_service.get_folder(
+        app, user_id=user_id, folder_id=folder_id, product_name=product_name
+    )
+
+    if not _can_delete(
+        folder.folder_db,
+        folder.my_access_rights,
+        user_id=user_id,
+        until_equal_datetime=until_equal_datetime,
+    ):
+        raise FolderNotTrashedError(
+            folder_id=folder_id,
+            user_id=user_id,
+            reason="Cannot delete trashed folder since it does not fit current criteria",
+        )
+
+    # NOTE: this function deletes folder AND its content recursively!
+    await _folders_service.delete_folder(
+        app, user_id=user_id, folder_id=folder_id, product_name=product_name
+    )

services/web/server/src/simcore_service_webserver/folders/errors.py

@@ -19,3 +19,13 @@ class FolderAccessForbiddenError(FoldersValueError):
 
 class FolderGroupNotFoundError(FoldersValueError):
     msg_template = "Folder group not found. {reason}"
+
+
+class FoldersRuntimeError(WebServerBaseError, RuntimeError):
+    ...
+
+
+class FolderNotTrashedError(FoldersRuntimeError):
+    msg_template = (
+        "Cannot delete folder {folder_id} since it was not trashed first: {reason}"
+    )

services/web/server/src/simcore_service_webserver/folders/folders_trash_service.py

@@ -0,0 +1,8 @@
+from ._trash_service import delete_trashed_folder, list_explicitly_trashed_folders
+
+__all__: tuple[str, ...] = (
+    "delete_trashed_folder",
+    "list_explicitly_trashed_folders",
+)
+
+# nopycln: file

services/web/server/src/simcore_service_webserver/licenses/_itis_vip_models.py

@@ -19,6 +19,25 @@
 )
 
 
+def _clean_dict_data(data_dict):
+    """
+    Strips leading/trailing whitespace from all string values
+    and removes keys whose stripped value is empty.
+    """
+    cleaned = {}
+    for k, v in data_dict.items():
+        if v is not None:
+            if isinstance(v, str):
+                v_stripped = v.strip()
+                # Keep the key only if it's not empty after strip
+                if v_stripped:
+                    cleaned[k] = v_stripped
+            else:
+                # If it's not a string, just copy the value as is
+                cleaned[k] = v
+    return cleaned
+
+
 def _feature_descriptor_to_dict(descriptor: str) -> dict[str, Any]:
     # NOTE: this is manually added in the server side so be more robust to errors
     descriptor = _max_str_adapter.validate_python(descriptor.strip("{}"))
@@ -34,6 +53,7 @@ class ItisVipData(BaseModel):
     thumbnail: Annotated[str, Field(alias="Thumbnail")]
     features: Annotated[
         FeaturesDict,
+        BeforeValidator(_clean_dict_data),
         BeforeValidator(_feature_descriptor_to_dict),
         Field(alias="Features"),
     ]