EventEntry complete state fixes

ankaios_sdk/_components/event_campaign.py

@@ -26,12 +26,6 @@
 Usage
 -----
 
-- Check current state of the followed fields:
-    .. code-block:: python
-
-        event_queue: EventQueue
-        current_state = event_queue.complete_state
-
 - Get the events out of the queue:
     .. code-block:: python
 
@@ -44,8 +38,6 @@
 
 from queue import Queue
 from .request import EventsRequest
-from .response import EventEntry
-from .complete_state import CompleteState
 
 
 class EventQueue(Queue):
@@ -66,15 +58,4 @@ def __init__(
             request_id (str): The request id of the event campaign.
         """
         super().__init__()
-        self.complete_state: CompleteState = None
         self._request_id = request_id
-
-    def add_event(self, event: EventEntry) -> None:
-        """
-        Adds an event to the queue and updates the known complete state.
-
-        Args:
-            event (EventEntry): The event to be added to the queue.
-        """
-        self.complete_state = event.complete_state
-        self.put(event)

ankaios_sdk/ankaios.py

@@ -1240,7 +1240,9 @@ def register_event(
             raise AnkaiosResponseError(f"Received error: {content}")
         if content_type == ResponseType.COMPLETE_STATE:
             self.logger.info("Event registered successfully, state received.")
-            self._events_callbacks[request.get_id()] = event_queue.add_event
+            initial_entry = EventEntry(content, [], [], [])
+            event_queue.put(initial_entry)
+            self._events_callbacks[request.get_id()] = event_queue.put
             return event_queue
         raise AnkaiosProtocolException("Received unexpected content type.")
 

tests/test_ankaios.py

@@ -1067,10 +1067,11 @@ def test_register_events():
         request = mock_send_request.call_args[0][0]
         assert isinstance(events_queue, EventQueue)
         assert len(ankaios._events_callbacks) == 1
+        assert events_queue.qsize() == 1  # Initial event
         # pylint: disable=comparison-with-callable
         assert (
             ankaios._events_callbacks[request.get_id()]
-            == events_queue.add_event
+            == events_queue.put
         )
         mock_send_request.assert_called_once()
         ankaios.logger.info.assert_called()

tests/test_event_campaign.py

@@ -48,15 +48,13 @@ def test_events_queue():
     Test the queue functionality.
     """
     events_queue = EventQueue(EventsRequest(masks=["field1"]))
-    complete_state = CompleteState(_proto=COMPLETE_STATE_PROTO)
 
-    event_entry = generate_test_event_entry(complete_state=complete_state)
-    events_queue.add_event(event_entry)
+    event_entry = generate_test_event_entry()
+    events_queue.put(event_entry)
     assert events_queue.empty() is False
     entry = events_queue.get()
     assert isinstance(entry, EventEntry)
     assert entry == event_entry
-    assert events_queue.complete_state == complete_state
 
     assert (
         str(entry) == "Event:\n  Added fields: ['field1']\n  "