fractal-server 2.10.4__py3-none-any.whl → 2.10.6__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.10.4"
+__VERSION__ = "2.10.6"

fractal_server/app/security/__init__.py

@@ -254,10 +254,15 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
 
             if this_user.oauth_accounts and settings.MAIL_SETTINGS is not None:
                 try:
+                    logger.info(
+                        "START sending email about new signup to "
+                        f"{settings.MAIL_SETTINGS.recipients}."
+                    )
                     mail_new_oauth_signup(
                         msg=f"New user registered: '{this_user.email}'.",
                         mail_settings=settings.MAIL_SETTINGS,
                     )
+                    logger.info("END sending email about new signup.")
                 except Exception as e:
                     logger.error(
                         "ERROR sending notification email after oauth "

fractal_server/app/security/signup_email.py

@@ -13,7 +13,7 @@ def mail_new_oauth_signup(msg: str, mail_settings: MailSettings):
     mail_msg = EmailMessage()
     mail_msg.set_content(msg)
     mail_msg["From"] = formataddr((mail_settings.sender, mail_settings.sender))
-    mail_msg["To"] = ",".join(
+    mail_msg["To"] = ", ".join(
         [
             formataddr((recipient, recipient))
             for recipient in mail_settings.recipients

fractal_server/logger.py

@@ -109,7 +109,10 @@ def set_logger(
             if isinstance(handler, logging.FileHandler)
         ]
         if len(current_file_handlers) > 1:
-            logger.warning(f"Logger {logger_name} has multiple file handlers.")
+            logger.warning(
+                f"Logger {logger_name} has multiple file handlers: "
+                f"{current_file_handlers}"
+            )
 
     return logger
 

fractal_server/tasks/v2/local/collect.py

@@ -33,8 +33,6 @@ from fractal_server.tasks.v2.utils_templates import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def collect_local(
     *,
@@ -59,6 +57,8 @@ def collect_local(
         wheel_file:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/local/deactivate.py

@@ -21,8 +21,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def deactivate_local(
     *,
@@ -40,6 +38,8 @@ def deactivate_local(
         task_group_activity_id:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/local/reactivate.py

@@ -23,9 +23,6 @@ from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
 
-LOGGER_NAME = __name__
-
-
 def reactivate_local(
     *,
     task_group_activity_id: int,
@@ -42,6 +39,8 @@ def reactivate_local(
         task_group_activity_id:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/ssh/collect.py

@@ -30,8 +30,6 @@ from fractal_server.tasks.v2.utils_templates import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def collect_ssh(
     *,
@@ -62,6 +60,8 @@ def collect_ssh(
         wheel_file:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     # Work within a temporary folder, where also logs will be placed
     with TemporaryDirectory() as tmpdir:
         LOGGER_NAME = "task_collection_ssh"

fractal_server/tasks/v2/ssh/deactivate.py

@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def deactivate_ssh(
     *,
@@ -47,6 +45,8 @@ def deactivate_ssh(
             `user_settings.ssh_tasks_dir`.
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

fractal_server/tasks/v2/ssh/reactivate.py

@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_python_interpreter import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def reactivate_ssh(
     *,
@@ -47,6 +45,8 @@ def reactivate_ssh(
             `user_settings.ssh_tasks_dir`.
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.10.4.dist-info → fractal_server-2.10.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.10.4
+Version: 2.10.6
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.10.4.dist-info → fractal_server-2.10.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=SpR6dFPN1o2qOtKLrw5k3LkAdAJmWRd66Z2nXQfCN_4,23
+fractal_server/__init__.py,sha256=a7_sazZoCnsqPILpPj1L3cASrJQAtTkPgpVlFA0CJpY,23
 fractal_server/__main__.py,sha256=D2YTmSowmXNyvqOjW_HeItCZT2UliWlySl_owicaZg0,8026
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -160,8 +160,8 @@ fractal_server/app/schemas/v2/task_collection.py,sha256=9c_yyFcVBXdAZpQQniy1bROh
 fractal_server/app/schemas/v2/task_group.py,sha256=EPQ1WHjIA8WDrpsTfvfRESjwUVzu6jKiaKZx45b36N4,3215
 fractal_server/app/schemas/v2/workflow.py,sha256=-KWvXnbHBFA3pj5n7mfSyLKJQSqkJmoziIEe7mpLl3M,1875
 fractal_server/app/schemas/v2/workflowtask.py,sha256=FthKErVgx3a-k7WVk3nqJe1G-fl_iHND4rVrDXJ0F84,5942
-fractal_server/app/security/__init__.py,sha256=UmFnFFGM9WB_7b0itBi0b9uOIUWx_tcA2rCRaTNXErU,13778
-fractal_server/app/security/signup_email.py,sha256=hzzHxoEizl6IPVeB0j9Ek_tKIalGRxH6npzWUyGkCc4,1164
+fractal_server/app/security/__init__.py,sha256=qn6idYgl-p5HWea0gTVnz4JnkoxGEkmQjPzvKpDWT0I,14035
+fractal_server/app/security/signup_email.py,sha256=DrL51UdTSrgjleynMD5CRZwTSOpPrZ96fasRV0fvxDE,1165
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
 fractal_server/config.py,sha256=9rAzw7OO6ZeHEz-I8NJHuGoHf4xCHxfFLyRNZQD9ytY,27019
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
@@ -170,7 +170,7 @@ fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_
 fractal_server/images/__init__.py,sha256=xO6jTLE4EZKO6cTDdJsBmK9cdeh9hFTaSbSuWgQg7y4,196
 fractal_server/images/models.py,sha256=UlWazUOFQtpS3pZuROjcJXviG_Ai453jqUDHdzuvD5w,4170
 fractal_server/images/tools.py,sha256=gxeniYy4Z-cp_ToK2LHPJUTVVUUrdpogYdcBUvBuLiY,2209
-fractal_server/logger.py,sha256=zwg_AjIHkNP0ruciXjm5lI5UFP3n6tMHullsM9lDjz4,5039
+fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
 fractal_server/main.py,sha256=gStLT9Du5QMpc9SyvRvtKU21EKwp-dG4HL3zGHzE06A,4908
 fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
@@ -216,14 +216,14 @@ fractal_server/tasks/v1/utils.py,sha256=HYFyNAyZofmf--mVgdwGC5TJpGShIWIDaS01yRr4
 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=JuMplfREqrPvVEGlT5kJhcmZXC_iYlwvNlkgFrCaCC0,12107
-fractal_server/tasks/v2/local/deactivate.py,sha256=SOFtOaR5yYm3IkbOw48TrQgzEpONQ9647KvyD_zImr8,9899
-fractal_server/tasks/v2/local/reactivate.py,sha256=MeUZHx8IKrfTEf-pXlfYms8I4o-26co3jdNgSNAvw60,6053
+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/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=2XXEPpl4LS22A75v_k4Bd46k46tmnLNZfceHyPi3kXo,13457
-fractal_server/tasks/v2/ssh/deactivate.py,sha256=D8rfnC46davmDKZCipPdWZHDD4TIZ-4nr9vxZSV2aC0,11261
-fractal_server/tasks/v2/ssh/reactivate.py,sha256=cmdT2P1J0FwS1NYYRrhxHsSRyUZ5uu78hS3fDrSVbKo,7837
+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/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
@@ -238,8 +238,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=utvmBx8K9I8hRWFquxna2pBaOqe0JifDL_NVPmihEJI,3525
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.10.4.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.10.4.dist-info/METADATA,sha256=oEdEOyPOLPqYkCxgyXF1S_RKX5k4PGQWC7ZpwBmikU0,4562
-fractal_server-2.10.4.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.10.4.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.10.4.dist-info/RECORD,,
+fractal_server-2.10.6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.10.6.dist-info/METADATA,sha256=51h1I8zU4HexWwOkqbObhEXf6pFk7mqi0ET7uUUxW2g,4562
+fractal_server-2.10.6.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.10.6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.10.6.dist-info/RECORD,,