fractal-server 2.17.1a0__py3-none-any.whl → 2.17.2__py3-none-any.whl

fractal_server/tasks/v2/local/deactivate.py

@@ -3,11 +3,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_templates import get_collection_replacements
-from ._utils import _customize_and_run_template
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -18,10 +13,16 @@ from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import FORBIDDEN_DEPENDENCY_STRINGS
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
+from fractal_server.tasks.v2.utils_templates import get_collection_replacements
 from fractal_server.utils import get_timestamp
 
+from ._utils import _customize_and_run_template
+
 
 def deactivate_local(
     *,
@@ -172,9 +173,7 @@ def deactivate_local(
                             / Path(task_group.archive_path).name
                         ).as_posix()
                         shutil.copy(task_group.archive_path, new_archive_path)
-                        logger.info(
-                            f"Copied wheel file to {new_archive_path}."
-                        )
+                        logger.info(f"Copied wheel file to {new_archive_path}.")
 
                         task_group.archive_path = new_archive_path
                         new_pip_freeze = task_group.env_info.replace(

fractal_server/tasks/v2/local/deactivate_pixi.py

@@ -2,10 +2,6 @@ import shutil
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_pixi import SOURCE_DIR_NAME
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -13,7 +9,11 @@ from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
 from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_pixi import SOURCE_DIR_NAME
 from fractal_server.utils import get_timestamp
 
 

fractal_server/tasks/v2/local/delete.py

@@ -12,9 +12,7 @@ from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
 from fractal_server.tasks.v2.utils_background import fail_and_cleanup
-from fractal_server.tasks.v2.utils_background import (
-    get_activity_and_task_group,
-)
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.utils import get_timestamp
 

fractal_server/tasks/v2/local/reactivate.py

@@ -3,11 +3,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_templates import get_collection_replacements
-from ._utils import _customize_and_run_template
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -16,13 +11,19 @@ from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
 from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_python_interpreter import (
     get_python_interpreter,
 )
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
+from fractal_server.tasks.v2.utils_templates import get_collection_replacements
 from fractal_server.utils import get_timestamp
 
+from ._utils import _customize_and_run_template
+
 
 def reactivate_local(
     *,
@@ -142,8 +143,7 @@ def reactivate_local(
                     logger.info(f"Deleted folder {task_group.venv_path}")
                 except Exception as rm_e:
                     logger.error(
-                        "Removing folder failed.\n"
-                        f"Original error:\n{str(rm_e)}"
+                        f"Removing folder failed.\nOriginal error:\n{str(rm_e)}"
                     )
 
                 fail_and_cleanup(

fractal_server/tasks/v2/local/reactivate_pixi.py

@@ -3,11 +3,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_pixi import SOURCE_DIR_NAME
-from ._utils import edit_pyproject_toml_in_place_local
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -17,11 +12,17 @@ from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.local._utils import _customize_and_run_template
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_pixi import SOURCE_DIR_NAME
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import execute_command_sync
 from fractal_server.utils import get_timestamp
 
+from ._utils import edit_pyproject_toml_in_place_local
+
 
 def reactivate_local_pixi(
     *,
@@ -192,8 +193,7 @@ def reactivate_local_pixi(
                     logger.info(f"Deleted folder {source_dir}")
                 except Exception as rm_e:
                     logger.error(
-                        "Removing folder failed. "
-                        f"Original error: {str(rm_e)}"
+                        f"Removing folder failed. Original error: {str(rm_e)}"
                     )
 
                 fail_and_cleanup(

fractal_server/tasks/v2/ssh/_utils.py

@@ -3,14 +3,14 @@ from pathlib import Path
 
 from sqlalchemy.orm import Session
 
-from ..utils_background import fail_and_cleanup
-from ..utils_pixi import simplify_pyproject_toml
 from fractal_server.app.models import Resource
 from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.logger import get_logger
 from fractal_server.logger import set_logger
 from fractal_server.ssh._fabric import FractalSSH
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_pixi import simplify_pyproject_toml
 from fractal_server.tasks.v2.utils_templates import customize_template
 
 logger = set_logger(__name__)
@@ -156,7 +156,7 @@ def check_ssh_or_fail_and_cleanup(
     except Exception as e:
         logger = get_logger(logger_name=logger_name)
         logger.error(
-            "Cannot establish SSH connection. " f"Original error: {str(e)}"
+            f"Cannot establish SSH connection. Original error: {str(e)}"
         )
         fail_and_cleanup(
             task_group=task_group,

fractal_server/tasks/v2/ssh/collect.py

@@ -2,11 +2,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_background import prepare_tasks_metadata
-from ..utils_database import create_db_tasks_and_update_task_group_sync
-from ._utils import check_ssh_or_fail_and_cleanup
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -20,18 +15,24 @@ from fractal_server.ssh._fabric import SingleUseFractalSSH
 from fractal_server.ssh._fabric import SSHConfig
 from fractal_server.tasks.v2.ssh._utils import _customize_and_run_template
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_background import prepare_tasks_metadata
+from fractal_server.tasks.v2.utils_database import (
+    create_db_tasks_and_update_task_group_sync,
+)
 from fractal_server.tasks.v2.utils_package_names import compare_package_names
 from fractal_server.tasks.v2.utils_python_interpreter import (
     get_python_interpreter,
 )
-from fractal_server.tasks.v2.utils_templates import get_collection_replacements
-from fractal_server.tasks.v2.utils_templates import (
-    parse_script_pip_show_stdout,
-)
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
+from fractal_server.tasks.v2.utils_templates import get_collection_replacements
+from fractal_server.tasks.v2.utils_templates import parse_script_pip_show_stdout
 from fractal_server.utils import get_timestamp
 
+from ._utils import check_ssh_or_fail_and_cleanup
+
 
 def collect_ssh(
     *,
@@ -55,8 +56,8 @@ def collect_ssh(
     Args:
         task_group_id:
         task_group_activity_id:
-        ssh_config:
         resource:
+        profile:
         wheel_file:
     """
 
@@ -136,9 +137,7 @@ def collect_ssh(
                         tmp_archive_path = (
                             Path(tmpdir) / wheel_filename
                         ).as_posix()
-                        logger.info(
-                            f"Write wheel file into {tmp_archive_path}"
-                        )
+                        logger.info(f"Write wheel file into {tmp_archive_path}")
                         with open(tmp_archive_path, "wb") as f:
                             f.write(wheel_file.contents)
                         fractal_ssh.send_file(
@@ -267,9 +266,7 @@ def collect_ssh(
                     )
                     logger.info("_prepare_tasks_metadata - end")
 
-                    logger.info(
-                        "create_db_tasks_and_update_task_group - " "start"
-                    )
+                    logger.info("create_db_tasks_and_update_task_group - start")
                     create_db_tasks_and_update_task_group_sync(
                         task_list=task_list,
                         task_group_id=task_group.id,
@@ -310,9 +307,7 @@ def collect_ssh(
                             folder=task_group.path,
                             safe_root=profile.tasks_remote_dir,
                         )
-                        logger.info(
-                            f"Deleted remoted folder {task_group.path}"
-                        )
+                        logger.info(f"Deleted remoted folder {task_group.path}")
                     except Exception as e_rm:
                         logger.error(
                             "Removing folder failed. "

fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -2,15 +2,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_background import prepare_tasks_metadata
-from ..utils_database import create_db_tasks_and_update_task_group_sync
-from ..utils_pixi import parse_collect_stdout
-from ..utils_pixi import SOURCE_DIR_NAME
-from ._pixi_slurm_ssh import run_script_on_remote_slurm
-from ._utils import check_ssh_or_fail_and_cleanup
-from ._utils import edit_pyproject_toml_in_place_ssh
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -25,10 +16,22 @@ from fractal_server.ssh._fabric import SSHConfig
 from fractal_server.tasks.v2.ssh._utils import _customize_and_run_template
 from fractal_server.tasks.v2.ssh._utils import _customize_and_send_template
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_background import prepare_tasks_metadata
+from fractal_server.tasks.v2.utils_database import (
+    create_db_tasks_and_update_task_group_sync,
+)
+from fractal_server.tasks.v2.utils_pixi import SOURCE_DIR_NAME
+from fractal_server.tasks.v2.utils_pixi import parse_collect_stdout
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
+from ._pixi_slurm_ssh import run_script_on_remote_slurm
+from ._utils import check_ssh_or_fail_and_cleanup
+from ._utils import edit_pyproject_toml_in_place_ssh
+
 
 def collect_ssh_pixi(
     *,
@@ -52,8 +55,9 @@ def collect_ssh_pixi(
     Args:
         task_group_id:
         task_group_activity_id:
-        ssh_config:
         tar_gz_file:
+        resource:
+        profile:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
@@ -247,9 +251,7 @@ def collect_ssh_pixi(
                             remote_script3_path,
                             f"chmod -R 755 {source_dir}",
                         ],
-                        slurm_config=resource.tasks_pixi_config[
-                            "SLURM_CONFIG"
-                        ],
+                        slurm_config=resource.tasks_pixi_config["SLURM_CONFIG"],
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
                         prefix=common_args["prefix"],
@@ -290,9 +292,7 @@ def collect_ssh_pixi(
                     )
                     logger.info("_prepare_tasks_metadata - end")
 
-                    logger.info(
-                        "create_db_tasks_and_update_task_group - " "start"
-                    )
+                    logger.info("create_db_tasks_and_update_task_group - start")
                     create_db_tasks_and_update_task_group_sync(
                         task_list=task_list,
                         task_group_id=task_group.id,
@@ -344,9 +344,7 @@ def collect_ssh_pixi(
                             folder=task_group.path,
                             safe_root=profile.tasks_remote_dir,
                         )
-                        logger.info(
-                            f"Deleted remoted folder {task_group.path}"
-                        )
+                        logger.info(f"Deleted remoted folder {task_group.path}")
                     except Exception as e_rm:
                         logger.error(
                             "Removing folder failed. "

fractal_server/tasks/v2/ssh/deactivate.py

@@ -2,13 +2,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_templates import get_collection_replacements
-from ._utils import _copy_wheel_file_ssh
-from ._utils import _customize_and_run_template
-from ._utils import check_ssh_or_fail_and_cleanup
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -21,10 +14,18 @@ from fractal_server.ssh._fabric import SingleUseFractalSSH
 from fractal_server.ssh._fabric import SSHConfig
 from fractal_server.tasks.utils import FORBIDDEN_DEPENDENCY_STRINGS
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
+from fractal_server.tasks.v2.utils_templates import get_collection_replacements
 from fractal_server.utils import get_timestamp
 
+from ._utils import _copy_wheel_file_ssh
+from ._utils import _customize_and_run_template
+from ._utils import check_ssh_or_fail_and_cleanup
+
 
 def deactivate_ssh(
     *,
@@ -42,7 +43,8 @@ def deactivate_ssh(
     Args:
         task_group_id:
         task_group_activity_id:
-        ssh_config:
+        resource:
+        profile:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"

fractal_server/tasks/v2/ssh/deactivate_pixi.py

@@ -1,11 +1,6 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_pixi import SOURCE_DIR_NAME
-from ._utils import check_ssh_or_fail_and_cleanup
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -15,9 +10,15 @@ from fractal_server.logger import set_logger
 from fractal_server.ssh._fabric import SingleUseFractalSSH
 from fractal_server.ssh._fabric import SSHConfig
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_pixi import SOURCE_DIR_NAME
 from fractal_server.utils import get_timestamp
 
+from ._utils import check_ssh_or_fail_and_cleanup
+
 
 def deactivate_ssh_pixi(
     *,

fractal_server/tasks/v2/ssh/delete.py

@@ -1,10 +1,6 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ._utils import check_ssh_or_fail_and_cleanup
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -15,9 +11,14 @@ from fractal_server.logger import set_logger
 from fractal_server.ssh._fabric import SingleUseFractalSSH
 from fractal_server.ssh._fabric import SSHConfig
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.utils import get_timestamp
 
+from ._utils import check_ssh_or_fail_and_cleanup
+
 
 def delete_ssh(
     *,
@@ -35,7 +36,8 @@ def delete_ssh(
     Args:
         task_group_id:
         task_group_activity_id:
-        ssh_config:
+        resource:
+        profile:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"

fractal_server/tasks/v2/ssh/reactivate.py

@@ -2,12 +2,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import add_commit_refresh
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_templates import get_collection_replacements
-from ._utils import _customize_and_run_template
-from ._utils import check_ssh_or_fail_and_cleanup
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -18,13 +12,20 @@ from fractal_server.logger import set_logger
 from fractal_server.ssh._fabric import SingleUseFractalSSH
 from fractal_server.ssh._fabric import SSHConfig
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_python_interpreter import (
     get_python_interpreter,
 )
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
+from fractal_server.tasks.v2.utils_templates import get_collection_replacements
 from fractal_server.utils import get_timestamp
 
+from ._utils import _customize_and_run_template
+from ._utils import check_ssh_or_fail_and_cleanup
+
 
 def reactivate_ssh(
     *,
@@ -40,9 +41,10 @@ def reactivate_ssh(
     handled.
 
     Args:
-        task_group_id:
         task_group_activity_id:
-        ssh_config:
+        task_group_id:
+        resource:
+        profile:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
@@ -182,9 +184,7 @@ def reactivate_ssh(
                 except Exception as reactivate_e:
                     # Delete corrupted venv_path
                     try:
-                        logger.info(
-                            f"Now delete folder {task_group.venv_path}"
-                        )
+                        logger.info(f"Now delete folder {task_group.venv_path}")
                         fractal_ssh.remove_folder(
                             folder=task_group.venv_path,
                             safe_root=profile.tasks_remote_dir,

fractal_server/tasks/v2/ssh/reactivate_pixi.py

@@ -2,12 +2,6 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_background import fail_and_cleanup
-from ..utils_background import get_activity_and_task_group
-from ..utils_pixi import SOURCE_DIR_NAME
-from ._pixi_slurm_ssh import run_script_on_remote_slurm
-from ._utils import check_ssh_or_fail_and_cleanup
-from ._utils import edit_pyproject_toml_in_place_ssh
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
@@ -21,10 +15,17 @@ from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.ssh._utils import _customize_and_run_template
 from fractal_server.tasks.v2.ssh._utils import _customize_and_send_template
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
+from fractal_server.tasks.v2.utils_background import fail_and_cleanup
+from fractal_server.tasks.v2.utils_background import get_activity_and_task_group
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_pixi import SOURCE_DIR_NAME
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
+from ._pixi_slurm_ssh import run_script_on_remote_slurm
+from ._utils import check_ssh_or_fail_and_cleanup
+from ._utils import edit_pyproject_toml_in_place_ssh
+
 
 def reactivate_ssh_pixi(
     *,
@@ -233,9 +234,7 @@ def reactivate_ssh_pixi(
                             remote_script3_path,
                             f"chmod -R 755 {source_dir}",
                         ],
-                        slurm_config=resource.tasks_pixi_config[
-                            "SLURM_CONFIG"
-                        ],
+                        slurm_config=resource.tasks_pixi_config["SLURM_CONFIG"],
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
                         prefix=common_args["prefix"],

fractal_server/tasks/v2/templates/1_create_venv.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/templates/2_pip_install.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/templates/3_pip_freeze.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 # Variables to be filled within fractal-server

fractal_server/tasks/v2/templates/4_pip_show.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/templates/5_get_venv_size_and_file_number.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 # Variables to be filled within fractal-server
@@ -7,4 +9,4 @@ PACKAGE_ENV_DIR=__PACKAGE_ENV_DIR__
 ENV_DISK_USAGE=$(du -sk "${PACKAGE_ENV_DIR}" | cut -f1)
 ENV_FILE_NUMBER=$(find "${PACKAGE_ENV_DIR}" -type f | wc -l)
 
-echo $ENV_DISK_USAGE $ENV_FILE_NUMBER
+echo "$ENV_DISK_USAGE" "$ENV_FILE_NUMBER"

fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/templates/pixi_1_extract.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/templates/pixi_2_install.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/templates/pixi_3_post_install.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 
 write_log(){

fractal_server/tasks/v2/utils_background.py

@@ -112,9 +112,9 @@ def prepare_tasks_metadata(
         if package_version is not None:
             task_attributes["version"] = package_version
         if package_manifest.has_args_schemas:
-            task_attributes[
-                "args_schema_version"
-            ] = package_manifest.args_schema_version
+            task_attributes["args_schema_version"] = (
+                package_manifest.args_schema_version
+            )
         # Set command attributes
         if _task.executable_non_parallel is not None:
             non_parallel_path = package_root / _task.executable_non_parallel

fractal_server/tasks/v2/utils_package_names.py

@@ -62,8 +62,7 @@ def compare_package_names(
         return
 
     logger.warning(
-        f"Package name mismatch: "
-        f"{pkg_name_task_group=}, {pkg_name_pip_show=}."
+        f"Package name mismatch: {pkg_name_task_group=}, {pkg_name_pip_show=}."
     )
     normalized_pkg_name_pip = normalize_package_name(pkg_name_pip_show)
     normalized_pkg_name_taskgroup = normalize_package_name(pkg_name_task_group)

fractal_server/tasks/v2/utils_pixi.py

@@ -95,9 +95,7 @@ def simplify_pyproject_toml(
             if key == pixi_environment
         }
         if pixi_data["environments"] == {}:
-            raise ValueError(
-                f"No '{pixi_environment}' pixi environment found."
-            )
+            raise ValueError(f"No '{pixi_environment}' pixi environment found.")
     except KeyError:
         logger.info("KeyError for workspace/platforms - skip.")