python-ntfy 0.2.4__tar.gz → 0.2.5__tar.gz

{python_ntfy-0.2.4 → python_ntfy-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ntfy
-Version: 0.2.4
+Version: 0.2.5
 Summary: An ntfy library aiming for feature completeness
 Home-page: https://github.com/MatthewCane/python-ntfy
 License: MIT

{python_ntfy-0.2.4 → python_ntfy-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-ntfy"
-version = "0.2.4"
+version = "0.2.5"
 description = "An ntfy library aiming for feature completeness"
 authors = ["Matthew Cane <matthew.cane0@gmail.com>"]
 readme = "README.md"

{python_ntfy-0.2.4 → python_ntfy-0.2.5}/python_ntfy/__init__.py

@@ -1,17 +1,22 @@
 import os
-from types import MethodType
-from ._send_functions import (
-    send,
-    send_file,
-    MessagePriority,
-    ViewAction,
-    BroadcastAction,
-    HttpAction,
-)
-from ._get_functions import get_cached_messages
 
 
 class NtfyClient:
+    # The functions need to be imported here to:
+    # 1. Keep the functions in a separate file
+    # 2. Keep the docstrings working in the IDE
+    # 3. Allow the functions to be called with self
+    # MyPy does not like this, but it works
+    from ._send_functions import (  # type: ignore
+        send,
+        send_file,
+        MessagePriority,
+        ViewAction,
+        BroadcastAction,
+        HttpAction,
+    )
+    from ._get_functions import get_cached_messages  # type: ignore
+
     def __init__(
         self,
         topic: str,
@@ -22,16 +27,6 @@ class NtfyClient:
         :param server: The server to connect to. Must include the protocol (http/https)
         :return None:
         """
-        # Bind the imported functions to the class
-        self.send = MethodType(send, self)
-        self.send_file = MethodType(send_file, self)
-        self.MessagePriority = MethodType(MessagePriority, self)
-        self.get_cached_messages = MethodType(get_cached_messages, self)
-
-        # These are Enums that don't need to be bound
-        self.ViewAction = ViewAction
-        self.BroadcastAction = BroadcastAction
-        self.HttpAction = HttpAction
 
         self._server = os.environ.get("NTFY_SERVER") or server
         self._topic = topic

{python_ntfy-0.2.4 → python_ntfy-0.2.5}/python_ntfy/_send_functions.py

@@ -57,7 +57,7 @@ class BroadcastAction(Action):
         self,
         label: str,
         intent: str = "io.heckel.ntfy.USER_ACTION",
-        extras: Optional[dict] = None,
+        extras: Optional[dict[str, str]] = None,
         clear: bool = False,
     ):
         self.action = ActionType.BROADCAST
@@ -71,14 +71,18 @@ class BroadcastAction(Action):
             "label": self.label,
             "extras": self.extras,
             "clear": self.clear,
+            "intent": self.intent,
         }
 
     def to_header(self) -> str:
-        extras = ""
-        if self.extras is not None:
-            for key, value in self.extras.items():
-                extras += f"{key}={value},"
-        return f"action={self.action.value}, label={self.label}, url={self.url}, clear={self.clear}"
+        if self.extras:
+            extras_str = ", ".join([f"extras.{k}={v}" for k, v in self.extras.items()])
+        return (
+            f"action={self.action.value}, label={self.label}, url={self.url}, clear={self.clear}, intent={self.intent}"
+            + extras_str
+            if self.extras
+            else ""
+        )
 
 
 class HttpAction(Action):
@@ -153,7 +157,7 @@ def send(
         "Title": title,
         "Priority": priority.value,
         "Tags": ",".join(tags),
-        "Markdown": "true" if format_as_markdown else "false",
+        "Markdown": str(format_as_markdown).lower(),
     }
     if len(actions) > 0:
         headers["Actions"] = " ; ".join([action.to_header() for action in actions])