Skip to content

Refactor alert message builder for improved type handling and simplif… #1804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MikaKerman merged 1 commit into from
Feb 9, 2025
Merged

Refactor alert message builder for improved type handling and simplif… #1804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions elementary/monitor/alerts/alert_messages/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ def _get_color(self, alert_status: Optional[str]) -> Optional[Color]:
return None
return self.STATUS_COLORS.get(alert_status)

def _get_alert_color(self, alert: AlertType) -> Optional[Color]:
return self._get_color(alert.status)

def _get_alert_title(
self, summary: str, status: Optional[str], test_type: Optional[str]
) -> str:
Expand Down Expand Up @@ -580,22 +583,20 @@ def _get_alert_config_blocks(

def _get_alert_groups_blocks(
self,
alert: Union[AlertsGroup, GroupedByTableAlerts],
alert: AlertsGroup,
) -> List[MessageBlock]:
if isinstance(alert, AlertsGroup):
return self._get_sub_alert_groups_blocks(
model_errors=alert.model_errors,
test_failures=alert.test_failures,
test_warnings=alert.test_warnings,
test_errors=alert.test_errors,
)
return []
return self._get_sub_alert_groups_blocks(
model_errors=alert.model_errors,
test_failures=alert.test_failures,
test_warnings=alert.test_warnings,
test_errors=alert.test_errors,
)

def build(
self,
alert: AlertType,
) -> MessageBody:
color = self._get_color(alert.status)
color = self._get_alert_color(alert)

blocks: List[MessageBlock] = []

Expand All @@ -618,7 +619,7 @@ def build(
config_blocks = self._get_alert_config_blocks(alert)
blocks.extend(config_blocks)

if isinstance(alert, (AlertsGroup, GroupedByTableAlerts)):
if isinstance(alert, AlertsGroup):
alert_groups_blocks = self._get_alert_groups_blocks(alert)
blocks.extend(alert_groups_blocks)

Expand Down
Loading