cli2telegram 2.0.1__tar.gz → 2.0.3__tar.gz

{cli2telegram-2.0.1 → cli2telegram-2.0.3}/PKG-INFO

@@ -1,32 +1,27 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cli2telegram
-Version: 2.0.1
+Version: 2.0.3
 Summary: Small utility to send Telegram messages from the CLI.
-Home-page: https://github.com/markusressel/cli2telegram
 License: AGPL-3.0-or-later
+License-File: LICENSE
 Keywords: cli,telegram,notification
 Author: Markus Ressel
 Author-email: mail@markusressel.de
-Requires-Python: >=3.7,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Requires-Dist: aiofiles
 Requires-Dist: click
 Requires-Dist: container-app-conf
 Requires-Dist: emoji
 Requires-Dist: python-telegram-bot
+Project-URL: Homepage, https://github.com/markusressel/cli2telegram
 Project-URL: Repository, https://github.com/markusressel/cli2telegram
 Description-Content-Type: text/markdown
 

{cli2telegram-2.0.1 → cli2telegram-2.0.3}/cli2telegram/cli.py

@@ -35,8 +35,6 @@ CONFIG = Config(validate=False)
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
-loop = asyncio.get_event_loop()
-
 
 @click.command(context_settings=CONTEXT_SETTINGS)
 @click.option('-b', '--bot-token', 'bot_token', default=None, type=str, help='Telegram Bot Token')
@@ -92,11 +90,7 @@ def cli(bot_token: str or None, chat_id: str or None, code_block: bool, lines: T
 
     app = Application.builder().token(CONFIG.TELEGRAM_BOT_TOKEN.value).build()
 
-    tasks = asyncio.gather(
-        _send_messages(app, messages),
-    )
-
-    loop.run_until_complete(tasks)
+    asyncio.run(_send_messages(app, messages))
 
 
 def prepare_messages(text: str, code_block: bool) -> List[str]:

{cli2telegram-2.0.1 → cli2telegram-2.0.3}/cli2telegram/daemon.py

@@ -54,13 +54,13 @@ class Daemon:
         signal(SIGINT, self.signal_handler)  # ctrl+c
         signal(SIGTERM, self.signal_handler)  # systemctl stop
 
-        loop = asyncio.get_event_loop()
-        tasks = asyncio.gather(
+        asyncio.run(self._run_workers())
+
+    async def _run_workers(self):
+        await asyncio.gather(
             self.send_message_worker(),
             self.read_pipe_loop(),
         )
-        loop.run_until_complete(tasks)
-        loop.close()
 
     async def read_pipe_loop(self):
         LOGGER.info(f"Daemon is listening for input on {self.pipe_file_path}...")

{cli2telegram-2.0.1 → cli2telegram-2.0.3}/cli2telegram/util.py

@@ -18,6 +18,7 @@ import time
 from datetime import datetime, timedelta
 
 from telegram import Bot, InlineKeyboardMarkup, Message
+from telegram.error import BadRequest, Forbidden, InvalidToken
 from telegram.ext import Application
 
 from cli2telegram import RetryLimitReachedException
@@ -88,11 +89,25 @@ async def try_send_message(
     :param give_up_after: when to give up trying
     """
     started_trying = datetime.now()
+    parse_mode = "markdown"
     success = False
     while not success:
         try:
-            await send_message(bot=app.bot, chat_id=chat_id, message=message, parse_mode="markdown")
+            await send_message(bot=app.bot, chat_id=chat_id, message=message, parse_mode=parse_mode)
             success = True
+        except BadRequest as ex:
+            if parse_mode is not None and "parse entities" in str(ex).lower():
+                # characters like "_" or "*" in the text are not valid markdown, so send it as plain text
+                LOGGER.warning(f"Message is not valid markdown, sending it as plain text instead: {ex}")
+                parse_mode = None
+                continue
+            # the request itself is wrong, retrying would never help
+            LOGGER.exception(ex)
+            raise
+        except (InvalidToken, Forbidden) as ex:
+            # wrong token or the bot is not allowed to write to the chat, retrying would never help
+            LOGGER.exception(ex)
+            raise
         except Exception as ex:
             LOGGER.exception(ex)
 

{cli2telegram-2.0.1 → cli2telegram-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cli2telegram"
-version = "2.0.1"
+version = "2.0.3"
 description = "Small utility to send Telegram messages from the CLI."
 
 license = "AGPL-3.0-or-later"
@@ -20,10 +20,9 @@ classifiers = [
     "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3",
-    'Programming Language :: Python :: 3.7',
-    'Programming Language :: Python :: 3.8',
-    'Programming Language :: Python :: 3.9',
-    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Development Status :: 5 - Production/Stable"
 ]
 
@@ -32,7 +31,7 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
-python = "^3.7"  # Compatible python versions must be declared here
+python = "^3.12"  # Compatible python versions must be declared here
 
 container-app-conf = "*"
 click = "*"