fractal-server 2.9.0a12__py3-none-any.whl → 2.9.1__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.9.0a12"
+__VERSION__ = "2.9.1"

fractal_server/tasks/v2/ssh/collect.py

@@ -69,7 +69,6 @@ def collect_ssh(
         )
 
         with next(get_sync_db()) as db:
-
             # Get main objects from db
             activity = db.get(TaskGroupActivityV2, task_group_activity_id)
             task_group = db.get(TaskGroupV2, task_group_id)
@@ -117,6 +116,25 @@ def collect_ssh(
                 return
 
             try:
+                script_dir_remote = (
+                    Path(task_group.path) / SCRIPTS_SUBFOLDER
+                ).as_posix()
+                # 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
+                # needed` scenario for `mkdir`)
+                fractal_ssh.mkdir(folder=task_group.path, parents=True)
+                fractal_ssh.mkdir(folder=script_dir_remote, parents=True)
+
+                # Copy wheel file into task group path
+                if task_group.wheel_path:
+                    new_wheel_path = _copy_wheel_file_ssh(
+                        task_group=task_group,
+                        fractal_ssh=fractal_ssh,
+                        logger_name=LOGGER_NAME,
+                    )
+                    task_group.wheel_path = new_wheel_path
+                    task_group = add_commit_refresh(obj=task_group, db=db)
 
                 # Prepare replacements for templates
                 replacements = get_collection_replacements(
@@ -127,9 +145,6 @@ def collect_ssh(
                 )
 
                 # Prepare common arguments for `_customize_and_run_template``
-                script_dir_remote = (
-                    Path(task_group.path) / SCRIPTS_SUBFOLDER
-                ).as_posix()
                 common_args = dict(
                     replacements=replacements,
                     script_dir_local=(
@@ -144,23 +159,6 @@ def collect_ssh(
                     logger_name=LOGGER_NAME,
                 )
 
-                # 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
-                # needed` scenario for `mkdir`)
-                fractal_ssh.mkdir(folder=task_group.path, parents=True)
-                fractal_ssh.mkdir(folder=script_dir_remote, parents=True)
-
-                # Copy wheel file into task group path
-                if task_group.wheel_path:
-                    new_wheel_path = _copy_wheel_file_ssh(
-                        task_group=task_group,
-                        fractal_ssh=fractal_ssh,
-                        logger_name=LOGGER_NAME,
-                    )
-                    task_group.wheel_path = new_wheel_path
-                    task_group = add_commit_refresh(obj=task_group, db=db)
-
                 logger.debug("installing - START")
 
                 # Set status to ONGOING and refresh logs

{fractal_server-2.9.0a12.dist-info → fractal_server-2.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.9.0a12
+Version: 2.9.1
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.9.0a12.dist-info → fractal_server-2.9.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=JIykE6nusWjfkKUyAj2-Gbeh8nJP3e4L6LX9XBNXH7M,25
+fractal_server/__init__.py,sha256=PV3pFNkPgVbTBTGekRDdEwLUrBsGNXOb1hGr6F9R4OE,22
 fractal_server/__main__.py,sha256=dEkCfzLLQrIlxsGC-HBfoR-RBMWnJDgNrxYTyzmE9c0,6146
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -222,7 +222,7 @@ fractal_server/tasks/v2/local/deactivate.py,sha256=XR1nvJY3mKCRqwPwV79rVaQmtb3J8
 fractal_server/tasks/v2/local/reactivate.py,sha256=R3rArAzUpMGf6xa3dGVwwXHW9WVDi5ia28AFisZsqNc,6112
 fractal_server/tasks/v2/ssh/__init__.py,sha256=aSQbVi6Ummt9QzcSLWNmSqYjfdxrn9ROmqgH6bDpI7k,135
 fractal_server/tasks/v2/ssh/_utils.py,sha256=2E-F_862zM6FZA-im-E8t8kjptWRIhBj1IDHC6QD1H8,2818
-fractal_server/tasks/v2/ssh/collect.py,sha256=ZOpz-v2t2kOAbbpdlsH_P_XjNtEh2TaC1dIZ1bBHwxw,12941
+fractal_server/tasks/v2/ssh/collect.py,sha256=FkTfyhdwAp4qa4W_dqjT0CmuDMFuCBSOYjg_y1Kq2Bs,12939
 fractal_server/tasks/v2/ssh/deactivate.py,sha256=Ffk_UuQSBUBNBCiviuKNhEUGyZPQa4_erJKFdwgMcE8,10616
 fractal_server/tasks/v2/ssh/reactivate.py,sha256=jdO8iyzavzSVPcOpIZrYSEkGPYTvz5XJ5h_5-nz9yzA,7896
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
@@ -239,8 +239,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=C5WLuY3uGG2s53OEL-__H35-fmSlgu
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=utvmBx8K9I8hRWFquxna2pBaOqe0JifDL_NVPmihEJI,3525
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.9.0a12.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.9.0a12.dist-info/METADATA,sha256=4_h_wWBEo_p6k4KxkzUmwzSO54gtToDfUVM2CwpVz48,4546
-fractal_server-2.9.0a12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.9.0a12.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.9.0a12.dist-info/RECORD,,
+fractal_server-2.9.1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.9.1.dist-info/METADATA,sha256=2XOrXmdvOE1zcrKJoCr4VemPcRk3PpZJOUg_0yXxeDc,4543
+fractal_server-2.9.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.9.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.9.1.dist-info/RECORD,,