ix-notifiers 0.0.259196408__tar.gz → 0.0.1296513512__tar.gz

ix_notifiers-0.0.1296513512/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 ix.ai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 2.1
 Name: ix-notifiers
-Version: 0.0.259196408
+Version: 0.0.1296513512
 Summary: A python library for notifiers
 Home-page: https://gitlab.com/ix.ai/notifiers
 Author: ix.ai
 Author-email: docker@ix.ai
 License: MIT License
-Description: A python library for notifiers. Used in the ix.ai projects.
-        
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests>=2.31.0
+
+A python library for notifiers. Used in the ix.ai projects.

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/ix_notifiers/constants.py

@@ -4,4 +4,4 @@
 
 # These get overwritten at build time. See build.sh
 VERSION = '0.0'
-BUILD = '259196408'
+BUILD = '1296513512'

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/ix_notifiers/core.py

@@ -12,7 +12,6 @@ class IxNotifiers():
     """ the IxNotifiers class """
 
     notifiers = [
-        'telegram',
         'gotify',
         'null',
     ]
@@ -40,7 +39,7 @@ class IxNotifiers():
         return: True if at least one notification channel was successful, False otherwise
         """
         success = False
-        for notifier in self.registered:
+        for notifier in self.registered.items():
             log.debug(f'Sending notification to {notifier}')
             if self.registered[notifier].send(**kwargs) is True:
                 success = True

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/ix_notifiers/gotify_notifier.py

@@ -90,7 +90,7 @@ class GotifyNotifier(Notifier):
 
         resp = None
         try:
-            resp = requests.post(self.settings['url'], json=req_json, headers=headers)
+            resp = requests.post(self.settings['url'], json=req_json, headers=headers, timeout=60)
         except requests.exceptions.RequestException as e:
             # Print exception if reqeuest fails
             log.warning(self.redact(f'Could not connect to the Gotify server. The error: {e}'))

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/ix_notifiers.egg-info/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 2.1
 Name: ix-notifiers
-Version: 0.0.259196408
+Version: 0.0.1296513512
 Summary: A python library for notifiers
 Home-page: https://gitlab.com/ix.ai/notifiers
 Author: ix.ai
 Author-email: docker@ix.ai
 License: MIT License
-Description: A python library for notifiers. Used in the ix.ai projects.
-        
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests>=2.31.0
+
+A python library for notifiers. Used in the ix.ai projects.

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/ix_notifiers.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 setup.py
 ix_notifiers/__init__.py
@@ -5,7 +6,6 @@ ix_notifiers/constants.py
 ix_notifiers/core.py
 ix_notifiers/gotify_notifier.py
 ix_notifiers/null_notifier.py
-ix_notifiers/telegram_notifier.py
 ix_notifiers.egg-info/PKG-INFO
 ix_notifiers.egg-info/SOURCES.txt
 ix_notifiers.egg-info/dependency_links.txt

ix_notifiers-0.0.1296513512/ix_notifiers.egg-info/requires.txt

@@ -0,0 +1 @@
+requests>=2.31.0

{ix-notifiers-0.0.259196408 → ix_notifiers-0.0.1296513512}/setup.py

@@ -5,7 +5,7 @@
 import setuptools
 from ix_notifiers import constants
 
-with open("README.md", "r") as fh:
+with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 setuptools.setup(
@@ -26,7 +26,6 @@ setuptools.setup(
     ],
     python_requires='>=3.6',
     install_requires=[
-        'python-telegram-bot>=13.1',
-        'requests>=2.25.0',
+        'requests>=2.31.0',
     ],
 )

ix-notifiers-0.0.259196408/ix_notifiers/telegram_notifier.py

@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-""" Telegram """
-
-import logging
-import time
-import telegram
-from .core import Notifier
-
-log = logging.getLogger(__package__)
-
-
-def start(**kwargs):
-    """ Returns an instance of the TelegramNotifier """
-    return TelegramNotifier(**kwargs)
-
-
-class TelegramNotifier(Notifier):
-    """ The TelegramNotifier class """
-    params = {
-        'token': {
-            'mandatory': True,
-            'redact': True,
-            'type': 'string',
-        },
-        'chat_id': {
-            'mandatory': True,
-            'type': 'string',
-        },
-        'parse_mode': {
-            'default': 'Markdown',
-            'type': 'string,'
-        },
-        'max_retries': {
-            'default': 0,
-            'type': 'integer',
-        },
-        'always_succeed': {
-            'default': False,
-            'type': 'boolean',
-        },
-    }
-
-    def __init__(self, **kwargs):
-        self.settings = {}
-        super().__init__(**kwargs)
-        self.notifier = telegram.Bot(token=self.settings['token'])
-        log.debug(self.redact(f"Initialized with {self.settings}"))
-
-    def send(self, **kwargs):
-        """ sends a notification to telegram """
-
-        # Allow per message override of parse_mode
-        parse_mode = kwargs.get('parse_mode', self.settings['parse_mode'])
-
-        retry = True
-        success = True
-        tries = 0
-
-        # Telegram has a maximum message limit of 4096 characters
-        if len(kwargs['message']) > 4096:
-            success = False
-            retry = False
-            log.error(f"The Telegram message is too long ({len(kwargs['message'])} > 4096). Not sending.")
-
-        while retry is True and (
-            (self.settings['max_retries'] == 0) or (tries < self.settings['max_retries'])
-        ):
-            tries += 1
-            try:
-                self.notifier.sendMessage(
-                    chat_id=self.settings['chat_id'],
-                    text=kwargs['message'],
-                    parse_mode=parse_mode,
-                    disable_web_page_preview=True,
-                )
-                log.info("Sent message to telegram.")
-                log.debug(f"Message: {kwargs['message']}")
-                retry = False
-            except (TimeoutError, telegram.error.TimedOut, telegram.error.RetryAfter) as error:
-                try:
-                    retry_after = 0.5 + int(error.retry_after)
-                except AttributeError:
-                    retry_after = 2
-                    if (self.settings['max_retries'] == 0) or (tries < self.settings['max_retries']):
-                        log.warning(f'Exception caught - retrying in {retry_after}s: {error}')
-                        time.sleep(retry_after)
-                    else:
-                        log.warning(f'Exception caught: {error}')
-                        success = False
-            except (telegram.error.Unauthorized) as error:
-                log.error(self.redact(f'{error} - check TELEGRAM_TOKEN - skipping retries.'))
-                retry = False
-                success = False
-            except (telegram.error.BadRequest) as error:
-                exit_message = ''
-                if str(error) == 'Chat not found':
-                    exit_message = 'Check TELEGRAM_CHAT_ID - '
-                exit_message = self.redact(f'{exit_message}Skipping retries. The exception: {error}')
-                log.error(exit_message)
-                retry = False
-                success = False
-            except Exception as error:
-                log.error(self.redact(f"Failed to send message! Exception: {error}"))
-                retry = False
-                success = False
-        if self.settings['always_succeed']:
-            success = True
-        return success

ix-notifiers-0.0.259196408/ix_notifiers.egg-info/requires.txt

@@ -1,2 +0,0 @@
-python-telegram-bot>=13.1
-requests>=2.25.0