fractal-server 2.4.1__tar.gz → 2.4.2__tar.gz

{fractal_server-2.4.1 → fractal_server-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.4.1
+Version: 2.4.2
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.4.2/fractal_server/__init__.py

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

{fractal_server-2.4.1 → fractal_server-2.4.2}/fractal_server/__main__.py

@@ -88,12 +88,11 @@ def set_db():
     alembic.config.main(argv=alembic_args)
     print("END: alembic.config")
     # Insert default group
-    print("START: Default group creation")
+    print()
     _create_first_group()
-    print("END: Default group creation")
+    print()
     # NOTE: It will be fixed with #1739
     settings = Inject(get_settings)
-    print("START: First user creation")
     asyncio.run(
         _create_first_user(
             email=settings.FRACTAL_DEFAULT_ADMIN_EMAIL,
@@ -103,7 +102,7 @@ def set_db():
             is_verified=True,
         )
     )
-    print("END: First user creation")
+    print()
 
 
 def update_db_data():

{fractal_server-2.4.1 → fractal_server-2.4.2}/fractal_server/app/runner/executors/slurm/sudo/_subprocess_run_as_user.py

@@ -49,7 +49,7 @@ def _run_command_as_user(
     """
     logger.debug(f'[_run_command_as_user] {user=}, cmd="{cmd}"')
     if user:
-        new_cmd = f"sudo --non-interactive -u {user} {cmd}"
+        new_cmd = f"sudo --set-home --non-interactive -u {user} {cmd}"
     else:
         new_cmd = cmd
     res = subprocess.run(  # nosec

{fractal_server-2.4.1 → fractal_server-2.4.2}/fractal_server/app/runner/executors/slurm/sudo/executor.py

@@ -1134,7 +1134,7 @@ class FractalSlurmExecutor(SlurmExecutor):
             f.write(sbatch_script)
 
         # Prepare submission command
-        pre_command = f"sudo --non-interactive -u {self.slurm_user}"
+        pre_command = f"sudo --set-home --non-interactive -u {self.slurm_user}"
         submit_command = f"sbatch --parsable {job.slurm_script}"
         full_command = f"{pre_command} {submit_command}"
 

{fractal_server-2.4.1 → fractal_server-2.4.2}/fractal_server/app/security/__init__.py

@@ -55,9 +55,9 @@ from fractal_server.app.models import OAuthAccount
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.schemas.user import UserCreate
-from fractal_server.logger import get_logger
+from fractal_server.logger import set_logger
 
-logger = get_logger(__name__)
+logger = set_logger(__name__)
 
 FRACTAL_DEFAULT_GROUP_NAME = "All"
 
@@ -264,9 +264,10 @@ async def _create_first_user(
         is_verified: `True` if the new user is verifie
         username:
     """
+    function_logger = set_logger("fractal_server.create_first_user")
+    function_logger.info(f"START _create_first_user, with email '{email}'")
     try:
         async with get_async_session_context() as session:
-
             if is_superuser is True:
                 # If a superuser already exists, exit
                 stm = select(UserOAuth).where(  # noqa
@@ -275,9 +276,9 @@ async def _create_first_user(
                 res = await session.execute(stm)
                 existing_superuser = res.scalars().first()
                 if existing_superuser is not None:
-                    logger.info(
-                        f"{existing_superuser.email} superuser already exists,"
-                        f" skip creation of {email}"
+                    function_logger.info(
+                        f"'{existing_superuser.email}' superuser already "
+                        f"exists, skip creation of '{email}'"
                     )
                     return None
 
@@ -292,15 +293,19 @@ async def _create_first_user(
                     if username is not None:
                         kwargs["username"] = username
                     user = await user_manager.create(UserCreate(**kwargs))
-                    logger.info(f"User {user.email} created")
+                    function_logger.info(f"User '{user.email}' created")
 
     except UserAlreadyExists:
-        logger.warning(f"User {email} already exists")
+        function_logger.warning(f"User '{email}' already exists")
+    finally:
+        function_logger.info(f"END   _create_first_user, with email '{email}'")
 
 
 def _create_first_group():
-    logger.info(
-        f"START _create_first_group, with name {FRACTAL_DEFAULT_GROUP_NAME}"
+    function_logger = set_logger("fractal_server.create_first_group")
+
+    function_logger.info(
+        f"START _create_first_group, with name '{FRACTAL_DEFAULT_GROUP_NAME}'"
     )
     with next(get_sync_db()) as db:
         group_all = db.execute(select(UserGroup))
@@ -308,11 +313,13 @@ def _create_first_group():
             first_group = UserGroup(name=FRACTAL_DEFAULT_GROUP_NAME)
             db.add(first_group)
             db.commit()
-            logger.info(f"Created group {FRACTAL_DEFAULT_GROUP_NAME}")
+            function_logger.info(
+                f"Created group '{FRACTAL_DEFAULT_GROUP_NAME}'"
+            )
         else:
-            logger.info(
-                f"Group {FRACTAL_DEFAULT_GROUP_NAME} already exists, skip."
+            function_logger.info(
+                f"Group '{FRACTAL_DEFAULT_GROUP_NAME}' already exists, skip."
             )
-    logger.info(
-        f"END   _create_first_group, with name {FRACTAL_DEFAULT_GROUP_NAME}"
+    function_logger.info(
+        f"END   _create_first_group, with name '{FRACTAL_DEFAULT_GROUP_NAME}'"
     )

{fractal_server-2.4.1 → fractal_server-2.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.4.1"
+version = "2.4.2"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -92,7 +92,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.4.1"
+current_version = "2.4.2"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.4.1/fractal_server/__init__.py

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