fractal-server 2.7.0a0__tar.gz → 2.7.0a1__tar.gz

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/PKG-INFO

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

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

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/models/linkusergroup.py

@@ -1,6 +1,12 @@
+from datetime import datetime
+
+from sqlalchemy import Column
+from sqlalchemy.types import DateTime
 from sqlmodel import Field
 from sqlmodel import SQLModel
 
+from fractal_server.utils import get_timestamp
+
 
 class LinkUserGroup(SQLModel, table=True):
     """
@@ -9,3 +15,8 @@ class LinkUserGroup(SQLModel, table=True):
 
     group_id: int = Field(foreign_key="usergroup.id", primary_key=True)
     user_id: int = Field(foreign_key="user_oauth.id", primary_key=True)
+
+    timestamp_created: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+    )

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/routes/api/v2/task_group.py

@@ -31,12 +31,17 @@ logger = set_logger(__name__)
 async def get_task_group_list(
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
+    only_active: bool = False,
+    only_owner: bool = False,
 ) -> list[TaskGroupReadV2]:
     """
     Get all accessible TaskGroups
     """
-    stm = select(TaskGroupV2).where(
-        or_(
+
+    if only_owner:
+        condition = TaskGroupV2.user_id == user.id
+    else:
+        condition = or_(
             TaskGroupV2.user_id == user.id,
             TaskGroupV2.user_group_id.in_(
                 select(LinkUserGroup.group_id).where(
@@ -44,7 +49,10 @@ async def get_task_group_list(
                 )
             ),
         )
-    )
+    stm = select(TaskGroupV2).where(condition)
+    if only_active:
+        stm = stm.where(TaskGroupV2.active)
+
     res = await db.execute(stm)
     task_groups = res.scalars().all()
 

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/routes/auth/_aux_auth.py

@@ -1,6 +1,7 @@
 from fastapi import HTTPException
 from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlmodel import asc
 from sqlmodel import select
 
 from fractal_server.app.models.linkusergroup import LinkUserGroup
@@ -9,58 +10,58 @@ from fractal_server.app.models.security import UserOAuth
 from fractal_server.app.schemas.user import UserRead
 from fractal_server.app.schemas.user_group import UserGroupRead
 from fractal_server.app.security import FRACTAL_DEFAULT_GROUP_NAME
+from fractal_server.logger import set_logger
 
+logger = set_logger(__name__)
 
-async def _get_single_user_with_group_names(
+
+async def _get_single_user_with_groups(
     user: UserOAuth,
     db: AsyncSession,
 ) -> UserRead:
     """
-    Enrich a user object by filling its `group_names` attribute.
+    Enrich a user object by filling its `group_ids_names` attribute.
 
     Arguments:
         user: The current `UserOAuth` object
         db: Async db session
 
     Returns:
-        A `UserRead` object with `group_names` set
+        A `UserRead` object with `group_ids_names` dict
     """
     stm_groups = (
         select(UserGroup)
         .join(LinkUserGroup)
-        .where(LinkUserGroup.user_id == UserOAuth.id)
+        .where(LinkUserGroup.user_id == user.id)
+        .order_by(asc(LinkUserGroup.timestamp_created))
     )
     res = await db.execute(stm_groups)
     groups = res.scalars().unique().all()
-    group_names = [group.name for group in groups]
-    return UserRead(
-        **user.model_dump(),
-        group_names=group_names,
-        oauth_accounts=user.oauth_accounts,
+    group_ids_names = [(group.id, group.name) for group in groups]
+
+    # Check that Fractal Default Group is the first of the list. If not, fix.
+    index = next(
+        (
+            i
+            for i, group_tuple in enumerate(group_ids_names)
+            if group_tuple[1] == FRACTAL_DEFAULT_GROUP_NAME
+        ),
+        None,
     )
+    if index is None:
+        logger.warning(
+            f"User {user.id} not in "
+            f"default UserGroup '{FRACTAL_DEFAULT_GROUP_NAME}'"
+        )
+    elif index != 0:
+        default_group = group_ids_names.pop(index)
+        group_ids_names.insert(0, default_group)
+    else:
+        pass
 
-
-async def _get_single_user_with_group_ids(
-    user: UserOAuth,
-    db: AsyncSession,
-) -> UserRead:
-    """
-    Enrich a user object by filling its `group_ids` attribute.
-
-    Arguments:
-        user: The current `UserOAuth` object
-        db: Async db session
-
-    Returns:
-        A `UserRead` object with `group_ids` set
-    """
-    stm_links = select(LinkUserGroup).where(LinkUserGroup.user_id == user.id)
-    res = await db.execute(stm_links)
-    links = res.scalars().unique().all()
-    group_ids = [link.group_id for link in links]
     return UserRead(
         **user.model_dump(),
-        group_ids=group_ids,
+        group_ids_names=group_ids_names,
         oauth_accounts=user.oauth_accounts,
     )
 

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/routes/auth/current_user.py

@@ -13,7 +13,7 @@ from ...schemas.user import UserRead
 from ...schemas.user import UserUpdate
 from ...schemas.user import UserUpdateStrict
 from ..aux.validate_user_settings import verify_user_has_settings
-from ._aux_auth import _get_single_user_with_group_names
+from ._aux_auth import _get_single_user_with_groups
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
@@ -28,15 +28,15 @@ router_current_user = APIRouter()
 
 @router_current_user.get("/current-user/", response_model=UserRead)
 async def get_current_user(
-    group_names: bool = False,
+    group_ids_names: bool = False,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ):
     """
     Return current user
     """
-    if group_names is True:
-        user_with_groups = await _get_single_user_with_group_names(user, db)
+    if group_ids_names is True:
+        user_with_groups = await _get_single_user_with_groups(user, db)
         return user_with_groups
     else:
         return user
@@ -65,7 +65,7 @@ async def patch_current_user(
     patched_user = await db.get(
         UserOAuth, validated_user.id, populate_existing=True
     )
-    patched_user_with_groups = await _get_single_user_with_group_names(
+    patched_user_with_groups = await _get_single_user_with_groups(
         patched_user, db
     )
     return patched_user_with_groups

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/routes/auth/router.py

@@ -2,7 +2,6 @@ from fastapi import APIRouter
 
 from .current_user import router_current_user
 from .group import router_group
-from .group_names import router_group_names
 from .login import router_login
 from .oauth import router_oauth
 from .register import router_register
@@ -13,7 +12,6 @@ router_auth = APIRouter()
 router_auth.include_router(router_register)
 router_auth.include_router(router_current_user)
 router_auth.include_router(router_login)
-router_auth.include_router(router_group_names)
 router_auth.include_router(router_users)
 router_auth.include_router(router_group)
 router_auth.include_router(router_oauth)

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/routes/auth/users.py

@@ -20,7 +20,7 @@ from ...schemas.user import UserRead
 from ...schemas.user import UserUpdate
 from ...schemas.user import UserUpdateWithNewGroupIds
 from ..aux.validate_user_settings import verify_user_has_settings
-from ._aux_auth import _get_single_user_with_group_ids
+from ._aux_auth import _get_single_user_with_groups
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
@@ -41,13 +41,14 @@ logger = set_logger(__name__)
 @router_users.get("/users/{user_id}/", response_model=UserRead)
 async def get_user(
     user_id: int,
-    group_ids: bool = True,
+    group_ids_names: bool = True,
     superuser: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserRead:
     user = await _user_or_404(user_id, db)
-    if group_ids:
-        user = await _get_single_user_with_group_ids(user, db)
+    if group_ids_names:
+        user_with_groups = await _get_single_user_with_groups(user, db)
+        return user_with_groups
     return user
 
 
@@ -163,12 +164,12 @@ async def patch_user(
         # Nothing to do, just continue
         patched_user = user_to_patch
 
-    # Enrich user object with `group_ids` attribute
-    patched_user_with_group_ids = await _get_single_user_with_group_ids(
+    # Enrich user object with `group_ids_names` attribute
+    patched_user_with_groups = await _get_single_user_with_groups(
         patched_user, db
     )
 
-    return patched_user_with_group_ids
+    return patched_user_with_groups
 
 
 @router_users.get("/users/", response_model=list[UserRead])

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/fractal_server/app/schemas/user.py

@@ -41,8 +41,7 @@ class UserRead(schemas.BaseUser[int]):
     """
 
     username: Optional[str]
-    group_names: Optional[list[str]] = None
-    group_ids: Optional[list[int]] = None
+    group_ids_names: Optional[list[tuple[int, str]]] = None
     oauth_accounts: list[OAuthAccountRead]
 
 

fractal_server-2.7.0a1/fractal_server/migrations/versions/df7cc3501bf7_linkusergroup_timestamp_created.py

@@ -0,0 +1,42 @@
+"""LinkUserGroup.timestamp_created
+
+Revision ID: df7cc3501bf7
+Revises: 7cf1baae8fb4
+Create Date: 2024-10-03 13:55:53.272269
+
+"""
+from datetime import datetime
+from datetime import timezone
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "df7cc3501bf7"
+down_revision = "7cf1baae8fb4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("linkusergroup", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "timestamp_created",
+                sa.DateTime(timezone=True),
+                nullable=False,
+                server_default=str(datetime(2000, 1, 1, tzinfo=timezone.utc)),
+            )
+        )
+
+    with op.batch_alter_table("project", schema=None) as batch_op:
+        batch_op.alter_column("timestamp_created", server_default=None)
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("linkusergroup", schema=None) as batch_op:
+        batch_op.drop_column("timestamp_created")
+
+    # ### end Alembic commands ###

{fractal_server-2.7.0a0 → fractal_server-2.7.0a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.7.0a0"
+version = "2.7.0a1"
 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.7.0a0"
+current_version = "2.7.0a1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.7.0a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.7.0a0"

fractal_server-2.7.0a0/fractal_server/app/routes/auth/group_names.py

@@ -1,34 +0,0 @@
-"""
-Definition `/auth/group-names/` endpoints
-"""
-from fastapi import APIRouter
-from fastapi import Depends
-from fastapi import status
-from sqlalchemy.ext.asyncio import AsyncSession
-from sqlmodel import select
-
-from . import current_active_user
-from ...db import get_async_db
-from fractal_server.app.models import UserGroup
-from fractal_server.app.models import UserOAuth
-
-router_group_names = APIRouter()
-
-
-@router_group_names.get(
-    "/group-names/", response_model=list[str], status_code=status.HTTP_200_OK
-)
-async def get_list_user_group_names(
-    user: UserOAuth = Depends(current_active_user),
-    db: AsyncSession = Depends(get_async_db),
-) -> list[str]:
-    """
-    Return the available group names.
-
-    This endpoint is not restricted to superusers.
-    """
-    stm_all_groups = select(UserGroup)
-    res = await db.execute(stm_all_groups)
-    groups = res.scalars().all()
-    group_names = [group.name for group in groups]
-    return group_names