fractal-server 2.15.10a0__py3-none-any.whl → 2.15.10a2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.15.10a0"
+__VERSION__ = "2.15.10a2"

fractal_server/app/runner/v2/runner.py

@@ -256,13 +256,6 @@ def execute_tasks_v2(
             }
             num_tasks = 0
 
-        # Store the SLURM error in the job database
-        with next(get_sync_db()) as db:
-            job_db = db.get(JobV2, job_id)
-            job_db.executor_error_log = runner.executor_error_log
-            db.merge(job_db)
-            db.commit()
-
         # POST TASK EXECUTION
         try:
             non_failed_task_outputs = [
@@ -443,6 +436,16 @@ def execute_tasks_v2(
             db.commit()
             db.close()  # NOTE: this is needed, but the reason is unclear
 
+            # Store the SLURM error in the job database
+            job_db = db.get(JobV2, job_id)
+            job_db.executor_error_log = runner.executor_error_log
+            logger.debug(
+                f"Setting JobV2[{job_id}].executor_error_log "
+                f"to '{job_db.executor_error_log}'."
+            )
+            db.merge(job_db)
+            db.commit()
+
             # Create accounting record
             record = AccountingRecord(
                 user_id=user_id,

fractal_server/app/runner/v2/submit_workflow.py

@@ -51,6 +51,7 @@ def fail_job(
     if emit_log:
         logger.error(log_msg)
     reset_logger_handlers(logger)
+    job = db.get(JobV2, job.id)  # refetch, in case it was updated
     job.status = JobStatusTypeV2.FAILED
     job.end_timestamp = get_timestamp()
     job.log = log_msg
@@ -302,6 +303,7 @@ def submit_workflow(
         logger.debug(f'END workflow "{workflow.name}"')
 
         # Update job DB entry
+        job = db_sync.get(JobV2, job_id)  # refetch, in case it was updated
         job.status = JobStatusTypeV2.DONE
         job.end_timestamp = get_timestamp()
         with log_file_path.open("r") as f:
@@ -341,5 +343,7 @@ def submit_workflow(
 
     finally:
         reset_logger_handlers(logger)
+        # refetch, in case it is not already available
+        job = db_sync.get(JobV2, job_id)
         db_sync.close()
         _zip_folder_to_file_and_remove(folder=job.working_dir)

fractal_server/config.py

@@ -579,11 +579,6 @@ class Settings(BaseSettings):
         else:
             return "--no-cache-dir"
 
-    FRACTAL_MAX_PIP_VERSION: str = "25.2"
-    """
-    Maximum value at which to update `pip` before performing task collection.
-    """
-
     FRACTAL_VIEWER_AUTHORIZATION_SCHEME: Literal[
         "viewer-paths", "users-folders", "none"
     ] = "none"

fractal_server/tasks/v2/templates/2_pip_install.sh

@@ -10,7 +10,6 @@ PACKAGE_ENV_DIR=__PACKAGE_ENV_DIR__
 INSTALL_STRING="__INSTALL_STRING__"
 PINNED_PACKAGE_LIST_PRE="__PINNED_PACKAGE_LIST_PRE__"
 PINNED_PACKAGE_LIST_POST="__PINNED_PACKAGE_LIST_POST__"
-FRACTAL_MAX_PIP_VERSION="__FRACTAL_MAX_PIP_VERSION__"
 FRACTAL_PIP_CACHE_DIR_ARG="__FRACTAL_PIP_CACHE_DIR_ARG__"
 
 TIME_START=$(date +%s)
@@ -19,8 +18,7 @@ VENVPYTHON=${PACKAGE_ENV_DIR}/bin/python
 
 # Upgrade `pip` and install `setuptools`
 write_log "START upgrade pip and install setuptools"
-"$VENVPYTHON" -m pip install ${FRACTAL_PIP_CACHE_DIR_ARG} "pip<=${FRACTAL_MAX_PIP_VERSION}" --upgrade
-"$VENVPYTHON" -m pip install ${FRACTAL_PIP_CACHE_DIR_ARG} setuptools
+"$VENVPYTHON" -m pip install ${FRACTAL_PIP_CACHE_DIR_ARG} pip setuptools --upgrade
 write_log "END   upgrade pip and install setuptools"
 echo
 

fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh

@@ -8,7 +8,6 @@ write_log(){
 # Variables to be filled within fractal-server
 PACKAGE_ENV_DIR=__PACKAGE_ENV_DIR__
 PIP_FREEZE_FILE=__PIP_FREEZE_FILE__
-FRACTAL_MAX_PIP_VERSION=__FRACTAL_MAX_PIP_VERSION__
 FRACTAL_PIP_CACHE_DIR_ARG="__FRACTAL_PIP_CACHE_DIR_ARG__"
 
 TIME_START=$(date +%s)
@@ -17,8 +16,7 @@ VENVPYTHON=${PACKAGE_ENV_DIR}/bin/python
 
 # Upgrade `pip` and install `setuptools`
 write_log "START upgrade pip and install setuptools"
-"$VENVPYTHON" -m pip install ${FRACTAL_PIP_CACHE_DIR_ARG} "pip<=${FRACTAL_MAX_PIP_VERSION}" --upgrade
-"$VENVPYTHON" -m pip install ${FRACTAL_PIP_CACHE_DIR_ARG} setuptools
+"$VENVPYTHON" -m pip install ${FRACTAL_PIP_CACHE_DIR_ARG} pip setuptools --upgrade
 write_log "END   upgrade pip and install setuptools"
 echo
 

fractal_server/tasks/v2/utils_templates.py

@@ -93,10 +93,6 @@ def get_collection_replacements(
         ("__PACKAGE_ENV_DIR__", task_group.venv_path),
         ("__PYTHON__", python_bin),
         ("__INSTALL_STRING__", task_group.pip_install_string),
-        (
-            "__FRACTAL_MAX_PIP_VERSION__",
-            settings.FRACTAL_MAX_PIP_VERSION,
-        ),
         ("__FRACTAL_PIP_CACHE_DIR_ARG__", settings.PIP_CACHE_DIR_ARG),
         (
             "__PINNED_PACKAGE_LIST_PRE__",

{fractal_server-2.15.10a0.dist-info → fractal_server-2.15.10a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.15.10a0
+Version: 2.15.10a2
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin

{fractal_server-2.15.10a0.dist-info → fractal_server-2.15.10a2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=ZeYOB3HonBjDHE69pjAH9kiI5pyCycjD5zz9wrVQ4QA,26
+fractal_server/__init__.py,sha256=OXJ1IQcsAqThDeI77mxXoVQ6l_Epw75B8RINw_5nxCQ,26
 fractal_server/__main__.py,sha256=rkM8xjY1KeS3l63irB8yCrlVobR-73uDapC4wvrIlxI,6957
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,9 +103,9 @@ fractal_server/app/runner/v2/_slurm_sudo.py,sha256=Gvsh4tUlc1_3KdF3B7zEqs-YIntC_
 fractal_server/app/runner/v2/db_tools.py,sha256=ozp4RFLB3LNI0rM0q0udi6ja8-5vooH_dVqrbmTPNDg,3323
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
 fractal_server/app/runner/v2/merge_outputs.py,sha256=YOTKbGOM9s-uqY4KN2onoIxuHNm-v3hr5zv6Aa1KEtA,905
-fractal_server/app/runner/v2/runner.py,sha256=3ueCWyYpDEMzakMwn_VLC1lEgUSEUqIGBfERpfqUTag,19297
+fractal_server/app/runner/v2/runner.py,sha256=IrC4f0SaaFdN3iKoVa7XK87Gb8f9GSLjhImtvwNODCM,19417
 fractal_server/app/runner/v2/runner_functions.py,sha256=xteoDSXKxStl3ABEXyjrggPiXdXAPy9sJPfT3B8CQ3Y,19050
-fractal_server/app/runner/v2/submit_workflow.py,sha256=L6WqQC3Vm-tLe_CJXHIMbYLAeulAN2no_4HZD4cbhR0,12554
+fractal_server/app/runner/v2/submit_workflow.py,sha256=wHBlUxoD2HZ_oKWBMpGH0B5jqSuiLcIH3uXYWGAwfa8,12793
 fractal_server/app/runner/v2/task_interface.py,sha256=BRSKpitGproY48JQdCbfrghbDonA-EqPP1yIopohpPo,2525
 fractal_server/app/runner/versions.py,sha256=4BW-8Et8RVgILgpFoUJLWkEnZz53pv8hv_2ucG480ns,398
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
@@ -129,7 +129,7 @@ fractal_server/app/schemas/v2/workflowtask.py,sha256=6eweAMyziwaoMT-7R1fVJYunIeZ
 fractal_server/app/security/__init__.py,sha256=oJ8RVglpOvWPQY4RokiE2YA72Nqo42dZEjywWTt8xr8,14032
 fractal_server/app/security/signup_email.py,sha256=Xd6QYxcdmg0PHpDwmUE8XQmPcOj3Xjy5oROcIMhmltM,1472
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
-fractal_server/config.py,sha256=vNaDkzjqOzQMQyNVCWJ9qNMvfXKDuk2L0mMTPGzX79U,29505
+fractal_server/config.py,sha256=1urzZC54g7CKRFKbfCPZqQrAc-JMmKoMTWxhx3qqIv0,29368
 fractal_server/data_migrations/2_14_10.py,sha256=jzMg2c1zNO8C_Nho_9_EZJD6kR1-gkFNpNrMR5Hr8hM,1598
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
@@ -211,11 +211,11 @@ fractal_server/tasks/v2/ssh/deactivate_pixi.py,sha256=K0yK_NPUqhFMj6cp6G_0Kfn0Yo
 fractal_server/tasks/v2/ssh/reactivate.py,sha256=NJIgMNFKaXMhbvK0iZOsMwMtsms6Boj9f8N4L01X9Bo,8271
 fractal_server/tasks/v2/ssh/reactivate_pixi.py,sha256=UOlG01wOv-eQCtUxSwphEY-Ey7OoUm5PMCSP9J-i1rY,10323
 fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
-fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=fabqylWdCZtI9YaD4QUvY5O_cRcVOrPkdFxHhvIWBO0,2297
+fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=vN9DX-eucJjB-XCuQuZmkuATGBzL4FlDQJTQdVewJG8,2155
 fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
 fractal_server/tasks/v2/templates/4_pip_show.sh,sha256=qm1vPy6AkKhWDjCJGXS8LqCLYO3KsAyRK325ZsFcF6U,1747
 fractal_server/tasks/v2/templates/5_get_venv_size_and_file_number.sh,sha256=q-6ZUvA6w6FDVEoSd9O63LaJ9tKZc7qAFH72SGPrd_k,284
-fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh,sha256=A2y8RngEjAcRhG-_owA6P7tAdrS_AszFuGXnaeMV8u0,1122
+fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh,sha256=jHoALPagSCD1_HuqrxEYibWAJNOUxQGm-A2oE3f_LPE,982
 fractal_server/tasks/v2/templates/pixi_1_extract.sh,sha256=Jdy5OyKo2jxe_qIDB9Zi4a0FL0cMBysxvBPHlUrARQM,1099
 fractal_server/tasks/v2/templates/pixi_2_install.sh,sha256=h6-M101Q1AdAfZNZyPfSUc8AlZ-uS84Hae4vJdDSglY,1601
 fractal_server/tasks/v2/templates/pixi_3_post_install.sh,sha256=99J8KXkNeQk9utuEtUxfAZS6VCThC32X7I7HAp2gdTU,2501
@@ -224,7 +224,7 @@ fractal_server/tasks/v2/utils_database.py,sha256=yi7793Uue32O59OBVUgomO42oUrVKdS
 fractal_server/tasks/v2/utils_package_names.py,sha256=RDg__xrvQs4ieeVzmVdMcEh95vGQYrv9Hfal-5EDBM8,2393
 fractal_server/tasks/v2/utils_pixi.py,sha256=tqCnxMdxs7KGWncWvk0alrdvDbX-w77P3fAot68Bqh4,3257
 fractal_server/tasks/v2/utils_python_interpreter.py,sha256=kF86UClk6HxghRLDYY4rKOXwnWGUYQfrNsVNxOmOGxM,964
-fractal_server/tasks/v2/utils_templates.py,sha256=Ny-62q95NqgrzfS1UniijfeO8KUaEgyiNxWxRY2l2l8,3651
+fractal_server/tasks/v2/utils_templates.py,sha256=BU2F2Hn0At-QjtUc6-BmU9CAsL3ljqvVv7cGxrsFluc,3541
 fractal_server/types/__init__.py,sha256=aA_8J1xXzuiLqpwO_Qf18-qzaRcYkHzevhH_T-diXWM,2026
 fractal_server/types/validators/__init__.py,sha256=5uj6KJ9MelFZgyoq3MzXLhgWCl0yiriS7XKmb0gathg,392
 fractal_server/types/validators/_common_validators.py,sha256=MpxyaP2kwgbyCTOaVRjYnJ74Lfi0f2X0q3rjX9w3vTk,1170
@@ -233,8 +233,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=Vn35lApt1T1J8nc09sAVqd10Cy0sa3dLipcljI-hkuk,2185
 fractal_server/zip_tools.py,sha256=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.15.10a0.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.15.10a0.dist-info/METADATA,sha256=RmShfyZgv2QeI_UbVOnSH0GAndEUmCUsyr5XuaWehGE,4337
-fractal_server-2.15.10a0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-fractal_server-2.15.10a0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.15.10a0.dist-info/RECORD,,
+fractal_server-2.15.10a2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.15.10a2.dist-info/METADATA,sha256=z9Zc4RpcoHZQc06j9JhKKzjOtdVcdM21PlH_RR3wU4o,4337
+fractal_server-2.15.10a2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+fractal_server-2.15.10a2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.15.10a2.dist-info/RECORD,,