fractal-server 2.18.0a4__py3-none-any.whl → 2.18.0a6__py3-none-any.whl

fractal_server/runner/v2/runner_functions.py

@@ -64,9 +64,9 @@ GetRunnerConfigType = GetRunnerConfigTypeLocal | GetRunnerConfigTypeSLURM
 
 
 __all__ = [
-    "run_v2_task_parallel",
-    "run_v2_task_non_parallel",
-    "run_v2_task_compound",
+    "run_task_parallel",
+    "run_task_non_parallel",
+    "run_task_compound",
 ]
 
 
@@ -145,7 +145,7 @@ def _check_parallelization_list_size(my_list):
         )
 
 
-def run_v2_task_non_parallel(
+def run_task_non_parallel(
     *,
     images: list[dict[str, Any]],
     zarr_dir: str,
@@ -168,9 +168,7 @@ def run_v2_task_non_parallel(
         TaskType.NON_PARALLEL,
         TaskType.CONVERTER_NON_PARALLEL,
     ]:
-        raise ValueError(
-            f"Invalid {task_type=} for `run_v2_task_non_parallel`."
-        )
+        raise ValueError(f"Invalid {task_type=} for `run_task_non_parallel`.")
 
     # Get TaskFiles object
     task_files = TaskFiles(
@@ -213,7 +211,7 @@ def run_v2_task_non_parallel(
         db.commit()
         db.refresh(history_unit)
         logger.debug(
-            "[run_v2_task_non_parallel] Created `HistoryUnit` with "
+            "[run_task_non_parallel] Created `HistoryUnit` with "
             f"{history_run_id=}."
         )
         history_unit_id = history_unit.id
@@ -265,7 +263,7 @@ def run_v2_task_non_parallel(
     return outcome, num_tasks
 
 
-def run_v2_task_parallel(
+def run_task_parallel(
     *,
     images: list[dict[str, Any]],
     task: TaskV2,
@@ -326,7 +324,7 @@ def run_v2_task_parallel(
         db.add_all(history_units)
         db.commit()
         logger.debug(
-            f"[run_v2_task_non_parallel] Created {len(history_units)} "
+            f"[run_task_non_parallel] Created {len(history_units)} "
             "`HistoryUnit`s."
         )
 
@@ -388,7 +386,7 @@ def run_v2_task_parallel(
     return outcome, num_tasks
 
 
-def run_v2_task_compound(
+def run_task_compound(
     *,
     images: list[dict[str, Any]],
     zarr_dir: str,
@@ -445,7 +443,7 @@ def run_v2_task_compound(
         db.refresh(history_unit)
         init_history_unit_id = history_unit.id
         logger.debug(
-            "[run_v2_task_compound] Created `HistoryUnit` with "
+            "[run_task_compound] Created `HistoryUnit` with "
             f"{init_history_unit_id=}."
         )
         # Create one `HistoryImageCache` for each input image
@@ -557,8 +555,7 @@ def run_v2_task_compound(
         for history_unit in history_units:
             db.refresh(history_unit)
         logger.debug(
-            f"[run_v2_task_compound] Created {len(history_units)} "
-            "`HistoryUnit`s."
+            f"[run_task_compound] Created {len(history_units)} `HistoryUnit`s."
         )
         history_unit_ids = [history_unit.id for history_unit in history_units]
 

fractal_server/runner/v2/submit_workflow.py

@@ -20,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
@@ -71,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)
@@ -145,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
 
@@ -273,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/tasks/v2/local/_utils.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 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
@@ -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

@@ -9,8 +9,8 @@ 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
@@ -132,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)
 
@@ -257,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")

fractal_server/tasks/v2/local/collect_pixi.py

@@ -8,8 +8,8 @@ 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
@@ -132,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)
 
@@ -241,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

@@ -6,9 +6,9 @@ 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 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
@@ -78,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:
@@ -102,7 +102,7 @@ def deactivate_local(
                         ).as_posix(),
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.DEACTIVATE}"
+                            f"{TaskGroupActivityAction.DEACTIVATE}"
                         ),
                         logger_name=LOGGER_NAME,
                     )
@@ -120,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=}."
                     )
@@ -209,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

@@ -5,7 +5,7 @@ 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.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
@@ -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,8 +5,8 @@ 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
@@ -45,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)
 
@@ -53,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)

fractal_server/tasks/v2/local/reactivate.py

@@ -6,8 +6,8 @@ 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 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
@@ -79,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
@@ -105,7 +105,7 @@ def reactivate_local(
                     ).as_posix(),
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE}"
+                        f"{TaskGroupActivityAction.REACTIVATE}"
                     ),
                     logger_name=LOGGER_NAME,
                 )
@@ -126,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

fractal_server/tasks/v2/local/reactivate_pixi.py

@@ -6,8 +6,8 @@ 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 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
@@ -77,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(
@@ -126,7 +126,7 @@ def reactivate_local_pixi(
                     ).as_posix(),
                     prefix=(
                         f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE}"
+                        f"{TaskGroupActivityAction.REACTIVATE}"
                     ),
                     logger_name=LOGGER_NAME,
                 )
@@ -176,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

fractal_server/tasks/v2/ssh/collect.py

@@ -6,8 +6,8 @@ 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
@@ -166,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,
@@ -175,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)
 
@@ -290,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")

fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -6,8 +6,8 @@ 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
@@ -184,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)
 
@@ -195,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,
@@ -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")

fractal_server/tasks/v2/ssh/deactivate.py

@@ -5,9 +5,9 @@ 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 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
@@ -101,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:
@@ -135,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,
@@ -160,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=}."
                         )
@@ -264,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

@@ -4,7 +4,7 @@ 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.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
@@ -109,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

@@ -4,8 +4,8 @@ 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.ssh._fabric import SingleUseFractalSSH
@@ -80,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)
 
@@ -88,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=})."
@@ -99,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)

fractal_server/tasks/v2/ssh/reactivate.py

@@ -5,8 +5,8 @@ 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 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.ssh._fabric import SingleUseFractalSSH
@@ -103,7 +103,7 @@ def reactivate_ssh(
                         )
                         return
 
-                    activity.status = TaskGroupActivityStatusV2.ONGOING
+                    activity.status = TaskGroupActivityStatus.ONGOING
                     activity = add_commit_refresh(obj=activity, db=db)
 
                     # Prepare replacements for templates
@@ -147,7 +147,7 @@ def reactivate_ssh(
                         script_dir_remote=script_dir_remote,
                         prefix=(
                             f"{int(time.time())}_"
-                            f"{TaskGroupActivityActionV2.REACTIVATE}"
+                            f"{TaskGroupActivityAction.REACTIVATE}"
                         ),
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
@@ -172,7 +172,7 @@ def reactivate_ssh(
                     )
                     logger.info("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