fractal-server 2.18.0a9__py3-none-any.whl → 2.18.1__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.18.0a9"
+__VERSION__ = "2.18.1"

fractal_server/app/models/linkuserproject.py

@@ -1,10 +1,7 @@
-from sqlmodel import BOOLEAN
 from sqlmodel import CheckConstraint
-from sqlmodel import Column
 from sqlmodel import Field
 from sqlmodel import Index
 from sqlmodel import SQLModel
-from sqlmodel import String
 from sqlmodel import column
 
 
@@ -18,18 +15,9 @@ class LinkUserProjectV2(SQLModel, table=True):
     )
     user_id: int = Field(foreign_key="user_oauth.id", primary_key=True)
 
-    # TODO-2.18.1 drop server_default
-    is_owner: bool = Field(
-        sa_column=Column(BOOLEAN, server_default="true", nullable=False)
-    )
-    # TODO-2.18.1 drop server_default
-    is_verified: bool = Field(
-        sa_column=Column(BOOLEAN, server_default="true", nullable=False)
-    )
-    # TODO-2.18.1 drop server_default
-    permissions: str = Field(
-        sa_column=Column(String, server_default="'rwx'", nullable=False)
-    )
+    is_owner: bool
+    is_verified: bool
+    permissions: str
 
     __table_args__ = (
         Index(

fractal_server/app/models/security.py

@@ -75,8 +75,8 @@ class UserOAuth(SQLModel, table=True):
         profile_id:
             Foreign key linking the user to a `Profile`. If this is unset,
             the user has no access to the `/api/v2/` endpoints.
-        project_dir:
-            Absolute path of the user's project directory. This is used (A) as
+        project_dirs:
+            Absolute paths of the user's project directory. This is used (A) as
             a default base folder for the `zarr_dir` of new datasets (where
             the output Zarr are located), and (B) as a folder which is included
             by default in the paths that a user is allowed to stream (if the
@@ -112,11 +112,8 @@ class UserOAuth(SQLModel, table=True):
         ondelete="RESTRICT",
     )
 
-    # TODO-2.18.1: drop `project_dir`
-    project_dir: str | None = Field(default=None, nullable=True)
-    # TODO-2.18.1: `project_dirs: list[str] = Field(min_length=1)`
     project_dirs: list[str] = Field(
-        sa_column=Column(ARRAY(String), nullable=False, server_default="{}"),
+        sa_column=Column(ARRAY(String), nullable=False),
     )
 
     slurm_accounts: list[str] = Field(

fractal_server/app/routes/auth/_aux_auth.py

@@ -228,6 +228,7 @@ async def _check_project_dirs_update(
                 LinkUserProjectV2.project_id == ProjectV2.id,
             )
             .where(LinkUserProjectV2.user_id == user_id)
+            .where(LinkUserProjectV2.is_verified.is_(True))
             .where(
                 or_(
                     *[

fractal_server/app/routes/auth/viewer_paths.py

@@ -34,7 +34,7 @@ async def get_current_user_allowed_viewer_paths(
                 LinkUserProjectV2, LinkUserProjectV2.project_id == ProjectV2.id
             )
             .where(LinkUserProjectV2.user_id == current_user.id)
-            .where(LinkUserProjectV2.is_owner.is_(False))
+            .where(LinkUserProjectV2.is_verified.is_(True))
         )
         authorized_paths.extend(res.unique().scalars().all())
         # Note that `project_dirs` and the `db.execute` result may have some

fractal_server/migrations/versions/b7477cc98f45_2_18_1.py

@@ -0,0 +1,50 @@
+"""2.18.1
+
+Revision ID: b7477cc98f45
+Revises: 88270f589c9b
+Create Date: 2025-12-04 14:07:27.954252
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "b7477cc98f45"
+down_revision = "88270f589c9b"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("user_oauth", schema=None) as batch_op:
+        batch_op.drop_column("project_dir")
+
+        # ### end Alembic commands ###
+
+        batch_op.alter_column("project_dirs", server_default=None)
+
+    with op.batch_alter_table("linkuserprojectv2", schema=None) as batch_op:
+        batch_op.alter_column("is_owner", server_default=None)
+        batch_op.alter_column("is_verified", server_default=None)
+        batch_op.alter_column("permissions", server_default=None)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("linkuserprojectv2", schema=None) as batch_op:
+        batch_op.alter_column("permissions", server_default="rwx")
+        batch_op.alter_column("is_verified", server_default="true")
+        batch_op.alter_column("is_owner", server_default="true")
+
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("user_oauth", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "project_dir", sa.VARCHAR(), autoincrement=False, nullable=True
+            )
+        )
+
+        # ### end Alembic commands ###
+
+        batch_op.alter_column("project_dirs", server_default="{}")

{fractal_server-2.18.0a9.dist-info → fractal_server-2.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.0a9
+Version: 2.18.1
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE

{fractal_server-2.18.0a9.dist-info → fractal_server-2.18.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-fractal_server/__init__.py,sha256=vSgwVVk65ixAjcQXYQvUCMCu-rptRXj7Icz8W84_MRE,25
+fractal_server/__init__.py,sha256=BKsIdxrz9PsV9xvr1HmK94dmxX69wjDyrYRY53MjstQ,23
 fractal_server/__main__.py,sha256=QeKoAgqoiozLJDa8kSVe-Aso1WWgrk1yLUYWS8RxZVM,11405
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/db/__init__.py,sha256=Otswoi_PlwX1zRhLTFQUKbW9Ho7piRn8dezjq8k-XaU,2834
 fractal_server/app/models/__init__.py,sha256=oglUT1A1lLhXy2GFz3XsQ7wqkyfs3NXRtuNov-gOHXM,368
 fractal_server/app/models/linkusergroup.py,sha256=3KkkE4QIUAlTrBAZs_tVy0pGvAxUAq6yOEjflct_z2M,678
-fractal_server/app/models/linkuserproject.py,sha256=LW09JFTY2lFLqp3KdxUNjldeJRaao3WnTko_gS21EU4,1572
-fractal_server/app/models/security.py,sha256=mhKmRN5Ln2nwDOf-K_-BrSdTB6qQZrjeT_FiD76sMu4,4781
+fractal_server/app/models/linkuserproject.py,sha256=Bk0VzjzG7RbnVnOwrztqxKIPxz_AsUynXVxyMWHCbXA,1109
+fractal_server/app/models/security.py,sha256=Wh25Vk_lTU-qwgwCNn_m5FEfj_dlY-yk5ASsfK_blyQ,4592
 fractal_server/app/models/v2/__init__.py,sha256=xL05Mvdx0dqUFhJf694oPfuqkUQxZbxOkoUgRuNIXl4,949
 fractal_server/app/models/v2/accounting.py,sha256=VNweFARrvY3mj5LI0834Ku061S2aGC61kuVHzi_tZhc,1187
 fractal_server/app/models/v2/dataset.py,sha256=BL5elDU0UXnUSwvuXSO4JeKa9gje0QFerU_LP7sI754,1273
@@ -61,7 +61,7 @@ fractal_server/app/routes/api/v2/workflow.py,sha256=VR4zdtJpkBcYg6uh8dcVeeV742y3
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=mf5u2q9XRDOGa0-gbDmJKNsJj9zbBdzkJvrWRz2CEyY,9646
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=a2RJ4Ln9H9qplQVgPEiifSc5YWIcmqTQW2wZDojEyNA,8254
 fractal_server/app/routes/auth/__init__.py,sha256=RghfjGuu0RTW8RxBCvaePx9KErO4rTkI96XgbtbeSJU,2337
-fractal_server/app/routes/auth/_aux_auth.py,sha256=kgMdmZZvGebWEtmotiuc4nQMTjQcF5aX9LTDcYaIpfA,9135
+fractal_server/app/routes/auth/_aux_auth.py,sha256=gKdYTWUzxcU44Iep787zReWwdAs4kW5baNDXCPmiKn8,9195
 fractal_server/app/routes/auth/current_user.py,sha256=uDWttWo9isG69Jv1EGnnr2Ki5ZGd0D76jgjVDQMkn8c,3251
 fractal_server/app/routes/auth/group.py,sha256=uR98vdQHH-7BFl-Czj85ESPxT2yQymy4qtagaMrnUPU,6491
 fractal_server/app/routes/auth/login.py,sha256=buVa5Y8T0cd_SW1CqC-zMv-3SfPxGJknf7MYlUyKOl0,567
@@ -69,7 +69,7 @@ fractal_server/app/routes/auth/oauth.py,sha256=NxrwOWBGPe7hLPEnD66nfWPGMWzDM80LI
 fractal_server/app/routes/auth/register.py,sha256=IiUJhgY0ZrTs0RlBRRjoTv4wF5Gb3eXTInFV-dXkpsE,615
 fractal_server/app/routes/auth/router.py,sha256=Zip_fw9qJWtoXWjluznschyrCKb2n_rf3xWarSXMkgI,692
 fractal_server/app/routes/auth/users.py,sha256=5BagdH1dz-ZoXdvTgIo9QWBNFPW3p1pIZfY9BBu4eds,7397
-fractal_server/app/routes/auth/viewer_paths.py,sha256=pzlZ1Gd_CDHVCD9ysJPfJwSbwemSab2wuEfHg0dKnxI,1616
+fractal_server/app/routes/auth/viewer_paths.py,sha256=aW1QM4fdCM-WFEOXNf7I7V7_XQuuRrOHvd32nr08Ofs,1618
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=n-UhONvomKyKkQDDqd0lFh2kCMhlCGXpfdMNW39R1E4,644
 fractal_server/app/routes/aux/_runner.py,sha256=-SvcXCVEV7Mb6q4PbbxuTCCruX6sAlR5QGXk9CzBVv8,979
@@ -105,7 +105,6 @@ fractal_server/config/_email.py,sha256=vMwLHN9-beYp_-up-WkTpeyNUZk4EHwt3N2l6-PYn
 fractal_server/config/_main.py,sha256=6splUmAPRD1J9HXkeZ-Vqif7Nw4ljJXIugpvRrcwPeI,2476
 fractal_server/config/_oauth.py,sha256=UTmlFppDZcOQhr3RvkiG5XMqvr54XRAQ_Y-iR0V8N-8,2024
 fractal_server/config/_settings_config.py,sha256=tsyXQOnn9QKCFJD6hRo_dJXlQQyl70DbqgHMJoZ1xnY,144
-fractal_server/data_migrations/2_18_0.py,sha256=GSTs69gLnMJ0XSf59dIOARYu5aP4SSAG5Eid670yCgk,854
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/exceptions.py,sha256=l6aZDk_6u_9PwDaQSoIFdI40ekpzqOJaxjx5rhW-HVI,141
@@ -157,6 +156,7 @@ fractal_server/migrations/versions/af1ef1c83c9b_add_accounting_tables.py,sha256=
 fractal_server/migrations/versions/af8673379a5c_drop_old_filter_columns.py,sha256=iEqkCJvqpDxRCKD1twh92W_u665OKEGRJqsWflPx8BM,1552
 fractal_server/migrations/versions/b1e7f7a1ff71_task_group_for_pixi.py,sha256=ElHX3KHpEGJoWc-yPS5ZlGNqJ9khONWEe5_Loh78egA,1293
 fractal_server/migrations/versions/b3ffb095f973_json_to_jsonb.py,sha256=fwaqVzGKRwZ4Nz3n_Y29WO6NzLYpa3JWCM8GjiNY9WQ,10036
+fractal_server/migrations/versions/b7477cc98f45_2_18_1.py,sha256=clKGCwh95sWFTeU04KE6ScyuULL3Iugjx4kENvSwTHg,1581
 fractal_server/migrations/versions/bc0e8b3327a7_project_sharing.py,sha256=5h8ogjfQPbKbVwN0-pfh5ixPQSCCYsiVnQoOveUKKUA,2145
 fractal_server/migrations/versions/c90a7c76e996_job_id_in_history_run.py,sha256=CPQNKHqsx22wSY4ylqM8UMhDOWkQeC9eLAHlQQJYSfQ,1102
 fractal_server/migrations/versions/caba9fb1ea5e_drop_useroauth_user_settings_id.py,sha256=7MpunfOBk0LM6u-xrwca8GUHIjinAJZrS9AUT3l62qU,1320
@@ -268,8 +268,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
 fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
-fractal_server-2.18.0a9.dist-info/METADATA,sha256=68oxr2Sxc8Kr0m6yZEnfki369h06fyzKRlj1HKrl50Q,4277
-fractal_server-2.18.0a9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.18.0a9.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.18.0a9.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.18.0a9.dist-info/RECORD,,
+fractal_server-2.18.1.dist-info/METADATA,sha256=iRsGxaPkJm0dyxgMSpGihfqfAbjZ3l-j3K-LcQR4Qfo,4275
+fractal_server-2.18.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.18.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.18.1.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.18.1.dist-info/RECORD,,

fractal_server/data_migrations/2_18_0.py

@@ -1,30 +0,0 @@
-import logging
-import sys
-from os.path import normpath
-
-from sqlalchemy.orm.attributes import flag_modified
-from sqlmodel import select
-
-from fractal_server.app.db import get_sync_db
-from fractal_server.app.models import UserOAuth
-
-logging.basicConfig(level=logging.INFO)
-
-
-def fix_db():
-    logging.info("START - fix db")
-
-    with next(get_sync_db()) as db:
-        res = db.execute(select(UserOAuth).order_by(UserOAuth.email))
-        user_list = res.scalars().unique().all()
-
-        for user in user_list:
-            logging.info(f"Now handling user {user.email}.")
-            if user.project_dirs != []:
-                sys.exit(f"Non empty `project_dirs` for User[{user.id}]")
-            user.project_dirs.append(normpath(user.project_dir))
-            flag_modified(user, "project_dirs")
-
-        db.commit()
-
-    logging.info("END - fix db")