python-ntfy 0.5.2__tar.gz → 0.6.1__tar.gz

{python_ntfy-0.5.2 → python_ntfy-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-ntfy
-Version: 0.5.2
+Version: 0.6.1
 Summary: An ntfy library aiming for feature completeness
 License: MIT
 Author: Matthew Cane
@@ -28,11 +28,7 @@ An easy-to-use python library for the [ntfy notification service](https://ntfy.s
 ## Quickstart
 
 1. Install using pip with `pip3 install python-ntfy`
-2. Configure the following environment variables:
-    - `NTFY_USER`: The username for your server (if required)
-    - `NTFY_PASSWORD`: The password for your server (if required)
-    - `NTFY_SERVER`: The server URL (defaults to `https://ntft.sh`)
-3. Setup your application to use the library:
+2. Use the `NtfyClient` to send messages:
 
 ```python
 # Import the ntfy client
@@ -45,6 +41,8 @@ client = NtfyClient(topic="Your topic")
 client.send("Your message here")
 ```
 
+For information on setting up authentication, see the [quickstart guide](https://matthewcane.github.io/python-ntfy/quickstart/).
+
 ## Documentation
 
 See the full documentation at [https://matthewcane.github.io/python-ntfy/](https://matthewcane.github.io/python-ntfy/).
@@ -61,11 +59,7 @@ See the full documentation at [https://matthewcane.github.io/python-ntfy/](https
 - Scheduled delivery
 - Tags
 - Action buttons
-
-## Future Features
-
-- [Email notifications](https://docs.ntfy.sh/publish/#e-mail-notifications)
-- Send to multiple topics at once
+- Email notifications
 
 ## Contributing
 

{python_ntfy-0.5.2 → python_ntfy-0.6.1}/README.md

@@ -9,11 +9,7 @@ An easy-to-use python library for the [ntfy notification service](https://ntfy.s
 ## Quickstart
 
 1. Install using pip with `pip3 install python-ntfy`
-2. Configure the following environment variables:
-    - `NTFY_USER`: The username for your server (if required)
-    - `NTFY_PASSWORD`: The password for your server (if required)
-    - `NTFY_SERVER`: The server URL (defaults to `https://ntft.sh`)
-3. Setup your application to use the library:
+2. Use the `NtfyClient` to send messages:
 
 ```python
 # Import the ntfy client
@@ -26,6 +22,8 @@ client = NtfyClient(topic="Your topic")
 client.send("Your message here")
 ```
 
+For information on setting up authentication, see the [quickstart guide](https://matthewcane.github.io/python-ntfy/quickstart/).
+
 ## Documentation
 
 See the full documentation at [https://matthewcane.github.io/python-ntfy/](https://matthewcane.github.io/python-ntfy/).
@@ -42,11 +40,7 @@ See the full documentation at [https://matthewcane.github.io/python-ntfy/](https
 - Scheduled delivery
 - Tags
 - Action buttons
-
-## Future Features
-
-- [Email notifications](https://docs.ntfy.sh/publish/#e-mail-notifications)
-- Send to multiple topics at once
+- Email notifications
 
 ## Contributing
 

{python_ntfy-0.5.2 → python_ntfy-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-ntfy"
-version = "0.5.2"
+version = "0.6.1"
 description = "An ntfy library aiming for feature completeness"
 authors = ["Matthew Cane <matthew.cane0@gmail.com>"]
 readme = "README.md"
@@ -24,7 +24,7 @@ mkdocstrings = {extras = ["python"], version = ">=0.26.2,<0.30.0"}
 mypy = "^1.12.0"
 pytest = ">=7.4.1,<9.0.0"
 python-dotenv = "^1.0.0"
-pytest-asyncio = ">=0.21.1,<1.1.0"
+pytest-asyncio = ">=0.21.1,<1.2.0"
 pytest-codecov = ">=0.5.1,<0.8.0"
 ruff = ">=0.7,<0.13"
 mkdocs-material = "^9.5.41"

{python_ntfy-0.5.2 → python_ntfy-0.6.1}/python_ntfy/_ntfy.py

@@ -46,12 +46,14 @@ class NtfyClient(GetFunctionsMixin, SendFunctionsMixin):
         self,
         topic: str,
         server: str = "https://ntfy.sh",
+        auth: tuple[str, str] | str | None = None,
     ) -> None:
         """Itinialize the NtfyClient.
 
         Args:
             topic: The topic to use for this client
             server: The server to connect to. Must include the protocol (http/https)
+            auth: The authentication credentials to use for this client. Takes precedence over environment variables. Can be a tuple of (user, password) or a token.
 
         Returns:
             None
@@ -65,18 +67,39 @@ class NtfyClient(GetFunctionsMixin, SendFunctionsMixin):
         self._server = os.environ.get("NTFY_SERVER") or server
         self._topic = topic
         self.__set_url(self._server, topic)
+        self._auth: tuple[str, str] | None = self._resolve_auth(auth)
 
-        # If the user has set the user and password, use that
-        # If the user has set the token, use that
-        # Otherwise, use None
-
-        self._auth: tuple[str, str] | None = None
-        if (user := os.environ.get("NTFY_USER")) and (
-            password := os.environ.get("NTFY_PASSWORD")
-        ):
-            self._auth = (user, password)
-        elif token := os.environ.get("NTFY_TOKEN"):
-            self._auth = ("", token)
+    def _resolve_auth(
+        self, auth: tuple[str, str] | str | None
+    ) -> tuple[str, str] | None:
+        """Resolve the authentication credentials.
+
+        Args:
+            auth: The authentication credentials to use for this client. Takes precedence over environment variables. Can be a tuple of (user, password) or a token string.
+
+        Returns:
+            tuple[str, str] | None: The authentication credentials.
+        """
+        # If the user has supplied credentials, use them (including empty string)
+        if auth is not None:
+            if isinstance(auth, tuple):
+                return auth
+            if isinstance(auth, str):
+                return ("", auth)
+
+        # Otherwise, check environment variables
+        user = os.environ.get("NTFY_USER")
+        password = os.environ.get("NTFY_PASSWORD")
+        token = os.environ.get("NTFY_TOKEN")
+
+        if user and password:
+            return (user, password)
+
+        if token:
+            return ("", token)
+
+        # If no credentials are found, return None
+        return None
 
     def __set_url(
         self,

{python_ntfy-0.5.2 → python_ntfy-0.6.1}/python_ntfy/_send_functions.py

@@ -192,6 +192,7 @@ def send(
     schedule: Optional[datetime] = None,
     format_as_markdown: bool = False,
     timeout_seconds: int = 5,
+    email: Optional[str] = None,
 ) -> dict:
     """Send a text-based message to the server.
 
@@ -208,6 +209,7 @@ def send(
         format_as_markdown: If true, the message will be formatted as markdown.
         additional_topics: A list of additional topics to send the message to.
         timeout_seconds: The number of seconds to wait before timing out the reqest to the server.
+        email: Forward messages to an email address. Only one email address can be specified.
 
     Returns:
         dict: The response from the server.
@@ -236,6 +238,9 @@ def send(
     if len(actions) > 0:
         headers["Actions"] = " ; ".join([action.to_header() for action in actions])
 
+    if email:
+        headers["Email"] = email
+
     if schedule:
         headers["Delay"] = str(int(schedule.timestamp()))
 
@@ -259,6 +264,7 @@ def send_file(
     actions: Optional[list[Union[ViewAction, BroadcastAction, HttpAction]]] = None,
     schedule: Optional[datetime] = None,
     timeout_seconds: int = 30,
+    email: Optional[str] = None,
 ) -> dict:
     """Sends a file to the server.
 
@@ -270,6 +276,7 @@ def send_file(
         actions: A list of ActionButton objects to attach to the message.
         schedule: The time to schedule the message to be sent. Must be more than 10 seconds away and less than 3 days in the future.
         timeout_seconds: The number of seconds to wait before timing out.
+        email: Forward messages to an email address. Only one email address can be specified.
 
     Returns:
         dict: The response from the server.
@@ -293,6 +300,9 @@ def send_file(
         "Actions": " ; ".join([action.to_header() for action in actions]),
     }
 
+    if email:
+        headers["Email"] = email
+
     if schedule:
         headers["Delay"] = str(int(schedule.timestamp()))