fractal-server 2.18.0__py3-none-any.whl → 2.18.0a1__py3-none-any.whl

fractal_server/app/routes/auth/_aux_auth.py

@@ -1,21 +1,12 @@
-from os.path import normpath
-from pathlib import Path
-
 from fastapi import HTTPException
 from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlmodel import and_
 from sqlmodel import asc
-from sqlmodel import not_
-from sqlmodel import or_
 from sqlmodel import select
 
 from fractal_server.app.models.linkusergroup import LinkUserGroup
-from fractal_server.app.models.linkuserproject import LinkUserProjectV2
 from fractal_server.app.models.security import UserGroup
 from fractal_server.app.models.security import UserOAuth
-from fractal_server.app.models.v2.dataset import DatasetV2
-from fractal_server.app.models.v2.project import ProjectV2
 from fractal_server.app.schemas.user import UserRead
 from fractal_server.app.schemas.user_group import UserGroupRead
 from fractal_server.config import get_settings
@@ -187,94 +178,3 @@ async def _verify_user_belongs_to_group(
                     f"to UserGroup {user_group_id}"
                 ),
             )
-
-
-async def _check_project_dirs_update(
-    *,
-    old_project_dirs: list[str],
-    new_project_dirs: list[str],
-    user_id: int,
-    db: AsyncSession,
-) -> None:
-    """
-    Raises 422 if by replacing user's `project_dirs` with new ones we are
-    removing the access to a `zarr_dir` used by some dataset.
-
-    Note both `old_project_dirs` and `new_project_dirs` have been
-    normalized through `os.path.normpath`, which notably strips any trailing
-    `/` character. To be safe, we also re-normalize them within this function.
-    """
-    # Create a list of all the old project dirs that will lose privileges.
-    # E.g.:
-    #   old_project_dirs = ["/a", "/b", "/c/d", "/e/f"]
-    #   new_project_dirs = ["/a", "/c", "/e/f/g1", "/e/f/g2"]
-    #   removed_project_dirs == ["/b", "/e/f"]
-    removed_project_dirs = [
-        old_project_dir
-        for old_project_dir in old_project_dirs
-        if not any(
-            Path(old_project_dir).is_relative_to(new_project_dir)
-            for new_project_dir in new_project_dirs
-        )
-    ]
-    if removed_project_dirs:
-        # Query all the `zarr_dir`s linked to the user such that `zarr_dir`
-        # starts with one of the project dirs in `removed_project_dirs`.
-        stmt = (
-            select(DatasetV2.zarr_dir)
-            .join(ProjectV2, ProjectV2.id == DatasetV2.project_id)
-            .join(
-                LinkUserProjectV2,
-                LinkUserProjectV2.project_id == ProjectV2.id,
-            )
-            .where(LinkUserProjectV2.user_id == user_id)
-            .where(LinkUserProjectV2.is_verified.is_(True))
-            .where(
-                or_(
-                    *[
-                        DatasetV2.zarr_dir.startswith(normpath(old_project_dir))
-                        for old_project_dir in removed_project_dirs
-                    ]
-                )
-            )
-        )
-        if new_project_dirs:
-            stmt = stmt.where(
-                and_(
-                    *[
-                        not_(
-                            DatasetV2.zarr_dir.startswith(
-                                normpath(new_project_dir)
-                            )
-                        )
-                        for new_project_dir in new_project_dirs
-                    ]
-                )
-            )
-        res = await db.execute(stmt)
-
-        # Raise 422 if one of the query results is relative to a path in
-        # `removed_project_dirs`, but its not relative to any path in
-        # `new_project_dirs`.
-        if any(
-            (
-                any(
-                    Path(zarr_dir).is_relative_to(old_project_dir)
-                    for old_project_dir in removed_project_dirs
-                )
-                and not any(
-                    Path(zarr_dir).is_relative_to(new_project_dir)
-                    for new_project_dir in new_project_dirs
-                )
-            )
-            for zarr_dir in res.scalars().all()
-        ):
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-                detail=(
-                    "You tried updating the user project_dirs, removing "
-                    f"{removed_project_dirs}. This operation is not possible, "
-                    "because it would make the user loose access to some of "
-                    "their dataset zarr directories."
-                ),
-            )

fractal_server/app/routes/auth/current_user.py

@@ -2,16 +2,21 @@
 Definition of `/auth/current-user/` endpoints
 """
 
+import os
+
 from fastapi import APIRouter
 from fastapi import Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
 from fractal_server.app.db import get_async_db
+from fractal_server.app.models import LinkUserGroup
 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.routes.auth import current_user_act
+from fractal_server.app.routes.auth import current_user_act_ver
 from fractal_server.app.routes.auth._aux_auth import (
     _get_single_user_with_groups,
 )
@@ -21,6 +26,9 @@ from fractal_server.app.schemas.user import UserUpdate
 from fractal_server.app.schemas.user import UserUpdateStrict
 from fractal_server.app.security import UserManager
 from fractal_server.app.security import get_user_manager
+from fractal_server.config import DataAuthScheme
+from fractal_server.config import get_data_settings
+from fractal_server.syringe import Inject
 
 router_current_user = APIRouter()
 
@@ -98,3 +106,58 @@ async def get_current_user_profile_info(
         )
 
     return response_data
+
+
+@router_current_user.get(
+    "/current-user/allowed-viewer-paths/", response_model=list[str]
+)
+async def get_current_user_allowed_viewer_paths(
+    current_user: UserOAuth = Depends(current_user_act_ver),
+    db: AsyncSession = Depends(get_async_db),
+) -> list[str]:
+    """
+    Returns the allowed viewer paths for current user, according to the
+    selected FRACTAL_DATA_AUTH_SCHEME
+    """
+
+    data_settings = Inject(get_data_settings)
+
+    authorized_paths = []
+
+    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.NONE:
+        return authorized_paths
+
+    # 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 (
+        data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.USERS_FOLDERS
+        and current_user.profile_id is not None
+    ):
+        profile = await db.get(Profile, current_user.profile_id)
+        if profile is not None and profile.username is not None:
+            base_folder = data_settings.FRACTAL_DATA_BASE_FOLDER
+            user_folder = os.path.join(base_folder, profile.username)
+            authorized_paths.append(user_folder)
+
+    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.VIEWER_PATHS:
+        # Returns the union of `viewer_paths` for all user's groups
+        cmd = (
+            select(UserGroup.viewer_paths)
+            .join(LinkUserGroup, LinkUserGroup.group_id == UserGroup.id)
+            .where(LinkUserGroup.user_id == current_user.id)
+        )
+        res = await db.execute(cmd)
+        viewer_paths_nested = res.scalars().all()
+
+        # Flatten a nested object and make its elements unique
+        all_viewer_paths_set = {
+            path
+            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

@@ -16,6 +16,7 @@ from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
 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.config import get_settings
 from fractal_server.logger import set_logger
 from fractal_server.syringe import Inject
@@ -100,13 +101,41 @@ async def create_single_group(
         )
 
     # Create and return new group
-    new_group = UserGroup(name=group_create.name)
+    new_group = UserGroup(
+        name=group_create.name, viewer_paths=group_create.viewer_paths
+    )
     db.add(new_group)
     await db.commit()
 
     return dict(new_group.model_dump(), user_ids=[])
 
 
+@router_group.patch(
+    "/group/{group_id}/",
+    response_model=UserGroupRead,
+    status_code=status.HTTP_200_OK,
+)
+async def update_single_group(
+    group_id: int,
+    group_update: UserGroupUpdate,
+    user: UserOAuth = Depends(current_superuser_act),
+    db: AsyncSession = Depends(get_async_db),
+) -> UserGroupRead:
+    group = await _usergroup_or_404(group_id, db)
+
+    # Patch `viewer_paths`
+    if group_update.viewer_paths is not None:
+        group.viewer_paths = group_update.viewer_paths
+        db.add(group)
+        await db.commit()
+
+    updated_group = await _get_single_usergroup_with_user_ids(
+        group_id=group_id, db=db
+    )
+
+    return updated_group
+
+
 @router_group.delete("/group/{group_id}/", status_code=204)
 async def delete_single_group(
     group_id: int,

fractal_server/app/routes/auth/router.py

@@ -6,7 +6,6 @@ from .login import router_login
 from .oauth import get_oauth_router
 from .register import router_register
 from .users import router_users
-from .viewer_paths import router_viewer_paths
 
 router_auth = APIRouter()
 
@@ -15,7 +14,6 @@ router_auth.include_router(router_current_user)
 router_auth.include_router(router_login)
 router_auth.include_router(router_users)
 router_auth.include_router(router_group)
-router_auth.include_router(router_viewer_paths)
 router_oauth = get_oauth_router()
 if router_oauth is not None:
     router_auth.include_router(router_oauth)

fractal_server/app/routes/auth/users.py

@@ -28,7 +28,6 @@ from fractal_server.logger import set_logger
 from fractal_server.syringe import Inject
 
 from . import current_superuser_act
-from ._aux_auth import _check_project_dirs_update
 from ._aux_auth import _get_default_usergroup_id_or_none
 from ._aux_auth import _get_single_user_with_groups
 
@@ -75,14 +74,6 @@ async def patch_user(
                 detail=f"Profile {user_update.profile_id} not found.",
             )
 
-    if user_update.project_dirs is not None:
-        await _check_project_dirs_update(
-            old_project_dirs=user_to_patch.project_dirs,
-            new_project_dirs=user_update.project_dirs,
-            user_id=user_id,
-            db=db,
-        )
-
     # Modify user attributes
     try:
         user = await user_manager.update(

fractal_server/app/schemas/user.py

@@ -8,18 +8,12 @@ from pydantic import EmailStr
 from pydantic import Field
 
 from fractal_server.string_tools import validate_cmd
-from fractal_server.types import ListUniqueAbsolutePathStr
+from fractal_server.types import AbsolutePathStr
 from fractal_server.types import ListUniqueNonEmptyString
 from fractal_server.types import ListUniqueNonNegativeInt
 from fractal_server.types import NonEmptyStr
 
 
-def _validate_cmd_list(value: list[str]) -> list[str]:
-    for v in value:
-        validate_cmd(v)
-    return value
-
-
 class OAuthAccountRead(BaseModel):
     """
     Schema for storing essential `OAuthAccount` information within
@@ -44,17 +38,20 @@ class UserRead(schemas.BaseUser[int]):
         group_ids_names:
         oauth_accounts:
         profile_id:
-        project_dirs:
-        slurm_accounts:
     """
 
     group_ids_names: list[tuple[int, str]] | None = None
     oauth_accounts: list[OAuthAccountRead]
     profile_id: int | None = None
-    project_dirs: list[str]
+    project_dir: str
     slurm_accounts: list[str]
 
 
+def _validate_cmd(value: str) -> str:
+    validate_cmd(value)
+    return value
+
+
 class UserUpdate(schemas.BaseUserUpdate):
     """
     Schema for `User` update.
@@ -66,7 +63,7 @@ class UserUpdate(schemas.BaseUserUpdate):
         is_superuser:
         is_verified:
         profile_id:
-        project_dirs:
+        project_dir:
         slurm_accounts:
     """
 
@@ -77,9 +74,9 @@ class UserUpdate(schemas.BaseUserUpdate):
     is_superuser: bool = None
     is_verified: bool = None
     profile_id: int | None = None
-    project_dirs: Annotated[
-        ListUniqueAbsolutePathStr, AfterValidator(_validate_cmd_list)
-    ] = Field(default=None, min_length=1)
+    project_dir: Annotated[AbsolutePathStr, AfterValidator(_validate_cmd)] = (
+        None
+    )
     slurm_accounts: ListUniqueNonEmptyString = None
 
 
@@ -101,14 +98,10 @@ class UserCreate(schemas.BaseUserCreate):
 
     Attributes:
         profile_id:
-        project_dirs:
-        slurm_accounts:
     """
 
     profile_id: int | None = None
-    project_dirs: Annotated[
-        ListUniqueAbsolutePathStr, AfterValidator(_validate_cmd_list)
-    ] = Field(min_length=1)
+    project_dir: Annotated[AbsolutePathStr, AfterValidator(_validate_cmd)]
     slurm_accounts: list[str] = Field(default_factory=list)
 
 
@@ -116,8 +109,6 @@ class UserUpdateGroups(BaseModel):
     """
     Schema for `POST /auth/users/{user_id}/set-groups/`
 
-    Attributes:
-        group_ids:
     """
 
     model_config = ConfigDict(extra="forbid")
@@ -126,14 +117,6 @@ class UserUpdateGroups(BaseModel):
 
 
 class UserProfileInfo(BaseModel):
-    """
-    Attributes:
-        has_profile:
-        resource_name:
-        profile_name:
-        username:
-    """
-
     has_profile: bool
     resource_name: str | None = None
     profile_name: str | None = None

fractal_server/app/schemas/user_group.py

@@ -2,13 +2,16 @@ from datetime import datetime
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
+from pydantic import Field
 from pydantic import field_serializer
 from pydantic.types import AwareDatetime
 
+from fractal_server.types import ListUniqueAbsolutePathStr
 from fractal_server.types import NonEmptyStr
 
 __all__ = (
     "UserGroupRead",
+    "UserGroupUpdate",
     "UserGroupCreate",
 )
 
@@ -31,6 +34,7 @@ class UserGroupRead(BaseModel):
     name: str
     timestamp_created: AwareDatetime
     user_ids: list[int] | None = None
+    viewer_paths: list[str]
 
     @field_serializer("timestamp_created")
     def serialize_datetime(v: datetime) -> str:
@@ -48,3 +52,14 @@ class UserGroupCreate(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: NonEmptyStr
+    viewer_paths: ListUniqueAbsolutePathStr = Field(default_factory=list)
+
+
+class UserGroupUpdate(BaseModel):
+    """
+    Schema for `UserGroup` update
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    viewer_paths: ListUniqueAbsolutePathStr = None

fractal_server/app/schemas/v2/__init__.py

@@ -1,25 +1,25 @@
 from .accounting import AccountingRecordRead  # noqa F401
-from .dataset import DatasetCreate  # noqa F401
-from .dataset import DatasetExport  # noqa F401
-from .dataset import DatasetImport  # noqa F401
-from .dataset import DatasetRead  # noqa F401
-from .dataset import DatasetUpdate  # noqa F401
-from .dumps import DatasetDump  # noqa F401
-from .dumps import ProjectDump  # noqa F401
-from .dumps import TaskDump  # noqa F401
-from .dumps import TaskGroupDump  # noqa F401
-from .dumps import WorkflowDump  # noqa F401
-from .dumps import WorkflowTaskDump  # noqa F401
+from .dataset import DatasetCreateV2  # noqa F401
+from .dataset import DatasetExportV2  # noqa F401
+from .dataset import DatasetImportV2  # noqa F401
+from .dataset import DatasetReadV2  # noqa F401
+from .dataset import DatasetUpdateV2  # noqa F401
+from .dumps import DatasetDumpV2  # noqa F401
+from .dumps import ProjectDumpV2  # noqa F401
+from .dumps import TaskDumpV2  # noqa F401
+from .dumps import TaskGroupDumpV2  # noqa F401
+from .dumps import WorkflowDumpV2  # noqa F401
+from .dumps import WorkflowTaskDumpV2  # noqa F401
 from .history import HistoryRunRead  # noqa F401
 from .history import HistoryRunReadAggregated  # noqa F401
 from .history import HistoryUnitRead  # noqa F401
 from .history import HistoryUnitStatus  # noqa F401
 from .history import HistoryUnitStatusWithUnset  # noqa F401
 from .history import ImageLogsRequest  # noqa F401
-from .job import JobCreate  # noqa F401
-from .job import JobRead  # noqa F401
-from .job import JobStatusType  # noqa F401
-from .job import JobUpdate  # noqa F401
+from .job import JobCreateV2  # noqa F401
+from .job import JobReadV2  # noqa F401
+from .job import JobStatusTypeV2  # noqa F401
+from .job import JobUpdateV2  # noqa F401
 from .manifest import ManifestV2  # noqa F401
 from .manifest import TaskManifestV2  # noqa F401
 from .profile import ProfileCreate  # noqa F401
@@ -27,9 +27,9 @@ from .profile import ProfileRead  # noqa F401
 from .profile import ValidProfileLocal  # noqa F401
 from .profile import ValidProfileSlurmSSH  # noqa F401
 from .profile import ValidProfileSlurmSudo  # noqa F401
-from .project import ProjectCreate  # noqa F401
-from .project import ProjectRead  # noqa F401
-from .project import ProjectUpdate  # noqa F401
+from .project import ProjectCreateV2  # noqa F401
+from .project import ProjectReadV2  # noqa F401
+from .project import ProjectUpdateV2  # noqa F401
 from .sharing import ProjectPermissions  # noqa F401
 from .sharing import ProjectGuestCreate  # noqa F401
 from .sharing import ProjectAccessRead  # noqa F401
@@ -43,36 +43,36 @@ from .resource import ResourceType  # noqa F401
 from .resource import ValidResourceLocal  # noqa F401
 from .resource import ValidResourceSlurmSSH  # noqa F401
 from .resource import ValidResourceSlurmSudo  # noqa F401
-from .status_legacy import WorkflowTaskStatusType  # noqa F401
-from .task import TaskCreate  # noqa F401
-from .task import TaskExport  # noqa F401
-from .task import TaskImport  # noqa F401
-from .task import TaskImportLegacy  # noqa F401
-from .task import TaskRead  # noqa F401
+from .status_legacy import WorkflowTaskStatusTypeV2  # noqa F401
+from .task import TaskCreateV2  # noqa F401
+from .task import TaskExportV2  # noqa F401
+from .task import TaskImportV2  # noqa F401
+from .task import TaskImportV2Legacy  # noqa F401
+from .task import TaskReadV2  # noqa F401
 from .task import TaskType  # noqa F401
-from .task import TaskUpdate  # noqa F401
+from .task import TaskUpdateV2  # noqa F401
 from .task_collection import FractalUploadedFile  # noqa F401
-from .task_collection import TaskCollectCustom  # noqa F401
-from .task_collection import TaskCollectPip  # noqa F401
-from .task_group import TaskGroupActivityAction  # noqa F401
-from .task_group import TaskGroupActivityStatus  # noqa F401
-from .task_group import TaskGroupActivityRead  # noqa F401
-from .task_group import TaskGroupCreate  # noqa F401
-from .task_group import TaskGroupCreateStrict  # noqa F401
+from .task_collection import TaskCollectCustomV2  # noqa F401
+from .task_collection import TaskCollectPipV2  # noqa F401
+from .task_group import TaskGroupActivityActionV2  # noqa F401
+from .task_group import TaskGroupActivityStatusV2  # noqa F401
+from .task_group import TaskGroupActivityV2Read  # noqa F401
+from .task_group import TaskGroupCreateV2  # noqa F401
+from .task_group import TaskGroupCreateV2Strict  # noqa F401
 from .task_group import TaskGroupReadSuperuser  # noqa F401
-from .task_group import TaskGroupRead  # noqa F401
-from .task_group import TaskGroupUpdate  # noqa F401
-from .task_group import TaskGroupOriginEnum  # noqa F401
-from .workflow import WorkflowCreate  # noqa F401
-from .workflow import WorkflowExport  # noqa F401
-from .workflow import WorkflowImport  # noqa F401
-from .workflow import WorkflowRead  # noqa F401
-from .workflow import WorkflowReadWithWarnings  # noqa F401
-from .workflow import WorkflowUpdate  # noqa F401
-from .workflowtask import WorkflowTaskCreate  # noqa F401
-from .workflowtask import WorkflowTaskExport  # noqa F401
-from .workflowtask import WorkflowTaskImport  # noqa F401
-from .workflowtask import WorkflowTaskRead  # noqa F401
-from .workflowtask import WorkflowTaskReadWithWarning  # noqa F401
-from .workflowtask import WorkflowTaskReplace  # noqa F401
-from .workflowtask import WorkflowTaskUpdate  # noqa F401
+from .task_group import TaskGroupReadV2  # noqa F401
+from .task_group import TaskGroupUpdateV2  # noqa F401
+from .task_group import TaskGroupV2OriginEnum  # noqa F401
+from .workflow import WorkflowCreateV2  # noqa F401
+from .workflow import WorkflowExportV2  # noqa F401
+from .workflow import WorkflowImportV2  # noqa F401
+from .workflow import WorkflowReadV2  # noqa F401
+from .workflow import WorkflowReadV2WithWarnings  # noqa F401
+from .workflow import WorkflowUpdateV2  # noqa F401
+from .workflowtask import WorkflowTaskCreateV2  # noqa F401
+from .workflowtask import WorkflowTaskExportV2  # noqa F401
+from .workflowtask import WorkflowTaskImportV2  # noqa F401
+from .workflowtask import WorkflowTaskReadV2  # noqa F401
+from .workflowtask import WorkflowTaskReadV2WithWarning  # noqa F401
+from .workflowtask import WorkflowTaskReplaceV2  # noqa F401
+from .workflowtask import WorkflowTaskUpdateV2  # noqa F401

fractal_server/app/schemas/v2/dataset.py

@@ -1,49 +1,35 @@
 from datetime import datetime
-from pathlib import Path
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import Field
 from pydantic import field_serializer
-from pydantic import model_validator
 from pydantic.types import AwareDatetime
 
-from fractal_server.app.schemas.v2.project import ProjectRead
+from fractal_server.app.schemas.v2.project import ProjectReadV2
 from fractal_server.images import SingleImage
-from fractal_server.types import AbsolutePathStr
 from fractal_server.types import NonEmptyStr
-from fractal_server.types import RelativePathStr
 from fractal_server.types import ZarrDirStr
 
 
-class DatasetCreate(BaseModel):
+class DatasetCreateV2(BaseModel):
     """
-    DatasetCreate
+    DatasetCreateV2
 
     Attributes:
         name:
-        project_dir:
-        zarr_subfolder:
+        zarr_dir:
     """
 
     model_config = ConfigDict(extra="forbid")
 
     name: NonEmptyStr
-    project_dir: AbsolutePathStr | None = None
-    zarr_subfolder: RelativePathStr | None = None
-
-    @model_validator(mode="after")
-    def validate_zarr_dir(self):
-        if (self.project_dir is None) and (self.zarr_subfolder is not None):
-            raise ValueError(
-                "Cannot provide `zarr_subfolder` without `project_dir`"
-            )
-        return self
+    zarr_dir: ZarrDirStr | None = None
 
 
-class DatasetRead(BaseModel):
+class DatasetReadV2(BaseModel):
     """
-    DatasetRead
+    DatasetReadV2
 
     Attributes:
         id:
@@ -58,7 +44,7 @@ class DatasetRead(BaseModel):
     name: str
 
     project_id: int
-    project: ProjectRead
+    project: ProjectReadV2
 
     timestamp_created: AwareDatetime
 
@@ -69,9 +55,9 @@ class DatasetRead(BaseModel):
         return v.isoformat()
 
 
-class DatasetUpdate(BaseModel):
+class DatasetUpdateV2(BaseModel):
     """
-    DatasetUpdate
+    DatasetUpdateV2
 
     Attributes:
         name:
@@ -81,9 +67,10 @@ class DatasetUpdate(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: NonEmptyStr = None
+    zarr_dir: ZarrDirStr | None = None
 
 
-class DatasetImport(BaseModel):
+class DatasetImportV2(BaseModel):
     """
     Class for `Dataset` import.
 
@@ -101,17 +88,8 @@ class DatasetImport(BaseModel):
     zarr_dir: ZarrDirStr
     images: list[SingleImage] = Field(default_factory=list)
 
-    @model_validator(mode="after")
-    def validate_image_zarr_url(self):
-        for image in self.images:
-            if not Path(image.zarr_url).is_relative_to(self.zarr_dir):
-                raise ValueError(
-                    f"{image.zarr_url=} is not relative to {self.zarr_dir=}."
-                )
-        return self
-
 
-class DatasetExport(BaseModel):
+class DatasetExportV2(BaseModel):
     """
     Class for `Dataset` export.