fractal-server 2.14.5__py3-none-any.whl → 2.14.6__py3-none-any.whl

fractal_server/tasks/v2/ssh/reactivate.py

@@ -14,7 +14,8 @@ 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
 from fractal_server.logger import set_logger
-from fractal_server.ssh._fabric import FractalSSH
+from fractal_server.ssh._fabric import SingleUseFractalSSH
+from fractal_server.ssh._fabric import SSHConfig
 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 (
@@ -28,7 +29,7 @@ def reactivate_ssh(
     *,
     task_group_activity_id: int,
     task_group_id: int,
-    fractal_ssh: FractalSSH,
+    ssh_config: SSHConfig,
     tasks_base_dir: str,
 ) -> None:
     """
@@ -40,7 +41,7 @@ def reactivate_ssh(
     Arguments:
         task_group_id:
         task_group_activity_id:
-        fractal_ssh:
+        ssh_config:
         tasks_base_dir:
             Only used as a `safe_root` in `remove_dir`, and typically set to
             `user_settings.ssh_tasks_dir`.
@@ -55,150 +56,157 @@ def reactivate_ssh(
             log_file_path=log_file_path,
         )
 
-        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)
-            if activity is None or task_group is None:
-                # Use `logging` directly
-                logging.error(
-                    "Cannot find database rows with "
-                    f"{task_group_id=} and {task_group_activity_id=}:\n"
-                    f"{task_group=}\n{activity=}. Exit."
-                )
-                return
-
-            # Log some info
-            logger.info("START")
-            for key, value in task_group.model_dump().items():
-                logger.debug(f"task_group.{key}: {value}")
-
-            # Check that SSH connection works
-            try:
-                fractal_ssh.check_connection()
-            except Exception as e:
-                logger.error("Cannot establish SSH connection.")
-                fail_and_cleanup(
-                    task_group=task_group,
-                    task_group_activity=activity,
-                    logger_name=LOGGER_NAME,
-                    log_file_path=log_file_path,
-                    exception=e,
-                    db=db,
-                )
-                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:
-                activity.status = TaskGroupActivityStatusV2.ONGOING
-                activity = add_commit_refresh(obj=activity, db=db)
-
-                # Prepare replacements for templates
-                replacements = get_collection_replacements(
-                    task_group=task_group,
-                    python_bin=get_python_interpreter_v2(
-                        python_version=task_group.python_version
-                    ),
-                )
-
-                # Prepare replacements for templates
-                pip_freeze_file_local = f"{tmpdir}/pip_freeze.txt"
-                pip_freeze_file_remote = (
-                    Path(task_group.path) / "_tmp_pip_freeze.txt"
-                ).as_posix()
-                with open(pip_freeze_file_local, "w") as f:
-                    f.write(task_group.pip_freeze)
-                fractal_ssh.send_file(
-                    local=pip_freeze_file_local, remote=pip_freeze_file_remote
-                )
-                replacements.append(
-                    ("__PIP_FREEZE_FILE__", pip_freeze_file_remote)
-                )
-
-                # Define script_dir_remote and create it if missing
-                script_dir_remote = (
-                    Path(task_group.path) / SCRIPTS_SUBFOLDER
-                ).as_posix()
-                fractal_ssh.mkdir(folder=script_dir_remote, parents=True)
-
-                # Prepare common arguments for `_customize_and_run_template`
-                common_args = dict(
-                    replacements=replacements,
-                    script_dir_local=(
-                        Path(tmpdir) / SCRIPTS_SUBFOLDER
-                    ).as_posix(),
-                    script_dir_remote=script_dir_remote,
-                    prefix=(
-                        f"{int(time.time())}_"
-                        f"{TaskGroupActivityActionV2.REACTIVATE.value}"
-                    ),
-                    fractal_ssh=fractal_ssh,
-                    logger_name=LOGGER_NAME,
-                )
-
-                # Create remote directory for scripts
-                fractal_ssh.mkdir(folder=script_dir_remote)
-
-                logger.info("start - create venv")
-                _customize_and_run_template(
-                    template_filename="1_create_venv.sh",
-                    **common_args,
-                )
-                logger.info("end - create venv")
-                activity.log = get_current_log(log_file_path)
-                activity = add_commit_refresh(obj=activity, db=db)
-
-                logger.info("start - install from pip freeze")
-                _customize_and_run_template(
-                    template_filename="6_pip_install_from_freeze.sh",
-                    **common_args,
-                )
-                logger.info("end - install from pip freeze")
-                activity.log = get_current_log(log_file_path)
-                activity.status = TaskGroupActivityStatusV2.OK
-                activity.timestamp_ended = get_timestamp()
-                activity = add_commit_refresh(obj=activity, db=db)
-                task_group.active = True
-                task_group = add_commit_refresh(obj=task_group, db=db)
-                logger.info("END")
-
-                reset_logger_handlers(logger)
-
-            except Exception as reactivate_e:
-                # Delete corrupted venv_path
+        with SingleUseFractalSSH(
+            ssh_config=ssh_config,
+            logger_name=LOGGER_NAME,
+        ) as fractal_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)
+                if activity is None or task_group is None:
+                    # Use `logging` directly
+                    logging.error(
+                        "Cannot find database rows with "
+                        f"{task_group_id=} and {task_group_activity_id=}:\n"
+                        f"{task_group=}\n{activity=}. Exit."
+                    )
+                    return
+
+                # Log some info
+                logger.info("START")
+                for key, value in task_group.model_dump().items():
+                    logger.debug(f"task_group.{key}: {value}")
+
+                # Check that SSH connection works
+                try:
+                    fractal_ssh.check_connection()
+                except Exception as e:
+                    logger.error("Cannot establish SSH connection.")
+                    fail_and_cleanup(
+                        task_group=task_group,
+                        task_group_activity=activity,
+                        logger_name=LOGGER_NAME,
+                        log_file_path=log_file_path,
+                        exception=e,
+                        db=db,
+                    )
+                    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:
-                    logger.info(f"Now delete folder {task_group.venv_path}")
-                    fractal_ssh.remove_folder(
-                        folder=task_group.venv_path,
-                        safe_root=tasks_base_dir,
+                    activity.status = TaskGroupActivityStatusV2.ONGOING
+                    activity = add_commit_refresh(obj=activity, db=db)
+
+                    # Prepare replacements for templates
+                    replacements = get_collection_replacements(
+                        task_group=task_group,
+                        python_bin=get_python_interpreter_v2(
+                            python_version=task_group.python_version
+                        ),
                     )
-                    logger.info(f"Deleted folder {task_group.venv_path}")
-                except Exception as rm_e:
-                    logger.error(
-                        "Removing folder failed.\n"
-                        f"Original error:\n{str(rm_e)}"
+
+                    # Prepare replacements for templates
+                    pip_freeze_file_local = f"{tmpdir}/pip_freeze.txt"
+                    pip_freeze_file_remote = (
+                        Path(task_group.path) / "_tmp_pip_freeze.txt"
+                    ).as_posix()
+                    with open(pip_freeze_file_local, "w") as f:
+                        f.write(task_group.pip_freeze)
+                    fractal_ssh.send_file(
+                        local=pip_freeze_file_local,
+                        remote=pip_freeze_file_remote,
+                    )
+                    replacements.append(
+                        ("__PIP_FREEZE_FILE__", pip_freeze_file_remote)
+                    )
+
+                    # Define script_dir_remote and create it if missing
+                    script_dir_remote = (
+                        Path(task_group.path) / SCRIPTS_SUBFOLDER
+                    ).as_posix()
+                    fractal_ssh.mkdir(folder=script_dir_remote, parents=True)
+
+                    # Prepare common arguments for _customize_and_run_template
+                    common_args = dict(
+                        replacements=replacements,
+                        script_dir_local=(
+                            Path(tmpdir) / SCRIPTS_SUBFOLDER
+                        ).as_posix(),
+                        script_dir_remote=script_dir_remote,
+                        prefix=(
+                            f"{int(time.time())}_"
+                            f"{TaskGroupActivityActionV2.REACTIVATE}"
+                        ),
+                        fractal_ssh=fractal_ssh,
+                        logger_name=LOGGER_NAME,
                     )
 
-                fail_and_cleanup(
-                    task_group=task_group,
-                    task_group_activity=activity,
-                    logger_name=LOGGER_NAME,
-                    log_file_path=log_file_path,
-                    exception=reactivate_e,
-                    db=db,
-                )
-        return
+                    # Create remote directory for scripts
+                    fractal_ssh.mkdir(folder=script_dir_remote)
+
+                    logger.info("start - create venv")
+                    _customize_and_run_template(
+                        template_filename="1_create_venv.sh",
+                        **common_args,
+                    )
+                    logger.info("end - create venv")
+                    activity.log = get_current_log(log_file_path)
+                    activity = add_commit_refresh(obj=activity, db=db)
+
+                    logger.info("start - install from pip freeze")
+                    _customize_and_run_template(
+                        template_filename="6_pip_install_from_freeze.sh",
+                        **common_args,
+                    )
+                    logger.info("end - install from pip freeze")
+                    activity.log = get_current_log(log_file_path)
+                    activity.status = TaskGroupActivityStatusV2.OK
+                    activity.timestamp_ended = get_timestamp()
+                    activity = add_commit_refresh(obj=activity, db=db)
+                    task_group.active = True
+                    task_group = add_commit_refresh(obj=task_group, db=db)
+                    logger.info("END")
+
+                    reset_logger_handlers(logger)
+
+                except Exception as reactivate_e:
+                    # Delete corrupted venv_path
+                    try:
+                        logger.info(
+                            f"Now delete folder {task_group.venv_path}"
+                        )
+                        fractal_ssh.remove_folder(
+                            folder=task_group.venv_path,
+                            safe_root=tasks_base_dir,
+                        )
+                        logger.info(f"Deleted folder {task_group.venv_path}")
+                    except Exception as rm_e:
+                        logger.error(
+                            "Removing folder failed.\n"
+                            f"Original error:\n{str(rm_e)}"
+                        )
+
+                    fail_and_cleanup(
+                        task_group=task_group,
+                        task_group_activity=activity,
+                        logger_name=LOGGER_NAME,
+                        log_file_path=log_file_path,
+                        exception=reactivate_e,
+                        db=db,
+                    )

fractal_server/tasks/v2/utils_background.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 from typing import TypeVar
 
 from sqlalchemy.orm import Session as DBSyncSession
@@ -53,7 +52,7 @@ def _prepare_tasks_metadata(
     package_manifest: ManifestV2,
     python_bin: Path,
     package_root: Path,
-    package_version: Optional[str] = None,
+    package_version: str | None = None,
 ) -> list[TaskCreateV2]:
     """
     Based on the package manifest and additional info, prepare the task list.
@@ -101,5 +100,5 @@ def _prepare_tasks_metadata(
 
 
 def get_current_log(logger_file_path: str) -> str:
-    with open(logger_file_path, "r") as f:
+    with open(logger_file_path) as f:
         return f.read()

fractal_server/types/__init__.py

@@ -1,6 +1,5 @@
 from typing import Annotated
 from typing import Any
-from typing import Optional
 from typing import Union
 
 from pydantic import AfterValidator
@@ -70,7 +69,7 @@ ImageAttributes = Annotated[
     AfterValidator(valdict_keys),
 ]
 ImageAttributesWithNone = Annotated[
-    dict[str, Optional[ImageAttributeValue]],
+    dict[str, ImageAttributeValue | None],
     AfterValidator(valdict_keys),
 ]
 AttributeFilters = Annotated[

fractal_server/types/validators/_filter_validators.py

@@ -1,11 +1,10 @@
 from typing import Any
-from typing import Union
 
 from ._common_validators import valdict_keys
 
 
 def validate_attribute_filters(
-    attribute_filters: dict[str, list[Union[int, float, str, bool]]]
+    attribute_filters: dict[str, list[int | float | str | bool]]
 ) -> dict[str, list[Any]]:
     attribute_filters = valdict_keys(attribute_filters)
     for key, values in attribute_filters.items():

fractal_server/utils.py

@@ -19,7 +19,6 @@ import subprocess  # nosec
 from datetime import datetime
 from datetime import timezone
 from pathlib import Path
-from typing import Optional
 
 from .logger import get_logger
 from .string_tools import validate_cmd
@@ -35,8 +34,8 @@ def get_timestamp() -> datetime:
 async def execute_command_async(
     *,
     command: str,
-    cwd: Optional[Path] = None,
-    logger_name: Optional[str] = None,
+    cwd: Path | None = None,
+    logger_name: str | None = None,
 ) -> str:
     """
     Execute arbitrary command
@@ -82,8 +81,8 @@ async def execute_command_async(
 def execute_command_sync(
     *,
     command: str,
-    logger_name: Optional[str] = None,
-    allow_char: Optional[str] = None,
+    logger_name: str | None = None,
+    allow_char: str | None = None,
 ) -> str:
     """
     Execute arbitrary command

fractal_server/zip_tools.py

@@ -1,8 +1,8 @@
 import os
 import shutil
+from collections.abc import Iterator
 from io import BytesIO
 from pathlib import Path
-from typing import Iterator
 from typing import TypeVar
 from zipfile import ZIP_DEFLATED
 from zipfile import ZipFile

{fractal_server-2.14.5.dist-info → fractal_server-2.14.6.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.14.5
+Version: 2.14.6
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin
 Author-email: tommaso.comparin@exact-lab.it
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.11,<3.13
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: alembic (>=1.13.1,<2.0.0)