fractal-server 2.6.1__tar.gz → 2.6.2__tar.gz

{fractal_server-2.6.1 → fractal_server-2.6.2}/PKG-INFO

@@ -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.2/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.6.2"

{fractal_server-2.6.1 → fractal_server-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-2.6.1 → fractal_server-2.6.2}/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 → fractal_server-2.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.6.1"
+version = "2.6.2"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -92,7 +92,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.6.1"
+current_version = "2.6.2"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.6.1/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.6.1"