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

fractal_server/migrations/versions/f65ee53991e3_user_settings_related.py

@@ -0,0 +1,67 @@
+"""user-settings-related
+
+Revision ID: f65ee53991e3
+Revises: 90f6508c6379
+Create Date: 2025-10-22 15:16:42.217910
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "f65ee53991e3"
+down_revision = "90f6508c6379"
+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.add_column(
+            sa.Column(
+                "project_dir",
+                sa.String(),
+                server_default="/PLACEHOLDER",
+                nullable=False,
+            )
+        )
+        batch_op.add_column(
+            sa.Column(
+                "slurm_accounts",
+                postgresql.ARRAY(sa.String()),
+                server_default="{}",
+                nullable=True,
+            )
+        )
+        batch_op.drop_constraint(
+            batch_op.f("fk_user_oauth_user_settings_id_user_settings"),
+            type_="foreignkey",
+        )
+        batch_op.drop_column("user_settings_id")
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### 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(
+                "user_settings_id",
+                sa.INTEGER(),
+                autoincrement=False,
+                nullable=True,
+            )
+        )
+        batch_op.create_foreign_key(
+            batch_op.f("fk_user_oauth_user_settings_id_user_settings"),
+            "user_settings",
+            ["user_settings_id"],
+            ["id"],
+        )
+        batch_op.drop_column("slurm_accounts")
+        batch_op.drop_column("project_dir")
+
+    # ### end Alembic commands ###

fractal_server/runner/executors/slurm_common/base_slurm_runner.py

@@ -87,7 +87,7 @@ class BaseSlurmRunner(BaseRunner):
         python_worker_interpreter: str,
         poll_interval: int,
         common_script_lines: list[str] | None = None,
-        user_cache_dir: str | None = None,  # FIXME: make required?
+        user_cache_dir: str,
         slurm_account: str | None = None,
     ):
         self.slurm_runner_type = slurm_runner_type

fractal_server/runner/executors/slurm_common/slurm_config.py

@@ -136,7 +136,7 @@ class SlurmConfig(BaseModel):
 
     def to_sbatch_preamble(
         self,
-        remote_export_dir: str | None = None,
+        remote_export_dir: str,
     ) -> list[str]:
         """
         Compile `SlurmConfig` object into the preamble of a SLURM submission
@@ -189,13 +189,10 @@ class SlurmConfig(BaseModel):
         for line in self._sorted_extra_lines():
             lines.append(line)
 
-        if self.user_local_exports != {} and remote_export_dir is None:
-            raise ValueError(
-                f"{remote_export_dir=} but {self.user_local_exports=}"
-            )
-        for key, value in self.user_local_exports.items():
-            tmp_value = str(Path(remote_export_dir) / value)
-            lines.append(f"export {key}={tmp_value}")
+        if self.user_local_exports:
+            for key, value in self.user_local_exports.items():
+                tmp_value = str(Path(remote_export_dir) / value)
+                lines.append(f"export {key}={tmp_value}")
 
         """
         FIXME export SRUN_CPUS_PER_TASK

fractal_server/runner/executors/slurm_ssh/runner.py

@@ -31,7 +31,7 @@ class SlurmSSHRunner(BaseSlurmRunner):
         # Specific
         slurm_account: str | None = None,
         profile: Profile,
-        user_cache_dir: str | None = None,
+        user_cache_dir: str,
         fractal_ssh: FractalSSH,
     ) -> None:
         """

fractal_server/runner/executors/slurm_sudo/runner.py

@@ -54,7 +54,7 @@ class SudoSlurmRunner(BaseSlurmRunner):
         resource: Resource,
         # Specific
         profile: Profile,
-        user_cache_dir: str | None = None,  # FIXME: make required?
+        user_cache_dir: str,
         slurm_account: str | None = None,
     ) -> None:
         """

fractal_server/runner/v2/_slurm_ssh.py

@@ -50,7 +50,7 @@ def process_workflow(
     fractal_ssh: FractalSSH | None = None,
     slurm_account: str | None = None,
     worker_init: str | None = None,
-    user_cache_dir: str | None = None,
+    user_cache_dir: str,
 ) -> None:
     """
     Run a workflow through a `slurm_ssh` backend.
@@ -105,6 +105,7 @@ def process_workflow(
         resource=resource,
         profile=profile,
         common_script_lines=worker_init,
+        user_cache_dir=user_cache_dir,
     ) as runner:
         execute_tasks_v2(
             wf_task_list=workflow.task_list[

fractal_server/runner/v2/_slurm_sudo.py

@@ -44,7 +44,7 @@ def process_workflow(
     user_id: int,
     resource: Resource,
     profile: Profile,
-    user_cache_dir: str | None = None,
+    user_cache_dir: str,
     slurm_account: str | None = None,
     worker_init: str | None = None,
     fractal_ssh: FractalSSH | None = None,

fractal_server/runner/v2/submit_workflow.py

@@ -52,6 +52,7 @@ class ProcessWorkflowType(Protocol):
         user_id: int,
         resource: Resource,
         profile: Profile,
+        user_cache_dir: str,
     ) -> None:
         ...
 
@@ -84,10 +85,10 @@ def submit_workflow(
     dataset_id: int,
     job_id: int,
     user_id: int,
-    worker_init: str | None = None,
-    user_cache_dir: str | None = None,  # FIXME: review this
+    user_cache_dir: str,
     resource: Resource,
     profile: Profile,
+    worker_init: str | None = None,
     fractal_ssh: FractalSSH | None = None,
 ) -> None:
     """
@@ -110,8 +111,10 @@ def submit_workflow(
             Custom executor parameters that get parsed before the execution of
             each task.
         user_cache_dir:
-            Cache directory (namely a path where the user can write); for the
-            slurm backend, this is used as a base directory for FIXME.
+            Cache directory (namely a path where the user can write). For
+            `slurm_sudo` backend, this is both a base directory for
+            `job.working_dir_user`. For `slurm_sudo` and `slurm_ssh` backends,
+            this is used for `user_local_exports`.
         resource:
             Computational resource to be used for this job (e.g. a SLURM
             cluster).
@@ -224,22 +227,18 @@ def submit_workflow(
         job_working_dir = job.working_dir
 
     try:
+        process_workflow: ProcessWorkflowType
         match resource.type:
             case ResourceType.LOCAL:
-                process_workflow: ProcessWorkflowType = local_process_workflow
+                process_workflow = local_process_workflow
                 backend_specific_kwargs = {}
             case ResourceType.SLURM_SUDO:
-                process_workflow: ProcessWorkflowType = (
-                    slurm_sudo_process_workflow
-                )
+                process_workflow = slurm_sudo_process_workflow
                 backend_specific_kwargs = dict(
                     slurm_account=job.slurm_account,
-                    user_cache_dir=user_cache_dir,
                 )
             case ResourceType.SLURM_SSH:
-                process_workflow: ProcessWorkflowType = (
-                    slurm_ssh_process_workflow
-                )
+                process_workflow = slurm_ssh_process_workflow
                 backend_specific_kwargs = dict(
                     fractal_ssh=fractal_ssh,
                     slurm_account=job.slurm_account,
@@ -260,6 +259,7 @@ def submit_workflow(
             job_type_filters=job.type_filters,
             resource=resource,
             profile=profile,
+            user_cache_dir=user_cache_dir,
             **backend_specific_kwargs,
         )
 

{fractal_server-2.17.0a4.dist-info → fractal_server-2.17.0a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.17.0a4
+Version: 2.17.0a5
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE
@@ -12,7 +12,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
-Requires-Dist: cryptography (>=46.0.0,<47.0.0)
 Requires-Dist: fabric (>=3.2.2,<3.3.0)
 Requires-Dist: fastapi (>=0.118.0,<0.119.0)
 Requires-Dist: fastapi-users[oauth] (>=14,<15)

{fractal_server-2.17.0a4.dist-info → fractal_server-2.17.0a5.dist-info}/RECORD

@@ -1,13 +1,13 @@
-fractal_server/__init__.py,sha256=Km-7IFlZnTXL2BNs_1wfkjKQe7Fj63edH31p1rDJIlg,25
-fractal_server/__main__.py,sha256=sPwlrhE7utCWYUaQ7D9Z1wC0L-7dd-9tlFtBeYoEg_M,11721
+fractal_server/__init__.py,sha256=twgXmjGJdfHSKap7ALSL1NPDHaBCT4z5bFl9BlhdIyk,25
+fractal_server/__main__.py,sha256=68FlTuST3zbzVofFI8JSYsSBrBQ07Bv3Mu3PsZX9Fw0,11423
 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=sttX0mHVV0ESI1SJ1kcxUKiuEwqeP-BWsst0o_9Yo44,2810
 fractal_server/app/models/__init__.py,sha256=xJWiGAwpXmCpnFMC4c_HTqoUCzMOXrakoGLUH_uMvdA,415
 fractal_server/app/models/linkusergroup.py,sha256=3KkkE4QIUAlTrBAZs_tVy0pGvAxUAq6yOEjflct_z2M,678
 fractal_server/app/models/linkuserproject.py,sha256=hvaxh3Lkiy2uUCwB8gvn8RorCpvxSSdzWdCS_U1GL7g,315
-fractal_server/app/models/security.py,sha256=R20lgbRx8I_6xcaCUcg1TP8uhsnNAmqcswAXGad5xjw,3948
-fractal_server/app/models/user_settings.py,sha256=Mel2DGZzFSeS8xfWjiQcdpb6MR29c21e-W7zweLm_uI,1091
+fractal_server/app/models/security.py,sha256=snHmvnjYnq37qcXlUfieTUDz9bf-djOMeXMixP5EW3g,3736
+fractal_server/app/models/user_settings.py,sha256=6Cc4r6ZVcASwlcPtnKZfKe2OidzOafQlmzWYZNTpRYU,1126
 fractal_server/app/models/v2/__init__.py,sha256=A668GF4z_UPar6kAOwC-o_qUo3CIRJ3SmBGYTs3Xc7k,923
 fractal_server/app/models/v2/accounting.py,sha256=i-2TsjqyuclxFQ21C-TeDoss7ZBTRuXdzIJfVr2UxwE,1081
 fractal_server/app/models/v2/dataset.py,sha256=P_zy4dPQAqrCALQ6737VkAFk1SvcgYjnslGUZhPI8sc,1226
@@ -17,23 +17,23 @@ fractal_server/app/models/v2/profile.py,sha256=dH5xftMYThd6xqw86a--2MPCysxGTLTsy
 fractal_server/app/models/v2/project.py,sha256=b6QZaMutwTfT1e_1mDDuwccgKVs4pcB0SMSYTtvfMrg,866
 fractal_server/app/models/v2/resource.py,sha256=RPQqOp1auoiXdPf27QazSXvzuUz9iPN1qfh7cRwxF64,3536
 fractal_server/app/models/v2/task.py,sha256=iBIQB8POQE5MyKvLZhw7jZWlBhbrThzCDzRTcgiAczQ,1493
-fractal_server/app/models/v2/task_group.py,sha256=kqjm76Ozb5BrklV_qMR9Q_ONzGMH9gu7h-3f-Xg5Eeg,4702
+fractal_server/app/models/v2/task_group.py,sha256=sOlBhOkDyIJN19yD358TsQtDJOVSeGhHffrxgB3KkkQ,4753
 fractal_server/app/models/v2/workflow.py,sha256=gBjDXO-RytVT81aAlesImBhmVHrwNUrmsF_UsGa1qLM,1057
 fractal_server/app/models/v2/workflowtask.py,sha256=qkTc-hcFLpJUVsEUbnDq2BJL0qg9jagy2doZeusF1ek,1266
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/v2/__init__.py,sha256=SzLurEzKBRWHcIFh2mpac2wrGAWJwv9WW-Ry2DiNkZY,1161
 fractal_server/app/routes/admin/v2/_aux_functions.py,sha256=fqA5sUCFuD2iVANQt2WUUfVOEVz5egQA7inzUKYGCw0,1684
-fractal_server/app/routes/admin/v2/accounting.py,sha256=-eLzBirENvdhjhrCf6bs1pTriIui19DAr_k-zuJB7Y8,3593
-fractal_server/app/routes/admin/v2/impersonate.py,sha256=gc4lshfEPFR6W2asH7aKu6hqE6chzusdhAUVV9p51eU,1131
-fractal_server/app/routes/admin/v2/job.py,sha256=6NG93I-yQTlJZ1AIhMPwuizQcQvFlvI7kGJ8jG94Igg,8595
-fractal_server/app/routes/admin/v2/profile.py,sha256=yK42jYTo2cEETx6oWbe3ZJCORtZHqCVS2uQq91H6wG8,2745
-fractal_server/app/routes/admin/v2/project.py,sha256=MA_LdoEuSuisSGRO43TapMuJ080y5iaUGSAUgKuuKOg,1188
-fractal_server/app/routes/admin/v2/resource.py,sha256=jSI8TruayQHgdzpchbp-KlUBpgsUCQpbGDKHv4TU1j0,7820
-fractal_server/app/routes/admin/v2/task.py,sha256=e1UxsA6CWeYqvnHqxySE78ckRuE0EK60X02VMnkG2gg,4309
-fractal_server/app/routes/admin/v2/task_group.py,sha256=7-Axk5SG6Nw02p7pc6Q6_EtO9Ncy74pVXvt2GCG-Iuc,6043
-fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=h3OYIwhzG8eCaXFGTZlAIQlpgvlaknrskbVVaTBwCp8,10006
-fractal_server/app/routes/api/__init__.py,sha256=wyEcQ8hXPvqU8M-YPVaRHMFheuDdfRvdX2sDQtMgxpg,1423
+fractal_server/app/routes/admin/v2/accounting.py,sha256=DjgMqzdrL8hYMn19cZj2pkwtLKl3QfBwxd473kH4KaI,3584
+fractal_server/app/routes/admin/v2/impersonate.py,sha256=ictDjuvBr3iLv3YtwkVRMNQRq5qtPAeAXbbC7STSsEg,1125
+fractal_server/app/routes/admin/v2/job.py,sha256=sFgMbOtUCIJ-ri6YD3ZWP7XETZZDQsLqPfT1kaH9RHQ,8577
+fractal_server/app/routes/admin/v2/profile.py,sha256=h9R4bwZQXBg0FAm2lj-DQ3vKQSFDtvjRARFpxfI3WR4,2733
+fractal_server/app/routes/admin/v2/project.py,sha256=rRq7ZDngr_29skASnte1xfycZCjK-WPdeTf7siBXiCU,1182
+fractal_server/app/routes/admin/v2/resource.py,sha256=uel-MN3f9TkkIJ7flEC4yPH7q2qGQxoaxPB0LxfZzYs,7796
+fractal_server/app/routes/admin/v2/task.py,sha256=B_RfL320acBKFkOa34S0sWI44VCFBE_jg_jGHZASKO8,4303
+fractal_server/app/routes/admin/v2/task_group.py,sha256=sxASS5948inqcP2IU3C2tcLB5egXfxef0TPlVcRtP-U,6028
+fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=W7LjIBAheyjrn0fEz0SsWINqcZK5HMB5GRGMjPrc6a4,9994
+fractal_server/app/routes/api/__init__.py,sha256=wJE77LxZ51p1N9AIX-kd4VdUDEk0RYbCy-T_pn2V73I,1408
 fractal_server/app/routes/api/v2/__init__.py,sha256=D3sRRsqkmZO6kBxUjg40q0aRDsnuXI4sOOfn0xF9JsM,2820
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=8xnXYPjzo1yZfcg18b5ZY5tu9OQ1e55fOnX1IEmDSHk,15019
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=PXsqMQ3sfkABqAMI7v1_VAzUEDF_-kvaZyyhEicqsCw,4431
@@ -41,43 +41,41 @@ fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=5gNt35r
 fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=PKjV7r8YsPRXoNiVSnOK4KBYVV3l_Yb_ZPrqAkMkXrQ,1182
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=eAXGnC7yEYGn1g2VDfSGvApN2mw79r4fW7ykRlDY2CY,12468
 fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=8x1_q9FyCzItnPmdSdLQuwUTy4B9xCsXscp97_lJcpM,4635
-fractal_server/app/routes/api/v2/dataset.py,sha256=7hSqqE3sFjQjJOZf_QvYbMersjXXbS3YM3a1WDgv1rM,8893
-fractal_server/app/routes/api/v2/history.py,sha256=kEhD-TKkORenUUsfyODNBi1jOsGc82h_EWbRKyRkD5k,17102
-fractal_server/app/routes/api/v2/images.py,sha256=foA5ZNjMzZWlcYMgYuGSZsm1I-po-8NSYBIMz4ZbkPc,7867
-fractal_server/app/routes/api/v2/job.py,sha256=FyK4Aa9XoIcfD0ZpKM-4Bkj3ZcIc93UzDc8jF85uHps,6478
-fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=AEN6w2X5kCkSpZydudvuTPhl_VZUQ4zUav6D3NiF6r8,4935
-fractal_server/app/routes/api/v2/project.py,sha256=4NFnMV2pTCwAE5C2dA6NJr_7J1fB-QovAMqoUGFPrhs,4746
-fractal_server/app/routes/api/v2/status_legacy.py,sha256=GG-AUdAngFL1QpE8Alo3xPxyKC4csG7DbomYlIfqTEs,6318
-fractal_server/app/routes/api/v2/submit.py,sha256=5K7Q7xBCwuBpTHJaC3a3danKWIEBva1HPSbmGp1BU7k,9400
-fractal_server/app/routes/api/v2/task.py,sha256=zGB9fMLv71o9aCS6DWXpccHyNvTbYVbnKHhaNHGSLmY,7214
-fractal_server/app/routes/api/v2/task_collection.py,sha256=QeT9Eidp1Sm7nhzWgHw_kWYxjRkNSwqxCjXRzCgaSKg,12279
-fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=JaO8CQrN5z3hB_YNqE3kOpEsBUXqYOStlN-xf01qK7U,7008
-fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=B8xF9w2nZt-VTiHtAeQ-SCXEg383aLKEFqlXk8Yyl0Y,7250
-fractal_server/app/routes/api/v2/task_group.py,sha256=An8EAwZDNx53TVnGBhjgeW7RI_uk-bAlu-6NrqYuaWY,8068
-fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=3jWQcUvnFlcGsHbSyQSem5TwzP08ADGgO3YIxFZQWIs,10569
-fractal_server/app/routes/api/v2/task_version_update.py,sha256=zBYlyqN0UvCfnkqcg945b5jNMRNjSUKJvBz6IPxC0qo,8236
-fractal_server/app/routes/api/v2/workflow.py,sha256=iTIasNP2I5ovhHafQ2P8JJuImAl41ucy5y64J7FiP3w,10701
-fractal_server/app/routes/api/v2/workflow_import.py,sha256=fsYnFAOwtOR7u2Hod1ij7i_BQjnA2jv2EKzuSPG_pEc,9083
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=gwFvC-qU4yb-Q5ey30rOD4u3D0-4jlJzBTuq8udqpzc,7930
-fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
+fractal_server/app/routes/api/v2/dataset.py,sha256=HhRrReo_isFJFMaUhQfxEQkLj0_lXNfGblzwpLG81VU,8623
+fractal_server/app/routes/api/v2/history.py,sha256=T-7GDLZ_x4cp9PMEozJoEFt4cGFYPDqv9-akYmN2JSU,17150
+fractal_server/app/routes/api/v2/images.py,sha256=_R-F1qrsFv3PPukrwXSa-5swNS4kNghY0DTrxjLC_7E,7897
+fractal_server/app/routes/api/v2/job.py,sha256=fyIYGcplsxzx91FxYWlImp1ATPk5IC8bfIcJkuZOhws,6526
+fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=DEnlFj6PMNMy9DrnH6_pMW9evdKl6iTlAb0zlzBR1Qs,4953
+fractal_server/app/routes/api/v2/project.py,sha256=eQcQs0ElMpUN0OTcgG7DXk70t9Dn8Fdd6oHeQ0WbgJI,4782
+fractal_server/app/routes/api/v2/status_legacy.py,sha256=vZA4AYMehXbNFgekl4j6p8idETC3IylQQL64CmFCr98,6330
+fractal_server/app/routes/api/v2/submit.py,sha256=jPPvJNeLBcPVl0BsLnOZn_KtxoQvdBnAVnzFVihUJIc,9364
+fractal_server/app/routes/api/v2/task.py,sha256=KDIBrQpIbbVrffOBtxah-gXiOnN-EG84ujXeGPOqKhg,7160
+fractal_server/app/routes/api/v2/task_collection.py,sha256=A0mfajyJVVrWNuI7YaPih7juSWOnks78NnJDwnGfvdo,12281
+fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=9SqiMPuED5LEGKo3Tiq5KfXFqmjaZPg9KWL-Yn5jdLo,7010
+fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=QHqdnaddTW-DZKrnzLKwCPP5j3UiqxOtFO04aZeexdk,7244
+fractal_server/app/routes/api/v2/task_group.py,sha256=_M_munannm0wMmLdOwo-qATqrl0Vu_TsrpLb-2554fs,8104
+fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=ZSn8Ibjwkp89v87OPBquULPc9xsdpBfRvV1PiQdiicw,10593
+fractal_server/app/routes/api/v2/task_version_update.py,sha256=JO5xggiRqay4zNlbjlRa26ygMEue2klSFPyLrXS215k,8254
+fractal_server/app/routes/api/v2/workflow.py,sha256=szb6t9OWOjr0CwboF0fJUyO5jUPj_HRpf5N0CDuHkqc,10755
+fractal_server/app/routes/api/v2/workflow_import.py,sha256=iFy8jPuMMt1DpIcs5iJc5Gzcq-wbMtnk05NdU1y5nkQ,9095
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=-V7WjTfYb2L7i3_dQ0Am_ydqepdqs-j3BY67_5iZPfU,7960
+fractal_server/app/routes/auth/__init__.py,sha256=Y-RQMwY5V25ZVgyYYoFIXvEDQgm6PGTDgxH755oa_NM,2358
 fractal_server/app/routes/auth/_aux_auth.py,sha256=fyGxBVb6yrVrsE7-2tTyiJ7orb9Jzkg36m_q-rP7Zs8,4868
-fractal_server/app/routes/auth/current_user.py,sha256=jvr5AX3tSmxV7HMY8OIiojcYxcX4mF-UIUNwG8CqvVo,7110
-fractal_server/app/routes/auth/group.py,sha256=gSyB9iuwCqT6CMDHyO8hYIQ1J341gs8SDrRdHppOMT0,7890
+fractal_server/app/routes/auth/current_user.py,sha256=A8GJpWV90FnheuhhYsAGjiuQn8IAoOVNAR0e53JHwPU,5611
+fractal_server/app/routes/auth/group.py,sha256=wZnqzIOZHpoUW2Yp6dkAMRqIiM_otVdG4fZuBYmLocA,6919
 fractal_server/app/routes/auth/login.py,sha256=tSu6OBLOieoBtMZB4JkBAdEgH2Y8KqPGSbwy7NIypIo,566
 fractal_server/app/routes/auth/oauth.py,sha256=iI2vEdvDlEE5BrFz5Krq96VUk39HDuE0NzqW9fS3dDE,2261
-fractal_server/app/routes/auth/register.py,sha256=DlHq79iOvGd_gt2v9uwtsqIKeO6i_GKaW59VIkllPqY,587
+fractal_server/app/routes/auth/register.py,sha256=Ola-lNdYYEOK8Wh0Q-TFKwIJ25e6UswlUojJ8QGBCfc,581
 fractal_server/app/routes/auth/router.py,sha256=-E87A8h2UvcLucy5xjzKiWbXHVKcqxUmmZGeV_utEzA,598
-fractal_server/app/routes/auth/users.py,sha256=8QMjZ3nq-UGX4pamCTesEtWO8I9BYalLh1FlLwRp9BA,8310
+fractal_server/app/routes/auth/users.py,sha256=L94-1A62FFfASflURggYsVDOxtWNRU-gK6eSx8ZckyA,6921
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=nqqdcW5B7fL_PbvHf57_TcifjUfcMgl04tKNvG2sV1U,628
 fractal_server/app/routes/aux/_runner.py,sha256=SDzI7glEfkW_XecWFuRQitbSWSvAPegI-J5c7i5d0_w,957
 fractal_server/app/routes/aux/validate_user_profile.py,sha256=fGqJDdAFkbQoEIjqZ5F9-SDY_4os63R2EUMqODC7eBg,1969
-fractal_server/app/routes/aux/validate_user_settings.py,sha256=C_V5QhnBppyr-YYoni_yVrooU5bKfSTrwM-ea2m5pqU,2405
 fractal_server/app/routes/pagination.py,sha256=IGy8Ll5lYr6ENYE18h3huH5s0GMX1DCs5VdCi6j1cdk,1174
-fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
-fractal_server/app/schemas/user.py,sha256=gMvnEZcbHIoFTzyZE9VX-GGut3iYcpbs0Xo33eKC9aw,2136
+fractal_server/app/schemas/__init__.py,sha256=VIWJCaqokte3OljDLX00o-EC2d12rFoPb5HOLKQI94Y,86
+fractal_server/app/schemas/user.py,sha256=nXsE4yEt8xiMlr2IhLoul0M0x2vYWaXIJBG_-NmRj6w,2919
 fractal_server/app/schemas/user_group.py,sha256=x3-kqbo0q2wTP7QI0iZ7PU_9Dr957UYrFMKqS7BXLhE,1425
-fractal_server/app/schemas/user_settings.py,sha256=x-MS4Hq0RWkE3in6Su454Yk_cmbfY1lnIzjM82jij5U,1692
 fractal_server/app/schemas/v2/__init__.py,sha256=ShdbfHQe_MNMQzyjaEl7NGj30h2u8mUD9-UX3hsS3sA,3669
 fractal_server/app/schemas/v2/accounting.py,sha256=C_ekrYQwhi7PtrxxB07oVAG2y1NLigXjYwyp4E38fao,396
 fractal_server/app/schemas/v2/dataset.py,sha256=NKCjBwGBC7mPiSlXktZAcleJsvlLY6KfNKw7Wx4Zfqk,1728
@@ -91,17 +89,16 @@ fractal_server/app/schemas/v2/resource.py,sha256=4iXzZJeHVLcXYY08-okoJM_4gqpzhG4
 fractal_server/app/schemas/v2/status_legacy.py,sha256=eQT1zGxbkzSwd0EqclsOdZ60n1x6J3DB1CZ3m4LYyxc,955
 fractal_server/app/schemas/v2/task.py,sha256=IJv8loB4kx9FBkaIHoiMsswQyq02FxvyAnHK1u074fU,4364
 fractal_server/app/schemas/v2/task_collection.py,sha256=BzHQXq2_zLZTbigWauOR5Zi-mlsqCIF2NEF_z12Nqxg,4480
-fractal_server/app/schemas/v2/task_group.py,sha256=DzgcUvn3rZvttk6Zrbyr3Kw8YYYF-rPiGkGzV_fdzSQ,3415
+fractal_server/app/schemas/v2/task_group.py,sha256=anC7YPiOEcLmxN2JyARLMMHp6l7NfvsCpx3sMcnug4o,3436
 fractal_server/app/schemas/v2/workflow.py,sha256=L-dW6SzCH_VNoH6ENip44lTgGGqVYHHBk_3PtM-Ooy8,1772
 fractal_server/app/schemas/v2/workflowtask.py,sha256=6eweAMyziwaoMT-7R1fVJYunIeZKzT0-7fAVgPO_FEc,3639
-fractal_server/app/security/__init__.py,sha256=eiYSoUA0XrRGKGKnBOK1KxLhQT9gK0H11ndok2md46c,13841
-fractal_server/app/security/signup_email.py,sha256=RgU9ia092778j35W4Iil3Ke9wNpPzKH6rjpE0zM9Zb4,1486
+fractal_server/app/security/__init__.py,sha256=gtfJkwdXTm_F38sFgb5LH3AcdvKs42fOUJa8jo8Cmbw,17484
+fractal_server/app/security/signup_email.py,sha256=kphjq6TAygvPpYpg95QJWefyqmzdVrGz7fyRMctUJWE,1982
 fractal_server/app/shutdown.py,sha256=ViSNJyXWU_iWPSDOOMGNh_iQdUFrdPh_jvf8vVKLpAo,1950
-fractal_server/app/user_settings.py,sha256=5thFLR6de-CiaUyDZG9Bpn-P97vraDk4TP85eDuh8io,898
-fractal_server/config/__init__.py,sha256=WvcoE3qiY1qnkumv3qspcemCFw5iFG5NkSFR78vN4ks,562
+fractal_server/config/__init__.py,sha256=EDk6ylmCXc8FoCYWTQ1bC-27yZ7iYHWxbhcjjMbQX2A,611
 fractal_server/config/_database.py,sha256=YOBi3xuJno5wLGw1hKsjLm-bftaxVWiBNIQWVTMX3Ag,1661
-fractal_server/config/_email.py,sha256=iiUP5Be9AzDDJmVsWfTFzLt9XreTFt9pRcX7f9eRNvw,5682
-fractal_server/config/_main.py,sha256=NaKnNjkGZQdHjWPRuwa42I2a024Yqg3zuFUM0vMJzlo,3630
+fractal_server/config/_email.py,sha256=j1QmZCyspNbD1xxkypc9Kv299tU3vTO1AqDFJ8-LZzQ,4201
+fractal_server/config/_main.py,sha256=Xtcz2q2HuHYdk7DaD6uBG1KtQeBiQhKz6CANvevg1AA,3877
 fractal_server/config/_oauth.py,sha256=OYWqJnL0yn8ymagKb4fK-2zNqXVBbumRWwZrr9TFUms,1926
 fractal_server/config/_settings_config.py,sha256=tsyXQOnn9QKCFJD6hRo_dJXlQQyl70DbqgHMJoZ1xnY,144
 fractal_server/data_migrations/2_14_10.py,sha256=jzMg2c1zNO8C_Nho_9_EZJD6kR1-gkFNpNrMR5Hr8hM,1598
@@ -161,6 +158,7 @@ fractal_server/migrations/versions/e81103413827_add_job_type_filters.py,sha256=t
 fractal_server/migrations/versions/efa89c30e0a4_add_project_timestamp_created.py,sha256=jilQW3QIqYQ4Q6hCnUiG7UtNMpA41ujqrB3tPFiPM1Q,1221
 fractal_server/migrations/versions/f37aceb45062_make_historyunit_logfile_required.py,sha256=jLHcVq9z0Ou20u-mwPf6EICDKY4dwFAzBgbRRx9_xDw,1007
 fractal_server/migrations/versions/f384e1c0cf5d_drop_task_default_args_columns.py,sha256=9BwqUS9Gf7UW_KjrzHbtViC880qhD452KAytkHWWZyk,746
+fractal_server/migrations/versions/f65ee53991e3_user_settings_related.py,sha256=q9oaVpp85X4EZt3f33ThyBDZD3_9trO2va9uAIh2yK0,1883
 fractal_server/migrations/versions/fbce16ff4e47_new_history_items.py,sha256=TDWCaIoM0Q4SpRWmR9zr_rdp3lJXhCfBPTMhtrP5xYE,3950
 fractal_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -179,31 +177,31 @@ fractal_server/runner/executors/local/runner.py,sha256=cwQyPfSXyvLTigU4hfyQuCTps
 fractal_server/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_common/_batching.py,sha256=la_FXt4ErYU63vkmk2SGZcSOqq-Jzp_L9tZfzBY7rlU,8806
 fractal_server/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
-fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=MiyRBurrSuvqMdyZd7uPj_hOcEp_HPCB32mps-1X0P0,41008
+fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=jnUuoHDwNu1UL0FWu61PjY8GLgK20PvVBpJRwRCKJP8,40969
 fractal_server/runner/executors/slurm_common/get_slurm_config.py,sha256=kQQtc4o5Ya3gLMB6x9xuuyDX6jKpa0bSqkHeiAz7lTM,7071
 fractal_server/runner/executors/slurm_common/remote.py,sha256=2ByWIHFKL1bW6CS04ijrJvX4jH8CpX2Pp-QhAncc-Hs,3806
-fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=5P-kd2DejimRrZISJ6DGkTJwb0oX94JO6z6nvwrOnxc,8048
+fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=hnZWxgXZsawubPNRHPXMHe1eD8cT44z1BTuKaYqPLTU,7895
 fractal_server/runner/executors/slurm_common/slurm_job_task_models.py,sha256=wOVtACSFLulc0gUwXlj_SXJHIQmgHpseohw-SahT1DM,3517
 fractal_server/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_ssh/run_subprocess.py,sha256=SyW6t4egvbiARph2YkFjc88Hj94fCamZVi50L7ph8VM,996
-fractal_server/runner/executors/slurm_ssh/runner.py,sha256=ejViETgV0GF5tRipJy_-PlZu-Y8pDQwO6C4j5S9oILI,10217
+fractal_server/runner/executors/slurm_ssh/runner.py,sha256=1ehjRxcbChvk9mZgqCUCQY69Xpn8JyYH-Db6cQ7Xrt4,10203
 fractal_server/runner/executors/slurm_ssh/tar_commands.py,sha256=yqBjWTLmh_FzhCllt_KfbuCUGvRhsHLVWlPOZlRWLzY,1762
 fractal_server/runner/executors/slurm_sudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/executors/slurm_sudo/_subprocess_run_as_user.py,sha256=9pN0N409M24TXIyhuWJb-Tj0Ztaud68xtQ7wfAibmfk,2566
-fractal_server/runner/executors/slurm_sudo/runner.py,sha256=h5YYtgBz2WQ5fu6_ny5B9aK7bgVde5g5nMLKqrDLZf8,5955
+fractal_server/runner/executors/slurm_sudo/runner.py,sha256=a_9c29735U3xqiWGv8WsyBN8SX9SgkGTY1mepNUUh64,5916
 fractal_server/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV0gA8E,70
 fractal_server/runner/set_start_and_last_task_index.py,sha256=NsioSzfEpGyo9ZKrV5KsbxeI7d5V3tE678Y3IAo5rHM,1218
 fractal_server/runner/task_files.py,sha256=MvOrklZrN8iLj3oPx7G-iaEFj2N_mkTOnxIBX-okH1E,4037
 fractal_server/runner/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/v2/_local.py,sha256=js1W8_9QQad_kbvMM8ytjfWX_BEoq8OER9BLdxH0JRs,3759
-fractal_server/runner/v2/_slurm_ssh.py,sha256=mZ4G1MTXR1-gI9FY1ckwTzpUROwWSfZ4oTA2odweMZ0,4412
-fractal_server/runner/v2/_slurm_sudo.py,sha256=Vi82KecepFM0AH5XXNV3eJ174JZVnMqbdSIJxpf30Gs,4358
+fractal_server/runner/v2/_slurm_ssh.py,sha256=F7Zcs9NpmXDktTX_fQQke99Ov06Hi4XUUDsDKZwOmOI,4437
+fractal_server/runner/v2/_slurm_sudo.py,sha256=f34B6KWtn1Wwm7Y-D95Ecub0vKpA03zYL7jZAF53tfI,4344
 fractal_server/runner/v2/db_tools.py,sha256=kLB0sGYNuCMPPoP4XDSClPIf7x5lSseTKUjzGk6gAfc,3318
 fractal_server/runner/v2/deduplicate_list.py,sha256=vidkd7K6u3w0A4zVgsGZkc9mwoP6ihTYJZQUhBNorfE,667
 fractal_server/runner/v2/merge_outputs.py,sha256=0ahaSwdMFAoEhxVaEaO9nSJuKIcWg9pDZ356ktSHcC0,897
 fractal_server/runner/v2/runner.py,sha256=1vj6m_ir6RrYNr3Ew98h5hnEAms_TaHPhee52swQ_gA,19404
 fractal_server/runner/v2/runner_functions.py,sha256=w_i74LCt_9f07w511wslTFhoDUtoE1R-IKcglEGWPIc,19618
-fractal_server/runner/v2/submit_workflow.py,sha256=T8Y9OuX9eudNP_b2qpKlsnVOq956oDgaiKDXOIG5W8E,11447
+fractal_server/runner/v2/submit_workflow.py,sha256=s3mo5pLZH5x8V01IZjoJXcbpCl9geZwvISEr5StSBeI,11458
 fractal_server/runner/v2/task_interface.py,sha256=ftPPpOU16rbJD8q-QV7o_3ey8W7MQTFuWJiYUr4OmF4,2532
 fractal_server/runner/versions.py,sha256=uz59Dxj7BphnFnr-p0kyaZRH0h4w5Xkd0UJNVGtt4ds,474
 fractal_server/ssh/__init__.py,sha256=sVUmzxf7_DuXG1xoLQ1_00fo5NPhi2LJipSmU5EAkPs,124
@@ -258,8 +256,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=SYVVUuXe_nWyrJLsy7QA-KJscwc5PHEXjvsW4TK7XQI,2180
 fractal_server/zip_tools.py,sha256=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.17.0a4.dist-info/METADATA,sha256=ZMzqbkf3Z7bm6P9mWPHsIWpwt1FUEIxSSe3sgbqXNMQ,4319
-fractal_server-2.17.0a4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.17.0a4.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.17.0a4.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.17.0a4.dist-info/RECORD,,
+fractal_server-2.17.0a5.dist-info/METADATA,sha256=oUgYkhW5EongBJTrbWUUyPKU6j64g8F9GG4PPY0NR0c,4272
+fractal_server-2.17.0a5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.17.0a5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.17.0a5.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.17.0a5.dist-info/RECORD,,

fractal_server/app/routes/aux/validate_user_settings.py

@@ -1,76 +0,0 @@
-from fastapi import HTTPException
-from fastapi import status
-from pydantic import ValidationError
-
-from fractal_server.app.db import AsyncSession
-from fractal_server.app.models import UserOAuth
-from fractal_server.app.models import UserSettings
-from fractal_server.app.schemas.v2 import ResourceType
-from fractal_server.app.user_settings import SlurmSshUserSettings
-from fractal_server.app.user_settings import SlurmSudoUserSettings
-from fractal_server.logger import set_logger
-
-
-logger = set_logger(__name__)
-
-
-def verify_user_has_settings(user: UserOAuth) -> None:
-    """
-    Check that the `user.user_settings_id` foreign-key is set.
-
-    NOTE: This check will become useless when we make the foreign-key column
-    required, but for the moment (as of v2.6.0) we have to keep it in place.
-
-    Args:
-        user: The user to be checked.
-    """
-    if user.user_settings_id is None:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=f"Error: user '{user.email}' has no settings.",
-        )
-
-
-async def validate_user_settings(
-    *, user: UserOAuth, backend: str, db: AsyncSession
-) -> UserSettings:
-    """
-    Get a UserSettings object and validate it based on a given Fractal backend.
-
-    Args:
-        user: The user whose settings we should validate.
-        backend: The value of `FRACTAL_RUNNER_BACKEND`
-        db: An async DB session
-
-    Returns:
-        `UserSetting` object associated to `user`, if valid.
-    """
-
-    verify_user_has_settings(user)
-
-    user_settings = await db.get(UserSettings, user.user_settings_id)
-
-    match backend:
-        case ResourceType.SLURM_SSH:
-            UserSettingsValidationModel = SlurmSshUserSettings
-        case ResourceType.SLURM_SUDO:
-            UserSettingsValidationModel = SlurmSudoUserSettings
-        case _:
-            # For other backends, we don't validate anything
-            return user_settings
-
-    try:
-        UserSettingsValidationModel(**user_settings.model_dump())
-    except ValidationError as e:
-        error_msg = (
-            "User settings are not valid for "
-            f"FRACTAL_RUNNER_BACKEND='{backend}'. "
-            f"Original error: {str(e)}"
-        )
-        logger.warning(error_msg)
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=error_msg,
-        )
-
-    return user_settings

fractal_server/app/schemas/user_settings.py

@@ -1,63 +0,0 @@
-from pydantic import BaseModel
-from pydantic import ConfigDict
-from pydantic import field_validator
-
-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 NonEmptyStr
-
-__all__ = (
-    "UserSettingsRead",
-    "UserSettingsReadStrict",
-    "UserSettingsUpdate",
-    "UserSettingsUpdateStrict",
-)
-
-
-class UserSettingsRead(BaseModel):
-    """
-    Schema reserved for superusers
-    """
-
-    id: int
-    ssh_host: str | None = None
-    ssh_username: str | None = None
-    ssh_private_key_path: str | None = None
-    slurm_user: str | None = None
-    slurm_accounts: list[str]
-    project_dir: str | None = None
-
-
-class UserSettingsReadStrict(BaseModel):
-    slurm_user: str | None = None
-    slurm_accounts: list[str]
-    ssh_username: str | None = None
-    project_dir: str | None = None
-
-
-class UserSettingsUpdate(BaseModel):
-    """
-    Schema reserved for superusers
-    """
-
-    model_config = ConfigDict(extra="forbid")
-
-    ssh_host: NonEmptyStr | None = None
-    ssh_username: NonEmptyStr | None = None
-    ssh_private_key_path: AbsolutePathStr | None = None
-    slurm_user: NonEmptyStr | None = None
-    slurm_accounts: ListUniqueNonEmptyString | None = None
-    project_dir: AbsolutePathStr | None = None
-
-    @field_validator("project_dir", mode="after")
-    @classmethod
-    def validate_project_dir(cls, value):
-        if value is not None:
-            validate_cmd(value)
-        return value
-
-
-class UserSettingsUpdateStrict(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-    slurm_accounts: ListUniqueNonEmptyString | None = None

fractal_server/app/user_settings.py

@@ -1,32 +0,0 @@
-# TODO: move this file to the appropriate path
-from pydantic import BaseModel
-
-
-class SlurmSshUserSettings(BaseModel):
-    """
-    Subset of user settings which must be present for task collection and job
-    execution when using the Slurm-SSH runner.
-
-    Attributes:
-        project_dir: Folder where `slurm_user` can write.
-        slurm_accounts:
-            List of SLURM accounts, to be used upon Fractal job submission.
-    """
-
-    project_dir: str
-    slurm_accounts: list[str]
-
-
-class SlurmSudoUserSettings(BaseModel):
-    """
-    Subset of user settings which must be present for task collection and job
-    execution when using the Slurm-sudo runner.
-
-    Attributes:
-        project_dir: Folder where `slurm_user` can write.
-        slurm_accounts:
-            List of SLURM accounts, to be used upon Fractal job submission.
-    """
-
-    project_dir: str
-    slurm_accounts: list[str]