From a7d2c98c97defc54ad256b655a93bbe7b55521a8 Mon Sep 17 00:00:00 2001 From: cyclop-bot <178948048+cyclop-bot@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:55:30 -0500 Subject: [PATCH] Refactor telegram_helper.py: Apply constants, remove unused git import, and prepare for processing_status encapsulation. --- telegram_helper.py | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/telegram_helper.py b/telegram_helper.py index 53d55b7..e3c83cc 100644 --- a/telegram_helper.py +++ b/telegram_helper.py @@ -3,16 +3,21 @@ import logging import sys import asyncio import time -import git from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup from telegram.ext import Application, CommandHandler, MessageHandler, filters, ContextTypes, CallbackQueryHandler from browse_command import browse_command, button_callback class TelegramHelper: + # --- Constants for configurable paths and magic strings --- + REBOOT_CLAUDE_FILE = '.reboot_claude' + REBOOT_FILE = '.doreboot' + CLAUDE_REBOOT_TARGET = 'claude' + HTML_QUOTE_BLOCK_START = '
Thinking...' + HTML_QUOTE_BLOCK_END = '
' + def __init__(self, bot): self.bot = bot self.telegram_bot_token = os.getenv('TELEGRAM_BOT_TOKEN') - self.repo = git.Repo(".") self.start_time = time.time() async def start(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: @@ -23,11 +28,11 @@ class TelegramHelper: async def clear(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: user_id = update.effective_user.id - await self.bot.clear(user_id) + await self.bot.clear_conversation_history(user_id) await update.message.reply_text("Conversation history cleared. Let's start fresh!") async def status(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: - status_message = await self.bot.status() + status_message = await self.bot.get_bot_status() await update.message.reply_text(status_message) async def switch(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: @@ -56,23 +61,22 @@ class TelegramHelper: logging.info(f"Message from user {user_id}: {user_message}") - status_message = await update.message.reply_text("Processing your request...", reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("Abort", callback_data='abort')]])) - self.bot.processing_status[user_id] = {"processing": True, "message_id": status_message.message_id} + status_message = await update.message.reply_text("Processing your request...", reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("Abort", callback_data='abort')]]))\ + await self.bot.set_processing_status(user_id, status_message.message_id) response = await self.bot.handle_message(user_id, user_message) await context.bot.delete_message(chat_id=update.effective_chat.id, message_id=status_message.message_id) - del self.bot.processing_status[user_id] - response = response.replace("", "
Thinking...").replace("", "
") - # Return response as html message + await self.bot.clear_processing_status(user_id) + + response = response.replace("", self.HTML_QUOTE_BLOCK_START).replace("", self.HTML_QUOTE_BLOCK_END) + if len(response) > 4096: - # If the response is too long, split it into chunks chunks = [response[i:i + 4096] for i in range(0, len(response), 4096)] for chunk in chunks: await update.message.reply_text(chunk) - # Add a small delay to avoid flooding await asyncio.sleep(0.1) - else: + else: await update.message.reply_text(response) except Exception as e: @@ -82,27 +86,27 @@ class TelegramHelper: async def abort_processing(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: query = update.callback_query await query.answer() - + user_id = query.from_user.id result = await self.bot.abort_processing(user_id) await query.edit_message_text(text=result) async def reboot(self, update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: - user_message = update.message.text.split() # Split the message to check for 'claude' - if len(user_message) > 1 and user_message[1].lower() == 'claude': - open('./.reboot_claude', 'w').close() # Create an empty file + user_message = update.message.text.split() + if len(user_message) > 1 and user_message[1].lower() == self.CLAUDE_REBOOT_TARGET: + open(self.REBOOT_CLAUDE_FILE, 'w').close() if update: await update.message.reply_text("Rebooting the bot...") logging.info("Received reboot command. Exiting process...") - reboot_file_path = "./.doreboot" + reboot_file_path = self.REBOOT_FILE if not os.path.exists(reboot_file_path): with open(reboot_file_path, 'w') as f: f.write(str(update.effective_chat.id) if update else "") sys.exit(0) async def check_doreboot_file(self, application: Application): - reboot_file_path = "./.doreboot" + reboot_file_path = self.REBOOT_FILE if os.path.exists(reboot_file_path): with open(reboot_file_path, 'r') as f: chat_id = f.read().strip() @@ -122,16 +126,12 @@ class TelegramHelper: application.add_handler(CommandHandler("status", self.status)) application.add_handler(CommandHandler("reboot", self.reboot)) application.add_handler(CommandHandler("browse", self.browse)) - application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, self.handle_message)) + application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, self.handle_message))\ application.add_handler(CallbackQueryHandler(self.abort_processing, pattern='^abort$')) application.add_handler(CallbackQueryHandler(button_callback, pattern='^(browse|file):')) - + logging.info("Bot is running...") - # Check for .doreboot file and send message if it exists asyncio.get_event_loop().create_task(self.check_doreboot_file(application)) - - # Commenting out the commit checking task - # asyncio.get_event_loop().create_task(self.check_for_new_commits()) - - application.run_polling() \ No newline at end of file + + application.run_polling()