fractal-server 2.0.0a5__tar.gz → 2.0.0a6__tar.gz

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.0a5
+Version: 2.0.0a6
 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.0.0a6/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.0.0a6"

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/models/v2/dataset.py

@@ -28,7 +28,6 @@ class DatasetV2(SQLModel, table=True):
     history: list[dict[str, Any]] = Field(
         sa_column=Column(JSON, server_default="[]", nullable=False)
     )
-    read_only: bool = False
 
     timestamp_created: datetime = Field(
         default_factory=get_timestamp,

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/models/v2/project.py

@@ -16,7 +16,6 @@ class ProjectV2(SQLModel, table=True):
 
     id: Optional[int] = Field(default=None, primary_key=True)
     name: str
-    read_only: bool = False
     timestamp_created: datetime = Field(
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/routes/api/v2/submit.py

@@ -59,15 +59,6 @@ async def apply_workflow(
     project = output["project"]
     dataset = output["dataset"]
 
-    if dataset.read_only:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=(
-                "Cannot apply workflow because dataset "
-                f"({dataset_id=}) is read_only."
-            ),
-        )
-
     workflow = await _get_workflow_check_owner(
         project_id=project_id, workflow_id=workflow_id, user_id=user.id, db=db
     )

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/schemas/v2/dataset.py

@@ -8,8 +8,8 @@ from pydantic import validator
 
 from .._validators import valstr
 from .._validators import valutc
-from ..v1.project import ProjectReadV1
 from .dumps import WorkflowTaskDumpV2
+from .project import ProjectReadV2
 from .workflowtask import WorkflowTaskStatusTypeV2
 from fractal_server.images import Filters
 
@@ -45,7 +45,6 @@ class DatasetCreateV2(BaseModel, extra=Extra.forbid):
 
     name: str
 
-    read_only: bool = False
     zarr_dir: str
 
     filters: Filters = Field(default_factory=Filters)
@@ -60,10 +59,9 @@ class DatasetReadV2(BaseModel):
     name: str
 
     project_id: int
-    project: ProjectReadV1
+    project: ProjectReadV2
 
     history: list[_DatasetHistoryItemV2]
-    read_only: bool
 
     timestamp_created: datetime
 
@@ -81,7 +79,6 @@ class DatasetUpdateV2(BaseModel):
         extra = "forbid"
 
     name: Optional[str]
-    read_only: Optional[bool]
     zarr_dir: Optional[str]
     filters: Optional[Filters]
 

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/schemas/v2/dumps.py

@@ -22,7 +22,6 @@ class ProjectDumpV2(BaseModel, extra=Extra.forbid):
 
     id: int
     name: str
-    read_only: bool
     timestamp_created: str
 
 
@@ -80,7 +79,6 @@ class DatasetDumpV2(BaseModel):
     id: int
     name: str
     project_id: int
-    read_only: bool
     timestamp_created: str
 
     zarr_dir: str

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/schemas/v2/project.py

@@ -12,7 +12,6 @@ from .._validators import valutc
 class ProjectCreateV2(BaseModel, extra=Extra.forbid):
 
     name: str
-    read_only: bool = False
     # Validators
     _name = validator("name", allow_reuse=True)(valstr("name"))
 
@@ -21,7 +20,6 @@ class ProjectReadV2(BaseModel):
 
     id: int
     name: str
-    read_only: bool
     timestamp_created: datetime
     # Validators
     _timestamp_created = validator("timestamp_created", allow_reuse=True)(
@@ -32,6 +30,5 @@ class ProjectReadV2(BaseModel):
 class ProjectUpdateV2(BaseModel):
 
     name: Optional[str]
-    read_only: Optional[bool]
     # Validators
     _name = validator("name", allow_reuse=True)(valstr("name"))

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/fractal_server/app/schemas/v2/workflow.py

@@ -7,7 +7,7 @@ from pydantic import validator
 
 from .._validators import valstr
 from .._validators import valutc
-from ..v1.project import ProjectReadV1
+from .project import ProjectReadV2
 from .workflowtask import WorkflowTaskExportV2
 from .workflowtask import WorkflowTaskImportV2
 from .workflowtask import WorkflowTaskReadV2
@@ -27,7 +27,7 @@ class WorkflowReadV2(BaseModel):
     name: str
     project_id: int
     task_list: list[WorkflowTaskReadV2]
-    project: ProjectReadV1
+    project: ProjectReadV2
     timestamp_created: datetime
 
     _timestamp_created = validator("timestamp_created", allow_reuse=True)(

fractal_server-2.0.0a5/fractal_server/migrations/versions/d71e732236cd_v2.py → fractal_server-2.0.0a6/fractal_server/migrations/versions/80e12e1bc4fd_v2.py

@@ -1,8 +1,8 @@
-"""v2
+"""V2
 
-Revision ID: d71e732236cd
+Revision ID: 80e12e1bc4fd
 Revises: 9fd26a2b0de4
-Create Date: 2024-04-05 11:09:17.639183
+Create Date: 2024-04-12 10:13:58.085788
 
 """
 import sqlalchemy as sa
@@ -11,7 +11,7 @@ from alembic import op
 
 
 # revision identifiers, used by Alembic.
-revision = "d71e732236cd"
+revision = "80e12e1bc4fd"
 down_revision = "9fd26a2b0de4"
 branch_labels = None
 depends_on = None
@@ -23,7 +23,6 @@ def upgrade() -> None:
         "projectv2",
         sa.Column("id", sa.Integer(), nullable=False),
         sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-        sa.Column("read_only", sa.Boolean(), nullable=False),
         sa.Column(
             "timestamp_created", sa.DateTime(timezone=True), nullable=False
         ),
@@ -81,7 +80,6 @@ def upgrade() -> None:
         sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("project_id", sa.Integer(), nullable=False),
         sa.Column("history", sa.JSON(), server_default="[]", nullable=False),
-        sa.Column("read_only", sa.Boolean(), nullable=False),
         sa.Column(
             "timestamp_created", sa.DateTime(timezone=True), nullable=False
         ),

{fractal_server-2.0.0a5 → fractal_server-2.0.0a6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.0.0a5"
+version = "2.0.0a6"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Jacopo Nespolo <jacopo.nespolo@exact-lab.it>",
@@ -86,7 +86,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.0.0a5"
+current_version = "2.0.0a6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.0.0a5/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.0.0a5"