Skip to content

Commit 4d288fd

Browse files
committed
Remove ZMQ client from LegacyEnsemble
This commit changes LegacyEnsemble to put events directly in scheduler queue rather than sending it over ZMQ.
1 parent 87d29bb commit 4d288fd

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

src/ert/ensemble_evaluator/_ensemble.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
FMEvent,
1717
ForwardModelStepFailure,
1818
ForwardModelStepSuccess,
19-
event_to_json,
2019
)
21-
from _ert.forward_model_runner.client import Client
2220
from ert.config import ForwardModelStep, QueueConfig
2321
from ert.run_arg import RunArg
2422
from ert.scheduler import Scheduler, create_driver
@@ -185,14 +183,9 @@ def update_snapshot(self, events: Sequence[Event]) -> EnsembleSnapshot:
185183

186184
return snapshot_mutate_event
187185

188-
async def send_event(
189-
self,
190-
event: Event,
191-
retries: int = 10,
192-
) -> None:
193-
assert self._config is not None
194-
async with Client(self._config.get_uri(), token=self._config.token) as client:
195-
await client.send(event_to_json(event), retries)
186+
async def send_event(self, event: Event) -> None:
187+
if self.outbound_event_queue is not None:
188+
await self.outbound_event_queue.put(event)
196189

197190
async def evaluate(
198191
self,
@@ -209,6 +202,7 @@ async def evaluate(
209202
the final result of executing all its jobs through a scheduler and driver.
210203
"""
211204
self._config = config
205+
self.outbound_event_queue = scheduler_queue
212206

213207
if not self.id_:
214208
raise ValueError("Ensemble id not set")

tests/ert/unit_tests/ensemble_evaluator/test_ensemble_legacy.py

-8
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,6 @@ async def test_queue_config_properties_propagated_to_scheduler(
114114
monkeypatch.setattr(QueueConfig, "max_running", 44)
115115
ensemble._queue_config.max_submit = 55
116116

117-
async def mock_send_event_method(*args, **kwargs):
118-
return
119-
120-
monkeypatch.setattr(
121-
"ert.ensemble_evaluator._ensemble.LegacyEnsemble.send_event",
122-
mock_send_event_method,
123-
)
124-
125117
# The function under test:
126118
await ensemble.evaluate(config=MagicMock())
127119

0 commit comments

Comments
 (0)