fractal-server 2.17.0a3__py3-none-any.whl → 2.17.0a5__py3-none-any.whl

fractal_server/app/routes/auth/current_user.py

@@ -15,23 +15,18 @@ from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.models import UserSettings
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act
 from fractal_server.app.routes.auth._aux_auth import (
     _get_single_user_with_groups,
 )
-from fractal_server.app.routes.aux.validate_user_settings import (
-    verify_user_has_settings,
-)
 from fractal_server.app.schemas import UserProfileInfo
-from fractal_server.app.schemas import UserSettingsReadStrict
-from fractal_server.app.schemas import UserSettingsUpdateStrict
 from fractal_server.app.schemas.user import UserRead
 from fractal_server.app.schemas.user import UserUpdate
 from fractal_server.app.schemas.user import UserUpdateStrict
 from fractal_server.app.security import get_user_manager
 from fractal_server.app.security import UserManager
 from fractal_server.config import get_settings
+from fractal_server.config import ViewerAuthScheme
 from fractal_server.syringe import Inject
 
 router_current_user = APIRouter()
@@ -40,7 +35,7 @@ router_current_user = APIRouter()
 @router_current_user.get("/current-user/", response_model=UserRead)
 async def get_current_user(
     group_ids_names: bool = False,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act),
     db: AsyncSession = Depends(get_async_db),
 ):
     """
@@ -56,7 +51,7 @@ async def get_current_user(
 @router_current_user.patch("/current-user/", response_model=UserRead)
 async def patch_current_user(
     user_update: UserUpdateStrict,
-    current_user: UserOAuth = Depends(current_active_user),
+    current_user: UserOAuth = Depends(current_user_act),
     user_manager: UserManager = Depends(get_user_manager),
     db: AsyncSession = Depends(get_async_db),
 ):
@@ -82,47 +77,12 @@ async def patch_current_user(
     return patched_user_with_groups
 
 
-@router_current_user.get(
-    "/current-user/settings/", response_model=UserSettingsReadStrict
-)
-async def get_current_user_settings(
-    current_user: UserOAuth = Depends(current_active_user),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserSettingsReadStrict:
-    verify_user_has_settings(current_user)
-    user_settings = await db.get(UserSettings, current_user.user_settings_id)
-    return user_settings
-
-
-@router_current_user.patch(
-    "/current-user/settings/", response_model=UserSettingsReadStrict
-)
-async def patch_current_user_settings(
-    settings_update: UserSettingsUpdateStrict,
-    current_user: UserOAuth = Depends(current_active_user),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserSettingsReadStrict:
-    verify_user_has_settings(current_user)
-    current_user_settings = await db.get(
-        UserSettings, current_user.user_settings_id
-    )
-
-    for k, v in settings_update.model_dump(exclude_unset=True).items():
-        setattr(current_user_settings, k, v)
-
-    db.add(current_user_settings)
-    await db.commit()
-    await db.refresh(current_user_settings)
-
-    return current_user_settings
-
-
 @router_current_user.get(
     "/current-user/profile-info/",
     response_model=UserProfileInfo,
 )
 async def get_current_user_profile_info(
-    current_user: UserOAuth = Depends(current_active_user),
+    current_user: UserOAuth = Depends(current_user_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserProfileInfo:
     stm = (
@@ -152,7 +112,7 @@ async def get_current_user_profile_info(
     "/current-user/allowed-viewer-paths/", response_model=list[str]
 )
 async def get_current_user_allowed_viewer_paths(
-    current_user: UserOAuth = Depends(current_active_user),
+    current_user: UserOAuth = Depends(current_user_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[str]:
     """
@@ -162,35 +122,31 @@ async def get_current_user_allowed_viewer_paths(
 
     settings = Inject(get_settings)
 
-    if settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "none":
-        return []
-
     authorized_paths = []
 
-    # Respond with 422 error if user has no settings
-    verify_user_has_settings(current_user)
+    if settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == ViewerAuthScheme.NONE:
+        return authorized_paths
 
-    # Load current user settings
-    current_user_settings = await db.get(
-        UserSettings, current_user.user_settings_id
-    )
-    # If project_dir is set, append it to the list of authorized paths
-    if current_user_settings.project_dir is not None:
-        authorized_paths.append(current_user_settings.project_dir)
+    # Append `project_dir` to the list of authorized paths
+    authorized_paths.append(current_user.project_dir)
 
     # If auth scheme is "users-folders" and `slurm_user` is set,
     # build and append the user folder
     if (
-        settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "users-folders"
-        and current_user_settings.slurm_user is not None
+        settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME
+        == ViewerAuthScheme.USERS_FOLDERS
+        and current_user.profile_id is not None
     ):
-        base_folder = settings.FRACTAL_VIEWER_BASE_FOLDER
-        user_folder = os.path.join(
-            base_folder, current_user_settings.slurm_user
-        )
-        authorized_paths.append(user_folder)
+        profile = await db.get(Profile, current_user.profile_id)
+        if profile is not None and profile.username is not None:
+            base_folder = settings.FRACTAL_VIEWER_BASE_FOLDER
+            user_folder = os.path.join(base_folder, profile.username)
+            authorized_paths.append(user_folder)
 
-    if settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "viewer-paths":
+    if (
+        settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME
+        == ViewerAuthScheme.VIEWER_PATHS
+    ):
         # Returns the union of `viewer_paths` for all user's groups
         cmd = (
             select(UserGroup.viewer_paths)
@@ -207,7 +163,6 @@ async def get_current_user_allowed_viewer_paths(
             for _viewer_paths in viewer_paths_nested
             for path in _viewer_paths
         }
-
         authorized_paths.extend(all_viewer_paths_set)
 
     return authorized_paths

fractal_server/app/routes/auth/group.py

@@ -9,7 +9,7 @@ from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
-from . import current_active_superuser
+from . import current_superuser_act
 from ._aux_auth import _get_default_usergroup_id
 from ._aux_auth import _get_single_usergroup_with_user_ids
 from ._aux_auth import _user_or_404
@@ -18,11 +18,9 @@ from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.models import UserSettings
 from fractal_server.app.schemas.user_group import UserGroupCreate
 from fractal_server.app.schemas.user_group import UserGroupRead
 from fractal_server.app.schemas.user_group import UserGroupUpdate
-from fractal_server.app.schemas.user_settings import UserSettingsUpdate
 from fractal_server.app.security import FRACTAL_DEFAULT_GROUP_NAME
 from fractal_server.logger import set_logger
 
@@ -36,7 +34,7 @@ router_group = APIRouter()
 )
 async def get_list_user_groups(
     user_ids: bool = False,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[UserGroupRead]:
     # Get all groups
@@ -70,7 +68,7 @@ async def get_list_user_groups(
 )
 async def get_single_user_group(
     group_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     group = await _get_single_usergroup_with_user_ids(group_id=group_id, db=db)
@@ -84,7 +82,7 @@ async def get_single_user_group(
 )
 async def create_single_group(
     group_create: UserGroupCreate,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     # Check that name is not already in use
@@ -116,7 +114,7 @@ async def create_single_group(
 async def update_single_group(
     group_id: int,
     group_update: UserGroupUpdate,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     group = await _usergroup_or_404(group_id, db)
@@ -137,7 +135,7 @@ async def update_single_group(
 @router_group.delete("/group/{group_id}/", status_code=204)
 async def delete_single_group(
     group_id: int,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     group = await _usergroup_or_404(group_id, db)
@@ -159,36 +157,11 @@ async def delete_single_group(
     return Response(status_code=status.HTTP_204_NO_CONTENT)
 
 
-@router_group.patch("/group/{group_id}/user-settings/", status_code=200)
-async def patch_user_settings_bulk(
-    group_id: int,
-    settings_update: UserSettingsUpdate,
-    superuser: UserOAuth = Depends(current_active_superuser),
-    db: AsyncSession = Depends(get_async_db),
-):
-    await _usergroup_or_404(group_id, db)
-    res = await db.execute(
-        select(UserSettings)
-        .join(UserOAuth)
-        .where(LinkUserGroup.user_id == UserOAuth.id)
-        .where(LinkUserGroup.group_id == group_id)
-    )
-    settings_list = res.scalars().all()
-    update = settings_update.model_dump(exclude_unset=True)
-    for settings in settings_list:
-        for k, v in update.items():
-            setattr(settings, k, v)
-        db.add(settings)
-    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),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     await _usergroup_or_404(group_id, db)
@@ -212,7 +185,7 @@ async def add_user_to_group(
 async def remove_user_from_group(
     group_id: int,
     user_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
     # Check that user and group exist

fractal_server/app/routes/auth/register.py

@@ -4,7 +4,7 @@ Definition of `/auth/register/` routes.
 from fastapi import APIRouter
 from fastapi import Depends
 
-from . import current_active_superuser
+from . import current_superuser_act
 from . import fastapi_users
 from ...schemas.user import UserCreate
 from ...schemas.user import UserRead
@@ -13,7 +13,7 @@ router_register = APIRouter()
 
 router_register.include_router(
     fastapi_users.get_register_router(UserRead, UserCreate),
-    dependencies=[Depends(current_active_superuser)],
+    dependencies=[Depends(current_superuser_act)],
 )
 
 

fractal_server/app/routes/auth/users.py

@@ -12,22 +12,18 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import func
 from sqlmodel import select
 
-from . import current_active_superuser
+from . import current_superuser_act
 from ...db import get_async_db
 from ...schemas.user import UserRead
 from ...schemas.user import UserUpdate
-from ..aux.validate_user_settings import verify_user_has_settings
 from ._aux_auth import _get_default_usergroup_id
 from ._aux_auth import _get_single_user_with_groups
 from ._aux_auth import FRACTAL_DEFAULT_GROUP_NAME
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.models import UserSettings
 from fractal_server.app.models.v2 import Profile
 from fractal_server.app.routes.auth._aux_auth import _user_or_404
-from fractal_server.app.schemas import UserSettingsRead
-from fractal_server.app.schemas import UserSettingsUpdate
 from fractal_server.app.schemas.user import UserUpdateGroups
 from fractal_server.app.security import get_user_manager
 from fractal_server.app.security import UserManager
@@ -43,7 +39,7 @@ logger = set_logger(__name__)
 async def get_user(
     user_id: int,
     group_ids_names: bool = True,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserRead:
     user = await _user_or_404(user_id, db)
@@ -57,7 +53,7 @@ async def get_user(
 async def patch_user(
     user_id: int,
     user_update: UserUpdate,
-    current_superuser: UserOAuth = Depends(current_active_superuser),
+    current_superuser: UserOAuth = Depends(current_superuser_act),
     user_manager: UserManager = Depends(get_user_manager),
     db: AsyncSession = Depends(get_async_db),
 ):
@@ -113,7 +109,7 @@ async def patch_user(
 @router_users.get("/users/", response_model=list[UserRead])
 async def list_users(
     profile_id: int | None = None,
-    user: UserOAuth = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ):
     """
@@ -148,7 +144,7 @@ async def list_users(
 async def set_user_groups(
     user_id: int,
     user_update: UserUpdateGroups,
-    superuser: UserOAuth = Depends(current_active_superuser),
+    superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserRead:
     # Preliminary check that all objects exist in the db
@@ -210,40 +206,3 @@ async def set_user_groups(
     user_with_groups = await _get_single_user_with_groups(user, db)
 
     return user_with_groups
-
-
-@router_users.get(
-    "/users/{user_id}/settings/", response_model=UserSettingsRead
-)
-async def get_user_settings(
-    user_id: int,
-    superuser: UserOAuth = Depends(current_active_superuser),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserSettingsRead:
-    user = await _user_or_404(user_id=user_id, db=db)
-    verify_user_has_settings(user)
-    user_settings = await db.get(UserSettings, user.user_settings_id)
-    return user_settings
-
-
-@router_users.patch(
-    "/users/{user_id}/settings/", response_model=UserSettingsRead
-)
-async def patch_user_settings(
-    user_id: int,
-    settings_update: UserSettingsUpdate,
-    superuser: UserOAuth = Depends(current_active_superuser),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserSettingsRead:
-    user = await _user_or_404(user_id=user_id, db=db)
-    verify_user_has_settings(user)
-    user_settings = await db.get(UserSettings, user.user_settings_id)
-
-    for k, v in settings_update.model_dump(exclude_unset=True).items():
-        setattr(user_settings, k, v)
-
-    db.add(user_settings)
-    await db.commit()
-    await db.refresh(user_settings)
-
-    return user_settings

fractal_server/app/schemas/__init__.py

@@ -1,3 +1,2 @@
 from .user import *  # noqa: F401, F403
 from .user_group import *  # noqa: F401, F403
-from .user_settings import *  # noqa: F401, F403

fractal_server/app/schemas/user.py

@@ -1,9 +1,15 @@
+from typing import Annotated
+
 from fastapi_users import schemas
+from pydantic import AfterValidator
 from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import EmailStr
 from pydantic import Field
 
+from fractal_server.string_tools import validate_cmd
+from fractal_server.types import AbsolutePathStr
+from fractal_server.types import ListUniqueNonEmptyString
 from fractal_server.types import ListUniqueNonNegativeInt
 from fractal_server.types import NonEmptyStr
 
@@ -37,6 +43,13 @@ class UserRead(schemas.BaseUser[int]):
     group_ids_names: list[tuple[int, str]] | None = None
     oauth_accounts: list[OAuthAccountRead]
     profile_id: int | None = None
+    project_dir: str
+    slurm_accounts: list[str]
+
+
+def _validate_cmd(value: str) -> str:
+    validate_cmd(value)
+    return value
 
 
 class UserUpdate(schemas.BaseUserUpdate):
@@ -50,6 +63,8 @@ class UserUpdate(schemas.BaseUserUpdate):
         is_superuser:
         is_verified:
         profile_id:
+        project_dir:
+        slurm_accounts:
     """
 
     model_config = ConfigDict(extra="forbid")
@@ -59,6 +74,10 @@ class UserUpdate(schemas.BaseUserUpdate):
     is_superuser: bool = None
     is_verified: bool = None
     profile_id: int | None = None
+    project_dir: Annotated[
+        AbsolutePathStr, AfterValidator(_validate_cmd)
+    ] | None = None
+    slurm_accounts: ListUniqueNonEmptyString | None = None
 
 
 class UserUpdateStrict(BaseModel):
@@ -66,9 +85,11 @@ class UserUpdateStrict(BaseModel):
     Schema for `User` self-editing.
 
     Attributes:
+        slurm_accounts:
     """
 
     model_config = ConfigDict(extra="forbid")
+    slurm_accounts: ListUniqueNonEmptyString | None = None
 
 
 class UserCreate(schemas.BaseUserCreate):
@@ -80,6 +101,8 @@ class UserCreate(schemas.BaseUserCreate):
     """
 
     profile_id: int | None = None
+    project_dir: Annotated[AbsolutePathStr, AfterValidator(_validate_cmd)]
+    slurm_accounts: list[str] = Field(default_factory=list)
 
 
 class UserUpdateGroups(BaseModel):

fractal_server/app/schemas/v2/task_group.py

@@ -37,6 +37,7 @@ class TaskGroupActivityActionV2(StrEnum):
 class TaskGroupCreateV2(BaseModel):
     model_config = ConfigDict(extra="forbid")
     user_id: int
+    resource_id: int
     user_group_id: int | None = None
     active: bool = True
     origin: TaskGroupV2OriginEnum