fractal-server 2.12.0a0__tar.gz → 2.12.0a1__tar.gz

{fractal_server-2.12.0a0 → fractal_server-2.12.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.12.0a0
+Version: 2.12.0a1
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.12.0a1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.12.0a1"

{fractal_server-2.12.0a0 → fractal_server-2.12.0a1}/fractal_server/app/runner/executors/slurm/ssh/executor.py

@@ -385,9 +385,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         args_batches = []
         batch_size = tasks_per_job
         for ind_chunk in range(0, tot_tasks, batch_size):
-            args_batches.append(
-                list_args[ind_chunk : ind_chunk + batch_size]  # noqa
-            )
+            args_batches.append(list_args[ind_chunk : ind_chunk + batch_size])
         if len(args_batches) != math.ceil(tot_tasks / tasks_per_job):
             raise RuntimeError("Something wrong here while batching tasks")
 
@@ -536,10 +534,15 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             _prefixes = []
             _subfolder_names = []
             for component in components:
-                if isinstance(component, dict):
+                # In Fractal, `component` is `dict` by construction (e.g.
+                # `component = {"zarr_url": "/something", "param": 1}``). The
+                # try/except covers the case of e.g. `executor.map([1, 2])`,
+                # which is useful for testing.
+                try:
                     actual_component = component.get(_COMPONENT_KEY_, None)
-                else:
-                    actual_component = component
+                except AttributeError:
+                    actual_component = str(component)
+
                 _task_file_paths = get_task_file_paths(
                     workflow_dir_local=task_files.workflow_dir_local,
                     workflow_dir_remote=task_files.workflow_dir_remote,

{fractal_server-2.12.0a0 → fractal_server-2.12.0a1}/fractal_server/app/runner/executors/slurm/sudo/executor.py

@@ -608,11 +608,7 @@ class FractalSlurmExecutor(SlurmExecutor):
             _prefixes = []
             _subfolder_names = []
             for component in components:
-                if isinstance(component, dict):
-                    # This is needed for V2
-                    actual_component = component.get(_COMPONENT_KEY_, None)
-                else:
-                    actual_component = component
+                actual_component = component.get(_COMPONENT_KEY_, None)
                 _task_file_paths = get_task_file_paths(
                     workflow_dir_local=task_files.workflow_dir_local,
                     workflow_dir_remote=task_files.workflow_dir_remote,

{fractal_server-2.12.0a0 → fractal_server-2.12.0a1}/fractal_server/app/schemas/_validators.py

@@ -48,25 +48,6 @@ def valdict_keys(attribute: str):
     return val
 
 
-def valint(attribute: str, min_val: int = 1):
-    """
-    Check that an integer attribute (e.g. if it is meant to be the ID of a
-    database entry) is greater or equal to min_val.
-    """
-
-    def val(integer: Optional[int]) -> Optional[int]:
-        if integer is None:
-            raise ValueError(f"Integer attribute '{attribute}' cannot be None")
-        if integer < min_val:
-            raise ValueError(
-                f"Integer attribute '{attribute}' cannot be less than "
-                f"{min_val} (given {integer})"
-            )
-        return integer
-
-    return val
-
-
 def val_absolute_path(attribute: str, accept_none: bool = False):
     """
     Check that a string attribute is an absolute path

{fractal_server-2.12.0a0 → fractal_server-2.12.0a1}/fractal_server/tasks/utils.py

@@ -7,9 +7,5 @@ COLLECTION_FREEZE_FILENAME = "collection_freeze.txt"
 FORBIDDEN_DEPENDENCY_STRINGS = ["github.com"]
 
 
-def get_collection_path(base: Path) -> Path:
-    return base / COLLECTION_FILENAME
-
-
 def get_log_path(base: Path) -> Path:
     return base / COLLECTION_LOG_FILENAME

{fractal_server-2.12.0a0 → fractal_server-2.12.0a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.12.0a0"
+version = "2.12.0a1"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.12.0a0"
+current_version = "2.12.0a1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.12.0a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.12.0a0"