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

fractal_server/runner/v2/submit_workflow.py

@@ -5,6 +5,7 @@ This module is the single entry point to the runner backend subsystem V2.
 Other subsystems should only import this module and not its submodules or
 the individual backends.
 """
+
 import os
 import traceback
 from pathlib import Path
@@ -12,9 +13,6 @@ from typing import Protocol
 
 from sqlalchemy.orm import Session as DBSyncSession
 
-from ._local import process_workflow as local_process_workflow
-from ._slurm_ssh import process_workflow as slurm_ssh_process_workflow
-from ._slurm_sudo import process_workflow as slurm_sudo_process_workflow
 from fractal_server import __VERSION__
 from fractal_server.app.db import DB
 from fractal_server.app.models.v2 import DatasetV2
@@ -22,7 +20,7 @@ from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import Profile
 from fractal_server.app.models.v2 import Resource
 from fractal_server.app.models.v2 import WorkflowV2
-from fractal_server.app.schemas.v2 import JobStatusTypeV2
+from fractal_server.app.schemas.v2 import JobStatusType
 from fractal_server.app.schemas.v2 import ResourceType
 from fractal_server.logger import get_logger
 from fractal_server.logger import reset_logger_handlers
@@ -34,6 +32,10 @@ from fractal_server.types import AttributeFilters
 from fractal_server.utils import get_timestamp
 from fractal_server.zip_tools import _zip_folder_to_file_and_remove
 
+from ._local import process_workflow as local_process_workflow
+from ._slurm_ssh import process_workflow as slurm_ssh_process_workflow
+from ._slurm_sudo import process_workflow as slurm_sudo_process_workflow
+
 
 class ProcessWorkflowType(Protocol):
     def __call__(
@@ -53,8 +55,7 @@ class ProcessWorkflowType(Protocol):
         resource: Resource,
         profile: Profile,
         user_cache_dir: str,
-    ) -> None:
-        ...
+    ) -> None: ...
 
 
 def fail_job(
@@ -70,7 +71,7 @@ def fail_job(
         logger.error(log_msg)
     reset_logger_handlers(logger)
     job = db.get(JobV2, job.id)  # refetch, in case it was updated
-    job.status = JobStatusTypeV2.FAILED
+    job.status = JobStatusType.FAILED
     job.end_timestamp = get_timestamp()
     job.log = log_msg
     db.merge(job)
@@ -119,7 +120,7 @@ def submit_workflow(
             Computational resource to be used for this job (e.g. a SLURM
             cluster).
         profile:
-           Computational profile to be used for this job.
+            Computational profile to be used for this job.
         fractal_ssh: SSH object, for when `resource.type = "slurm_ssh"`.
     """
     # Declare runner backend and set `process_workflow` function
@@ -144,14 +145,27 @@ def submit_workflow(
             return
         if dataset is None or workflow is None:
             log_msg = ""
-            if not dataset:
-                log_msg += f"Cannot fetch dataset {dataset_id} from database\n"
-            if not workflow:
-                log_msg += (
-                    f"Cannot fetch workflow {workflow_id} from database\n"
+            if dataset is None:
+                current_log_msg = (
+                    f"Cannot fetch dataset {dataset_id} from database "
+                    f"(as part of job {job_id})."
+                )
+                logger.error(current_log_msg)
+                log_msg += f"{current_log_msg}\n"
+            if workflow is None:
+                current_log_msg += (
+                    f"Cannot fetch workflow {workflow_id} from database "
+                    f"(as part of job {job_id})."
                 )
+                logger.error(current_log_msg)
+                log_msg += f"{current_log_msg}\n"
+
             fail_job(
-                db=db_sync, job=job, log_msg=log_msg, logger_name=logger_name
+                db=db_sync,
+                job=job,
+                log_msg=log_msg,
+                logger_name=logger_name,
+                emit_log=False,
             )
             return
 
@@ -272,7 +286,7 @@ def submit_workflow(
         # Update job DB entry
         with next(DB.get_sync_db()) as db_sync:
             job = db_sync.get(JobV2, job_id)
-            job.status = JobStatusTypeV2.DONE
+            job.status = JobStatusType.DONE
             job.end_timestamp = get_timestamp()
             with log_file_path.open("r") as f:
                 logs = f.read()

fractal_server/ssh/_fabric.py

@@ -16,12 +16,11 @@ from invoke import UnexpectedExit
 from paramiko.ssh_exception import NoValidConnectionsError
 from pydantic import BaseModel
 
-from ..logger import close_logger
-from ..logger import get_logger
-from ..logger import set_logger
+from fractal_server.logger import close_logger
+from fractal_server.logger import get_logger
+from fractal_server.logger import set_logger
 from fractal_server.string_tools import validate_cmd
 
-
 SSH_MONITORING_LOGGER_NAME = "ssh-log"
 
 
@@ -99,8 +98,7 @@ def _acquire_lock_with_timeout(
         if not result:
             logger.error(f"Lock for '{label}' was *not* acquired.")
             raise FractalSSHTimeoutError(
-                f"Failed to acquire lock for '{label}' within "
-                f"{timeout} seconds"
+                f"Failed to acquire lock for '{label}' within {timeout} seconds"
             )
         t_lock_acquisition = time.perf_counter()
         elapsed = t_lock_acquisition - t_lock_request
@@ -374,8 +372,6 @@ class FractalSSH:
         Args:
             cmd: Command to be run
             allow_char: Forbidden chars to allow for this command
-            max_attempts:
-            base_interval:
             lock_timeout:
 
         Returns:
@@ -458,9 +454,7 @@ class FractalSSH:
                 logger_name=self.logger_name,
             ):
                 self._sftp_unsafe().put(local, remote)
-            self.logger.info(
-                f"[send_file] END transfer of '{local}' over SSH."
-            )
+            self.logger.info(f"[send_file] END transfer of '{local}' over SSH.")
         except Exception as e:
             self.log_and_raise(
                 e=e,
@@ -766,8 +760,7 @@ class FractalSSHList:
             logger_name=self._logger_name,
         ):
             self.logger.info(
-                f"Removing FractalSSH object for {user}@{host} "
-                "from collection."
+                f"Removing FractalSSH object for {user}@{host} from collection."
             )
             fractal_ssh_obj = self._data.pop(key)
             self.logger.info(

fractal_server/string_tools.py

@@ -1,6 +1,5 @@
 import string
 
-
 __SPECIAL_CHARACTERS__ = f"{string.punctuation}{string.whitespace}"
 
 # List of invalid characters discussed here:

fractal_server/syringe.py

@@ -34,11 +34,11 @@ or popped from the directory.
     >>> bar()
     42
 """
+
 from collections.abc import Callable
 from typing import Any
 from typing import TypeVar
 
-
 T = TypeVar("T")
 _instance_count = 0
 

fractal_server/tasks/config/_pixi.py

@@ -3,8 +3,8 @@ from typing import Annotated
 
 from pydantic import AfterValidator
 from pydantic import BaseModel
-from pydantic import model_validator
 from pydantic import PositiveInt
+from pydantic import model_validator
 
 from fractal_server.types import DictStrStr
 from fractal_server.types import NonEmptyStr

fractal_server/tasks/config/_python.py

@@ -14,12 +14,25 @@ class TasksPythonSettings(BaseModel):
 
     For task collection to work, there must be one or more base Python
     interpreters available on your system.
+
+    Attributes:
+        default_version:
+            Default task-collection Python version (must be a key of
+            `versions`).
+        versions:
+            Dictionary mapping Python versions to the corresponding
+            interpreters. Example:
+            ```json
+            {
+              "3.11": "/path/to/python3.11",
+              "3.13": "/path/to/python3.13"
+            }
+            ```
+        pip_cache_dir:
+            Argument for `--cache-dir` option of `pip install`, if set.
     """
 
     default_version: NonEmptyStr
-    """
-    Default task-collection Python version (must be a key of `versions`).
-    """
     versions: dict[
         Literal[
             "3.9",
@@ -31,14 +44,8 @@ class TasksPythonSettings(BaseModel):
         ],
         AbsolutePathStr,
     ]
-    """
-    Dictionary mapping Python versions to the corresponding interpreters.
-    """
 
     pip_cache_dir: AbsolutePathStr | None = None
-    """
-    Argument for `--cache-dir` option of `pip install`, if set.
-    """
 
     @model_validator(mode="after")
     def _validate_versions(self) -> Self:

fractal_server/tasks/utils.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 
-
 COLLECTION_FILENAME = "collection.json"
 COLLECTION_LOG_FILENAME = "collection.log"
 COLLECTION_FREEZE_FILENAME = "collection_freeze.txt"

fractal_server/tasks/v2/local/_utils.py

@@ -1,10 +1,10 @@
 from pathlib import Path
 
-from ..utils_pixi import simplify_pyproject_toml
 from fractal_server.app.models import Resource
-from fractal_server.app.schemas.v2 import TaskCreateV2
+from fractal_server.app.schemas.v2 import TaskCreate
 from fractal_server.logger import get_logger
 from fractal_server.logger import set_logger
+from fractal_server.tasks.v2.utils_pixi import simplify_pyproject_toml
 from fractal_server.tasks.v2.utils_templates import customize_template
 from fractal_server.utils import execute_command_sync
 
@@ -51,7 +51,7 @@ def _customize_and_run_template(
     return stdout
 
 
-def check_task_files_exist(task_list: list[TaskCreateV2]) -> None:
+def check_task_files_exist(task_list: list[TaskCreate]) -> None:
     """
     Check that the modules listed in task commands point to existing files.
 

fractal_server/tasks/v2/local/collect.py

@@ -4,15 +4,13 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..utils_database import create_db_tasks_and_update_task_group_sync
-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.models.v2 import TaskGroupV2
 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,22 +18,23 @@ from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.local._utils import check_task_files_exist
 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.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 _customize_and_run_template
+
 
 def collect_local(
     *,
@@ -133,14 +132,13 @@ def collect_local(
                         Path(task_group.path) / SCRIPTS_SUBFOLDER
                     ).as_posix(),
                     prefix=(
-                        f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.COLLECT}"
+                        f"{int(time.time())}_{TaskGroupActivityAction.COLLECT}"
                     ),
                     logger_name=LOGGER_NAME,
                 )
 
                 # 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)
 
@@ -234,7 +232,7 @@ def collect_local(
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                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,
@@ -258,7 +256,7 @@ def collect_local(
 
                 # 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")
@@ -274,8 +272,7 @@ def collect_local(
                     logger.info(f"Deleted folder {task_group.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/collect_pixi.py

@@ -4,16 +4,12 @@ import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-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 ._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 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
@@ -22,15 +18,20 @@ from fractal_server.tasks.v2.local._utils import _customize_and_run_template
 from fractal_server.tasks.v2.local._utils import check_task_files_exist
 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.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 execute_command_sync
 from fractal_server.utils import get_timestamp
 
+from ._utils import edit_pyproject_toml_in_place_local
+
 
 def collect_local_pixi(
     *,
@@ -131,13 +132,12 @@ def collect_local_pixi(
                         task_group.path, SCRIPTS_SUBFOLDER
                     ).as_posix(),
                     prefix=(
-                        f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.COLLECT}"
+                        f"{int(time.time())}_{TaskGroupActivityAction.COLLECT}"
                     ),
                     logger_name=LOGGER_NAME,
                 )
 
-                activity.status = TaskGroupActivityStatusV2.ONGOING
+                activity.status = TaskGroupActivityStatus.ONGOING
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
 
@@ -177,9 +177,7 @@ def collect_local_pixi(
                 package_root = parsed_output["package_root"]
                 venv_size = parsed_output["venv_size"]
                 venv_file_number = parsed_output["venv_file_number"]
-                project_python_wrapper = parsed_output[
-                    "project_python_wrapper"
-                ]
+                project_python_wrapper = parsed_output["project_python_wrapper"]
 
                 # Make task folder 755
                 command = f"chmod -R 755 {source_dir}"
@@ -242,7 +240,7 @@ def collect_local_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")

fractal_server/tasks/v2/local/deactivate.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_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 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.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(
     *,
@@ -77,7 +78,7 @@ def deactivate_local(
                 return
 
             try:
-                activity.status = TaskGroupActivityStatusV2.ONGOING
+                activity.status = TaskGroupActivityStatus.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
                 if task_group.env_info is None:
@@ -101,7 +102,7 @@ def deactivate_local(
                         ).as_posix(),
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.DEACTIVATE}"
+                            f"{TaskGroupActivityAction.DEACTIVATE}"
                         ),
                         logger_name=LOGGER_NAME,
                     )
@@ -119,7 +120,7 @@ def deactivate_local(
                     logger.info("Add pip freeze stdout to TaskGroupV2 - end")
 
                 # 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=}."
                     )
@@ -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(
@@ -210,7 +209,7 @@ def deactivate_local(
                 logger.info(f"Now removing {task_group.venv_path}.")
                 shutil.rmtree(task_group.venv_path)
                 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/local/deactivate_pixi.py

@@ -2,18 +2,18 @@ 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
-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.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
 
 
@@ -70,7 +70,7 @@ def deactivate_local_pixi(
                 return
 
             try:
-                activity.status = TaskGroupActivityStatusV2.ONGOING
+                activity.status = TaskGroupActivityStatus.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
                 # Actually mark the task group as non-active
@@ -82,7 +82,7 @@ def deactivate_local_pixi(
                 logger.info(f"Now removing '{source_dir.as_posix()}'.")
                 shutil.rmtree(source_dir)
                 logger.info(f"All good, '{source_dir.as_posix()}' 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/local/delete.py

@@ -5,16 +5,14 @@ from tempfile import TemporaryDirectory
 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.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
 
@@ -47,7 +45,7 @@ def delete_local(
                 return
 
             try:
-                activity.status = TaskGroupActivityStatusV2.ONGOING
+                activity.status = TaskGroupActivityStatus.ONGOING
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
 
@@ -55,12 +53,12 @@ def delete_local(
                 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 {task_group.path=}.")
                     shutil.rmtree(task_group.path)
                     logger.debug(f"{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)