diff --git a/changelog.d/+warn-unprioritized-events.fix.md b/changelog.d/+warn-unprioritized-events.fix.md new file mode 100644 index 00000000..a1679730 --- /dev/null +++ b/changelog.d/+warn-unprioritized-events.fix.md @@ -0,0 +1,3 @@ +Warn during experiment conversion when an SBML event still lacks a priority, +so users can address ambiguous ordering with PEtab condition changes +([#614](https://github.com/PEtab-dev/libpetab-python/pull/614)). diff --git a/petab/v2/converters.py b/petab/v2/converters.py index b001ad54..837c0120 100644 --- a/petab/v2/converters.py +++ b/petab/v2/converters.py @@ -201,7 +201,7 @@ def _preprocess(self) -> None: for event in model.getListOfEvents(): # Check for undefined event priorities and warn - if (prio := event.getPriority()) and prio.getMath() is None: + if not self._has_priority(event): warnings.warn( f"Event `{event.getId()}` has no priority set. " "Make sure that this event cannot trigger at the time of " diff --git a/tests/v2/test_converters.py b/tests/v2/test_converters.py index d121462b..ee9483ac 100644 --- a/tests/v2/test_converters.py +++ b/tests/v2/test_converters.py @@ -347,7 +347,7 @@ def _problem_0030(model_events: str) -> Problem: ("", {PETAB_EVENT: None}), ], ) -def test_auto_event_priority(model_events, expected): +def test_auto_event_priority(model_events, expected, recwarn): """Test automatic priority assignment for pre-existing events.""" problem = _problem_0030(model_events) orig_priorities = _event_priorities(problem.model.sbml_model) @@ -355,6 +355,17 @@ def test_auto_event_priority(model_events, expected): converted = ExperimentsToSbmlConverter(problem).convert() assert _event_priorities(converted.model.sbml_model) == expected + expected_warnings = { + f"Event `{event_id}` has no priority set." + for event_id in orig_priorities + if expected[event_id] is None + } + actual_warnings = { + str(warning.message).split(" Make sure", 1)[0] + for warning in recwarn + if "has no priority set." in str(warning.message) + } + assert actual_warnings == expected_warnings # the original problem is not modified assert _event_priorities(problem.model.sbml_model) == orig_priorities