webhook_server 1.0.1__tar.gz → 1.0.2__tar.gz

{webhook_server-1.0.1 → webhook_server-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webhook_server
-Version: 1.0.1
+Version: 1.0.2
 Summary: Create a webhook server with Flask to forward Datadog alerts to Telegram
 Keywords: datadog,webhook,telegram
 Author: daisukixci

{webhook_server-1.0.1 → webhook_server-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "webhook_server"
-version = "1.0.1"
+version = "1.0.2"
 description = "Create a webhook server with Flask to forward Datadog alerts to Telegram"
 authors = [{ name = "daisukixci", email = "piquenot.gaetan+pip@gmail.com" }]
 requires-python = ">=3.10,<4"

{webhook_server-1.0.1 → webhook_server-1.0.2}/webhook_server/datadog.py

@@ -35,10 +35,12 @@ At {datetime.fromtimestamp(int(self._alert.date), tz=UTC).strftime("%Y/%m/%d %H:
 {_clean_msg(self._alert.body)}"""
         return message
 
+
 def _markdown_to_html_links(markdown_text):
-    pattern = r'\[([^\]]+)\]\(([^)]+)\)'
+    pattern = r"\[([^\]]+)\]\(([^)]+)\)"
     html_text = re.sub(pattern, r'<a href="\2">\1</a>', markdown_text)
     return html_text
 
+
 def _clean_msg(msg: str) -> str:
-    return _markdown_to_html_links(msg.strip('%'))
+    return _markdown_to_html_links(msg.strip("%"))

{webhook_server-1.0.1 → webhook_server-1.0.2}/webhook_server/webhooks.py

@@ -3,12 +3,9 @@ from flask.typing import ResponseReturnValue
 import requests
 
 from flask import request, jsonify
-import logger
 from . import app, basic_auth
 from .datadog import DatadogAlert, DatadogAlertContent
 
-webhookLogger = logger.get_json_logger(__name__)
-
 
 @app.route("/")
 def ping() -> ResponseReturnValue:
@@ -21,13 +18,13 @@ def webhookHandler(chat_id) -> ResponseReturnValue:
     try:
         content = request.get_json()
     except requests.exceptions.RequestException:
-        webhookLogger.exception("failed to parse request payload")
+        app.logger.exception("failed to parse request payload")
         return jsonify({"message": "Bad request"}), HTTPStatus.BAD_REQUEST
 
     try:
         alert = DatadogAlert(DatadogAlertContent(**content))
     except TypeError:
-        webhookLogger.exception("failed to build DatadogAlert")
+        app.logger.exception("failed to build DatadogAlert")
         return jsonify({"message": "Bad request"}), HTTPStatus.BAD_REQUEST
 
     url = (
@@ -46,5 +43,5 @@ def webhookHandler(chat_id) -> ResponseReturnValue:
         telegram_response = req.json()
         return jsonify(telegram_response)
     except requests.exceptions.RequestException:
-        webhookLogger.exception("failed to post to Telegram")
+        app.logger.exception("failed to post to Telegram")
         return jsonify({"message": "Bad request"}), HTTPStatus.BAD_REQUEST