fractal-server 2.10.4__tar.gz → 2.10.6__tar.gz

{fractal_server-2.10.4 → fractal_server-2.10.6}/PKG-INFO

@@ -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.6/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.10.6"

{fractal_server-2.10.4 → fractal_server-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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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-2.10.4 → fractal_server-2.10.6}/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 → fractal_server-2.10.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.10.4"
+version = "2.10.6"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -64,7 +64,7 @@ pytest = "8.1.*"
 httpx = "^0.23"
 devtools = "^0.12"
 pytest-asyncio = "^0.23"
-bumpver = "^2022.1120"
+bumpver = ">=2024.0"
 pre-commit = "^2.19"
 coverage = {extras = ["toml"], version = "7.5.*"}
 pytest-docker = {version = "3.1.*"}
@@ -95,7 +95,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.10.4"
+current_version = "2.10.6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true
@@ -114,7 +114,10 @@ push = true
 branch = true
 parallel = true
 relative_files = true
-omit = ["tests/*", "benchmarks/*", "fractal_server/json_schemas/*"]
+omit = ["tests/*", "benchmarks/*", "fractal_server/json_schemas/*", "*/.venv/*"]
+
+[tool.coverage.report]
+omit = ["tests/*", "benchmarks/*", "fractal_server/json_schemas/*", "*/.venv/*"]
 
 [tool.mypy.overrides]
 module = ["devtools", "uvicorn", "pytest", "asgi_lifespan", "asyncpg"]

fractal_server-2.10.4/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.10.4"