fixup: change end of events sentinels

src/_ert_forward_model_runner/reporting/event.py

@@ -5,7 +5,7 @@
 import threading
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Type, Union
+from typing import Final, Type, Union
 
 from _ert import events
 from _ert.events import (
@@ -37,6 +37,10 @@
 logger = logging.getLogger(__name__)
 
 
+class EndOfEventsSentinel:
+    pass
+
+
 class Event(Reporter):
     """
     The Event reporter forwards events, coming from the running job, added with
@@ -53,7 +57,7 @@ class Event(Reporter):
     before stopping the reporter. Any remaining events will not be sent.
     """
 
-    _sentinel: None = None
+    _sentinel: Final = EndOfEventsSentinel()
 
     def __init__(self, evaluator_url, token=None, cert_path=None):
         self._evaluator_url = evaluator_url

src/ert/ensemble_evaluator/monitor.py

@@ -2,7 +2,7 @@
 import logging
 import ssl
 import uuid
-from typing import TYPE_CHECKING, Any, AsyncGenerator, Optional, Union
+from typing import TYPE_CHECKING, Any, AsyncGenerator, Final, Optional, Type, Union
 
 from aiohttp import ClientError
 from websockets import ConnectionClosed, Headers, WebSocketClientProtocol
@@ -30,10 +30,12 @@ class CloseTrackerEvent:
 
 
 class Monitor:
+    _sentinel: Final = CloseTrackerEvent()
+
     def __init__(self, ee_con_info: "EvaluatorConnectionInfo") -> None:
         self._ee_con_info = ee_con_info
         self._id = str(uuid.uuid1()).split("-", maxsplit=1)[0]
-        self._event_queue: asyncio.Queue[Union[Event, CloseTrackerEvent]] = (
+        self._event_queue: asyncio.Queue[Union[Event, Type[Monitor._sentinel]]] = (
             asyncio.Queue()
         )
         self._connection: Optional[WebSocketClientProtocol] = None
@@ -71,7 +73,7 @@ async def __aexit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None
     async def signal_cancel(self) -> None:
         if not self._connection:
             return
-        await self._event_queue.put(CloseTrackerEvent())
+        await self._event_queue.put(Monitor._sentinel)
         logger.debug(f"monitor-{self._id} asking server to cancel...")
 
         cancel_event = EEUserCancel(monitor=self._id)
@@ -81,7 +83,7 @@ async def signal_cancel(self) -> None:
     async def signal_done(self) -> None:
         if not self._connection:
             return
-        await self._event_queue.put(CloseTrackerEvent())
+        await self._event_queue.put(Monitor._sentinel)
         logger.debug(f"monitor-{self._id} informing server monitor is done...")
 
         done_event = EEUserDone(monitor=self._id)
@@ -108,7 +110,7 @@ async def track(
                     logger.error("Evaluator did not send the TERMINATED event!")
                     break
                 event = None
-            if isinstance(event, CloseTrackerEvent):
+            if event is Monitor._sentinel:
                 closetracker_received = True
                 _heartbeat_interval = self._receiver_timeout
             else: