@sanderegg review: interfaces for batch/ update

Author: pcrespov

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

@@ -213,13 +213,9 @@ async def get_for_user_or_workspace(
         return FolderDB.from_orm(row)
 
 
-_MAX_ITEMS_UPDATE: Final = 100
-
-
-async def update(
+async def _update_impl(
     app: web.Application,
-    *,
-    folder_id: FolderID | set[FolderID],
+    folders_id_or_ids: FolderID | set[FolderID],
     product_name: ProductName,
     # updatable columns
     name: str | UnSet = _unset,
@@ -244,25 +240,64 @@ async def update(
         .returning(*_SELECTION_ARGS)
     )
 
-    if isinstance(folder_id, set):
-        if len(folder_id) == 0 or len(folder_id) > _MAX_ITEMS_UPDATE:
-            msg = f"Number of items for batch update is out-of-range, got {len(folder_id)=}"
-            raise ValueError(msg)
-
+    if isinstance(folders_id_or_ids, set):
         # batch-update
-        query = query.where(folders_v2.c.folder_id.in_(list(folder_id)))
+        query = query.where(folders_v2.c.folder_id.in_(list(folders_id_or_ids)))
     else:
         # single-update
-        query = query.where(folders_v2.c.folder_id == folder_id)
+        query = query.where(folders_v2.c.folder_id == folders_id_or_ids)
 
     async with get_database_engine(app).acquire() as conn:
         result = await conn.execute(query)
         row = await result.first()
         if row is None:
-            raise FolderNotFoundError(reason=f"Folder {folder_id} not found.")
+            raise FolderNotFoundError(reason=f"Folder {folders_id_or_ids} not found.")
         return FolderDB.from_orm(row)
 
 
+async def update_batch(
+    app: web.Application,
+    *folder_id: FolderID,
+    product_name: ProductName,
+    # updatable columns
+    name: str | UnSet = _unset,
+    parent_folder_id: FolderID | None | UnSet = _unset,
+    trashed_at: datetime | None | UnSet = _unset,
+    trashed_explicitly: bool | UnSet = _unset,
+) -> FolderDB:
+    return await _update_impl(
+        app=app,
+        folders_id_or_ids=set(folder_id),
+        product_name=product_name,
+        name=name,
+        parent_folder_id=parent_folder_id,
+        trashed_at=trashed_at,
+        trashed_explicitly=trashed_explicitly,
+    )
+
+
+async def update(
+    app: web.Application,
+    *,
+    folder_id: FolderID,
+    product_name: ProductName,
+    # updatable columns
+    name: str | UnSet = _unset,
+    parent_folder_id: FolderID | None | UnSet = _unset,
+    trashed_at: datetime | None | UnSet = _unset,
+    trashed_explicitly: bool | UnSet = _unset,
+) -> FolderDB:
+    return await _update_impl(
+        app=app,
+        folders_id_or_ids=folder_id,
+        product_name=product_name,
+        name=name,
+        parent_folder_id=parent_folder_id,
+        trashed_at=trashed_at,
+        trashed_explicitly=trashed_explicitly,
+    )
+
+
 async def delete_recursively(
     app: web.Application,
     *,

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

@@ -75,9 +75,9 @@ async def _batch_update_folders(
     }
 
     if child_folders:
-        await _folders_db.update(
+        await _folders_db.update_batch(
             app,
-            folder_id=child_folders,
+            *child_folders,
             product_name=product_name,
             trashed_at=trashed_at,
             trashed_explicitly=False,