fractal-server 2.4.0a1__tar.gz → 2.4.1__tar.gz

{fractal_server-2.4.0a1 → fractal_server-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.4.0a1
+Version: 2.4.1
 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.4.1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.4.1"

{fractal_server-2.4.0a1 → fractal_server-2.4.1}/fractal_server/app/routes/auth/group.py

@@ -5,6 +5,7 @@ from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import col
 from sqlmodel import func
@@ -19,6 +20,9 @@ from ._aux_auth import _get_single_group_with_user_ids
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
+from fractal_server.logger import set_logger
+
+logger = set_logger(__name__)
 
 router_group = APIRouter()
 
@@ -133,7 +137,20 @@ async def update_single_group(
     for user_id in group_update.new_user_ids:
         link = LinkUserGroup(user_id=user_id, group_id=group_id)
         db.add(link)
-    await db.commit()
+    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,
+        )
 
     updated_group = await _get_single_group_with_user_ids(
         group_id=group_id, db=db

{fractal_server-2.4.0a1 → fractal_server-2.4.1}/fractal_server/app/routes/auth/users.py

@@ -8,6 +8,7 @@ from fastapi import status
 from fastapi_users import exceptions
 from fastapi_users import schemas
 from fastapi_users.router.common import ErrorCode
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import col
 from sqlmodel import func
@@ -25,10 +26,14 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth._aux_auth import _user_or_404
 from fractal_server.app.security import get_user_manager
 from fractal_server.app.security import UserManager
+from fractal_server.logger import set_logger
 
 router_users = APIRouter()
 
 
+logger = set_logger(__name__)
+
+
 @router_users.get("/users/{user_id}/", response_model=UserRead)
 async def get_user(
     user_id: int,
@@ -107,7 +112,21 @@ async def patch_user(
         for new_group_id in user_update.new_group_ids:
             link = LinkUserGroup(user_id=user_id, group_id=new_group_id)
             db.add(link)
-        await db.commit()
+
+        try:
+            await db.commit()
+        except IntegrityError as e:
+            error_msg = (
+                f"Cannot link groups with IDs {user_update.new_group_ids} "
+                f"to user {user_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,
+            )
 
         patched_user = user_to_patch
 
@@ -132,6 +151,11 @@ async def patch_user(
                     "reason": e.reason,
                 },
             )
+        except exceptions.UserAlreadyExists:
+            raise HTTPException(
+                status.HTTP_400_BAD_REQUEST,
+                detail=ErrorCode.UPDATE_USER_EMAIL_ALREADY_EXISTS,
+            )
     else:
         # Nothing to do, just continue
         patched_user = user_to_patch

{fractal_server-2.4.0a1 → fractal_server-2.4.1}/fractal_server/app/schemas/user.py

@@ -106,6 +106,10 @@ class UserUpdateStrict(BaseModel, extra=Extra.forbid):
 class UserUpdateWithNewGroupIds(UserUpdate):
     new_group_ids: Optional[list[int]] = None
 
+    _val_unique = validator("new_group_ids", allow_reuse=True)(
+        val_unique_list("new_group_ids")
+    )
+
 
 class UserCreate(schemas.BaseUserCreate):
     """

{fractal_server-2.4.0a1 → fractal_server-2.4.1}/fractal_server/app/schemas/user_group.py

@@ -4,6 +4,10 @@ from typing import Optional
 from pydantic import BaseModel
 from pydantic import Extra
 from pydantic import Field
+from pydantic import validator
+
+from ._validators import val_unique_list
+
 
 __all__ = (
     "UserGroupRead",
@@ -55,3 +59,7 @@ class UserGroupUpdate(BaseModel, extra=Extra.forbid):
     """
 
     new_user_ids: list[int] = Field(default_factory=list)
+
+    _val_unique = validator("new_user_ids", allow_reuse=True)(
+        val_unique_list("new_user_ids")
+    )

{fractal_server-2.4.0a1 → fractal_server-2.4.1}/pyproject.toml

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

fractal_server-2.4.0a1/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.4.0a1"