From 98909312f252c8523b728e6cac7558403e8a83fc Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 29 Mar 2024 23:01:34 +0800 Subject: [PATCH] Update the MarkdownV2 message --- handlers/__init__.py | 8 +++++++- handlers/claude.py | 7 ++----- handlers/gemini.py | 7 ++----- handlers/yi.py | 7 ++----- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/handlers/__init__.py b/handlers/__init__.py index 383e79d..43f0c04 100644 --- a/handlers/__init__.py +++ b/handlers/__init__.py @@ -20,6 +20,12 @@ T = TypeVar("T", bound=Callable) BOT_MESSAGE_LENGTH = 4000 +def bot_reply_first(message: Message, who: str, bot: TeleBot) -> Message: + """ Create the first reply message which make user feel the bot is working. """ + return bot.reply_to(message, + f"**{who}** is __thinking__ \.\.\.", + parse_mode="MarkdownV2" + ) def bot_reply_markdown(reply_id: Message, who: str, text: str, bot: TeleBot) -> None: """ @@ -144,4 +150,4 @@ def list_available_commands() -> list[str]: # `import *` will give you these -__all__ = ["bot_reply_markdown", "extract_prompt"] +__all__ = ["bot_reply_first", "bot_reply_markdown", "extract_prompt"] diff --git a/handlers/claude.py b/handlers/claude.py index 89b283d..85e6e5d 100644 --- a/handlers/claude.py +++ b/handlers/claude.py @@ -6,7 +6,7 @@ from anthropic import Anthropic, APITimeoutError from telebot import TeleBot from telebot.types import Message -from . import bot_reply_markdown +from . import * from telegramify_markdown import convert from telegramify_markdown.customize import markdown_symbol @@ -48,10 +48,7 @@ def claude_handler(message: Message, bot: TeleBot) -> None: return # show something, make it more responsible - reply_id = bot.reply_to(message, - "**Claude** is __thinking__...", - parse_mode="MarkdownV2" - ) + reply_id = bot_reply_first(message, "Claude", bot) player_message.append({"role": "user", "content": m}) # keep the last 5, every has two ask and answer. diff --git a/handlers/gemini.py b/handlers/gemini.py index 9c2f03d..0f1c2ba 100644 --- a/handlers/gemini.py +++ b/handlers/gemini.py @@ -6,7 +6,7 @@ from google.generativeai.types.generation_types import StopCandidateException from telebot import TeleBot from telebot.types import Message -from . import bot_reply_markdown +from . import * GOOGLE_GEMINI_KEY = environ.get("GOOGLE_GEMINI_KEY") @@ -59,10 +59,7 @@ def gemini_handler(message: Message, bot: TeleBot) -> None: return # show something, make it more responsible - reply_id = bot.reply_to(message, - "**Gemini** is __thinking__...", - parse_mode="MarkdownV2" - ) + reply_id = bot_reply_first(message, "Gemini", bot) # keep the last 5, every has two ask and answer. if len(player.history) > 10: diff --git a/handlers/yi.py b/handlers/yi.py index ccd194c..3f3230b 100644 --- a/handlers/yi.py +++ b/handlers/yi.py @@ -7,7 +7,7 @@ import requests from telebot import TeleBot from telebot.types import Message -from . import bot_reply_markdown +from . import * YI_BASE_URL = environ.get("YI_BASE_URL") YI_API_KEY = environ.get("YI_API_KEY") @@ -45,10 +45,7 @@ def yi_handler(message: Message, bot: TeleBot) -> None: return # show something, make it more responsible - reply_id = bot.reply_to(message, - "**Yi** is __thinking__...", - parse_mode="MarkdownV2" - ) + reply_id = bot_reply_first(message, "Yi", bot) player_message.append({"role": "user", "content": m}) # keep the last 5, every has two ask and answer.