fractal-server 2.16.5__py3-none-any.whl → 2.17.0a0__py3-none-any.whl

fractal_server/tasks/v2/local/collect_pixi.py

@@ -9,14 +9,14 @@ from ..utils_pixi import parse_collect_stdout
 from ..utils_pixi import SOURCE_DIR_NAME
 from ._utils import edit_pyproject_toml_in_place_local
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2 import FractalUploadedFile
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2.manifest import ManifestV2
-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.local._utils import check_task_files_exist
@@ -34,12 +34,12 @@ from fractal_server.utils import get_timestamp
 
 def collect_local_pixi(
     *,
-    task_group_activity_id: int,
     task_group_id: int,
+    task_group_activity_id: int,
     tar_gz_file: FractalUploadedFile,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
-    settings = Inject(get_settings)
-
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
 
     with TemporaryDirectory() as tmpdir:
@@ -90,7 +90,9 @@ def collect_local_pixi(
                     replacements={
                         (
                             "__PIXI_HOME__",
-                            settings.pixi.versions[task_group.pixi_version],
+                            resource.tasks_pixi_config["versions"][
+                                task_group.pixi_version
+                            ],
                         ),
                         ("__PACKAGE_DIR__", task_group.path),
                         ("__TAR_GZ_PATH__", archive_path),
@@ -102,15 +104,27 @@ def collect_local_pixi(
                         ("__FROZEN_OPTION__", ""),
                         (
                             "__TOKIO_WORKER_THREADS__",
-                            str(settings.pixi.TOKIO_WORKER_THREADS),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "TOKIO_WORKER_THREADS"
+                                ]
+                            ),
                         ),
                         (
                             "__PIXI_CONCURRENT_SOLVES__",
-                            str(settings.pixi.PIXI_CONCURRENT_SOLVES),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "PIXI_CONCURRENT_SOLVES"
+                                ]
+                            ),
                         ),
                         (
                             "__PIXI_CONCURRENT_DOWNLOADS__",
-                            str(settings.pixi.PIXI_CONCURRENT_DOWNLOADS),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "PIXI_CONCURRENT_DOWNLOADS"
+                                ]
+                            ),
                         ),
                     },
                     script_dir=Path(
@@ -138,7 +152,9 @@ def collect_local_pixi(
                 # Simplify `pyproject.toml`
                 source_dir = Path(task_group.path, SOURCE_DIR_NAME).as_posix()
                 pyproject_toml_path = Path(source_dir, "pyproject.toml")
-                edit_pyproject_toml_in_place_local(pyproject_toml_path)
+                edit_pyproject_toml_in_place_local(
+                    pyproject_toml_path, resource=resource
+                )
 
                 # Run script 2
                 _customize_and_run_template(

fractal_server/tasks/v2/local/deactivate.py

@@ -9,6 +9,8 @@ from ..utils_background import get_activity_and_task_group
 from ..utils_templates import get_collection_replacements
 from ._utils import _customize_and_run_template
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
 from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
@@ -25,6 +27,8 @@ def deactivate_local(
     *,
     task_group_activity_id: int,
     task_group_id: int,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
     """
     Deactivate a task group venv.
@@ -32,9 +36,10 @@ def deactivate_local(
     This function is run as a background task, therefore exceptions must be
     handled.
 
-    Arguments:
+    Args:
         task_group_id:
         task_group_activity_id:
+        resource:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
@@ -85,6 +90,7 @@ def deactivate_local(
                     replacements = get_collection_replacements(
                         task_group=task_group,
                         python_bin="/not/applicable",
+                        resource=resource,
                     )
 
                     # Prepare common arguments for _customize_and_run_template

fractal_server/tasks/v2/local/deactivate_pixi.py

@@ -7,6 +7,8 @@ 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.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
 from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
@@ -19,6 +21,8 @@ def deactivate_local_pixi(
     *,
     task_group_activity_id: int,
     task_group_id: int,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
     """
     Deactivate a pixi task group venv.
@@ -26,7 +30,7 @@ def deactivate_local_pixi(
     This function is run as a background task, therefore exceptions must be
     handled.
 
-    Arguments:
+    Args:
         task_group_id:
         task_group_activity_id:
     """

fractal_server/tasks/v2/local/delete.py

@@ -3,6 +3,8 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
 from fractal_server.logger import reset_logger_handlers
@@ -21,6 +23,8 @@ def delete_local(
     *,
     task_group_activity_id: int,
     task_group_id: int,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
 

fractal_server/tasks/v2/local/reactivate.py

@@ -9,6 +9,8 @@ from ..utils_background import get_activity_and_task_group
 from ..utils_templates import get_collection_replacements
 from ._utils import _customize_and_run_template
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2.task_group import TaskGroupActivityStatusV2
 from fractal_server.logger import reset_logger_handlers
@@ -16,7 +18,7 @@ from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_python_interpreter import (
-    get_python_interpreter_v2,
+    get_python_interpreter,
 )
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
@@ -26,6 +28,8 @@ def reactivate_local(
     *,
     task_group_activity_id: int,
     task_group_id: int,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
     """
     Reactivate a task group venv.
@@ -33,9 +37,10 @@ def reactivate_local(
     This function is run as a background task, therefore exceptions must be
     handled.
 
-    Arguments:
+    Args:
         task_group_id:
         task_group_activity_id:
+        resource:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
@@ -77,11 +82,14 @@ def reactivate_local(
                 activity = add_commit_refresh(obj=activity, db=db)
 
                 # Prepare replacements for templates
+                python_bin = get_python_interpreter(
+                    python_version=task_group.python_version,
+                    resource=resource,
+                )
                 replacements = get_collection_replacements(
                     task_group=task_group,
-                    python_bin=get_python_interpreter_v2(
-                        python_version=task_group.python_version
-                    ),
+                    python_bin=python_bin,
+                    resource=resource,
                 )
                 with open(f"{tmpdir}/pip_freeze.txt", "w") as f:
                     f.write(task_group.env_info)

fractal_server/tasks/v2/local/reactivate_pixi.py

@@ -9,12 +9,12 @@ from ..utils_background import get_activity_and_task_group
 from ..utils_pixi import SOURCE_DIR_NAME
 from ._utils import edit_pyproject_toml_in_place_local
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 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
@@ -27,6 +27,8 @@ def reactivate_local_pixi(
     *,
     task_group_activity_id: int,
     task_group_id: int,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
     """
     Reactivate a task group venv.
@@ -34,9 +36,10 @@ def reactivate_local_pixi(
     This function is run as a background task, therefore exceptions must be
     handled.
 
-    Arguments:
+    Args:
         task_group_id:
         task_group_activity_id:
+        resource:
     """
 
     LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
@@ -76,12 +79,13 @@ def reactivate_local_pixi(
                 activity.status = TaskGroupActivityStatusV2.ONGOING
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                settings = Inject(get_settings)
                 common_args = dict(
                     replacements={
                         (
                             "__PIXI_HOME__",
-                            settings.pixi.versions[task_group.pixi_version],
+                            resource.tasks_pixi_config["versions"][
+                                task_group.pixi_version
+                            ],
                         ),
                         ("__PACKAGE_DIR__", task_group.path),
                         ("__TAR_GZ_PATH__", task_group.archive_path),
@@ -93,15 +97,27 @@ def reactivate_local_pixi(
                         ("__FROZEN_OPTION__", "--frozen"),
                         (
                             "__TOKIO_WORKER_THREADS__",
-                            str(settings.pixi.TOKIO_WORKER_THREADS),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "TOKIO_WORKER_THREADS"
+                                ]
+                            ),
                         ),
                         (
                             "__PIXI_CONCURRENT_SOLVES__",
-                            str(settings.pixi.PIXI_CONCURRENT_SOLVES),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "PIXI_CONCURRENT_SOLVES"
+                                ]
+                            ),
                         ),
                         (
                             "__PIXI_CONCURRENT_DOWNLOADS__",
-                            str(settings.pixi.PIXI_CONCURRENT_DOWNLOADS),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "PIXI_CONCURRENT_DOWNLOADS"
+                                ]
+                            ),
                         ),
                     },
                     script_dir=Path(
@@ -124,7 +140,9 @@ def reactivate_local_pixi(
 
                 # Simplify `pyproject.toml`
                 pyproject_toml_path = Path(source_dir, "pyproject.toml")
-                edit_pyproject_toml_in_place_local(pyproject_toml_path)
+                edit_pyproject_toml_in_place_local(
+                    pyproject_toml_path, resource=resource
+                )
 
                 # Write pixi.lock into `source_dir`
                 logger.debug(f"start - writing {source_dir}/pixi.lock")

fractal_server/tasks/v2/ssh/_pixi_slurm_ssh.py

@@ -1,15 +1,14 @@
 import os
 import time
 from pathlib import Path
+from typing import Any
 
 from sqlalchemy.orm import Session
 
 from fractal_server.app.models.v2 import TaskGroupActivityV2
-from fractal_server.config import get_settings
-from fractal_server.config import PixiSLURMConfig
 from fractal_server.logger import get_logger
 from fractal_server.ssh._fabric import FractalSSH
-from fractal_server.syringe import Inject
+from fractal_server.tasks.config import PixiSLURMConfig
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
 from fractal_server.tasks.v2.utils_background import get_current_log
 
@@ -141,13 +140,14 @@ def _verify_success_file_exists(
 def run_script_on_remote_slurm(
     *,
     script_paths: list[str],
-    slurm_config: PixiSLURMConfig,
+    slurm_config: dict[str, Any],
     fractal_ssh: FractalSSH,
     logger_name: str,
     log_file_path: Path,
     prefix: str,
     db: Session,
     activity: TaskGroupActivityV2,
+    poll_interval: int,
 ):
     """
     Run a `pixi install` script as a SLURM job.
@@ -156,8 +156,9 @@ def run_script_on_remote_slurm(
     as a mechanism to propagate failure/errors.
     """
 
+    slurm_config_obj = PixiSLURMConfig(**slurm_config)
+
     logger = get_logger(logger_name=logger_name)
-    settings = Inject(get_settings)
 
     # (1) Prepare remote submission script
     workdir_remote = _get_workdir_remote(script_paths)
@@ -169,10 +170,10 @@ def run_script_on_remote_slurm(
     success_file_remote = os.path.join(workdir_remote, f"{prefix}-success.txt")
     script_lines = [
         "#!/bin/bash",
-        f"#SBATCH --partition={slurm_config.partition}",
-        f"#SBATCH --cpus-per-task={slurm_config.cpus}",
-        f"#SBATCH --mem={slurm_config.mem}",
-        f"#SBATCH --time={slurm_config.time}",
+        f"#SBATCH --partition={slurm_config_obj.partition}",
+        f"#SBATCH --cpus-per-task={slurm_config_obj.cpus}",
+        f"#SBATCH --mem={slurm_config_obj.mem}",
+        f"#SBATCH --time={slurm_config_obj.time}",
         f"#SBATCH --err={stderr_remote}",
         f"#SBATCH --out={stdout_remote}",
         f"#SBATCH -D {workdir_remote}",
@@ -234,7 +235,7 @@ def run_script_on_remote_slurm(
             logger.debug(f"Exit retrieval loop (state={new_state}).")
             break
         old_state = new_state
-        time.sleep(settings.FRACTAL_SLURM_POLL_INTERVAL)
+        time.sleep(poll_interval)
 
     _verify_success_file_exists(
         fractal_ssh=fractal_ssh,

fractal_server/tasks/v2/ssh/_utils.py

@@ -1,17 +1,16 @@
 import os
 from pathlib import Path
 
-from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import Session
 
 from ..utils_background import fail_and_cleanup
 from ..utils_pixi import simplify_pyproject_toml
+from fractal_server.app.models import Resource
 from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.config import get_settings
 from fractal_server.logger import get_logger
 from fractal_server.logger import set_logger
 from fractal_server.ssh._fabric import FractalSSH
-from fractal_server.syringe import Inject
 from fractal_server.tasks.v2.utils_templates import customize_template
 
 logger = set_logger(__name__)
@@ -143,7 +142,7 @@ def check_ssh_or_fail_and_cleanup(
     task_group_activity: TaskGroupActivityV2,
     logger_name: str,
     log_file_path: Path,
-    db: AsyncSession,
+    db: Session,
 ) -> bool:
     """
     Check SSH connection.
@@ -174,6 +173,7 @@ def edit_pyproject_toml_in_place_ssh(
     *,
     fractal_ssh: FractalSSH,
     pyproject_toml_path: Path,
+    resource: Resource,
 ) -> None:
     """
     Wrapper of `simplify_pyproject_toml`, with I/O.
@@ -185,11 +185,10 @@ def edit_pyproject_toml_in_place_ssh(
     )
 
     # Simplify contents
-    settings = Inject(get_settings)
     new_pyproject_contents = simplify_pyproject_toml(
         original_toml_string=pyproject_contents,
-        pixi_environment=settings.pixi.DEFAULT_ENVIRONMENT,
-        pixi_platform=settings.pixi.DEFAULT_PLATFORM,
+        pixi_environment=resource.tasks_pixi_config["DEFAULT_ENVIRONMENT"],
+        pixi_platform=resource.tasks_pixi_config["DEFAULT_PLATFORM"],
     )
     # Write new `pyproject.toml`
     fractal_ssh.write_remote_file(

fractal_server/tasks/v2/ssh/collect.py

@@ -8,6 +8,8 @@ from ..utils_background import prepare_tasks_metadata
 from ..utils_database import create_db_tasks_and_update_task_group_sync
 from ._utils import check_ssh_or_fail_and_cleanup
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2 import FractalUploadedFile
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
@@ -21,7 +23,7 @@ from fractal_server.tasks.v2.utils_background import add_commit_refresh
 from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_package_names import compare_package_names
 from fractal_server.tasks.v2.utils_python_interpreter import (
-    get_python_interpreter_v2,
+    get_python_interpreter,
 )
 from fractal_server.tasks.v2.utils_templates import get_collection_replacements
 from fractal_server.tasks.v2.utils_templates import (
@@ -35,8 +37,8 @@ def collect_ssh(
     *,
     task_group_id: int,
     task_group_activity_id: int,
-    ssh_config: SSHConfig,
-    tasks_base_dir: str,
+    resource: Resource,
+    profile: Profile,
     wheel_file: FractalUploadedFile | None = None,
 ) -> None:
     """
@@ -50,13 +52,11 @@ def collect_ssh(
     https://github.com/encode/starlette/blob/master/starlette/background.py).
 
 
-    Arguments:
+    Args:
         task_group_id:
         task_group_activity_id:
         ssh_config:
-        tasks_base_dir:
-            Only used as a `safe_root` in `remove_dir`, and typically set to
-            `user_settings.ssh_tasks_dir`.
+        resource:
         wheel_file:
     """
 
@@ -81,7 +81,11 @@ def collect_ssh(
                 return
 
             with SingleUseFractalSSH(
-                ssh_config=ssh_config,
+                ssh_config=SSHConfig(
+                    host=resource.host,
+                    user=profile.username,
+                    key_path=profile.ssh_key_path,
+                ),
                 logger_name=LOGGER_NAME,
             ) as fractal_ssh:
                 try:
@@ -144,11 +148,14 @@ def collect_ssh(
                         task_group.archive_path = archive_path
                         task_group = add_commit_refresh(obj=task_group, db=db)
 
+                    python_bin = get_python_interpreter(
+                        python_version=task_group.python_version,
+                        resource=resource,
+                    )
                     replacements = get_collection_replacements(
                         task_group=task_group,
-                        python_bin=get_python_interpreter_v2(
-                            python_version=task_group.python_version
-                        ),
+                        python_bin=python_bin,
+                        resource=resource,
                     )
 
                     # Prepare common arguments for _customize_and_run_template
@@ -301,7 +308,7 @@ def collect_ssh(
                         )
                         fractal_ssh.remove_folder(
                             folder=task_group.path,
-                            safe_root=tasks_base_dir,
+                            safe_root=profile.tasks_remote_dir,
                         )
                         logger.info(
                             f"Deleted remoted folder {task_group.path}"

fractal_server/tasks/v2/ssh/collect_pixi.py

@@ -12,16 +12,16 @@ from ._pixi_slurm_ssh import run_script_on_remote_slurm
 from ._utils import check_ssh_or_fail_and_cleanup
 from ._utils import edit_pyproject_toml_in_place_ssh
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import Profile
+from fractal_server.app.models import Resource
 from fractal_server.app.schemas.v2 import FractalUploadedFile
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2.manifest import ManifestV2
-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.ssh._fabric import SingleUseFractalSSH
 from fractal_server.ssh._fabric import SSHConfig
-from fractal_server.syringe import Inject
 from fractal_server.tasks.v2.ssh._utils import _customize_and_run_template
 from fractal_server.tasks.v2.ssh._utils import _customize_and_send_template
 from fractal_server.tasks.v2.utils_background import add_commit_refresh
@@ -34,9 +34,9 @@ def collect_ssh_pixi(
     *,
     task_group_id: int,
     task_group_activity_id: int,
-    ssh_config: SSHConfig,
-    tasks_base_dir: str,
     tar_gz_file: FractalUploadedFile,
+    resource: Resource,
+    profile: Profile,
 ) -> None:
     """
     Collect a task package over SSH
@@ -49,13 +49,10 @@ def collect_ssh_pixi(
     https://github.com/encode/starlette/blob/master/starlette/background.py).
 
 
-    Arguments:
+    Args:
         task_group_id:
         task_group_activity_id:
         ssh_config:
-        tasks_base_dir:
-            Only used as a `safe_root` in `remove_dir`, and typically set to
-            `user_settings.ssh_tasks_dir`.
         tar_gz_file:
     """
 
@@ -80,7 +77,11 @@ def collect_ssh_pixi(
                 return
 
             with SingleUseFractalSSH(
-                ssh_config=ssh_config,
+                ssh_config=SSHConfig(
+                    host=resource.host,
+                    user=profile.username,
+                    key_path=profile.ssh_key_path,
+                ),
                 logger_name=LOGGER_NAME,
             ) as fractal_ssh:
                 try:
@@ -135,11 +136,12 @@ def collect_ssh_pixi(
                     task_group.archive_path = archive_path
                     task_group = add_commit_refresh(obj=task_group, db=db)
 
-                    settings = Inject(get_settings)
                     replacements = {
                         (
                             "__PIXI_HOME__",
-                            settings.pixi.versions[task_group.pixi_version],
+                            resource.tasks_pixi_config["versions"][
+                                task_group.pixi_version
+                            ],
                         ),
                         ("__PACKAGE_DIR__", task_group.path),
                         ("__TAR_GZ_PATH__", task_group.archive_path),
@@ -151,15 +153,27 @@ def collect_ssh_pixi(
                         ("__FROZEN_OPTION__", ""),
                         (
                             "__TOKIO_WORKER_THREADS__",
-                            str(settings.pixi.TOKIO_WORKER_THREADS),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "TOKIO_WORKER_THREADS"
+                                ]
+                            ),
                         ),
                         (
                             "__PIXI_CONCURRENT_SOLVES__",
-                            str(settings.pixi.PIXI_CONCURRENT_SOLVES),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "PIXI_CONCURRENT_SOLVES"
+                                ]
+                            ),
                         ),
                         (
                             "__PIXI_CONCURRENT_DOWNLOADS__",
-                            str(settings.pixi.PIXI_CONCURRENT_DOWNLOADS),
+                            str(
+                                resource.tasks_pixi_config[
+                                    "PIXI_CONCURRENT_DOWNLOADS"
+                                ]
+                            ),
                         ),
                     }
 
@@ -201,6 +215,7 @@ def collect_ssh_pixi(
                     edit_pyproject_toml_in_place_ssh(
                         fractal_ssh=fractal_ssh,
                         pyproject_toml_path=pyproject_toml_path,
+                        resource=resource,
                     )
 
                     # Prepare scripts 2 and 3
@@ -232,13 +247,16 @@ def collect_ssh_pixi(
                             remote_script3_path,
                             f"chmod -R 755 {source_dir}",
                         ],
-                        slurm_config=settings.pixi.SLURM_CONFIG,
+                        slurm_config=resource.tasks_pixi_config[
+                            "SLURM_CONFIG"
+                        ],
                         fractal_ssh=fractal_ssh,
                         logger_name=LOGGER_NAME,
                         prefix=common_args["prefix"],
                         db=db,
                         activity=activity,
                         log_file_path=log_file_path,
+                        poll_interval=resource.jobs_poll_interval,
                     )
                     activity.log = get_current_log(log_file_path)
                     activity = add_commit_refresh(obj=activity, db=db)
@@ -324,7 +342,7 @@ def collect_ssh_pixi(
                         )
                         fractal_ssh.remove_folder(
                             folder=task_group.path,
-                            safe_root=tasks_base_dir,
+                            safe_root=profile.tasks_remote_dir,
                         )
                         logger.info(
                             f"Deleted remoted folder {task_group.path}"