fractal-server 2.6.1__py3-none-any.whl → 2.6.2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.6.1"
+__VERSION__ = "2.6.2"

fractal_server/app/schemas/_validators.py

@@ -69,14 +69,19 @@ def valint(attribute: str, min_val: int = 1):
     return val
 
 
-def val_absolute_path(attribute: str):
+def val_absolute_path(attribute: str, accept_none: bool = False):
     """
     Check that a string attribute is an absolute path
     """
 
     def val(string: Optional[str]) -> str:
         if string is None:
-            raise ValueError(f"String attribute '{attribute}' cannot be None")
+            if accept_none:
+                return string
+            else:
+                raise ValueError(
+                    f"String attribute '{attribute}' cannot be None"
+                )
         s = string.strip()
         if not s:
             raise ValueError(f"String attribute '{attribute}' cannot be empty")

fractal_server/app/schemas/user_settings.py

@@ -47,23 +47,25 @@ class UserSettingsUpdate(BaseModel, extra=Extra.forbid):
     slurm_accounts: Optional[list[StrictStr]] = None
     cache_dir: Optional[str] = None
 
-    _ssh_host = validator("ssh_host", allow_reuse=True)(valstr("ssh_host"))
+    _ssh_host = validator("ssh_host", allow_reuse=True)(
+        valstr("ssh_host", accept_none=True)
+    )
     _ssh_username = validator("ssh_username", allow_reuse=True)(
-        valstr("ssh_username")
+        valstr("ssh_username", accept_none=True)
     )
     _ssh_private_key_path = validator(
         "ssh_private_key_path", allow_reuse=True
-    )(val_absolute_path("ssh_private_key_path"))
+    )(val_absolute_path("ssh_private_key_path", accept_none=True))
 
     _ssh_tasks_dir = validator("ssh_tasks_dir", allow_reuse=True)(
-        val_absolute_path("ssh_tasks_dir")
+        val_absolute_path("ssh_tasks_dir", accept_none=True)
     )
     _ssh_jobs_dir = validator("ssh_jobs_dir", allow_reuse=True)(
-        val_absolute_path("ssh_jobs_dir")
+        val_absolute_path("ssh_jobs_dir", accept_none=True)
     )
 
     _slurm_user = validator("slurm_user", allow_reuse=True)(
-        valstr("slurm_user")
+        valstr("slurm_user", accept_none=True)
     )
 
     @validator("slurm_accounts")
@@ -76,6 +78,8 @@ class UserSettingsUpdate(BaseModel, extra=Extra.forbid):
 
     @validator("cache_dir")
     def cache_dir_validator(cls, value):
+        if value is None:
+            return None
         validate_cmd(value)
         return val_absolute_path("cache_dir")(value)
 
@@ -90,5 +94,7 @@ class UserSettingsUpdateStrict(BaseModel, extra=Extra.forbid):
 
     @validator("cache_dir")
     def cache_dir_validator(cls, value):
+        if value is None:
+            return value
         validate_cmd(value)
         return val_absolute_path("cache_dir")(value)

{fractal_server-2.6.1.dist-info → fractal_server-2.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.6.1
+Version: 2.6.2
 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.6.1.dist-info → fractal_server-2.6.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=-1k6i2MypR7h6rlPl9rspIqyTjooH_Jg700ipp3jnfo,22
+fractal_server/__init__.py,sha256=zk2Mr_vPWXiYjT0KF9CbddwUnuJ011NmmqEbItcDUz4,22
 fractal_server/__main__.py,sha256=WcBAkmVE9aH5mDI6wGkVmPAql2N5Vyk0A-7zuUl8WX0,6122
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -125,10 +125,10 @@ fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=1fWvQ6YZUUnDhO
 fractal_server/app/runner/v2/task_interface.py,sha256=myS-kT0DsJ8xIJZBVEzgD8g54VbiwL6i7Im3e1zcVHQ,1866
 fractal_server/app/runner/versions.py,sha256=dSaPRWqmFPHjg20kTCHmi_dmGNcCETflDtDLronNanU,852
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
-fractal_server/app/schemas/_validators.py,sha256=1dTOYr1IZykrxuQSV2-zuEMZbKe_nGwrfS7iUrsh-sE,3461
+fractal_server/app/schemas/_validators.py,sha256=XKEGEHxp3H6YSJewtFWXe_2Nh7SDdNtAXmlEmJO6Vb0,3606
 fractal_server/app/schemas/user.py,sha256=VNnAPnAVK6X0PZlw7XehocAshVNuUHdDwiZVWCCor6Y,2156
 fractal_server/app/schemas/user_group.py,sha256=2f9XQ6kIar6NMY4UCN0yOnve6ZDHUVZaHv1dna1Vfjg,1446
-fractal_server/app/schemas/user_settings.py,sha256=E9O4NAyxr1NpnO39MZ-AlYvEe-pielFYmerVLNJR9Do,2879
+fractal_server/app/schemas/user_settings.py,sha256=UEST1MSmd9w2YypCji3SONSFlJcr2u4uG3bTczZy_Pk,3102
 fractal_server/app/schemas/v1/__init__.py,sha256=CrBGgBhoemCvmZ70ZUchM-jfVAICnoa7AjZBAtL2UB0,1852
 fractal_server/app/schemas/v1/applyworkflow.py,sha256=uuIh7fHlHEL4yLqL-dePI6-nfCsqgBYATmht7w_KITw,4302
 fractal_server/app/schemas/v1/dataset.py,sha256=n71lNUO3JLy2K3IM9BZM2Fk1EnKQOTU7pm2s2rJ1FGY,3444
@@ -213,8 +213,8 @@ fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kq
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
 fractal_server/zip_tools.py,sha256=xYpzBshysD2nmxkD5WLYqMzPYUcCRM3kYy-7n9bJL-U,4426
-fractal_server-2.6.1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.6.1.dist-info/METADATA,sha256=HhI46bPrWtITVwopn7Lbqd_HBe2bMMUAOI_fMROALmg,4628
-fractal_server-2.6.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.6.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.6.1.dist-info/RECORD,,
+fractal_server-2.6.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.6.2.dist-info/METADATA,sha256=hlWGMOKcA-SXQpW1tlXMo9zfn6lKs31rl-byf88u8Bs,4628
+fractal_server-2.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.6.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.6.2.dist-info/RECORD,,