Merge pull request #26 from FusRoman/issue/25/bug_empty_skymap

fix bug when skymap is empty in gw_score

Author: FusRoman

pdm.lock

@@ -1,6 +1,6 @@
 [project]
 name = "grandma-gcn"
-version = "6.2.1"
+version = "6.2.2"
 description = "Automated ingestion, analysis, and distribution of gravitational wave (GW) alerts for the GRANDMA collaboration. Provides real-time GCN alert processing, observation strategy generation (gwemopt), Slack and OwnCloud integration, and Celery-based automation."
 authors = [{ name = "Roman", email = "roman.lemontagner@gmail.com" }]
 dependencies = [

pyproject.toml

@@ -451,8 +451,6 @@ def gw_score(self) -> tuple[int, str, GRANDMA_Action]:
         msg = ""
         conclusion = self.GRANDMA_Action.NO_GRANDMA
 
-        _, size_region, mean_dist, _ = self.get_error_region(0.9)
-
         if not self.is_real_observation():
             return score, msg, conclusion
 
@@ -464,6 +462,7 @@ def gw_score(self) -> tuple[int, str, GRANDMA_Action]:
                 | self.EventType.INITIAL
                 | self.EventType.UPDATE
             ):
+                _, size_region, mean_dist, _ = self.get_error_region(0.9)
                 match self.event_class:
                     case self.CBC_proba.Terrestrial:
                         msg = (

src/grandma_gcn/gcn_stream/gw_alert.py

@@ -7,7 +7,7 @@
 import time
 
 
-def push_message_for_test(mocker, message_queue, topic, notice_file):
+def push_message_for_test(mocker, message_queue: list, topic: str, notice_file: str):
     """
     Helper function to push a message to the mocked Kafka consumer for testing.
     """
@@ -19,6 +19,8 @@ def push_message_for_test(mocker, message_queue, topic, notice_file):
 
     message_queue.append(mock_message)
 
+    return mock_message
+
 
 @mark.e2e
 def test_e2e_grandma(mocker, logger):

tests/test_e2e.py

@@ -10,7 +10,8 @@
 
 from grandma_gcn.gcn_stream.consumer import Consumer
 from grandma_gcn.gcn_stream.gcn_logging import init_logging
-from tests.conftest import open_notice_file
+
+from tests.test_e2e import push_message_for_test
 
 
 def test_init_gcn_stream(gcn_config_path, logger):
@@ -173,17 +174,13 @@ def test_gcn_stream_with_real_notice(mocker, gcn_config_path, logger):
     # Simulate a message queue
     message_queue = []
 
-    # Create a mocked message
-    mock_message = mocker.Mock()
-    mock_message.topic.return_value = "igwn.gwalert"
-    mock_message.offset.return_value = 42
-    mock_message.error.return_value = None
-    mock_message.value.return_value = open_notice_file(
-        Path("tests"), "S241102br-update.json"
+    mock_message_update = push_message_for_test(
+        mocker, message_queue, "igwn.gwalert", "S241102br-update.json"
     )
 
-    # Add the mocked message to the queue
-    message_queue.append(mock_message)
+    mock_message_retraction = push_message_for_test(
+        mocker, message_queue, "igwn.gwalert", "retraction.json"
+    )
 
     # Mock the poll method
     def mock_poll(*args, **kwargs):
@@ -246,7 +243,8 @@ def mock_commit(message):
 
         # Assertions
         assert mock_poll_method.call_count == 121
-        mock_commit_method.assert_called_once_with(mock_message)
+        mock_commit_method.assert_any_call(mock_message_update)
+        mock_commit_method.assert_any_call(mock_message_retraction)
         mock_post_msg_on_slack.assert_called()  # Ensure post_msg_on_slack is called
         mock_gwemopt_task.s.assert_called()  # Ensure gwemopt_task.s is called
         mock_gwemopt_post_task.s.assert_called()  # Ensure gwemopt_post_task.s is called