fractal-server 2.4.0a2__py3-none-any.whl → 2.4.2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.4.0a2"
+__VERSION__ = "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/app/routes/auth/users.py

@@ -151,6 +151,11 @@ async def patch_user(
                     "reason": e.reason,
                 },
             )
+        except exceptions.UserAlreadyExists:
+            raise HTTPException(
+                status.HTTP_400_BAD_REQUEST,
+                detail=ErrorCode.UPDATE_USER_EMAIL_ALREADY_EXISTS,
+            )
     else:
         # Nothing to do, just continue
         patched_user = user_to_patch

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/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/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.0a2.dist-info → fractal_server-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.4.0a2
+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.0a2.dist-info → fractal_server-2.4.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fractal_server/__init__.py,sha256=LqB8PB8-x2CZLC5OUrNdxwSPLBLIrriGxEQXweZeNSc,24
-fractal_server/__main__.py,sha256=I9hF_SYc-GTZWDZZhihwyUBK7BMU5GAecbPLTjkpW4U,5830
+fractal_server/__init__.py,sha256=ahWw3pwB7t1_-BJaAAlCiD70Oi6bdhi1gUXGpXaDLzM,22
+fractal_server/__main__.py,sha256=upYBkGYrkBnkS1rp4D_nb_1LS37QT4j-wxGX1ZMvR4A,5704
 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=KpS_mfmRfew0kieFDlwkSrDFvpzxftcvPALBBZ0LxsY,4048
@@ -59,7 +59,7 @@ fractal_server/app/routes/auth/login.py,sha256=tSu6OBLOieoBtMZB4JkBAdEgH2Y8KqPGS
 fractal_server/app/routes/auth/oauth.py,sha256=AnFHbjqL2AgBX3eksI931xD6RTtmbciHBEuGf9YJLjU,1895
 fractal_server/app/routes/auth/register.py,sha256=DlHq79iOvGd_gt2v9uwtsqIKeO6i_GKaW59VIkllPqY,587
 fractal_server/app/routes/auth/router.py,sha256=zWoZWiO69U48QFQf5tLRYQDWu8PUCj7GacnaFeW1n_I,618
-fractal_server/app/routes/auth/users.py,sha256=hNTIR0e3QFbUUDvkzKNXJt4uKwONlI36i6UjjMPCgAA,6672
+fractal_server/app/routes/auth/users.py,sha256=5S_TD3elAeX0TBcvsME0i2_bSXEIGSuTrjRSOPPs3o0,6876
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=q-RCiW17yXnZKAC_0La52RLvhqhxuvbgQJ2MlGXOj8A,702
 fractal_server/app/routes/aux/_runner.py,sha256=FdCVla5DxGAZ__aB7Z8dEJzD_RIeh5tftjrPyqkr8N8,895
@@ -81,8 +81,8 @@ fractal_server/app/runner/executors/slurm/ssh/executor.py,sha256=oCc5cLZoNmJ3ENV
 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=z5LlhaiqAb8pHsF1WwdzXN39C5anQmwjo1rSQgtRAYE,4422
-fractal_server/app/runner/executors/slurm/sudo/_subprocess_run_as_user.py,sha256=uZgmxP0ZneGpzTVt-GT-6EgNKUh1sW2-QH7LFYc1tNI,5132
-fractal_server/app/runner/executors/slurm/sudo/executor.py,sha256=74jfNauDgQOdcILHcCLJM4Awm_SThsZYgc0Vwx0hnB8,48460
+fractal_server/app/runner/executors/slurm/sudo/_subprocess_run_as_user.py,sha256=0wRA-hg0JxVrFw4rBXAu6P2L2dbwzx2N_kUmpil1ErU,5143
+fractal_server/app/runner/executors/slurm/sudo/executor.py,sha256=6D83o4BE5D-1LZ3BhfEmhWJ1DZrk3Vzg-b3tB5TWMAU,48471
 fractal_server/app/runner/extract_archive.py,sha256=tLpjDrX47OjTNhhoWvm6iNukg8KoieWyTb7ZfvE9eWU,2483
 fractal_server/app/runner/filenames.py,sha256=9lwu3yB4C67yiijYw8XIKaLFn3mJUt6_TCyVFM_aZUQ,206
 fractal_server/app/runner/run_subprocess.py,sha256=KTkJnWLrLQdR2WRJ3jGu0RBu4330L3mtCAE_B0wDx3M,818
@@ -149,7 +149,7 @@ fractal_server/app/schemas/v2/task.py,sha256=7IfxiZkaVqlARy7WYE_H8m7j_IEcuQaZORU
 fractal_server/app/schemas/v2/task_collection.py,sha256=8PG1bOqkfQqORMN0brWf6mHDmijt0bBW-mZsF7cSxUs,6129
 fractal_server/app/schemas/v2/workflow.py,sha256=Zzx3e-qgkH8le0FUmAx9UrV5PWd7bj14PPXUh_zgZXM,1827
 fractal_server/app/schemas/v2/workflowtask.py,sha256=atVuVN4aXsVEOmSd-vyg-8_8OnPmqx-gT75rXcn_AlQ,6552
-fractal_server/app/security/__init__.py,sha256=FBxdrMvn2s3Gdmp1orqOpYji87JojLBzr9TMfblj1SI,11441
+fractal_server/app/security/__init__.py,sha256=vuAE0sg2er0I2PAf7xCUHcxbMgxV1d8y6oJjO98n86o,11858
 fractal_server/config.py,sha256=R0VezSe2PEDjQjHEX2V29A1jMdoomdyECBjWNY15v_0,25049
 fractal_server/data_migrations/2_4_0.py,sha256=T1HRRWp9ZuXeVfBY6NRGxQ8aNIHVSftOMnB-CMrfvi8,2117
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
@@ -207,8 +207,8 @@ fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kq
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
 fractal_server/zip_tools.py,sha256=xYpzBshysD2nmxkD5WLYqMzPYUcCRM3kYy-7n9bJL-U,4426
-fractal_server-2.4.0a2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.4.0a2.dist-info/METADATA,sha256=ujcw0RxpRcxYPLLI1NdkZ8v0IaKQP3d3D_CXsaxua4U,4630
-fractal_server-2.4.0a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.4.0a2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.4.0a2.dist-info/RECORD,,
+fractal_server-2.4.2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.4.2.dist-info/METADATA,sha256=rhvEtARu8BKU2hg2lsbhXA7NLqDXTtvWEenYBpXExmg,4628
+fractal_server-2.4.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.4.2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.4.2.dist-info/RECORD,,