fractal-server 2.12.0a1__py3-none-any.whl → 2.12.1__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.12.0a1"
+__VERSION__ = "2.12.1"

fractal_server/__main__.py

@@ -63,45 +63,18 @@ update_db_data_parser = subparsers.add_parser(
     description="Apply data-migration script to an existing database.",
 )
 
-# fractalctl email-settings
-email_settings_parser = subparsers.add_parser(
-    "email-settings",
+# fractalctl encrypt-email-password
+encrypt_email_password_parser = subparsers.add_parser(
+    "encrypt-email-password",
     description=(
         "Generate valid values for environment variables "
-        "`FRACTAL_EMAIL_SETTINGS` and `FRACTAL_EMAIL_SETTINGS_KEY`."
+        "FRACTAL_EMAIL_PASSWORD and FRACTAL_EMAIL_PASSWORD_KEY."
     ),
 )
-email_settings_parser.add_argument(
-    "sender",
-    type=str,
-    help="Email of the sender",
-)
-email_settings_parser.add_argument(
-    "server",
-    type=str,
-    help="SMPT server used to send emails",
-)
-email_settings_parser.add_argument(
-    "port",
-    type=int,
-    help="Port of the SMPT server",
-)
-email_settings_parser.add_argument(
-    "instance",
-    type=str,
-    help="Name of the Fractal instance sending emails",
-)
-email_settings_parser.add_argument(
-    "--skip-starttls",
-    action="store_true",
-    default=False,
-    help="If set, skip the execution of `starttls` when sending emails",
-)
 
 
 def save_openapi(dest="openapi.json"):
     from fractal_server.main import start_application
-    import json
 
     app = start_application()
     openapi_schema = app.openapi()
@@ -129,6 +102,11 @@ def set_db(skip_init_data: bool = False):
     from pathlib import Path
     import fractal_server
 
+    # Check settings
+    settings = Inject(get_settings)
+    settings.check_db()
+
+    # Perform migrations
     alembic_ini = Path(fractal_server.__file__).parent / "alembic.ini"
     alembic_args = ["-c", alembic_ini.as_posix(), "upgrade", "head"]
     print(f"START: Run alembic.config, with argv={alembic_args}")
@@ -138,12 +116,10 @@ def set_db(skip_init_data: bool = False):
     if skip_init_data:
         return
 
-    # Insert default group
+    # Create default group and user
     print()
     _create_first_group()
     print()
-    # NOTE: It will be fixed with #1739
-    settings = Inject(get_settings)
     asyncio.run(
         _create_first_user(
             email=settings.FRACTAL_DEFAULT_ADMIN_EMAIL,
@@ -224,31 +200,15 @@ def update_db_data():
     current_update_db_data_module.fix_db()
 
 
-def print_mail_settings(
-    sender: str,
-    server: str,
-    port: int,
-    instance: str,
-    skip_starttls: bool,
-):
+def print_encrypted_password():
     from cryptography.fernet import Fernet
 
-    password = input(f"Insert email password for sender '{sender}': ")
+    password = input("Insert email password: ").encode("utf-8")
     key = Fernet.generate_key().decode("utf-8")
-    fractal_mail_settings = json.dumps(
-        dict(
-            sender=sender,
-            password=password,
-            smtp_server=server,
-            port=port,
-            instance_name=instance,
-            use_starttls=(not skip_starttls),
-        )
-    ).encode("utf-8")
-    email_settings = Fernet(key).encrypt(fractal_mail_settings).decode("utf-8")
+    encrypted_password = Fernet(key).encrypt(password).decode("utf-8")
 
-    print(f"\nFRACTAL_EMAIL_SETTINGS: {email_settings}")
-    print(f"FRACTAL_EMAIL_SETTINGS_KEY: {key}")
+    print(f"\nFRACTAL_EMAIL_PASSWORD={encrypted_password}")
+    print(f"FRACTAL_EMAIL_PASSWORD_KEY={key}")
 
 
 def run():
@@ -267,14 +227,8 @@ def run():
             port=args.port,
             reload=args.reload,
         )
-    elif args.cmd == "email-settings":
-        print_mail_settings(
-            sender=args.sender,
-            server=args.server,
-            port=args.port,
-            instance=args.instance,
-            skip_starttls=args.skip_starttls,
-        )
+    elif args.cmd == "encrypt-email-password":
+        print_encrypted_password()
     else:
         sys.exit(f"Error: invalid command '{args.cmd}'.")
 

fractal_server/app/routes/api/v2/images.py

@@ -118,7 +118,6 @@ async def post_new_image(
 async def query_dataset_images(
     project_id: int,
     dataset_id: int,
-    use_dataset_filters: bool = False,  # query param
     page: int = 1,  # query param
     page_size: Optional[int] = None,  # query param
     query: Optional[ImageQuery] = None,  # body
@@ -138,17 +137,6 @@ async def query_dataset_images(
     dataset = output["dataset"]
     images = dataset.images
 
-    if use_dataset_filters is True:
-        images = [
-            image
-            for image in images
-            if match_filter(
-                image=image,
-                type_filters=dataset.type_filters,
-                attribute_filters=dataset.attribute_filters,
-            )
-        ]
-
     attributes = {}
     for image in images:
         for k, v in image["attributes"].items():

fractal_server/app/runner/executors/slurm/ssh/_slurm_job.py

@@ -88,7 +88,6 @@ class SlurmJob:
         self,
         num_tasks_tot: int,
         slurm_config: SlurmConfig,
-        workflow_task_file_prefix: Optional[str] = None,
         slurm_file_prefix: Optional[str] = None,
         wftask_file_prefixes: Optional[tuple[str, ...]] = None,
         single_task_submission: bool = False,

fractal_server/app/runner/executors/slurm/ssh/executor.py

@@ -62,7 +62,6 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         shutdown_file:
         python_remote: Equal to `settings.FRACTAL_SLURM_WORKER_PYTHON`
         wait_thread_cls: Class for waiting thread
-        keep_pickle_files:
         workflow_dir_local:
             Directory for both the cfut/SLURM and fractal-server files and logs
         workflow_dir_remote:
@@ -84,7 +83,6 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
     python_remote: str
 
     wait_thread_cls = FractalSlurmWaitThread
-    keep_pickle_files: bool
 
     common_script_lines: list[str]
     slurm_account: Optional[str]
@@ -100,8 +98,6 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         # Folders and files
         workflow_dir_local: Path,
         workflow_dir_remote: Path,
-        # Runner options
-        keep_pickle_files: bool = False,
         # Monitoring options
         slurm_poll_interval: Optional[int] = None,
         # SLURM submission script options
@@ -120,7 +116,6 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             fractal_ssh:
             workflow_dir_local:
             workflow_dir_remote:
-            keep_pickle_files:
             slurm_poll_interval:
             common_script_lines:
             slurm_account:
@@ -194,7 +189,6 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             raise e
 
         # Set/initialize some more options
-        self.keep_pickle_files = keep_pickle_files
         self.map_jobid_to_slurm_files_local = {}
 
     def _validate_common_script_lines(self):
@@ -901,12 +895,11 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                 pass
         for job_id in remaining_job_ids:
             self._cleanup(job_id)
-        if not self.keep_pickle_files:
-            for job in remaining_jobs:
-                for path in job.output_pickle_files_local:
-                    path.unlink()
-                for path in job.input_pickle_files_local:
-                    path.unlink()
+        for job in remaining_jobs:
+            for path in job.output_pickle_files_local:
+                path.unlink()
+            for path in job.input_pickle_files_local:
+                path.unlink()
 
     def _completion(self, job_ids: list[str]) -> None:
         """
@@ -1001,8 +994,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                                 f"Future {future} (SLURM job ID: {job_id}) "
                                 "was already cancelled."
                             )
-                            if not self.keep_pickle_files:
-                                in_path.unlink()
+                            in_path.unlink()
                             self._cleanup(job_id)
                             self._handle_remaining_jobs(
                                 remaining_futures=remaining_futures,
@@ -1062,17 +1054,15 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                                     remaining_job_ids=remaining_job_ids,
                                 )
                                 return
-                        if not self.keep_pickle_files:
-                            out_path.unlink()
+                        out_path.unlink()
                     except InvalidStateError:
                         logger.warning(
                             f"Future {future} (SLURM job ID: {job_id}) was "
                             "already cancelled, exit from "
                             "FractalSlurmSSHExecutor._completion."
                         )
-                        if not self.keep_pickle_files:
-                            out_path.unlink()
-                            in_path.unlink()
+                        out_path.unlink()
+                        in_path.unlink()
 
                         self._cleanup(job_id)
                         self._handle_remaining_jobs(
@@ -1082,8 +1072,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                         return
 
                     # Clean up input pickle file
-                    if not self.keep_pickle_files:
-                        in_path.unlink()
+                    in_path.unlink()
                 self._cleanup(job_id)
                 if job.single_task_submission:
                     future.set_result(outputs[0])
@@ -1210,8 +1199,10 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         script_lines = slurm_config.sort_script_lines(script_lines)
         logger.debug(script_lines)
 
-        # Always print output of `pwd`
-        script_lines.append('echo "Working directory (pwd): `pwd`"\n')
+        # Always print output of `uname -n` and `pwd`
+        script_lines.append(
+            '"Hostname: `uname -n`; current directory: `pwd`"\n'
+        )
 
         # Complete script preamble
         script_lines.append("\n")

fractal_server/app/runner/executors/slurm/sudo/executor.py

@@ -10,6 +10,7 @@
 #
 # Copyright 2022 (C) Friedrich Miescher Institute for Biomedical Research and
 # University of Zurich
+import json
 import math
 import shlex
 import subprocess  # nosec
@@ -161,7 +162,6 @@ class SlurmJob:
         self,
         num_tasks_tot: int,
         slurm_config: SlurmConfig,
-        workflow_task_file_prefix: Optional[str] = None,
         slurm_file_prefix: Optional[str] = None,
         wftask_file_prefixes: Optional[tuple[str, ...]] = None,
         single_task_submission: bool = False,
@@ -219,7 +219,6 @@ class FractalSlurmExecutor(SlurmExecutor):
     workflow_dir_local: Path
     workflow_dir_remote: Path
     map_jobid_to_slurm_files: dict[str, tuple[str, str, str]]
-    keep_pickle_files: bool
     slurm_account: Optional[str]
     jobs: dict[str, tuple[Future, SlurmJob]]
 
@@ -232,7 +231,6 @@ class FractalSlurmExecutor(SlurmExecutor):
         user_cache_dir: Optional[str] = None,
         common_script_lines: Optional[list[str]] = None,
         slurm_poll_interval: Optional[int] = None,
-        keep_pickle_files: bool = False,
         slurm_account: Optional[str] = None,
         *args,
         **kwargs,
@@ -253,11 +251,18 @@ class FractalSlurmExecutor(SlurmExecutor):
         # raised within `__init__`).
         self.wait_thread.shutdown_callback = self.shutdown
 
-        self.keep_pickle_files = keep_pickle_files
         self.slurm_user = slurm_user
         self.slurm_account = slurm_account
 
         self.common_script_lines = common_script_lines or []
+        settings = Inject(get_settings)
+
+        if settings.FRACTAL_SLURM_WORKER_PYTHON is not None:
+            try:
+                self.check_remote_python_interpreter()
+            except Exception as e:
+                self._stop_and_join_wait_thread()
+                raise RuntimeError(f"Original error {str(e)}")
 
         # Check that SLURM account is not set here
         try:
@@ -289,7 +294,6 @@ class FractalSlurmExecutor(SlurmExecutor):
         # Set the attribute slurm_poll_interval for self.wait_thread (see
         # cfut.SlurmWaitThread)
         if not slurm_poll_interval:
-            settings = Inject(get_settings)
             slurm_poll_interval = settings.FRACTAL_SLURM_POLL_INTERVAL
         self.wait_thread.slurm_poll_interval = slurm_poll_interval
         self.wait_thread.slurm_user = self.slurm_user
@@ -608,7 +612,14 @@ class FractalSlurmExecutor(SlurmExecutor):
             _prefixes = []
             _subfolder_names = []
             for component in components:
-                actual_component = component.get(_COMPONENT_KEY_, None)
+                # In Fractal, `component` is a `dict` by construction (e.g.
+                # `component = {"zarr_url": "/something", "param": 1}``). The
+                # try/except covers the case of e.g. `executor.map([1, 2])`,
+                # which is useful for testing.
+                try:
+                    actual_component = component.get(_COMPONENT_KEY_, None)
+                except AttributeError:
+                    actual_component = str(component)
                 _task_file_paths = get_task_file_paths(
                     workflow_dir_local=task_files.workflow_dir_local,
                     workflow_dir_remote=task_files.workflow_dir_remote,
@@ -860,8 +871,7 @@ class FractalSlurmExecutor(SlurmExecutor):
                             " cancelled, exit from"
                             " FractalSlurmExecutor._completion."
                         )
-                        if not self.keep_pickle_files:
-                            in_path.unlink()
+                        in_path.unlink()
                         self._cleanup(jobid)
                         return
 
@@ -903,23 +913,20 @@ class FractalSlurmExecutor(SlurmExecutor):
                             exc = TaskExecutionError(proxy.tb, **kwargs)
                             fut.set_exception(exc)
                             return
-                    if not self.keep_pickle_files:
-                        out_path.unlink()
+                    out_path.unlink()
                 except InvalidStateError:
                     logger.warning(
                         f"Future {fut} (SLURM job ID: {jobid}) was already"
                         " cancelled, exit from"
                         " FractalSlurmExecutor._completion."
                     )
-                    if not self.keep_pickle_files:
-                        out_path.unlink()
-                        in_path.unlink()
+                    out_path.unlink()
+                    in_path.unlink()
                     self._cleanup(jobid)
                     return
 
                 # Clean up input pickle file
-                if not self.keep_pickle_files:
-                    in_path.unlink()
+                in_path.unlink()
             self._cleanup(jobid)
             if job.single_task_submission:
                 fut.set_result(outputs[0])
@@ -1155,8 +1162,10 @@ class FractalSlurmExecutor(SlurmExecutor):
         script_lines = slurm_config.sort_script_lines(script_lines)
         logger.debug(script_lines)
 
-        # Always print output of `pwd`
-        script_lines.append('echo "Working directory (pwd): `pwd`"\n')
+        # Always print output of `uname -n` and `pwd`
+        script_lines.append(
+            '"Hostname: `uname -n`; current directory: `pwd`"\n'
+        )
 
         # Complete script preamble
         script_lines.append("\n")
@@ -1243,3 +1252,29 @@ class FractalSlurmExecutor(SlurmExecutor):
         )
         self._stop_and_join_wait_thread()
         logger.debug("[FractalSlurmExecutor.__exit__] End")
+
+    def check_remote_python_interpreter(self):
+        """
+        Check fractal-server version on the _remote_ Python interpreter.
+        """
+        settings = Inject(get_settings)
+        output = _subprocess_run_or_raise(
+            (
+                f"{settings.FRACTAL_SLURM_WORKER_PYTHON} "
+                "-m fractal_server.app.runner.versions"
+            )
+        )
+        runner_version = json.loads(output.stdout.strip("\n"))[
+            "fractal_server"
+        ]
+
+        if runner_version != __VERSION__:
+            error_msg = (
+                "Fractal-server version mismatch.\n"
+                "Local interpreter: "
+                f"({sys.executable}): {__VERSION__}.\n"
+                "Remote interpreter: "
+                f"({settings.FRACTAL_SLURM_WORKER_PYTHON}): {runner_version}."
+            )
+            logger.error(error_msg)
+            raise ValueError(error_msg)

fractal_server/app/security/__init__.py

@@ -252,15 +252,18 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
             # Send mail section
             settings = Inject(get_settings)
 
-            if this_user.oauth_accounts and settings.MAIL_SETTINGS is not None:
+            if (
+                this_user.oauth_accounts
+                and settings.email_settings is not None
+            ):
                 try:
                     logger.info(
                         "START sending email about new signup to "
-                        f"{settings.MAIL_SETTINGS.recipients}."
+                        f"{settings.email_settings.recipients}."
                     )
                     mail_new_oauth_signup(
                         msg=f"New user registered: '{this_user.email}'.",
-                        mail_settings=settings.MAIL_SETTINGS,
+                        email_settings=settings.email_settings,
                     )
                     logger.info("END sending email about new signup.")
                 except Exception as e:

fractal_server/app/security/signup_email.py

@@ -2,38 +2,47 @@ import smtplib
 from email.message import EmailMessage
 from email.utils import formataddr
 
+from cryptography.fernet import Fernet
+
 from fractal_server.config import MailSettings
 
 
-def mail_new_oauth_signup(msg: str, mail_settings: MailSettings):
+def mail_new_oauth_signup(msg: str, email_settings: MailSettings):
     """
     Send an email using the specified settings to notify a new OAuth signup.
     """
 
     mail_msg = EmailMessage()
     mail_msg.set_content(msg)
-    mail_msg["From"] = formataddr((mail_settings.sender, mail_settings.sender))
+    mail_msg["From"] = formataddr(
+        (email_settings.sender, email_settings.sender)
+    )
     mail_msg["To"] = ", ".join(
         [
             formataddr((recipient, recipient))
-            for recipient in mail_settings.recipients
+            for recipient in email_settings.recipients
         ]
     )
     mail_msg[
         "Subject"
-    ] = f"[Fractal, {mail_settings.instance_name}] New OAuth signup"
+    ] = f"[Fractal, {email_settings.instance_name}] New OAuth signup"
 
-    with smtplib.SMTP(mail_settings.smtp_server, mail_settings.port) as server:
+    with smtplib.SMTP(
+        email_settings.smtp_server, email_settings.port
+    ) as server:
         server.ehlo()
-        if mail_settings.use_starttls:
+        if email_settings.use_starttls:
             server.starttls()
             server.ehlo()
-
-        server.login(
-            user=mail_settings.sender, password=mail_settings.password
-        )
+        if email_settings.use_login:
+            password = (
+                Fernet(email_settings.encryption_key)
+                .decrypt(email_settings.encrypted_password)
+                .decode("utf-8")
+            )
+            server.login(user=email_settings.sender, password=password)
         server.sendmail(
-            from_addr=mail_settings.sender,
-            to_addrs=mail_settings.recipients,
+            from_addr=email_settings.sender,
+            to_addrs=email_settings.recipients,
             msg=mail_msg.as_string(),
         )

fractal_server/config.py

@@ -11,7 +11,6 @@
 # <exact-lab.it> under contract with Liberali Lab from the Friedrich Miescher
 # Institute for Biomedical Research and Pelkmans Lab from the University of
 # Zurich.
-import json
 import logging
 import shutil
 import sys
@@ -46,16 +45,19 @@ class MailSettings(BaseModel):
         port: SMTP server port
         password: Sender password
         instance_name: Name of SMTP server instance
-        use_starttls: Using or not security protocol
+        use_starttls: Whether to use the security protocol
+        use_login: Whether to use login
     """
 
     sender: EmailStr
     recipients: list[EmailStr] = Field(min_items=1)
     smtp_server: str
     port: int
-    password: str
+    encrypted_password: Optional[str] = None
+    encryption_key: Optional[str] = None
     instance_name: str
     use_starttls: bool
+    use_login: bool
 
 
 class FractalConfigurationError(RuntimeError):
@@ -406,7 +408,7 @@ class Settings(BaseSettings):
     """
 
     @root_validator(pre=True)
-    def check_tasks_python(cls, values) -> None:
+    def check_tasks_python(cls, values):
         """
         Perform multiple checks of the Python-interpreter variables.
 
@@ -416,7 +418,6 @@ class Settings(BaseSettings):
             `sys.executable` and set the corresponding
             `FRACTAL_TASKS_PYTHON_X_Y` (and unset all others).
         """
-
         # `FRACTAL_TASKS_PYTHON_X_Y` variables can only be absolute paths
         for version in ["3_9", "3_10", "3_11", "3_12"]:
             key = f"FRACTAL_TASKS_PYTHON_{version}"
@@ -575,66 +576,107 @@ class Settings(BaseSettings):
     ###########################################################################
     # SMTP SERVICE
     ###########################################################################
-    FRACTAL_EMAIL_SETTINGS: Optional[str] = None
+
+    FRACTAL_EMAIL_SENDER: Optional[EmailStr] = None
+    """
+    Address of the OAuth-signup email sender.
     """
-    Encrypted version of settings dictionary, with keys `sender`, `password`,
-    `smtp_server`, `port`, `instance_name`, `use_starttls`.
+    FRACTAL_EMAIL_PASSWORD: Optional[str] = None
     """
-    FRACTAL_EMAIL_SETTINGS_KEY: Optional[str] = None
+    Password for the OAuth-signup email sender.
+    """
+    FRACTAL_EMAIL_PASSWORD_KEY: Optional[str] = None
     """
     Key value for `cryptography.fernet` decrypt
     """
+    FRACTAL_EMAIL_SMTP_SERVER: Optional[str] = None
+    """
+    SMPT server for the OAuth-signup emails.
+    """
+    FRACTAL_EMAIL_SMTP_PORT: Optional[int] = None
+    """
+    SMPT server port for the OAuth-signup emails.
+    """
+    FRACTAL_EMAIL_INSTANCE_NAME: Optional[str] = None
+    """
+    Fractal instance name, to be included in the OAuth-signup emails.
+    """
     FRACTAL_EMAIL_RECIPIENTS: Optional[str] = None
     """
-    List of email receivers, separated with commas
+    Comma-separated list of recipients of the OAuth-signup emails.
+    """
+    FRACTAL_EMAIL_USE_STARTTLS: Optional[bool] = True
+    """
+    Whether to use StartTLS when using the SMTP server.
+    """
+    FRACTAL_EMAIL_USE_LOGIN: Optional[bool] = True
     """
+    Whether to use login when using the SMTP server.
+    """
+    email_settings: Optional[MailSettings] = None
 
-    @property
-    def MAIL_SETTINGS(self) -> Optional[MailSettings]:
-        if (
-            self.FRACTAL_EMAIL_SETTINGS is not None
-            and self.FRACTAL_EMAIL_SETTINGS_KEY is not None
-            and self.FRACTAL_EMAIL_RECIPIENTS is not None
-        ):
-            smpt_settings = (
-                Fernet(self.FRACTAL_EMAIL_SETTINGS_KEY)
-                .decrypt(self.FRACTAL_EMAIL_SETTINGS)
-                .decode("utf-8")
-            )
-            recipients = self.FRACTAL_EMAIL_RECIPIENTS.split(",")
-            mail_settings = MailSettings(
-                **json.loads(smpt_settings), recipients=recipients
-            )
-            return mail_settings
-        elif not all(
-            [
-                self.FRACTAL_EMAIL_RECIPIENTS is None,
-                self.FRACTAL_EMAIL_SETTINGS_KEY is None,
-                self.FRACTAL_EMAIL_SETTINGS is None,
-            ]
-        ):
-            raise ValueError(
-                "You must set all SMPT config variables: "
-                f"{self.FRACTAL_EMAIL_SETTINGS=}, "
-                f"{self.FRACTAL_EMAIL_RECIPIENTS=}, "
-                f"{self.FRACTAL_EMAIL_SETTINGS_KEY=}, "
+    @root_validator(pre=True)
+    def validate_email_settings(cls, values):
+        email_values = {
+            k: v for k, v in values.items() if k.startswith("FRACTAL_EMAIL")
+        }
+        if email_values:
+
+            def assert_key(key: str):
+                if key not in email_values:
+                    raise ValueError(f"Missing '{key}'")
+
+            assert_key("FRACTAL_EMAIL_SENDER")
+            assert_key("FRACTAL_EMAIL_SMTP_SERVER")
+            assert_key("FRACTAL_EMAIL_SMTP_PORT")
+            assert_key("FRACTAL_EMAIL_INSTANCE_NAME")
+            assert_key("FRACTAL_EMAIL_RECIPIENTS")
+
+            if email_values.get("FRACTAL_EMAIL_USE_LOGIN", True):
+                if "FRACTAL_EMAIL_PASSWORD" not in email_values:
+                    raise ValueError(
+                        "'FRACTAL_EMAIL_USE_LOGIN' is True but "
+                        "'FRACTAL_EMAIL_PASSWORD' is not provided."
+                    )
+                elif "FRACTAL_EMAIL_PASSWORD_KEY" not in email_values:
+                    raise ValueError(
+                        "'FRACTAL_EMAIL_USE_LOGIN' is True but "
+                        "'FRACTAL_EMAIL_PASSWORD_KEY' is not provided."
+                    )
+                else:
+                    try:
+                        (
+                            Fernet(email_values["FRACTAL_EMAIL_PASSWORD_KEY"])
+                            .decrypt(email_values["FRACTAL_EMAIL_PASSWORD"])
+                            .decode("utf-8")
+                        )
+                    except Exception as e:
+                        raise ValueError(
+                            "Invalid pair (FRACTAL_EMAIL_PASSWORD, "
+                            "FRACTAL_EMAIL_PASSWORD_KEY). "
+                            f"Original error: {str(e)}."
+                        )
+
+            values["email_settings"] = MailSettings(
+                sender=email_values["FRACTAL_EMAIL_SENDER"],
+                recipients=email_values["FRACTAL_EMAIL_RECIPIENTS"].split(","),
+                smtp_server=email_values["FRACTAL_EMAIL_SMTP_SERVER"],
+                port=email_values["FRACTAL_EMAIL_SMTP_PORT"],
+                encrypted_password=email_values.get("FRACTAL_EMAIL_PASSWORD"),
+                encryption_key=email_values.get("FRACTAL_EMAIL_PASSWORD_KEY"),
+                instance_name=email_values["FRACTAL_EMAIL_INSTANCE_NAME"],
+                use_starttls=email_values.get(
+                    "FRACTAL_EMAIL_USE_STARTTLS", True
+                ),
+                use_login=email_values.get("FRACTAL_EMAIL_USE_LOGIN", True),
             )
 
+        return values
+
     ###########################################################################
     # BUSINESS LOGIC
     ###########################################################################
 
-    def check_fractal_mail_settings(self):
-        """
-        Checks that the mail settings are properly set.
-        """
-        try:
-            self.MAIL_SETTINGS
-        except Exception as e:
-            raise FractalConfigurationError(
-                f"Invalid email configuration settings. Original error: {e}"
-            )
-
     def check_db(self) -> None:
         """
         Checks that db environment variables are properly set.
@@ -740,7 +782,6 @@ class Settings(BaseSettings):
 
         self.check_db()
         self.check_runner()
-        self.check_fractal_mail_settings()
 
     def get_sanitized(self) -> dict:
         def _must_be_sanitized(string) -> bool:

fractal_server/main.py

@@ -28,6 +28,7 @@ from .logger import get_logger
 from .logger import reset_logger_handlers
 from .logger import set_logger
 from .syringe import Inject
+from fractal_server import __VERSION__
 
 
 def collect_routers(app: FastAPI) -> None:
@@ -67,7 +68,7 @@ def check_settings() -> None:
     logger = set_logger("fractal_server_settings")
     logger.debug("Fractal Settings:")
     for key, value in settings.dict().items():
-        if any(s in key.upper() for s in ["PASSWORD", "SECRET"]):
+        if any(s in key.upper() for s in ["PASSWORD", "SECRET", "KEY"]):
             value = "*****"
         logger.debug(f"  {key}: {value}")
     reset_logger_handlers(logger)
@@ -77,7 +78,7 @@ def check_settings() -> None:
 async def lifespan(app: FastAPI):
     app.state.jobsV2 = []
     logger = set_logger("fractal_server.lifespan")
-    logger.info("Start application startup")
+    logger.info(f"[startup] START (fractal-server {__VERSION__})")
     check_settings()
     settings = Inject(get_settings)
 
@@ -88,31 +89,31 @@ async def lifespan(app: FastAPI):
         app.state.fractal_ssh_list = FractalSSHList()
 
         logger.info(
-            "Added empty FractalSSHList to app.state "
+            "[startup] Added empty FractalSSHList to app.state "
             f"(id={id(app.state.fractal_ssh_list)})."
         )
     else:
         app.state.fractal_ssh_list = None
 
     config_uvicorn_loggers()
-    logger.info("End application startup")
+    logger.info("[startup] END")
     reset_logger_handlers(logger)
 
     yield
 
     logger = get_logger("fractal_server.lifespan")
-    logger.info("Start application shutdown")
+    logger.info("[teardown] START")
 
     if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
         logger.info(
-            "Close FractalSSH connections "
+            "[teardown] Close FractalSSH connections "
             f"(current size: {app.state.fractal_ssh_list.size})."
         )
 
         app.state.fractal_ssh_list.close_all()
 
     logger.info(
-        f"Current worker with pid {os.getpid()} is shutting down. "
+        f"[teardown] Current worker with pid {os.getpid()} is shutting down. "
         f"Current jobs: {app.state.jobsV2=}"
     )
     if _backend_supports_shutdown(settings.FRACTAL_RUNNER_BACKEND):
@@ -128,9 +129,11 @@ async def lifespan(app: FastAPI):
                 f"Original error: {e}"
             )
     else:
-        logger.info("Shutdown not available for this backend runner.")
+        logger.info(
+            "[teardown] Shutdown not available for this backend runner."
+        )
 
-    logger.info("End application shutdown")
+    logger.info("[teardown] END")
     reset_logger_handlers(logger)
 
 

fractal_server/migrations/env.py

@@ -1,16 +1,11 @@
-import asyncio
 from logging.config import fileConfig
 
 from alembic import context
-from sqlalchemy.engine import Connection
 from sqlmodel import SQLModel
 
-from fractal_server.config import get_settings
 from fractal_server.migrations.naming_convention import NAMING_CONVENTION
-from fractal_server.syringe import Inject
 
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
+# Alembic Config object (provides access to the values within the .ini file)
 config = context.config
 
 
@@ -20,77 +15,35 @@ if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
 
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
 target_metadata = SQLModel.metadata
 target_metadata.naming_convention = NAMING_CONVENTION
-# Importing `fractal_server.app.models` after defining
+# Importing `fractal_server.app.models` *after* defining
 # `SQLModel.metadata.naming_convention` in order to apply the naming convention
 # when autogenerating migrations (see issue #1819).
 from fractal_server.app import models  # noqa
 
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-
-def run_migrations_offline() -> None:
-    """Run migrations in 'offline' mode.
-
-    This configures the context with just a URL
-    and not an Engine, though an Engine is acceptable
-    here as well.  By skipping the Engine creation
-    we don't even need a DBAPI to be available.
-
-    Calls to context.execute() here emit the given string to the
-    script output.
 
+def run_migrations_online() -> None:
     """
-    settings = Inject(get_settings)
-    settings.check_db()
-    context.configure(
-        url=settings.DATABASE_ASYNC_URL,
-        target_metadata=target_metadata,
-        literal_binds=True,
-        dialect_opts={"paramstyle": "named"},
-        render_as_batch=True,
-    )
-
-    with context.begin_transaction():
-        context.run_migrations()
-
-
-def do_run_migrations(connection: Connection) -> None:
-    context.configure(
-        connection=connection,
-        target_metadata=target_metadata,
-        render_as_batch=True,
-    )
-
-    with context.begin_transaction():
-        context.run_migrations()
-
-
-async def run_migrations_online() -> None:
-    """Run migrations in 'online' mode.
+    Run migrations in 'online' mode.
 
     In this scenario we need to create an Engine
     and associate a connection with the context.
-
     """
     from fractal_server.app.db import DB
 
-    engine = DB.engine_async()
-    async with engine.connect() as connection:
-        await connection.run_sync(do_run_migrations)
+    engine = DB.engine_sync()
+    with engine.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            render_as_batch=True,
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
 
-    await engine.dispose()
+    engine.dispose()
 
 
-if context.is_offline_mode():
-    run_migrations_offline()
-else:
-    asyncio.run(run_migrations_online())
+run_migrations_online()

fractal_server/tasks/v2/local/collect.py

@@ -15,6 +15,7 @@ from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import WheelFile
 from fractal_server.app.schemas.v2.manifest import ManifestV2
+from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import get_log_path
 from fractal_server.tasks.v2.local._utils import check_task_files_exist
@@ -80,7 +81,7 @@ def collect_local(
                 return
 
             # Log some info
-            logger.debug("START")
+            logger.info("START")
             for key, value in task_group.model_dump().items():
                 logger.debug(f"task_group.{key}: {value}")
 
@@ -101,7 +102,7 @@ def collect_local(
             try:
                 # Create task_group.path folder
                 Path(task_group.path).mkdir(parents=True)
-                logger.debug(f"Created {task_group.path}")
+                logger.info(f"Created {task_group.path}")
 
                 # Write wheel file and set task_group.wheel_path
                 if wheel_file is not None:
@@ -109,9 +110,7 @@ def collect_local(
                     wheel_path = (
                         Path(task_group.path) / wheel_file.filename
                     ).as_posix()
-                    logger.debug(
-                        f"Write wheel-file contents into {wheel_path}"
-                    )
+                    logger.info(f"Write wheel-file contents into {wheel_path}")
                     with open(wheel_path, "wb") as f:
                         f.write(wheel_file.contents)
                     task_group.wheel_path = wheel_path
@@ -256,12 +255,14 @@ def collect_local(
                 )
 
                 # Finalize (write metadata to DB)
-                logger.debug("finalising - START")
+                logger.info("finalising - START")
                 activity.status = TaskGroupActivityStatusV2.OK
                 activity.timestamp_ended = get_timestamp()
                 activity = add_commit_refresh(obj=activity, db=db)
-                logger.debug("finalising - END")
-                logger.debug("END")
+                logger.info("finalising - END")
+                logger.info("END")
+
+                reset_logger_handlers(logger)
 
             except Exception as collection_e:
                 # Delete corrupted package dir

fractal_server/tasks/v2/local/deactivate.py

@@ -14,6 +14,7 @@ from fractal_server.app.models.v2 import TaskGroupV2
 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
+from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.tasks.utils import FORBIDDEN_DEPENDENCY_STRINGS
 from fractal_server.tasks.utils import get_log_path
@@ -217,6 +218,8 @@ def deactivate_local(
                 activity.timestamp_ended = get_timestamp()
                 activity = add_commit_refresh(obj=activity, db=db)
 
+                reset_logger_handlers(logger)
+
             except Exception as e:
                 fail_and_cleanup(
                     task_group=task_group,

fractal_server/tasks/v2/local/reactivate.py

@@ -13,6 +13,7 @@ from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
 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.tasks.utils import get_log_path
 from fractal_server.tasks.v2.utils_background import get_current_log
@@ -134,6 +135,8 @@ def reactivate_local(
                 task_group = add_commit_refresh(obj=task_group, db=db)
                 logger.debug("END")
 
+                reset_logger_handlers(logger)
+
             except Exception as reactivate_e:
                 # Delete corrupted venv_path
                 try:

fractal_server/tasks/v2/ssh/collect.py

@@ -14,6 +14,7 @@ from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import WheelFile
 from fractal_server.app.schemas.v2.manifest import ManifestV2
+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.tasks.v2.ssh._utils import _customize_and_run_template
@@ -85,7 +86,7 @@ def collect_ssh(
                 return
 
             # Log some info
-            logger.debug("START")
+            logger.info("START")
             for key, value in task_group.model_dump().items():
                 logger.debug(f"task_group.{key}: {value}")
 
@@ -137,7 +138,7 @@ def collect_ssh(
                         Path(task_group.path) / wheel_filename
                     ).as_posix()
                     tmp_wheel_path = (Path(tmpdir) / wheel_filename).as_posix()
-                    logger.debug(
+                    logger.info(
                         f"Write wheel-file contents into {tmp_wheel_path}"
                     )
                     with open(tmp_wheel_path, "wb") as f:
@@ -171,7 +172,7 @@ def collect_ssh(
                     logger_name=LOGGER_NAME,
                 )
 
-                logger.debug("installing - START")
+                logger.info("installing - START")
 
                 # Set status to ONGOING and refresh logs
                 activity.status = TaskGroupActivityStatusV2.ONGOING
@@ -286,14 +287,13 @@ def collect_ssh(
                 )
 
                 # Finalize (write metadata to DB)
-                logger.debug("finalising - START")
+                logger.info("finalising - START")
                 activity.status = TaskGroupActivityStatusV2.OK
                 activity.timestamp_ended = get_timestamp()
                 activity = add_commit_refresh(obj=activity, db=db)
-                logger.debug("finalising - END")
-                logger.debug("END")
-
-                logger.debug("END")
+                logger.info("finalising - END")
+                logger.info("END")
+                reset_logger_handlers(logger)
 
             except Exception as collection_e:
                 # Delete corrupted package dir

fractal_server/tasks/v2/ssh/deactivate.py

@@ -14,6 +14,7 @@ from fractal_server.app.models.v2 import TaskGroupV2
 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
+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.tasks.utils import FORBIDDEN_DEPENDENCY_STRINGS
@@ -252,6 +253,8 @@ def deactivate_ssh(
                 activity.timestamp_ended = get_timestamp()
                 activity = add_commit_refresh(obj=activity, db=db)
 
+                reset_logger_handlers(logger)
+
             except Exception as e:
                 fail_and_cleanup(
                     task_group=task_group,

fractal_server/tasks/v2/ssh/reactivate.py

@@ -12,6 +12,7 @@ from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
 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.tasks.utils import get_log_path
@@ -69,7 +70,7 @@ def reactivate_ssh(
                 return
 
             # Log some info
-            logger.debug("START")
+            logger.info("START")
             for key, value in task_group.model_dump().items():
                 logger.debug(f"task_group.{key}: {value}")
 
@@ -152,28 +153,30 @@ def reactivate_ssh(
                 # Create remote directory for scripts
                 fractal_ssh.mkdir(folder=script_dir_remote)
 
-                logger.debug("start - create venv")
+                logger.info("start - create venv")
                 _customize_and_run_template(
                     template_filename="1_create_venv.sh",
                     **common_args,
                 )
-                logger.debug("end - create venv")
+                logger.info("end - create venv")
                 activity.log = get_current_log(log_file_path)
                 activity = add_commit_refresh(obj=activity, db=db)
 
-                logger.debug("start - install from pip freeze")
+                logger.info("start - install from pip freeze")
                 _customize_and_run_template(
                     template_filename="6_pip_install_from_freeze.sh",
                     **common_args,
                 )
-                logger.debug("end - install from pip freeze")
+                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.debug("END")
+                logger.info("END")
+
+                reset_logger_handlers(logger)
 
             except Exception as reactivate_e:
                 # Delete corrupted venv_path

{fractal_server-2.12.0a1.dist-info → fractal_server-2.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.12.0a1
+Version: 2.12.1
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
@@ -27,7 +27,7 @@ Requires-Dist: pydantic (>=1.10.8,<2)
 Requires-Dist: python-dotenv (>=1.0.0,<1.1.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
 Requires-Dist: sqlmodel (==0.0.21)
-Requires-Dist: uvicorn (==0.29.0)
+Requires-Dist: uvicorn (>=0.29.0,<0.35.0)
 Requires-Dist: uvicorn-worker (==0.2.0)
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
 Project-URL: Repository, https://github.com/fractal-analytics-platform/fractal-server

{fractal_server-2.12.0a1.dist-info → fractal_server-2.12.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fractal_server/__init__.py,sha256=gxqCoA1Q81Ojo5b58OAPQxwUtkX0nD4cBL1wD-a3TMg,25
-fractal_server/__main__.py,sha256=D2YTmSowmXNyvqOjW_HeItCZT2UliWlySl_owicaZg0,8026
+fractal_server/__init__.py,sha256=xmnpQEc5CF2JQ6rKqQzxa_0Lpy_QA2cHgLGOu73fTGo,23
+fractal_server/__main__.py,sha256=igfS2XL3e8JycuhASl2vsYuIPma0MG0cfPPFRuQfh14,6906
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/db/__init__.py,sha256=wup2wcOkyOh8Vd0Xm76PZn_naxeMqaL4eF8DHHXTGlI,2889
@@ -30,7 +30,7 @@ fractal_server/app/routes/api/v2/_aux_functions.py,sha256=NJ6_1biN_hhIEK1w8Vj6Xh
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=c8eqPXdMhc3nIixX50B1Ka5n7LgbOZm2JbEs7lICQ04,6767
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=uhNSs-jcS7ndIUFKiOC1yrDiViw3uvKEXi9UL04BMks,11642
 fractal_server/app/routes/api/v2/dataset.py,sha256=Y6uZz--YSEGgnPYu05rZ9sr1Ug08bNl2v1h3VeApBe8,9441
-fractal_server/app/routes/api/v2/images.py,sha256=0qkItqPrAvWEaK3YHUmCCrKrO_tQuzAPf4Te0q8mON8,8832
+fractal_server/app/routes/api/v2/images.py,sha256=LjAl0m4blWHda9rW_30MPYipEzU_JH6uhMf91X6CfWE,8478
 fractal_server/app/routes/api/v2/job.py,sha256=m89FTh9Px25oXCeWj2k2NdGWQaO2oxMh-6lZppcsJOY,5551
 fractal_server/app/routes/api/v2/project.py,sha256=eWYFJ7F2ZYQcpi-_n-rhPF-Q4gJhzYBsVGYFhHZZXAE,6653
 fractal_server/app/routes/api/v2/status.py,sha256=_cDZW-ESYw6zpf-lLFFqko5bLpKhqKrCM6yv1OfqxN4,6300
@@ -67,13 +67,13 @@ fractal_server/app/runner/executors/slurm/_slurm_config.py,sha256=Qa5UgcMZfYEj95
 fractal_server/app/runner/executors/slurm/remote.py,sha256=wLziIsGdSMiO-jIXM8x77JRK82g_2hx0iBKTiMghuIo,5852
 fractal_server/app/runner/executors/slurm/ssh/__init__.py,sha256=Cjn1rYvljddi96tAwS-qqGkNfOcfPzjChdaEZEObCcM,65
 fractal_server/app/runner/executors/slurm/ssh/_executor_wait_thread.py,sha256=bKo5Ja0IGxJWpPWyh9dN0AG-PwzTDZzD5LyaEHB3YU4,3742
-fractal_server/app/runner/executors/slurm/ssh/_slurm_job.py,sha256=rwlqZzoGo4SAb4nSlFjsQJdaCgfM1J6YGcjb8yYxlqc,4506
-fractal_server/app/runner/executors/slurm/ssh/executor.py,sha256=oqXssvcjBiTYxkud-WVQQuQiAKOiBYumz6piFSY5jNg,54316
+fractal_server/app/runner/executors/slurm/ssh/_slurm_job.py,sha256=rWPE_sZUNCMw5IWvZo9N1hlzoiasYoddS-wlBj4wMU4,4449
+fractal_server/app/runner/executors/slurm/ssh/executor.py,sha256=eX-HPmb6gDy2WLBn5llF-Pb6U10_gTtIE09wT7rHF7w,53862
 fractal_server/app/runner/executors/slurm/sudo/__init__.py,sha256=Cjn1rYvljddi96tAwS-qqGkNfOcfPzjChdaEZEObCcM,65
 fractal_server/app/runner/executors/slurm/sudo/_check_jobs_status.py,sha256=wAgwpVcr6JIslKHOuS0FhRa_6T1KCManyRJqA-fifzw,1909
 fractal_server/app/runner/executors/slurm/sudo/_executor_wait_thread.py,sha256=uRRyVHQtK9McHCB6OsjYfDnQsu2E8At9K_UYb_pe2pg,4682
 fractal_server/app/runner/executors/slurm/sudo/_subprocess_run_as_user.py,sha256=g8wqUjSicN17UZVXlfaMomYZ-xOIbBu1oE7HdJTzfvw,5218
-fractal_server/app/runner/executors/slurm/sudo/executor.py,sha256=z3_VKolY472GQ9mPr1MipQfRIbjt3XW-X13q-x0gAnE,47272
+fractal_server/app/runner/executors/slurm/sudo/executor.py,sha256=Z5lcyXOr9LNz1yFEHlu7StAIpZdK2BkiUZbX6Fh7QVY,48513
 fractal_server/app/runner/executors/slurm/utils_executors.py,sha256=naPyJI0I3lD-sYHbSXbMFGUBK4h_SggA5V91Z1Ch1Xg,1416
 fractal_server/app/runner/extract_archive.py,sha256=tLpjDrX47OjTNhhoWvm6iNukg8KoieWyTb7ZfvE9eWU,2483
 fractal_server/app/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV0gA8E,70
@@ -122,10 +122,10 @@ fractal_server/app/schemas/v2/task_collection.py,sha256=9c_yyFcVBXdAZpQQniy1bROh
 fractal_server/app/schemas/v2/task_group.py,sha256=zZfvAH7c3MZC4_An09TMuOkNE_e1Z9XsYEnmN-axHdU,3217
 fractal_server/app/schemas/v2/workflow.py,sha256=-KWvXnbHBFA3pj5n7mfSyLKJQSqkJmoziIEe7mpLl3M,1875
 fractal_server/app/schemas/v2/workflowtask.py,sha256=xjFTmnKuHSetJvN-9k_GTMbPKwPg-J00zUkc_96QO7E,7726
-fractal_server/app/security/__init__.py,sha256=qn6idYgl-p5HWea0gTVnz4JnkoxGEkmQjPzvKpDWT0I,14035
-fractal_server/app/security/signup_email.py,sha256=DrL51UdTSrgjleynMD5CRZwTSOpPrZ96fasRV0fvxDE,1165
+fractal_server/app/security/__init__.py,sha256=UyNjQc19cTNl-NwGyWwQs_-Yd22niHo86rIE-s-3czg,14087
+fractal_server/app/security/signup_email.py,sha256=CR1VbsGFNshxsWquLDZPbUAYnGzkCHeJChtncq63RBc,1434
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
-fractal_server/config.py,sha256=fIXjjdczTSBuPphQT6FukE3AwhdfIupsbmR38j3HZ_U,26623
+fractal_server/config.py,sha256=kK6mf4uPNd95N-oKlkc6eSsjLkBQHv57jGYuGvZKmko,28495
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
@@ -133,8 +133,8 @@ fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTs
 fractal_server/images/models.py,sha256=t4zcUFmWxhAzGgy7kkxs9Ctq8SAhVs0v910UcXcHIUw,3349
 fractal_server/images/tools.py,sha256=4kfPAFJJnvg7fM-cL0JMx97Dc1Npva_0ghitEji3JUU,3407
 fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
-fractal_server/main.py,sha256=1ZesKY3-ML8BVmVRg_r_aNWoaSea1uR3GP0DlunpE5U,4452
-fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
+fractal_server/main.py,sha256=yziIqi9AaecYYx9hVsaB5nzSpsgnOSSMvQOa0n30SBI,4555
+fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
 fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=vrPhC8hfFu1c4HmLHNZyCuqEfecFD8-bWc49bXMNes0,6199
 fractal_server/migrations/versions/091b01f51f88_add_usergroup_and_linkusergroup_table.py,sha256=-BSS9AFTPcu3gYC-sYbawSy4MWQQx8TfMb5BW5EBKmQ,1450
@@ -175,14 +175,14 @@ fractal_server/tasks/utils.py,sha256=V7dj8o2AnoHhGSTYlqJHcRFhCIpmOrMOUhtiE_DvRVA
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/tasks/v2/local/__init__.py,sha256=9RVItnS7OyLsJOuJjWMCicaky4ASUPQEYD4SzDs0hOE,141
 fractal_server/tasks/v2/local/_utils.py,sha256=EvhmVwYjqaNyDCUMEsTWYOUXLgEwR1xr6bu32apCEI8,2491
-fractal_server/tasks/v2/local/collect.py,sha256=Mr4BzscBY8zBRCzWq8ozTjFYy1-VFPXrMCBF7vd9Ods,12143
-fractal_server/tasks/v2/local/deactivate.py,sha256=uAV-tBgfKiN4chkfk6dYCZfF67POwhNizyxuCk_WJK8,9935
-fractal_server/tasks/v2/local/reactivate.py,sha256=DwtOZrSk6jhUHEmAiMcstK3YzqPQ12pfgxmUNdrSgfk,6088
+fractal_server/tasks/v2/local/collect.py,sha256=gtntegkilH-zdZpMQaSWYA3DuUqKRAlsoYhs-iJLEKc,12194
+fractal_server/tasks/v2/local/deactivate.py,sha256=94s_RDND8aR5Y8RxFrRx61rZBMPGqOmFnBFLVKK1HVY,10038
+fractal_server/tasks/v2/local/reactivate.py,sha256=eBgFgq5xVKNr4DIDX7QU8xXerhwMrPaHDJ1wTth7aQc,6191
 fractal_server/tasks/v2/ssh/__init__.py,sha256=aSQbVi6Ummt9QzcSLWNmSqYjfdxrn9ROmqgH6bDpI7k,135
 fractal_server/tasks/v2/ssh/_utils.py,sha256=LjaEYVUJDChilu3YuhxuGWYRNnVJ_zqNE9SDHdRTIHY,2824
-fractal_server/tasks/v2/ssh/collect.py,sha256=yLVcilvU7uMH8woc__qG_3a0wyT2mNTCuq9I93HVKNM,13493
-fractal_server/tasks/v2/ssh/deactivate.py,sha256=bFlcpZpGiTZcwG845YiLEIIYpiG7vslcSp6_NkXtHGw,11297
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=RoXM5HpIc0rVz4-8UCr3uWv-9zA8bobGSTNJamYsMOo,7873
+fractal_server/tasks/v2/ssh/collect.py,sha256=-wqqGMapjD1hQz1vphwXmZaD4qzziMetc6lV6fckDO4,13552
+fractal_server/tasks/v2/ssh/deactivate.py,sha256=EAVH2HtyvmIFXqUwsGYhlJcAcVh_MvIOaKDY8AyBODw,11400
+fractal_server/tasks/v2/ssh/reactivate.py,sha256=8Rnbbny7TjMEAHhboqfgxBVZZK5UNNmh4Ud-0y3jaVM,7970
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
 fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=Gpk2io8u9YaflFUlQu2NgkDQw5AA4m4AOVG1sB4yrHQ,1822
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
@@ -197,8 +197,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.12.0a1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.12.0a1.dist-info/METADATA,sha256=toS3YbZbnMrVzQOHOFPN8c4uj3gEJbjSdagv3NbrfjA,4564
-fractal_server-2.12.0a1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.12.0a1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.12.0a1.dist-info/RECORD,,
+fractal_server-2.12.1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.12.1.dist-info/METADATA,sha256=m7gJftwPSx3KP-HzIgYY_4a7m8zs-I8yGuQlW_HedKE,4570
+fractal_server-2.12.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.12.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.12.1.dist-info/RECORD,,