feat: extend Apprise JSON notification functionality with programmatic data (#1355)

* Fixed incorrect generic deleted notification text

* Added custom "event_source" header for json notifs

* Added internal reference data to event notifs

* Added event listeners to shopping list items

* Fixed type issues

* moved JSON event source k:v pairs to message body

* added hook for all supported custom endpoints
fixed bug that excluded non-custom notification types

* created event_source class to replace loosely-typed dict

* fixed silent error when dispatching a null task

* moved url updates to static function

* added unit tests for event_source url manipulation

* removed array from event bus (it's unsupported)
This commit is contained in:
Michael Genson
2022-06-15 14:49:42 -05:00
committed by GitHub
parent 3030e3e7f4
commit 754e77c9cb
42 changed files with 296 additions and 54 deletions

View File

@@ -1,3 +1,5 @@
from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit
from fastapi import BackgroundTasks, Depends
from pydantic import UUID4
@@ -9,6 +11,27 @@ from .message_types import EventBusMessage, EventTypes
from .publisher import ApprisePublisher, PublisherLike
class EventSource:
event_type: str
item_type: str
item_id: UUID4 | int
kwargs: dict
def __init__(self, event_type: str, item_type: str, item_id: UUID4 | int, **kwargs) -> None:
self.event_type = event_type
self.item_type = item_type
self.item_id = item_id
self.kwargs = kwargs
def dict(self) -> dict:
return {
"event_type": self.event_type,
"item_type": self.item_type,
"item_id": str(self.item_id),
**self.kwargs,
}
class EventBusService:
def __init__(self, bg: BackgroundTasks, session=Depends(generate_session)) -> None:
self.bg = bg
@@ -23,20 +46,26 @@ class EventBusService:
def get_urls(self, event_type: EventTypes) -> list[str]:
repos = AllRepositories(self.session)
notifiers: list[GroupEventNotifierPrivate] = repos.group_event_notifier.by_group(self.group_id).multi_query(
{"enabled": True}, override_schema=GroupEventNotifierPrivate
)
notifiers: list[GroupEventNotifierPrivate] = repos.group_event_notifier.by_group( # type: ignore
self.group_id
).multi_query({"enabled": True}, override_schema=GroupEventNotifierPrivate)
return [notifier.apprise_url for notifier in notifiers if getattr(notifier.options, event_type.name)]
def dispatch(self, group_id: UUID4, event_type: EventTypes, msg: str = "") -> None:
self.group_id = group_id
def dispatch(
self, group_id: UUID4, event_type: EventTypes, msg: str = "", event_source: EventSource = None
) -> None:
self.group_id = group_id # type: ignore
def _dispatch():
def _dispatch(event_source: EventSource = None):
if urls := self.get_urls(event_type):
if event_source:
urls = EventBusService.update_urls_with_event_source(urls, event_source)
self.publisher.publish(EventBusMessage.from_type(event_type, body=msg), urls)
self.bg.add_task(_dispatch)
if dispatch_task := _dispatch(event_source=event_source):
self.bg.add_task(dispatch_task)
def test_publisher(self, url: str) -> None:
self.bg.add_task(
@@ -44,3 +73,28 @@ class EventBusService:
event=EventBusMessage.from_type(EventTypes.test_message, body="This is a test event."),
notification_urls=[url],
)
@staticmethod
def update_urls_with_event_source(urls: list[str], event_source: EventSource):
return [
# We use query params to add custom key: value pairs to the Apprise payload by prepending the key with ":".
EventBusService.merge_query_parameters(url, {f":{k}": v for k, v in event_source.dict().items()})
# only certain endpoints support the custom key: value pairs, so we only apply them to those endpoints
if EventBusService.is_custom_url(url) else url
for url in urls
]
@staticmethod
def merge_query_parameters(url: str, params: dict):
scheme, netloc, path, query_string, fragment = urlsplit(url)
# merge query params
query_params = parse_qs(query_string)
query_params.update(params)
new_query_string = urlencode(query_params, doseq=True)
return urlunsplit((scheme, netloc, path, new_query_string, fragment))
@staticmethod
def is_custom_url(url: str):
return url.split(":", 1)[0].lower() in ["form", "forms", "json", "jsons", "xml", "xmls"]