fractal-server 2.14.8__tar.gz → 2.14.10__tar.gz

{fractal_server-2.14.8 → fractal_server-2.14.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.8
+Version: 2.14.10
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin

fractal_server-2.14.10/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.14.10"

fractal_server-2.14.8/fractal_server/data_migrations/2_14_6.py → fractal_server-2.14.10/fractal_server/data_migrations/2_14_10.py

@@ -21,7 +21,8 @@ def fix_db():
 
         for hr in history_runs:
             logger.info(f"HistoryRun[{hr.id}] START")
-
+            if hr.workflowtask_id is None:
+                continue
             wft = db.get(WorkflowTaskV2, hr.workflowtask_id)
             if wft is None:
                 logger.warning(

{fractal_server-2.14.8 → fractal_server-2.14.10}/fractal_server/tasks/v2/ssh/collect.py

@@ -108,21 +108,22 @@ def collect_ssh(
                     )
                     return
 
-                # Check that the (remote) task_group path does not exist
-                if fractal_ssh.remote_exists(task_group.path):
-                    error_msg = f"{task_group.path} already exists."
-                    logger.error(error_msg)
-                    fail_and_cleanup(
-                        task_group=task_group,
-                        task_group_activity=activity,
-                        logger_name=LOGGER_NAME,
-                        log_file_path=log_file_path,
-                        exception=FileExistsError(error_msg),
-                        db=db,
-                    )
-                    return
-
                 try:
+
+                    # Check that the (remote) task_group path does not exist
+                    if fractal_ssh.remote_exists(task_group.path):
+                        error_msg = f"{task_group.path} already exists."
+                        logger.error(error_msg)
+                        fail_and_cleanup(
+                            task_group=task_group,
+                            task_group_activity=activity,
+                            logger_name=LOGGER_NAME,
+                            log_file_path=log_file_path,
+                            exception=FileExistsError(error_msg),
+                            db=db,
+                        )
+                        return
+
                     # Create remote `task_group.path` and `script_dir_remote`
                     # folders (note that because of `parents=True` we  are in
                     # the `no error if existing, make parent directories as

{fractal_server-2.14.8 → fractal_server-2.14.10}/fractal_server/tasks/v2/ssh/deactivate.py

@@ -94,22 +94,22 @@ def deactivate_ssh(
                     )
                     return
 
-                # Check that the (local) task_group venv_path does exist
-                if not fractal_ssh.remote_exists(task_group.venv_path):
-                    error_msg = f"{task_group.venv_path} does not exist."
-                    logger.error(error_msg)
-                    fail_and_cleanup(
-                        task_group=task_group,
-                        task_group_activity=activity,
-                        logger_name=LOGGER_NAME,
-                        log_file_path=log_file_path,
-                        exception=FileNotFoundError(error_msg),
-                        db=db,
-                    )
-                    return
-
                 try:
 
+                    # Check that the (local) task_group venv_path does exist
+                    if not fractal_ssh.remote_exists(task_group.venv_path):
+                        error_msg = f"{task_group.venv_path} does not exist."
+                        logger.error(error_msg)
+                        fail_and_cleanup(
+                            task_group=task_group,
+                            task_group_activity=activity,
+                            logger_name=LOGGER_NAME,
+                            log_file_path=log_file_path,
+                            exception=FileNotFoundError(error_msg),
+                            db=db,
+                        )
+                        return
+
                     activity.status = TaskGroupActivityStatusV2.ONGOING
                     activity = add_commit_refresh(obj=activity, db=db)
 

{fractal_server-2.14.8 → fractal_server-2.14.10}/fractal_server/tasks/v2/ssh/reactivate.py

@@ -95,21 +95,22 @@ def reactivate_ssh(
                     )
                     return
 
-                # Check that the (remote) task_group venv_path does not exist
-                if fractal_ssh.remote_exists(task_group.venv_path):
-                    error_msg = f"{task_group.venv_path} already exists."
-                    logger.error(error_msg)
-                    fail_and_cleanup(
-                        task_group=task_group,
-                        task_group_activity=activity,
-                        logger_name=LOGGER_NAME,
-                        log_file_path=log_file_path,
-                        exception=FileExistsError(error_msg),
-                        db=db,
-                    )
-                    return
-
                 try:
+                    # Check that the (remote) task_group venv_path does not
+                    # exist
+                    if fractal_ssh.remote_exists(task_group.venv_path):
+                        error_msg = f"{task_group.venv_path} already exists."
+                        logger.error(error_msg)
+                        fail_and_cleanup(
+                            task_group=task_group,
+                            task_group_activity=activity,
+                            logger_name=LOGGER_NAME,
+                            log_file_path=log_file_path,
+                            exception=FileExistsError(error_msg),
+                            db=db,
+                        )
+                        return
+
                     activity.status = TaskGroupActivityStatusV2.ONGOING
                     activity = add_commit_refresh(obj=activity, db=db)
 

{fractal_server-2.14.8 → fractal_server-2.14.10}/pyproject.toml

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

fractal_server-2.14.8/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.14.8"