fractal-server 2.15.10a0__tar.gz → 2.15.10a1__tar.gz

{fractal_server-2.15.10a0 → fractal_server-2.15.10a1}/PKG-INFO

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

fractal_server-2.15.10a1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.15.10a1"

{fractal_server-2.15.10a0 → fractal_server-2.15.10a1}/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-2.15.10a0 → fractal_server-2.15.10a1}/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:

{fractal_server-2.15.10a0 → fractal_server-2.15.10a1}/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-2.15.10a0 → fractal_server-2.15.10a1}/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-2.15.10a0 → fractal_server-2.15.10a1}/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-2.15.10a0 → fractal_server-2.15.10a1}/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 → fractal_server-2.15.10a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.15.10a0"
+version = "2.15.10a1"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 markers = ["container", "ssh", "fails_on_macos"]
 
 [tool.bumpver]
-current_version = "2.15.10a0"
+current_version = "2.15.10a1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.15.10a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.15.10a0"