fractal-server 2.15.0a2__tar.gz → 2.15.0a3__tar.gz

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/PKG-INFO

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

fractal_server-2.15.0a3/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.15.0a3"

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/fractal_server/tasks/v2/local/collect_pixi.py

@@ -57,7 +57,9 @@ def collect_local_pixi(
                 return
 
             logger.info("START")
-            for key, value in task_group.model_dump().items():
+            for key, value in task_group.model_dump(
+                exclude={"env_info"}
+            ).items():
                 logger.debug(f"task_group.{key}: {value}")
 
             if Path(task_group.path).exists():

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/fractal_server/tasks/v2/local/deactivate_pixi.py

@@ -52,7 +52,9 @@ def deactivate_local_pixi(
             # Log some info
             logger.debug("START")
 
-            for key, value in task_group.model_dump().items():
+            for key, value in task_group.model_dump(
+                exclude={"env_info"}
+            ).items():
                 logger.debug(f"task_group.{key}: {value}")
 
             source_dir = Path(task_group.path, SOURCE_DIR_NAME)

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/fractal_server/tasks/v2/local/reactivate_pixi.py

@@ -57,7 +57,9 @@ def reactivate_local_pixi(
             # Log some info
             logger.debug("START")
 
-            for key, value in task_group.model_dump().items():
+            for key, value in task_group.model_dump(
+                exclude={"env_info"}
+            ).items():
                 logger.debug(f"task_group.{key}: {value}")
 
             source_dir = Path(task_group.path, SOURCE_DIR_NAME).as_posix()
@@ -78,11 +80,6 @@ def reactivate_local_pixi(
                 activity.status = TaskGroupActivityStatusV2.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                logger.debug(f"start - writing {source_dir}/pixi.lock")
-                with Path(source_dir, "pixi.lock").open("w") as f:
-                    f.write(task_group.env_info)
-                logger.debug(f"end - writing {source_dir}/pixi.lock")
-
                 settings = Inject(get_settings)
                 common_args = dict(
                     replacements={
@@ -109,7 +106,7 @@ def reactivate_local_pixi(
                     logger_name=LOGGER_NAME,
                 )
 
-                # Run script 1
+                # Run script 1 - extract tar.gz into `source_dir`
                 _customize_and_run_template(
                     template_filename="pixi_1_extract.sh",
                     **common_args,
@@ -117,7 +114,13 @@ def reactivate_local_pixi(
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                # Run script 2
+                # Write pixi.lock into `source_dir`
+                logger.debug(f"start - writing {source_dir}/pixi.lock")
+                with Path(source_dir, "pixi.lock").open("w") as f:
+                    f.write(task_group.env_info)
+                logger.debug(f"end - writing {source_dir}/pixi.lock")
+
+                # Run script 2 - run pixi-install command
                 _customize_and_run_template(
                     template_filename="pixi_2_install.sh",
                     **common_args,

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -80,7 +80,9 @@ def collect_ssh_pixi(
 
                 # Log some info
                 logger.info("START")
-                for key, value in task_group.model_dump().items():
+                for key, value in task_group.model_dump(
+                    exclude={"env_info"}
+                ).items():
                     logger.debug(f"task_group.{key}: {value}")
 
                 # Check that SSH connection works
@@ -130,9 +132,7 @@ def collect_ssh_pixi(
                     archive_path = (
                         Path(task_group.path) / tar_gz_filename
                     ).as_posix()
-                    tmp_archive_path = (
-                        Path(tmpdir) / tar_gz_filename
-                    ).as_posix()
+                    tmp_archive_path = Path(tmpdir, tar_gz_filename).as_posix()
                     logger.info(
                         f"Write tar.gz-file contents into {tmp_archive_path}"
                     )
@@ -176,8 +176,8 @@ def collect_ssh_pixi(
                             f"{int(time.time())}_"
                             f"{TaskGroupActivityActionV2.COLLECT}"
                         ),
-                        fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
+                        fractal_ssh=fractal_ssh,
                     )
 
                     # Run the three pixi-related scripts

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/fractal_server/tasks/v2/ssh/deactivate_pixi.py

@@ -62,7 +62,9 @@ def deactivate_ssh_pixi(
 
                 # Log some info
                 logger.debug("START")
-                for key, value in task_group.model_dump().items():
+                for key, value in task_group.model_dump(
+                    exclude={"env_info"}
+                ).items():
                     logger.debug(f"task_group.{key}: {value}")
 
                 # Check that SSH connection works

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/fractal_server/tasks/v2/ssh/reactivate_pixi.py

@@ -58,7 +58,9 @@ def reactivate_ssh_pixi(
 
                 # Log some info
                 logger.info("START")
-                for key, value in task_group.model_dump().items():
+                for key, value in task_group.model_dump(
+                    exclude={"env_info"}
+                ).items():
                     logger.debug(f"task_group.{key}: {value}")
 
                 # Check that SSH connection works

{fractal_server-2.15.0a2 → fractal_server-2.15.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.15.0a2"
+version = "2.15.0a3"
 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.15.0a2"
+current_version = "2.15.0a3"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.15.0a2/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.15.0a2"