fractal-server 2.14.8__py3-none-any.whl → 2.14.10__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.14.8"
+__VERSION__ = "2.14.10"

fractal_server/data_migrations/{2_14_6.py → 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/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/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/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.dist-info → fractal_server-2.14.10.dist-info}/METADATA

@@ -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.8.dist-info → fractal_server-2.14.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=J4Z_3MJBz35q1QkrsCfsHWFy9mFVPklMFbbA-LDr_dU,23
+fractal_server/__init__.py,sha256=4KxVhiHLgADdi86yBYpB-0c9NEhimJDPdBjyV6O1z1M,24
 fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,7 +128,7 @@ fractal_server/app/security/__init__.py,sha256=oJ8RVglpOvWPQY4RokiE2YA72Nqo42dZE
 fractal_server/app/security/signup_email.py,sha256=Xd6QYxcdmg0PHpDwmUE8XQmPcOj3Xjy5oROcIMhmltM,1472
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
 fractal_server/config.py,sha256=ldI9VzEWmwU75Z7zVku6I-rXGKS3bJDdCifZnwad9-4,25924
-fractal_server/data_migrations/2_14_6.py,sha256=cXmiMWPjtghr1f0uapZrs4mtbcj3tiliOebNz9LPR8Q,1532
+fractal_server/data_migrations/2_14_10.py,sha256=gMRR5QB0SDv0ToEiXVLg1VrHprM_Ii-9O1Kg-ZF-YhY,1599
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
@@ -192,9 +192,9 @@ fractal_server/tasks/v2/local/deactivate.py,sha256=94s_RDND8aR5Y8RxFrRx61rZBMPGq
 fractal_server/tasks/v2/local/reactivate.py,sha256=eBgFgq5xVKNr4DIDX7QU8xXerhwMrPaHDJ1wTth7aQc,6191
 fractal_server/tasks/v2/ssh/__init__.py,sha256=aSQbVi6Ummt9QzcSLWNmSqYjfdxrn9ROmqgH6bDpI7k,135
 fractal_server/tasks/v2/ssh/_utils.py,sha256=LjaEYVUJDChilu3YuhxuGWYRNnVJ_zqNE9SDHdRTIHY,2824
-fractal_server/tasks/v2/ssh/collect.py,sha256=Dxp1vd6gt3FZUqp9nVeqJR7w8l5i8F8CwvepYt4FRkg,14772
-fractal_server/tasks/v2/ssh/deactivate.py,sha256=eqMg1dOmKcQ2aKnlqDHmEQBwD22_ilUXMih9-i3IKaY,12876
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=29DPb7_103tHeIkniJAGsWiC6f-6Cy92ZBY6APFipOs,8744
+fractal_server/tasks/v2/ssh/collect.py,sha256=bClq8hB04igrUXk1Mgc7pRWQws77mpYX8KYL-w6Lwtg,14825
+fractal_server/tasks/v2/ssh/deactivate.py,sha256=YO2PJ0VV-LhVW-6O-t-d6BQciO2fYAkYbz5Y9UBiXaA,12928
+fractal_server/tasks/v2/ssh/reactivate.py,sha256=1DIQduhqZLbrIeoVyyp54vemBWZu94tFDvjpmDsZZI0,8818
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=Md2LPt3BJ7IfN0USF2uivl4rP8OwbzJOUepGAr_Cicg,1836
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
@@ -214,8 +214,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=FCY6HUsRnnbsWkT2kwQ2izijiHuCrCD3Kh50G0QudxE,3531
 fractal_server/zip_tools.py,sha256=tqz_8f-vQ9OBRW-4OQfO6xxY-YInHTyHmZxU7U4PqZo,4885
-fractal_server-2.14.8.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.14.8.dist-info/METADATA,sha256=Xh-fRUzKALs-_d20zzArQZnJvsqzejwtSgbOMec5xoY,4243
-fractal_server-2.14.8.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
-fractal_server-2.14.8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.14.8.dist-info/RECORD,,
+fractal_server-2.14.10.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.14.10.dist-info/METADATA,sha256=PYdArZinbL0-GpXR6qoaSlOrIz974JdmJN8cNXieP0Y,4244
+fractal_server-2.14.10.dist-info/WHEEL,sha256=7dDg4QLnNKTvwIDR9Ac8jJaAmBC_owJrckbC0jjThyA,88
+fractal_server-2.14.10.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.14.10.dist-info/RECORD,,