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

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

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

fractal_server-2.15.0a2/fractal_server/__init__.py

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

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

@@ -73,9 +73,6 @@ def collect_local_pixi(
                 )
                 return
 
-            # Set `pixi_home`
-            pixi_home = settings.pixi.versions[task_group.pixi_version]
-
             try:
                 Path(task_group.path).mkdir(parents=True)
                 logger.info(f"Created {task_group.path}")
@@ -90,7 +87,10 @@ def collect_local_pixi(
 
                 common_args = dict(
                     replacements={
-                        ("__PIXI_HOME__", pixi_home),
+                        (
+                            "__PIXI_HOME__",
+                            settings.pixi.versions[task_group.pixi_version],
+                        ),
                         ("__PACKAGE_DIR__", task_group.path),
                         ("__TAR_GZ_PATH__", archive_path),
                         (

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

@@ -1,6 +1,5 @@
-import shlex
 import shutil
-import subprocess  # nosec
+import time
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -9,13 +8,16 @@ from ..utils_background import fail_and_cleanup
 from ..utils_background import get_activity_and_task_group
 from ..utils_pixi import SOURCE_DIR_NAME
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
 from fractal_server.config import get_settings
 from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.syringe import Inject
 from fractal_server.tasks.utils import get_log_path
+from fractal_server.tasks.v2.local._utils import _customize_and_run_template
 from fractal_server.tasks.v2.utils_background import get_current_log
+from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
 
@@ -76,42 +78,60 @@ def reactivate_local_pixi(
                 activity.status = TaskGroupActivityStatusV2.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                logger.debug("start - writing pixi lock")
-                with open(f"{task_group.path}/pixi.lock", "w") as f:
+                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("end - writing pixi lock")
+                logger.debug(f"end - writing {source_dir}/pixi.lock")
 
-                subprocess.run(  # nosec
-                    shlex.split(
-                        f"tar xz -f {task_group.archive_path} "
-                        f"{Path(task_group.archive_path).name}"
+                settings = Inject(get_settings)
+                common_args = dict(
+                    replacements={
+                        (
+                            "__PIXI_HOME__",
+                            settings.pixi.versions[task_group.pixi_version],
+                        ),
+                        ("__PACKAGE_DIR__", task_group.path),
+                        ("__TAR_GZ_PATH__", task_group.archive_path),
+                        (
+                            "__IMPORT_PACKAGE_NAME__",
+                            task_group.pkg_name.replace("-", "_"),
+                        ),
+                        ("__SOURCE_DIR_NAME__", SOURCE_DIR_NAME),
+                        ("__FROZEN_OPTION__", "true"),
+                    },
+                    script_dir=Path(
+                        task_group.path, SCRIPTS_SUBFOLDER
+                    ).as_posix(),
+                    prefix=(
+                        f"{int(time.time())}_"
+                        f"{TaskGroupActivityActionV2.REACTIVATE}"
                     ),
-                    encoding="utf-8",
-                    cwd=task_group.path,
+                    logger_name=LOGGER_NAME,
                 )
 
-                subprocess.run(  # nosec
-                    shlex.split(
-                        f"mv {Path(task_group.archive_path).name} {source_dir}"
-                    ),
-                    encoding="utf-8",
-                    cwd=task_group.path,
+                # Run script 1
+                _customize_and_run_template(
+                    template_filename="pixi_1_extract.sh",
+                    **common_args,
                 )
+                activity.log = get_current_log(log_file_path)
+                activity = add_commit_refresh(obj=activity, db=db)
 
-                settings = Inject(get_settings)
-                pixi_home = settings.pixi.versions[task_group.pixi_version]
-                pixi_bin = Path(pixi_home, "bin/pixi").as_posix()
-
-                logger.debug("start - pixi install")
-                subprocess.run(  # nosec
-                    shlex.split(
-                        f"{pixi_bin} install "
-                        f"--manifest-path {source_dir}/pyproject.toml --frozen"
-                    ),
-                    encoding="utf-8",
-                    cwd=task_group.path,
+                # Run script 2
+                _customize_and_run_template(
+                    template_filename="pixi_2_install.sh",
+                    **common_args,
                 )
-                logger.debug("end - pixi install")
+                activity.log = get_current_log(log_file_path)
+                activity = add_commit_refresh(obj=activity, db=db)
+
+                # Run script 3
+                _customize_and_run_template(
+                    template_filename="pixi_3_post_install.sh",
+                    **common_args,
+                )
+                activity.log = get_current_log(log_file_path)
+                activity = add_commit_refresh(obj=activity, db=db)
 
                 activity.log = get_current_log(log_file_path)
                 activity.status = TaskGroupActivityStatusV2.OK

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

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

fractal_server-2.15.0a1/fractal_server/__init__.py

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