From 80219887335cc60ab154f99e37f0332388fdee0e Mon Sep 17 00:00:00 2001 From: pablomm Date: Sat, 17 Aug 2024 18:53:19 +0200 Subject: [PATCH] Use internally env.getenv to ensure env.setup is called on the first hit --- dmf/alerts/alerts.py | 5 +++-- dmf/alerts/slack_backend.py | 5 +++-- dmf/alerts/telegram_backend.py | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dmf/alerts/alerts.py b/dmf/alerts/alerts.py index b92a84f..fea1aec 100644 --- a/dmf/alerts/alerts.py +++ b/dmf/alerts/alerts.py @@ -1,7 +1,8 @@ from typing import Optional, TYPE_CHECKING, Tuple, Union -import os + from ..utils.typing import Literal +from ..env import env if TYPE_CHECKING: from .backend import AlertBackend @@ -155,7 +156,7 @@ def resolve_credentials( :param alert_token: Optional; Slack token to override the environment variable. :return: A tuple containing the alert_token and the backend type ('slack'). """ - alert_token = alert_token or os.getenv(ALERT_TOKEN) + alert_token = alert_token or env.getenv(ALERT_TOKEN) if not alert_token: raise ValueError( diff --git a/dmf/alerts/slack_backend.py b/dmf/alerts/slack_backend.py index c65c33b..c89c63c 100644 --- a/dmf/alerts/slack_backend.py +++ b/dmf/alerts/slack_backend.py @@ -1,5 +1,5 @@ import logging -import os + from datetime import datetime, timedelta from pathlib import Path from typing import Optional, Union @@ -14,6 +14,7 @@ ) from .backend import AlertBackend, AlertException +from ..env import env __all__ = ["SlackBackend"] @@ -74,7 +75,7 @@ def __init__( super().__init__(fail_silently=fail_silently) self.client = WebClient(token=token) - self.channel = channel or os.getenv(DEFAULT_CHANNEL_ENV) + self.channel = channel or env.getenv(DEFAULT_CHANNEL_ENV) def send_message( self, diff --git a/dmf/alerts/telegram_backend.py b/dmf/alerts/telegram_backend.py index 4a80093..9882a97 100644 --- a/dmf/alerts/telegram_backend.py +++ b/dmf/alerts/telegram_backend.py @@ -1,10 +1,10 @@ import logging -import os from datetime import datetime from pathlib import Path from typing import Optional, Union from ..utils.typing import Literal +from ..env import env try: import requests @@ -83,7 +83,7 @@ def __init__( """ super().__init__(fail_silently=fail_silently) self.token = token - self.channel = channel or os.getenv(DEFAULT_CHANNEL_ENV) + self.channel = channel or env.getenv(DEFAULT_CHANNEL_ENV) if not self.channel: raise AlertException(