fractal-server 2.17.1a1__py3-none-any.whl → 2.18.0__py3-none-any.whl

fractal_server/tasks/v2/local/reactivate.py

@@ -3,26 +3,27 @@ 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
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatus
 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(
     *,
@@ -78,7 +79,7 @@ def reactivate_local(
                 return
 
             try:
-                activity.status = TaskGroupActivityStatusV2.ONGOING
+                activity.status = TaskGroupActivityStatus.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
                 # Prepare replacements for templates
@@ -104,7 +105,7 @@ def reactivate_local(
                     ).as_posix(),
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE}"
+                        f"{TaskGroupActivityAction.REACTIVATE}"
                     ),
                     logger_name=LOGGER_NAME,
                 )
@@ -125,7 +126,7 @@ def reactivate_local(
                 )
                 logger.debug("end - install from pip freeze")
                 activity.log = get_current_log(log_file_path)
-                activity.status = TaskGroupActivityStatusV2.OK
+                activity.status = TaskGroupActivityStatus.OK
                 activity.timestamp_ended = get_timestamp()
                 activity = add_commit_refresh(obj=activity, db=db)
                 task_group.active = True
@@ -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,25 +3,26 @@ 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
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatus
 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(
     *,
@@ -76,7 +77,7 @@ def reactivate_local_pixi(
                 return
 
             try:
-                activity.status = TaskGroupActivityStatusV2.ONGOING
+                activity.status = TaskGroupActivityStatus.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
                 common_args = dict(
@@ -125,7 +126,7 @@ def reactivate_local_pixi(
                     ).as_posix(),
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE}"
+                        f"{TaskGroupActivityAction.REACTIVATE}"
                     ),
                     logger_name=LOGGER_NAME,
                 )
@@ -175,7 +176,7 @@ def reactivate_local_pixi(
                 )
 
                 activity.log = get_current_log(log_file_path)
-                activity.status = TaskGroupActivityStatusV2.OK
+                activity.status = TaskGroupActivityStatus.OK
                 activity.timestamp_ended = get_timestamp()
                 activity = add_commit_refresh(obj=activity, db=db)
                 task_group.active = True
@@ -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,17 +2,12 @@ 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
 from fractal_server.app.schemas.v2 import FractalUploadedFile
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
 from fractal_server.app.schemas.v2.manifest import ManifestV2
 from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
@@ -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(
@@ -167,7 +166,7 @@ def collect_ssh(
                         script_dir_remote=script_dir_remote,
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.COLLECT}"
+                            f"{TaskGroupActivityAction.COLLECT}"
                         ),
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
@@ -176,7 +175,7 @@ def collect_ssh(
                     logger.info("installing - START")
 
                     # Set status to ONGOING and refresh logs
-                    activity.status = TaskGroupActivityStatusV2.ONGOING
+                    activity.status = TaskGroupActivityStatus.ONGOING
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
@@ -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,
@@ -293,7 +290,7 @@ def collect_ssh(
 
                     # Finalize (write metadata to DB)
                     logger.info("finalising - START")
-                    activity.status = TaskGroupActivityStatusV2.OK
+                    activity.status = TaskGroupActivityStatus.OK
                     activity.timestamp_ended = get_timestamp()
                     activity = add_commit_refresh(obj=activity, db=db)
                     logger.info("finalising - END")
@@ -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,21 +2,12 @@ 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
 from fractal_server.app.schemas.v2 import FractalUploadedFile
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
 from fractal_server.app.schemas.v2.manifest import ManifestV2
 from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
@@ -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}"
@@ -180,7 +184,7 @@ def collect_ssh_pixi(
                     logger.info("installing - START")
 
                     # Set status to ONGOING and refresh logs
-                    activity.status = TaskGroupActivityStatusV2.ONGOING
+                    activity.status = TaskGroupActivityStatus.ONGOING
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
@@ -191,7 +195,7 @@ def collect_ssh_pixi(
                         script_dir_remote=script_dir_remote,
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.COLLECT}"
+                            f"{TaskGroupActivityAction.COLLECT}"
                         ),
                         logger_name=LOGGER_NAME,
                         fractal_ssh=fractal_ssh,
@@ -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,
@@ -327,7 +327,7 @@ def collect_ssh_pixi(
 
                     # Finalize (write metadata to DB)
                     logger.info("finalising - START")
-                    activity.status = TaskGroupActivityStatusV2.OK
+                    activity.status = TaskGroupActivityStatus.OK
                     activity.timestamp_ended = get_timestamp()
                     activity = add_commit_refresh(obj=activity, db=db)
                     logger.info("finalising - END")
@@ -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,29 +2,30 @@ 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
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
-from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupOriginEnum
+from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatus
 from fractal_server.logger import reset_logger_handlers
 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 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}"
@@ -99,7 +101,7 @@ def deactivate_ssh(
                         )
                         return
 
-                    activity.status = TaskGroupActivityStatusV2.ONGOING
+                    activity.status = TaskGroupActivityStatus.ONGOING
                     activity = add_commit_refresh(obj=activity, db=db)
 
                     if task_group.env_info is None:
@@ -133,7 +135,7 @@ def deactivate_ssh(
                             script_dir_remote=script_dir_remote,
                             prefix=(
                                 f"{int(time.time())}_"
-                                f"{TaskGroupActivityActionV2.DEACTIVATE}"
+                                f"{TaskGroupActivityAction.DEACTIVATE}"
                             ),
                             fractal_ssh=fractal_ssh,
                             logger_name=LOGGER_NAME,
@@ -158,7 +160,7 @@ def deactivate_ssh(
                         )
 
                     # Handle some specific cases for wheel-file case
-                    if task_group.origin == TaskGroupV2OriginEnum.WHEELFILE:
+                    if task_group.origin == TaskGroupOriginEnum.WHEELFILE:
                         logger.info(
                             f"Handle specific cases for {task_group.origin=}."
                         )
@@ -262,7 +264,7 @@ def deactivate_ssh(
                         safe_root=profile.tasks_remote_dir,
                     )
                     logger.info(f"All good, {task_group.venv_path} removed.")
-                    activity.status = TaskGroupActivityStatusV2.OK
+                    activity.status = TaskGroupActivityStatus.OK
                     activity.log = get_current_log(log_file_path)
                     activity.timestamp_ended = get_timestamp()
                     activity = add_commit_refresh(obj=activity, db=db)

fractal_server/tasks/v2/ssh/deactivate_pixi.py

@@ -1,23 +1,24 @@
 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
-from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
+from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatus
 from fractal_server.logger import reset_logger_handlers
 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(
     *,
@@ -108,7 +109,7 @@ def deactivate_ssh_pixi(
                         safe_root=profile.tasks_remote_dir,
                     )
                     logger.info(f"All good, {source_dir} removed.")
-                    activity.status = TaskGroupActivityStatusV2.OK
+                    activity.status = TaskGroupActivityStatus.OK
                     activity.log = get_current_log(log_file_path)
                     activity.timestamp_ended = get_timestamp()
                     activity = add_commit_refresh(obj=activity, db=db)

fractal_server/tasks/v2/ssh/delete.py

@@ -1,23 +1,24 @@
 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
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
-from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
+from fractal_server.app.schemas.v2 import TaskGroupOriginEnum
 from fractal_server.logger import reset_logger_handlers
 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}"
@@ -78,7 +80,7 @@ def delete_ssh(
                     if not ssh_ok:
                         return
 
-                    activity.status = TaskGroupActivityStatusV2.ONGOING
+                    activity.status = TaskGroupActivityStatus.ONGOING
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
 
@@ -86,7 +88,7 @@ def delete_ssh(
                     db.commit()
                     logger.debug("Task group removed from database.")
 
-                    if task_group.origin != TaskGroupV2OriginEnum.OTHER:
+                    if task_group.origin != TaskGroupOriginEnum.OTHER:
                         logger.debug(
                             f"Removing remote {task_group.path=} "
                             f"(with {profile.tasks_remote_dir=})."
@@ -97,7 +99,7 @@ def delete_ssh(
                         )
                         logger.debug(f"Remote {task_group.path=} removed.")
 
-                    activity.status = TaskGroupActivityStatusV2.OK
+                    activity.status = TaskGroupActivityStatus.OK
                     activity.log = get_current_log(log_file_path)
                     activity.timestamp_ended = get_timestamp()
                     activity = add_commit_refresh(obj=activity, db=db)