python-ntfy 0.4.1__tar.gz → 0.4.2__tar.gz

{python_ntfy-0.4.1 → python_ntfy-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ntfy
-Version: 0.4.1
+Version: 0.4.2
 Summary: An ntfy library aiming for feature completeness
 Home-page: https://github.com/MatthewCane/python-ntfy
 License: MIT
@@ -93,7 +93,7 @@ These tools are also run in the CI pipeline and must pass before merging.
 
 ### Tests
 
-This project is aiming for 95% code coverage. Any added features must include comprihensive tests.
+This project is aiming for 95% code coverage. Any added features must include comprehensive tests.
 
 #### Testing Steps
 

{python_ntfy-0.4.1 → python_ntfy-0.4.2}/README.md

@@ -73,7 +73,7 @@ These tools are also run in the CI pipeline and must pass before merging.
 
 ### Tests
 
-This project is aiming for 95% code coverage. Any added features must include comprihensive tests.
+This project is aiming for 95% code coverage. Any added features must include comprehensive tests.
 
 #### Testing Steps
 

{python_ntfy-0.4.1 → python_ntfy-0.4.2}/pyproject.toml

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

python_ntfy-0.4.2/python_ntfy/__init__.py

@@ -0,0 +1,3 @@
+from ._ntfy import NtfyClient as NtfyClient
+
+__all__ = ["NtfyClient"]

python_ntfy-0.4.1/python_ntfy/__init__.py → python_ntfy-0.4.2/python_ntfy/_ntfy.py

@@ -11,24 +11,36 @@ Typical usage example:
 
 import os
 
+from ._get_functions import get_cached_messages
+from ._send_functions import (
+    BroadcastAction,
+    HttpAction,
+    MessagePriority,
+    ViewAction,
+    send,
+    send_file,
+)
+
+
+class GetFunctionsMixin:
+    """Mixin for getting messages."""
+
+    get_cached_messages = get_cached_messages
 
-class NtfyClient:
-    """A class for interacting with the ntfy notification service."""
 
-    # 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 ._get_functions import get_cached_messages  # type: ignore
-    from ._send_functions import (  # type: ignore
-        BroadcastAction,
-        HttpAction,
-        MessagePriority,
-        ViewAction,
-        send,
-        send_file,
-    )
+class SendFunctionsMixin:
+    """Mixin for sending messages."""
+
+    send = send
+    send_file = send_file
+    BroadcastAction = BroadcastAction
+    HttpAction = HttpAction
+    MessagePriority = MessagePriority
+    ViewAction = ViewAction
+
+
+class NtfyClient(GetFunctionsMixin, SendFunctionsMixin):
+    """A class for interacting with the ntfy notification service."""
 
     def __init__(
         self,