wip

Author: rozen03

bot_logic.py

@@ -6,6 +6,7 @@
 import pytz
 import datetime
 import random
+from contextlib import contextmanager
 
 # Non STL imports
 from telegram import InlineKeyboardButton, InlineKeyboardMarkup, Update
@@ -39,16 +40,31 @@
 bsasTz = pytz.timezone("America/Argentina/Buenos_Aires")
 
 
+@contextmanager
+def get_session():
+    """Provide a transactional scope around a series of operations."""
+    session = Session()
+    try:
+        yield session
+        session.commit()
+    except:
+        session.rollback()
+        raise
+    finally:
+        session.close()
+
+
 async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await update.message.reply_text(
         "Hola, ¿qué tal? ¡Mandame /help si no sabés qué puedo hacer!")
 
 
 async def help(update: Update, context: ContextTypes.DEFAULT_TYPE):
     message_text = "Comandos disponibles:\n"
-    for name, command_info in sorted(COMMANDS.items()):
-        if 'description' in command_info and command_info['description']:
-            message_text += f"/{name} - {command_info['description']}\n"
+    with get_session() as session:
+        commands = session.query(Command).filter_by(enabled=True).order_by(Command.name).all()
+        for command in commands:
+            message_text += f"/{command.name} - {command.description}\n"
     await update.message.reply_text(message_text)
 
 
@@ -57,8 +73,7 @@ async def estasvivo(update: Update, context: ContextTypes.DEFAULT_TYPE):
 
 
 async def list_buttons(update: Update, context: ContextTypes.DEFAULT_TYPE, listable_type):
-    session = Session()
-    try:
+    with get_session() as session:
         buttons = session.query(listable_type).filter_by(validated=True).order_by(listable_type.name).all()
         keyboard = []
         columns = 3
@@ -71,8 +86,6 @@ async def list_buttons(update: Update, context: ContextTypes.DEFAULT_TYPE, lista
         reply_markup = InlineKeyboardMarkup(keyboard)
         await update.message.reply_text(text="Grupos: ", disable_web_page_preview=True,
                                         reply_markup=reply_markup)
-    finally:
-        session.close()
 
 
 async def listar(update: Update, context: ContextTypes.DEFAULT_TYPE):
@@ -92,16 +105,13 @@ async def listarotro(update: Update, context: ContextTypes.DEFAULT_TYPE):
 
 
 async def cubawiki(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    session = Session()
-    try:
+    with get_session() as session:
         group = session.query(Obligatoria).filter(
             Obligatoria.chat_id == str(update.message.chat.id),
             Obligatoria.cubawiki_url != None
         ).first()
         if group:
             await update.message.reply_text(group.cubawiki_url)
-    finally:
-        session.close()
 
 
 async def suggest_listable(update: Update, context: ContextTypes.DEFAULT_TYPE, listable_type):
@@ -115,14 +125,11 @@ async def suggest_listable(update: Update, context: ContextTypes.DEFAULT_TYPE, l
                                         " <nombre>|<link>")
         return
 
-    session = Session()
-    try:
+    with get_session() as session:
         group = listable_type(name=name, url=url)
         session.add(group)
-        session.commit()
+        session.flush()
         group_id = group.id
-    finally:
-        session.close()
 
     keyboard = [
         [
@@ -240,8 +247,7 @@ async def colaborar(update: Update, context: ContextTypes.DEFAULT_TYPE):
 # Manda una imagen a partir de su path al chat del update dado
 async def mandar_imagen(chat_id, context: ContextTypes.DEFAULT_TYPE, file_path):
     await context.bot.send_chat_action(chat_id=chat_id, action=ChatAction.UPLOAD_PHOTO)
-    session = Session()
-    try:
+    with get_session() as session:
         file = session.query(File).filter_by(path=file_path).first()
         if file:
             msg = await context.bot.send_photo(
@@ -252,17 +258,13 @@ async def mandar_imagen(chat_id, context: ContextTypes.DEFAULT_TYPE, file_path):
                     chat_id=chat_id, photo=f, allow_sending_without_reply=True)
             new_file = File(path=file_path, file_id=msg.photo[0].file_id)
             session.add(new_file)
-            session.commit()
-    finally:
-        session.close()
 
 
 # Manda un documento a partir de su path al chat del update dado
 async def mandar_pdf(chat_id, context: ContextTypes.DEFAULT_TYPE, file_path):
     await context.bot.send_chat_action(
         chat_id=chat_id, action=ChatAction.UPLOAD_DOCUMENT)
-    session = Session()
-    try:
+    with get_session() as session:
         file = session.query(File).filter_by(path=file_path).first()
         if file:
             msg = await context.bot.send_document(
@@ -273,9 +275,6 @@ async def mandar_pdf(chat_id, context: ContextTypes.DEFAULT_TYPE, file_path):
                     chat_id=chat_id, document=f, allow_sending_without_reply=True)
             new_file = File(path=file_path, file_id=msg.document.file_id)
             session.add(new_file)
-            session.commit()
-    finally:
-        session.close()
 
 
 # Responde una imagen a partir de su path al chat del update dado
@@ -293,18 +292,15 @@ async def button(update: Update, context: ContextTypes.DEFAULT_TYPE):
     message = query.message
     buttonType, id, action = query.data.split("|")
 
-    session = Session()
-    try:
+    with get_session() as session:
         if buttonType == "Listable":
             group = session.query(Listable).filter_by(id=int(id)).first()
             if group:
                 if action == "1":
                     group.validated = True
-                    session.commit()
                     action_text = "\n¡Aceptado!"
                 else:
                     session.delete(group)
-                    session.commit()
                     action_text = "\n¡Rechazado!"
                 await query.edit_message_text(text=message.text + action_text)
 
@@ -313,17 +309,13 @@ async def button(update: Update, context: ContextTypes.DEFAULT_TYPE):
             if noticia:
                 if action == "1":
                     noticia.validated = True
-                    session.commit()
                     action_text = "\n¡Aceptado!"
                     await context.bot.send_message(chat_id=NOTICIAS_CHATID,
                                                    text=noticia.text, parse_mode=ParseMode.MARKDOWN)
                 else:
                     session.delete(noticia)
-                    session.commit()
                     action_text = "\n¡Rechazado!"
                 await query.edit_message_text(text=message.text + action_text)
-    finally:
-        session.close()
 
 
 COMMANDS = {
@@ -375,6 +367,10 @@ async def button(update: Update, context: ContextTypes.DEFAULT_TYPE):
         'handler': sugerirotro,
         'description': 'Sugiere un grupo de otra categoría.'
     },
+    'agregargrupo': {
+        'handler': agregargrupo,
+        'description': 'Muestra ayuda para sugerir un grupo.'
+    },
     'campusvivo': {
         'handler': campusvivo,
         'description': 'Verifica si el Campus Virtual está funcionando.'

deletablecommandhandler.py

@@ -1,9 +1,10 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
+import datetime
 from telegram.ext import CommandHandler
 from telegram.error import BadRequest
-from models import *
+from models import Session, SentMessage
 import logging
 logger = logging.getLogger("DCUBABOT")
 
@@ -18,21 +19,37 @@ def handle_update(self, update, dispatcher, check_result, context=None):
         context.sent_messages = []
         super().handle_update(update, dispatcher, check_result, context)
 
-        with db_session:
+        session = Session()
+        try:
             # Delete previous messages sent with the command in the group
-            for message in select(m for m in SentMessage if
-                                  m.command == self.command[0] and
-                                  m.chat_id == update.effective_chat.id):
+            messages_to_delete = session.query(SentMessage).filter_by(
+                command=self.command[0],
+                chat_id=update.effective_chat.id
+            ).all()
+
+            for message in messages_to_delete:
                 if self._message_in_time_range(message):
                     try:
                         context.bot.delete_message(chat_id=message.chat_id,
                                                    message_id=message.message_id)
                     except BadRequest as e:
-                        logger.info("Menssage already deleted, tabunn")
-                    message.delete()
+                        logger.info("Message already deleted, tabunn")
+                    session.delete(message)
 
             # Insert new sent messages for later delete (only in groups)
             for message in context.sent_messages:
                 if message.chat.type != "private":
-                    SentMessage(command=self.command[0], chat_id=message.chat.id,
-                                message_id=message.message_id)
+                    new_message = SentMessage(
+                        command=self.command[0],
+                        chat_id=message.chat.id,
+                        message_id=message.message_id,
+                        timestamp=datetime.datetime.utcnow()
+                    )
+                    session.add(new_message)
+            
+            session.commit()
+        except Exception as e:
+            session.rollback()
+            logger.error(f"Error in DeletableCommandHandler: {e}")
+        finally:
+            session.close()

orga2Utils.py

@@ -1,13 +1,29 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
+from contextlib import contextmanager
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy import func
 # Local imports
-from models import *
+from models import AsmInstruction, Noitip, Session
+
+@contextmanager
+def get_session():
+    """Provide a transactional scope around a series of operations."""
+    session = Session()
+    try:
+        yield session
+        session.commit()
+    except:
+        session.rollback()
+        raise
+    finally:
+        session.close()
 
 
 def noitip(update, context):
-    with db_session:
-        random_noitip = Noitip.select_random(1)[0].text
+    with get_session() as session:
+        random_noitip = session.query(Noitip).order_by(func.random()).first().text
     msg = update.message.reply_text(random_noitip, quote=False)
     context.sent_messages.append(msg)
 
@@ -20,8 +36,9 @@ def asm(update, context):
         return
 
     mnemonic = " ".join(context.args).upper()
-    with db_session:
-        possibles = [i for i in list(AsmInstruction.select())
+    with get_session() as session:
+        all_instructions = session.query(AsmInstruction).all()
+        possibles = [i for i in all_instructions
                      if levenshtein(mnemonic, i.mnemonic.upper()) < 2]
     if not possibles:
         msg = update.message.reply_text(