Change error message shown when experiment is terminated by user

Author: JHolba

src/ert/run_models/base_run_model.py

@@ -94,6 +94,10 @@ def delete_runpath(run_path: str) -> None:
         shutil.rmtree(run_path)
 
 
+class _UserCancelled(Exception):
+    pass
+
+
 class _LogAggregration(logging.Handler):
     def __init__(self, messages: MutableSequence[str]) -> None:
         self.messages = messages
@@ -571,7 +575,7 @@ async def run_monitor(
                             # Allow track() to emit an EndEvent.
                             return False
                     elif type(event) is EETerminated:
-                        logger.debug("got terminator event")
+                        logger.debug("got terminated event")
 
                     if not self._end_queue.empty():
                         logger.debug("Run model canceled - during evaluation")
@@ -594,11 +598,12 @@ async def run_ensemble_evaluator_async(
         run_args: list[RunArg],
         ensemble: Ensemble,
         ee_config: EvaluatorServerConfig,
-    ) -> list[int]:
+    ) -> list[int] | _UserCancelled:
         if not self._end_queue.empty():
             logger.debug("Run model canceled - pre evaluation")
             self._end_queue.get()
-            return []
+            return _UserCancelled()
+
         ee_ensemble = self._build_ensemble(run_args, ensemble.experiment_id)
         evaluator = EnsembleEvaluator(
             ee_ensemble,
@@ -610,7 +615,7 @@ async def run_ensemble_evaluator_async(
         await evaluator._server_started
         if not (await self.run_monitor(ee_config, ensemble.iteration)):
             await evaluator_task
-            return []
+            return _UserCancelled()
 
         logger.debug("observed that model was finished, waiting tasks completion...")
         # The model has finished, we indicate this by sending a DONE
@@ -620,7 +625,8 @@ async def run_ensemble_evaluator_async(
             logger.debug("Run model canceled - post evaluation")
             self._end_queue.get()
             await evaluator_task
-            return []
+            return _UserCancelled()
+
         await evaluator_task
         ensemble.refresh_ensemble_state()
 
@@ -633,11 +639,10 @@ def run_ensemble_evaluator(
         run_args: list[RunArg],
         ensemble: Ensemble,
         ee_config: EvaluatorServerConfig,
-    ) -> list[int]:
-        successful_realizations = asyncio.run(
+    ) -> list[int] | _UserCancelled:
+        return asyncio.run(
             self.run_ensemble_evaluator_async(run_args, ensemble, ee_config)
         )
-        return successful_realizations
 
     def _build_ensemble(
         self,
@@ -757,11 +762,16 @@ def _evaluate_and_postprocess(
                 "run_paths": self.run_paths,
             },
         )
-        successful_realizations = self.run_ensemble_evaluator(
+        result = self.run_ensemble_evaluator(
             run_args,
             ensemble,
             evaluator_server_config,
         )
+        if type(result) is _UserCancelled:
+            self.active_realizations = [False for _ in self.active_realizations]
+            raise _UserCancelled("Experiment cancelled by user")
+        successful_realizations = cast(list[int], result)
+
         starting_realizations = [real.iens for real in run_args if real.active]
         failed_realizations = list(
             set(starting_realizations) - set(successful_realizations)