Skip to content

Commit

Permalink
further cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-eq committed Nov 20, 2024
1 parent b449835 commit ca39f44
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/_ert/forward_model_runner/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
import os
import signal
import sys
import typing
from datetime import datetime
from typing import List, Sequence

from _ert.forward_model_runner import reporting
from _ert.forward_model_runner.reporting.base import Reporter
from _ert.forward_model_runner.reporting.message import (
Finish,
Message,
Expand All @@ -33,8 +32,8 @@ def _setup_reporters(
ee_token=None,
ee_cert_path=None,
experiment_id=None,
) -> typing.List[reporting.Reporter]:
reporters: typing.List[reporting.Reporter] = []
) -> List[reporting.Reporter]:
reporters: List[reporting.Reporter] = []
if is_interactive_run:
reporters.append(reporting.Interactive())
elif ens_id and experiment_id is None:
Expand Down Expand Up @@ -172,7 +171,7 @@ def handle_sigterm(*args, **kwargs):


async def handle_reporting(
reporters: typing.Iterable[Reporter],
reporters: Sequence[reporting.Reporter],
message_queue: asyncio.Queue[Message],
done: asyncio.Event,
):
Expand All @@ -196,7 +195,8 @@ async def handle_reporting(
message_queue.task_done()
if isinstance(job_status, Finish) and not job_status.success():
await let_reporters_finish(reporters)
raise ForwardModelRunnerException
print(f"{job_status.error_message=}")
raise ForwardModelRunnerException(job_status.error_message)

await let_reporters_finish(reporters)

Expand Down
2 changes: 1 addition & 1 deletion src/_ert/forward_model_runner/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ async def run(self, names_of_steps_to_run: List[str]) -> None:
)
await self.put_event(
Finish().with_error(
"Not all forward model steps completed successfully."
f"Not all forward model steps completed successfully ({status_update.error_message})."
)
)
return
Expand Down

0 comments on commit ca39f44

Please sign in to comment.