Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions src/prefect/blocks/notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,15 @@ async def anotify(
body: str,
subject: str | None = None,
) -> None:
with LogEavesdropper("apprise", level=logging.DEBUG) as eavesdropper:
apprise_logger = logging.getLogger("apprise")
root_logger = logging.getLogger()

if apprise_logger.level == logging.NOTSET:
log_level = root_logger.getEffectiveLevel()
else:
log_level = max(apprise_logger.level, root_logger.getEffectiveLevel())

with LogEavesdropper("apprise", level=log_level) as eavesdropper:
result = await self._apprise_client.async_notify( # pyright: ignore[reportUnknownMemberType] incomplete type hints in apprise
body=body,
title=subject or "",
Expand All @@ -72,7 +80,15 @@ def notify(
body: str,
subject: str | None = None,
) -> None:
with LogEavesdropper("apprise", level=logging.DEBUG) as eavesdropper:
apprise_logger = logging.getLogger("apprise")
root_logger = logging.getLogger()

if apprise_logger.level == logging.NOTSET:
log_level = root_logger.getEffectiveLevel()
else:
log_level = max(apprise_logger.level, root_logger.getEffectiveLevel())

with LogEavesdropper("apprise", level=log_level) as eavesdropper:
result = self._apprise_client.notify( # pyright: ignore[reportUnknownMemberType] incomplete type hints in apprise
body=body,
title=subject or "",
Expand Down
33 changes: 33 additions & 0 deletions tests/blocks/test_notifications.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging
import urllib
from typing import Type
from unittest.mock import AsyncMock, MagicMock, call, patch
Expand Down Expand Up @@ -352,6 +353,38 @@ def mock_request(method, url, **kwargs):
)


class TestAppriseLoggingLevels:
async def test_notify_does_not_force_apprise_to_debug(self):
apprise_logger = logging.getLogger("apprise")
root_logger = logging.getLogger()

original_apprise_level = apprise_logger.level
original_root_level = root_logger.level

try:
root_logger.setLevel(logging.WARNING)
apprise_logger.setLevel(logging.NOTSET)

with patch("apprise.Apprise", autospec=True) as AppriseMock:
apprise_instance_mock = AppriseMock.return_value

async def _assert_level(*args, **kwargs):
assert logging.getLogger("apprise").level == logging.WARNING
return True

apprise_instance_mock.async_notify = AsyncMock(
side_effect=_assert_level
)

block = SlackWebhook(
url="https://hooks.slack.com/services/T1234/B5678/abcdefghijk"
)
await block.notify("test")
finally:
apprise_logger.setLevel(original_apprise_level)
root_logger.setLevel(original_root_level)


class TestMattermostWebhook:
async def test_notify_async(self):
mm_block = MattermostWebhook(
Expand Down
Loading