From 2e52fa58cbdcd315c4fea4a9fb9de07cd8f49b60 Mon Sep 17 00:00:00 2001 From: yihong0618 Date: Sat, 16 Mar 2024 15:42:22 +0800 Subject: [PATCH] fix: no reply message Signed-off-by: yihong0618 --- handlers/claude.py | 16 +++++++--------- handlers/gemini.py | 14 ++++++-------- handlers/github.py | 5 ++--- handlers/map.py | 10 +--------- requirements.txt | 2 +- 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/handlers/claude.py b/handlers/claude.py index d5d788b..160f8e9 100644 --- a/handlers/claude.py +++ b/handlers/claude.py @@ -4,7 +4,12 @@ from pathlib import Path from anthropic import Anthropic, APITimeoutError from telebot import TeleBot from telebot.types import Message -from md2tgmd import escape + +import telegramify_markdown +from telegramify_markdown.customize import markdown_symbol + +markdown_symbol.head_level_1 = "📌" # If you want, Customizing the head level 1 symbol +markdown_symbol.link = "🔗" # If you want, Customizing the link symbol ANTHROPIC_API_KEY = environ.get("ANTHROPIC_API_KEY") ANTHROPIC_BASE_URL = environ.get("ANTHROPIC_BASE_URL") @@ -18,10 +23,6 @@ claude_player_dict = {} def claude_handler(message: Message, bot: TeleBot) -> None: """claude : /claude """ - reply_message = bot.reply_to( - message, - "Generating Anthropic claude answer please wait, note, will only keep the last five messages:", - ) m = message.text.strip() player_message = [] # restart will lose all TODO @@ -71,7 +72,7 @@ def claude_handler(message: Message, bot: TeleBot) -> None: try: bot.reply_to( message, - "claude answer:\n" + escape(claude_reply_text), + "Claude answer:\n" + telegramify_markdown.convert(claude_reply_text), parse_mode="MarkdownV2", ) return @@ -82,9 +83,6 @@ def claude_handler(message: Message, bot: TeleBot) -> None: "claude answer:\n\n" + claude_reply_text, ) return - finally: - bot.delete_message(reply_message.chat.id, reply_message.message_id) - return def claude_photo_handler(message: Message, bot: TeleBot) -> None: diff --git a/handlers/gemini.py b/handlers/gemini.py index 6536f0d..5205f13 100644 --- a/handlers/gemini.py +++ b/handlers/gemini.py @@ -5,7 +5,11 @@ import google.generativeai as genai from google.generativeai.types.generation_types import StopCandidateException from telebot import TeleBot from telebot.types import Message -from md2tgmd import escape +import telegramify_markdown +from telegramify_markdown.customize import markdown_symbol + +markdown_symbol.head_level_1 = "📌" # If you want, Customizing the head level 1 symbol +markdown_symbol.link = "🔗" # If you want, Customizing the link symbol GOOGLE_GEMINI_KEY = environ.get("GOOGLE_GEMINI_KEY") @@ -46,10 +50,6 @@ def make_new_gemini_convo(): def gemini_handler(message: Message, bot: TeleBot) -> None: """Gemini : /gemini """ - reply_message = bot.reply_to( - message, - "Generating google gemini answer please wait, note, will only keep the last five messages:", - ) m = message.text.strip() player = None # restart will lose all TODO @@ -81,7 +81,7 @@ def gemini_handler(message: Message, bot: TeleBot) -> None: try: bot.reply_to( message, - "Gemini answer:\n" + escape(gemini_reply_text), + "Gemini answer:\n" + telegramify_markdown.convert(gemini_reply_text), parse_mode="MarkdownV2", ) except: @@ -90,8 +90,6 @@ def gemini_handler(message: Message, bot: TeleBot) -> None: message, "Gemini answer:\n\n" + gemini_reply_text, ) - finally: - bot.delete_message(reply_message.chat.id, reply_message.message_id) def gemini_photo_handler(message: Message, bot: TeleBot) -> None: diff --git a/handlers/github.py b/handlers/github.py index 8724726..e26dcf0 100644 --- a/handlers/github.py +++ b/handlers/github.py @@ -6,7 +6,6 @@ from telebot.types import Message def github_poster_handler(message: Message, bot: TeleBot): """github poster: /github [-]""" - reply_message = bot.reply_to(message, "Generating poster please wait:") m = message.text.strip() message_list = m.split(",") name = message_list[0].strip() @@ -26,8 +25,8 @@ def github_poster_handler(message: Message, bot: TeleBot): bot.send_photo( message.chat.id, photo, reply_to_message_id=message.message_id ) - finally: - bot.delete_message(reply_message.chat.id, reply_message.message_id) + except: + bot.reply_to(message, "github poster error") def register(bot: TeleBot) -> None: diff --git a/handlers/map.py b/handlers/map.py index a9989ff..7b70ab9 100644 --- a/handlers/map.py +++ b/handlers/map.py @@ -86,9 +86,7 @@ def draw_pretty_map(location, style, output_file): def map_handler(message: Message, bot: TeleBot): """pretty map: /map
""" - reply_message = bot.reply_to( - message, "Generating pretty map may take some time please wait:" - ) + bot.reply_to(message, "Generating pretty map may take some time please wait:") m = message.text.strip() location = m.strip() styles_list = list(STYLES.keys()) @@ -104,16 +102,11 @@ def map_handler(message: Message, bot: TeleBot): message.chat.id, out_image, reply_to_message_id=message.message_id ) finally: - bot.delete_message(reply_message.chat.id, reply_message.message_id) gc.collect() def map_location_handler(message: Message, bot: TeleBot): # TODO refactor the function - reply_message = bot.reply_to( - message, - "Generating pretty map using location now, may take some time please wait:", - ) location = "{0}, {1}".format(message.location.latitude, message.location.longitude) styles_list = list(STYLES.keys()) style = random.choice(styles_list) @@ -129,7 +122,6 @@ def map_location_handler(message: Message, bot: TeleBot): ) finally: - bot.delete_message(reply_message.chat.id, reply_message.message_id) gc.collect() diff --git a/requirements.txt b/requirements.txt index 33a6f85..cabaa81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ github_poster prettymapp google-generativeai==0.3.1 anthropic -md2tgmd +telegramify-markdown