aljaz/chatgpt-telegram-bot
1
1
Fork 0
mirror of https://github.com/aljazceru/chatgpt-telegram-bot.git synced 2025-12-22 07:04:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

some refactoring

Browse Source
This commit is contained in:
ned
2023-03-28 12:59:19 +02:00
parent bd4fe58551
commit 77a500a1ff
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bot/telegram_bot.py
View File

@@ -8,7 +8,7 @@ from telegram import constants
from telegram import Message, MessageEntity, Update, InlineQueryResultArticle, InputTextMessageContent, BotCommand from telegram import Message, MessageEntity, Update, InlineQueryResultArticle, InputTextMessageContent, BotCommand
from telegram.error import RetryAfter, TimedOut from telegram.error import RetryAfter, TimedOut
from telegram.ext import ApplicationBuilder, ContextTypes, CommandHandler, MessageHandler, \ from telegram.ext import ApplicationBuilder, ContextTypes, CommandHandler, MessageHandler, \
filters, InlineQueryHandler, Application filters, InlineQueryHandler, Application, CallbackContext
from pydub import AudioSegment from pydub import AudioSegment
from openai_helper import OpenAIHelper from openai_helper import OpenAIHelper
@@ -184,13 +184,7 @@ class ChatGPTTelegramBot:
parse_mode=constants.ParseMode.MARKDOWN parse_mode=constants.ParseMode.MARKDOWN
) )
task = context.application.create_task(_generate(), update=update) await self.wrap_with_indicator(update, context, constants.ChatAction.UPLOAD_PHOTO, _generate)
while not task.done():
context.application.create_task(update.effective_chat.send_action(constants.ChatAction.UPLOAD_PHOTO))
try:
await asyncio.wait_for(asyncio.shield(task), 4.5)
except asyncio.TimeoutError:
pass
async def transcribe(self, update: Update, context: ContextTypes.DEFAULT_TYPE): async def transcribe(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
""" """
@@ -317,13 +311,7 @@ class ChatGPTTelegramBot:
if os.path.exists(filename): if os.path.exists(filename):
os.remove(filename) os.remove(filename)
task = context.application.create_task(_execute(), update=update) await self.wrap_with_indicator(update, context, constants.ChatAction.TYPING, _execute)
while not task.done():
context.application.create_task(update.effective_chat.send_action(constants.ChatAction.TYPING))
try:
await asyncio.wait_for(asyncio.shield(task), 4.5)
except asyncio.TimeoutError:
pass
async def prompt(self, update: Update, context: ContextTypes.DEFAULT_TYPE): async def prompt(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
""" """
@@ -451,13 +439,7 @@ class ChatGPTTelegramBot:
parse_mode=constants.ParseMode.MARKDOWN parse_mode=constants.ParseMode.MARKDOWN
) )
task = context.application.create_task(_reply(), update=update) await self.wrap_with_indicator(update, context, constants.ChatAction.TYPING, _reply)
while not task.done():
context.application.create_task(update.effective_chat.send_action(constants.ChatAction.TYPING))
try:
await asyncio.wait_for(asyncio.shield(task), 4.5)
except asyncio.TimeoutError:
pass
try: try:
# add chat request to users usage tracker # add chat request to users usage tracker
@@ -532,6 +514,18 @@ class ChatGPTTelegramBot:
logging.warning(str(e)) logging.warning(str(e))
raise e raise e
async def wrap_with_indicator(self, update: Update, context: CallbackContext, chat_action: constants.ChatAction, coroutine):
"""
Wraps a coroutine while repeatedly sending a chat action to the user.
"""
task = context.application.create_task(coroutine(), update=update)
while not task.done():
context.application.create_task(update.effective_chat.send_action(chat_action))
try:
await asyncio.wait_for(asyncio.shield(task), 4.5)
except asyncio.TimeoutError:
pass
async def send_disallowed_message(self, update: Update, context: ContextTypes.DEFAULT_TYPE): async def send_disallowed_message(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
""" """
Sends the disallowed message to the user. Sends the disallowed message to the user.