fractal-server 2.9.0a9__tar.gz → 2.9.0a10__tar.gz

{fractal_server-2.9.0a9 → fractal_server-2.9.0a10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.9.0a9
+Version: 2.9.0a10
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.9.0a10/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.9.0a10"

{fractal_server-2.9.0a9 → fractal_server-2.9.0a10}/fractal_server/app/routes/admin/v2/task.py

@@ -7,6 +7,7 @@ from fastapi import status
 from pydantic import BaseModel
 from pydantic import EmailStr
 from pydantic import Field
+from sqlmodel import func
 from sqlmodel import select
 
 from fractal_server.app.db import AsyncSession
@@ -60,6 +61,9 @@ async def query_tasks(
     version: Optional[str] = None,
     name: Optional[str] = None,
     max_number_of_results: int = 25,
+    category: Optional[str] = None,
+    modality: Optional[str] = None,
+    author: Optional[str] = None,
     user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskV2Info]:
@@ -74,6 +78,9 @@ async def query_tasks(
         version: If not `None`, query for matching `task.version`.
         name: If not `None`, query for contained case insensitive `task.name`.
         max_number_of_results: The maximum length of the response.
+        category:
+        modality:
+        author:
     """
 
     stm = select(TaskV2)
@@ -86,6 +93,12 @@ async def query_tasks(
         stm = stm.where(TaskV2.version == version)
     if name is not None:
         stm = stm.where(TaskV2.name.icontains(name))
+    if category is not None:
+        stm = stm.where(func.lower(TaskV2.category) == category.lower())
+    if modality is not None:
+        stm = stm.where(func.lower(TaskV2.modality) == modality.lower())
+    if author is not None:
+        stm = stm.where(TaskV2.authors.icontains(author))
 
     res = await db.execute(stm)
     task_list = res.scalars().all()

{fractal_server-2.9.0a9 → fractal_server-2.9.0a10}/fractal_server/app/routes/auth/group.py

@@ -6,14 +6,12 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
-from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlmodel import col
-from sqlmodel import func
 from sqlmodel import select
 
 from . import current_active_superuser
 from ._aux_auth import _get_single_usergroup_with_user_ids
+from ._aux_auth import _user_or_404
 from ._aux_auth import _usergroup_or_404
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserGroup
@@ -126,42 +124,6 @@ async def update_single_group(
 
     group = await _usergroup_or_404(group_id, db)
 
-    # Check that all required users exist
-    # Note: The reason for introducing `col` is as in
-    # https://sqlmodel.tiangolo.com/tutorial/where/#type-annotations-and-errors,
-    stm = select(func.count()).where(
-        col(UserOAuth.id).in_(group_update.new_user_ids)
-    )
-    res = await db.execute(stm)
-    number_matching_users = res.scalar()
-    if number_matching_users != len(group_update.new_user_ids):
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=(
-                f"Not all requested users (IDs {group_update.new_user_ids}) "
-                "exist."
-            ),
-        )
-
-    # Add new users to existing group
-    for user_id in group_update.new_user_ids:
-        link = LinkUserGroup(user_id=user_id, group_id=group_id)
-        db.add(link)
-    try:
-        await db.commit()
-    except IntegrityError as e:
-        error_msg = (
-            f"Cannot link users with IDs {group_update.new_user_ids} "
-            f"to group {group_id}. "
-            "Likely reason: one of these links already exists.\n"
-            f"Original error: {str(e)}"
-        )
-        logger.info(error_msg)
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=error_msg,
-        )
-
     # Patch `viewer_paths`
     if group_update.viewer_paths is not None:
         group.viewer_paths = group_update.viewer_paths
@@ -239,3 +201,49 @@ async def patch_user_settings_bulk(
     await db.commit()
 
     return Response(status_code=status.HTTP_200_OK)
+
+
+@router_group.post("/group/{group_id}/add-user/{user_id}/", status_code=200)
+async def add_user_to_group(
+    group_id: int,
+    user_id: int,
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> UserGroupRead:
+    await _usergroup_or_404(group_id, db)
+    user = await _user_or_404(user_id, db)
+    link = await db.get(LinkUserGroup, (group_id, user_id))
+    if link is None:
+        db.add(LinkUserGroup(group_id=group_id, user_id=user_id))
+        await db.commit()
+    else:
+        raise HTTPException(
+            status_code=422,
+            detail=(
+                f"User '{user.email}' is already a member of group {group_id}."
+            ),
+        )
+    group = await _get_single_usergroup_with_user_ids(group_id=group_id, db=db)
+    return group
+
+
+@router_group.post("/group/{group_id}/remove-user/{user_id}/", status_code=200)
+async def remove_user_from_group(
+    group_id: int,
+    user_id: int,
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> UserGroupRead:
+    await _usergroup_or_404(group_id, db)
+    user = await _user_or_404(user_id, db)
+    link = await db.get(LinkUserGroup, (group_id, user_id))
+    if link is None:
+        raise HTTPException(
+            status_code=422,
+            detail=f"User '{user.email}' is not a member of group {group_id}.",
+        )
+    else:
+        await db.delete(link)
+        await db.commit()
+    group = await _get_single_usergroup_with_user_ids(group_id=group_id, db=db)
+    return group

{fractal_server-2.9.0a9 → fractal_server-2.9.0a10}/fractal_server/app/schemas/user_group.py

@@ -59,21 +59,10 @@ class UserGroupCreate(BaseModel, extra=Extra.forbid):
 class UserGroupUpdate(BaseModel, extra=Extra.forbid):
     """
     Schema for `UserGroup` update
-
-    NOTE: `new_user_ids` does not correspond to a column of the `UserGroup`
-    table, but it is rather used to create new `LinkUserGroup` rows.
-
-    Attributes:
-        new_user_ids: IDs of groups to be associated to user.
     """
 
-    new_user_ids: list[int] = Field(default_factory=list)
     viewer_paths: Optional[list[str]] = None
 
-    _val_unique = validator("new_user_ids", allow_reuse=True)(
-        val_unique_list("new_user_ids")
-    )
-
     @validator("viewer_paths")
     def viewer_paths_validator(cls, value):
         for i, path in enumerate(value):

{fractal_server-2.9.0a9 → fractal_server-2.9.0a10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.9.0a9"
+version = "2.9.0a10"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -86,7 +86,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.9.0a9"
+current_version = "2.9.0a10"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.9.0a9/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.9.0a9"