fractal-server 2.14.0a13__py3-none-any.whl → 2.14.0a15__py3-none-any.whl

fractal_server/app/runner/executors/local/runner.py

@@ -6,12 +6,16 @@ from typing import Literal
 
 from .get_local_config import LocalBackendConfig
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.runner.exceptions import TaskExecutionError
 from fractal_server.app.runner.executors.base_runner import BaseRunner
+from fractal_server.app.runner.task_files import MULTISUBMIT_PREFIX
+from fractal_server.app.runner.task_files import SUBMIT_PREFIX
 from fractal_server.app.runner.task_files import TaskFiles
 from fractal_server.app.runner.v2.db_tools import update_status_of_history_unit
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.logger import set_logger
 
+
 logger = set_logger(__name__)
 
 
@@ -65,6 +69,8 @@ class LocalRunner(BaseRunner):
         workdir_local = task_files.wftask_subfolder_local
         workdir_local.mkdir()
 
+        task_files.prefix = SUBMIT_PREFIX
+
         # SUBMISSION PHASE
         future = self.executor.submit(
             func,
@@ -85,15 +91,13 @@ class LocalRunner(BaseRunner):
                     )
                 return result, None
             except Exception as e:
-                exception = e
                 logger.debug("[submit] END with exception")
                 update_status_of_history_unit(
                     history_unit_id=history_unit_id,
                     status=HistoryUnitStatus.FAILED,
                     db_sync=db,
                 )
-
-                return None, exception
+                return None, TaskExecutionError(str(e))
 
     def multisubmit(
         self,
@@ -151,12 +155,14 @@ class LocalRunner(BaseRunner):
             active_futures: dict[int, Future] = {}
             for ind_within_chunk, kwargs in enumerate(list_parameters_chunk):
                 positional_index = ind_chunk + ind_within_chunk
+                current_task_files = list_task_files[positional_index]
+                current_task_files.prefix = (
+                    f"{MULTISUBMIT_PREFIX}-{positional_index:06d}"
+                )
                 future = self.executor.submit(
                     func,
                     parameters=kwargs,
-                    remote_files=list_task_files[
-                        positional_index
-                    ].remote_files_dict,
+                    remote_files=current_task_files.remote_files_dict,
                 )
                 active_futures[positional_index] = future
 
@@ -189,7 +195,9 @@ class LocalRunner(BaseRunner):
                                 )
 
                         except Exception as e:
-                            exceptions[positional_index] = e
+                            exceptions[positional_index] = TaskExecutionError(
+                                str(e)
+                            )
                             if task_type == "parallel":
                                 update_status_of_history_unit(
                                     history_unit_id=current_history_unit_id,

fractal_server/app/runner/executors/slurm_common/_handle_exception_proxy.py

@@ -0,0 +1,17 @@
+from fractal_server.app.runner.exceptions import JobExecutionError
+from fractal_server.app.runner.exceptions import TaskExecutionError
+
+
+def _handle_exception_proxy(proxy):  # FIXME
+    if proxy.exc_type_name == "JobExecutionError":
+        return JobExecutionError(str(proxy))
+    else:
+        kwargs = {}
+        for key in [
+            "workflow_task_id",
+            "workflow_task_order",
+            "task_name",
+        ]:
+            if key in proxy.kwargs.keys():
+                kwargs[key] = proxy.kwargs[key]
+        return TaskExecutionError(proxy.tb, **kwargs)