webhook_server 1.0.0__tar.gz → 1.0.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webhook_server
-Version: 1.0.0
+Version: 1.0.2
 Summary: Create a webhook server with Flask to forward Datadog alerts to Telegram
 Keywords: datadog,webhook,telegram
 Author: daisukixci
@@ -88,6 +88,13 @@ curl -X POST -H "Content-Type: application/json"\
 
 ### Documentation
 
+#### publish
+```
+uv version VERSION
+uv build
+uv publish --token=$(op read "op://Private/PyPI/publish_token")
+```
+
 ### Contribute
 Open to any PR/comments/issues
 

{webhook_server-1.0.0 → webhook_server-1.0.2}/README.md

@@ -61,6 +61,13 @@ curl -X POST -H "Content-Type: application/json"\
 
 ### Documentation
 
+#### publish
+```
+uv version VERSION
+uv build
+uv publish --token=$(op read "op://Private/PyPI/publish_token")
+```
+
 ### Contribute
 Open to any PR/comments/issues
 

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

@@ -1,6 +1,6 @@
 [project]
 name = "webhook_server"
-version = "1.0.0"
+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.2/webhook_server/datadog.py

@@ -0,0 +1,46 @@
+from __future__ import annotations
+from dataclasses import dataclass, asdict
+from datetime import datetime, UTC
+import re
+
+
+@dataclass
+class DatadogOrg:
+    id: int
+    name: str
+
+
+@dataclass
+class DatadogAlertContent:
+    title: str
+    event_type: str
+    body: str
+    date: int
+    org: DatadogOrg
+    id: int
+    last_updated: int
+
+    def to_dict(self) -> dict:
+        return asdict(self)
+
+
+class DatadogAlert:
+    def __init__(self, alert: DatadogAlertContent):
+        self._alert = alert
+
+    def get_message(self) -> str:
+        message = f"""<b>{self._alert.title}</b>
+In Org <b>{self._alert.org['name']}</b>({self._alert.org['id']})
+At {datetime.fromtimestamp(int(self._alert.date), tz=UTC).strftime("%Y/%m/%d %H:%M")}
+{_clean_msg(self._alert.body)}"""
+        return message
+
+
+def _markdown_to_html_links(markdown_text):
+    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("%"))

{webhook_server-1.0.0 → 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 = (
@@ -40,12 +37,11 @@ def webhookHandler(chat_id) -> ResponseReturnValue:
         payload = {
             "chat_id": chat_id,
             "text": alert.get_message(),
-            "parse_mode": "MarkdownV2",
+            "parse_mode": "HTML",
         }
-        print(payload)
         req = requests.post(url=url, data=payload, timeout=5)
         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

webhook_server-1.0.0/webhook_server/datadog.py

@@ -1,79 +0,0 @@
-from __future__ import annotations
-from dataclasses import dataclass, asdict
-from datetime import datetime, UTC
-import re
-
-
-@dataclass
-class DatadogOrg:
-    id: int
-    name: str
-
-
-@dataclass
-class DatadogAlertContent:
-    title: str
-    event_type: str
-    body: str
-    date: int
-    org: DatadogOrg
-    id: int
-    last_updated: int
-
-    def to_dict(self) -> dict:
-        return asdict(self)
-
-
-class DatadogAlert:
-    def __init__(self, alert: DatadogAlertContent):
-        self._alert = alert
-
-    def get_message(self) -> str:
-        message = f"""*{_datadog_to_telegram_md(self._alert.title)}*
-In Org {_escape_md(self._alert.org['name'])}\({_escape_md(self._alert.org['id'])}\)
-At {_escape_md(datetime.fromtimestamp(int(self._alert.date), tz=UTC).strftime("%Y/%m/%d %H:%M"))}
-{_datadog_to_telegram_md(self._alert.body)}"""
-        return message
-
-
-def _escape_md(text: str) -> str:
-    return re.sub(r"([_*\[\]()~`>#+\-=|{}.!])", r"\\\1", text)
-
-
-def _datadog_to_telegram_md(text: str) -> str:
-    text = text.strip().strip("%").strip()
-
-    links = []
-
-    def extract_link(match):
-        links.append((match.group(1), match.group(2)))
-        return f"LINKTOKEN{len(links)-1}END"
-
-    text = re.sub(r"\[\[(.*?)\]\((.*?)\)\]", extract_link, text)
-
-    # Process lines
-    lines = text.splitlines()
-    result = []
-
-    for line in lines:
-        line = line.strip()
-
-        if line.startswith("## "):
-            content = _escape_md(line[3:])
-            result.append(f"*{content}*")
-            continue
-
-        if line.startswith("- - -"):
-            continue
-
-        result.append(_escape_md(line))
-
-    text = "\n".join(result)
-
-    # Restore links
-    for i, (label, url) in enumerate(links):
-        safe_label = _escape_md(label)
-        print(safe_label + " " + url)
-        text = text.replace(f"LINKTOKEN{i}END", f"[{safe_label}]({url})")
-
-    return text