fractal-server 2.8.0__tar.gz → 2.8.1__tar.gz

{fractal_server-2.8.0 → fractal_server-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.8.0
+Version: 2.8.1
 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.8.1/fractal_server/__init__.py

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

{fractal_server-2.8.0 → fractal_server-2.8.1}/fractal_server/app/schemas/_validators.py

@@ -74,7 +74,7 @@ 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:
+    def val(string: Optional[str]) -> Optional[str]:
         if string is None:
             if accept_none:
                 return string

{fractal_server-2.8.0 → fractal_server-2.8.1}/fractal_server/app/schemas/v2/dataset.py

@@ -39,7 +39,7 @@ class DatasetCreateV2(BaseModel, extra=Extra.forbid):
 
     # Validators
     @validator("zarr_dir")
-    def normalize_zarr_dir(cls, v: str) -> str:
+    def normalize_zarr_dir(cls, v: Optional[str]) -> Optional[str]:
         if v is not None:
             return normalize_url(v)
         return v

{fractal_server-2.8.0 → fractal_server-2.8.1}/fractal_server/app/schemas/v2/task_collection.py

@@ -57,16 +57,8 @@ class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
     python_version: Optional[Literal["3.9", "3.10", "3.11", "3.12"]] = None
     pinned_package_versions: Optional[dict[str, str]] = None
 
-    _package = validator("package", allow_reuse=True)(valstr("package"))
-    _package_version = validator("package_version", allow_reuse=True)(
-        valstr("package_version")
-    )
-    _package_extras = validator("package_extras", allow_reuse=True)(
-        valstr("package_extras")
-    )
-
     @validator("pinned_package_versions")
-    def pinned_package_validator(cls, value):
+    def pinned_package_versions_validator(cls, value):
         if value is None:
             return value
         old_keys = list(value.keys())
@@ -87,6 +79,7 @@ class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
 
     @validator("package")
     def package_validator(cls, value):
+        value = valstr("package")(value)
         if "/" in value or value.endswith(".whl"):
             if not value.endswith(".whl"):
                 raise ValueError(
@@ -97,17 +90,27 @@ class TaskCollectPipV2(BaseModel, extra=Extra.forbid):
                 raise ValueError(
                     f"Local-package path must be absolute: (given {value})."
                 )
+        validate_cmd(value, attribute_name="package")
         return value
 
     @validator("package_version")
-    def package_version_validator(cls, v, values):
+    def package_version_validator(
+        cls, v: Optional[str], values
+    ) -> Optional[str]:
         v = valstr("package_version")(v)
         if values["package"].endswith(".whl"):
             raise ValueError(
                 "Cannot provide package version when package is a wheel file."
             )
+        validate_cmd(v, attribute_name="package_version")
         return v
 
+    @validator("package_extras")
+    def package_extras_validator(cls, value: Optional[str]) -> Optional[str]:
+        value = valstr("package_extras")(value)
+        validate_cmd(value, attribute_name="package_extras")
+        return value
+
 
 class TaskCollectCustomV2(BaseModel, extra=Extra.forbid):
     """

{fractal_server-2.8.0 → fractal_server-2.8.1}/fractal_server/string_tools.py

@@ -54,7 +54,12 @@ def slugify_task_name_for_source_v1(task_name: str) -> str:
     return task_name.replace(" ", "_").lower()
 
 
-def validate_cmd(command: str, allow_char: Optional[str] = None):
+def validate_cmd(
+    command: str,
+    *,
+    allow_char: Optional[str] = None,
+    attribute_name: str = "Command",
+):
     """
     Assert that the provided `command` does not contain any of the forbidden
     characters for commands
@@ -63,6 +68,7 @@ def validate_cmd(command: str, allow_char: Optional[str] = None):
     Args:
         command: command to validate.
         allow_char: chars to accept among the forbidden ones
+        attribute_name: Name of the attribute, to be used in error message.
     """
     if not isinstance(command, str):
         raise ValueError(f"{command=} is not a string.")
@@ -71,6 +77,7 @@ def validate_cmd(command: str, allow_char: Optional[str] = None):
         forbidden = forbidden - set(allow_char)
     if not forbidden.isdisjoint(set(command)):
         raise ValueError(
-            f"Command must not contain any of this characters: '{forbidden}'\n"
-            f"Provided command: '{command}'."
+            f"{attribute_name} must not contain any of this characters: "
+            f"'{forbidden}'\n"
+            f"Provided {attribute_name.lower()}: '{command}'."
         )

{fractal_server-2.8.0 → fractal_server-2.8.1}/pyproject.toml

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

fractal_server-2.8.0/fractal_server/__init__.py

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