Refactor: code smells and typings

- Replace tuple return in update_group_url with GroupUrlResult dataclass
- Fix bare excepts across the codebase
- Remove unused exception variables
- Remove unused imports and fix re-exports in bot_logic.py

Author: rozen03

bot_logic.py

@@ -2,9 +2,7 @@
 from handlers.basic import start, help_command, estasvivo, colaborar
 from handlers.info import campusvivo, flan, flanviejo, aulas, cuandovence, listarlabos
 from handlers.admin import checodepers, checodeppers, sugerirNoticia, get_logs, joder, movergrupo
-from handlers.groups import listar, listaroptativa, listareci, listarotro, cubawiki, agregargrupo, agregaroptativa, agregarotros, agregareci, sugerirgrupo, sugeriroptativa, sugerireci, sugerirotro, actualizar_grupos, _update_groups
-from handlers.callbacks import button
-from handlers.crons import felizdia, actualizarRiver
+from handlers.groups import listar, listaroptativa, listareci, listarotro, cubawiki, agregargrupo, agregaroptativa, agregarotros, agregareci, sugerirgrupo, sugeriroptativa, sugerireci, sugerirotro, actualizar_grupos
 
 COMMANDS = {
     'joder': {

cron.py

@@ -6,7 +6,8 @@
 import datetime
 from telegram.ext import Application
 from tg_ids import ROZEN_CHATID
-from bot_logic import _update_groups, felizdia, actualizarRiver
+from handlers.groups import _update_groups
+from handlers.crons import felizdia, actualizarRiver
 from handlers.db import get_session
 from models import ProcessedUpdate
 
@@ -31,19 +32,19 @@ async def run_update():
 
         try:
             await felizdia(application)
-        except Exception as e:
+        except Exception:
             error_msg = f"Error en felizdia:\n{traceback.format_exc()}"
             await application.bot.send_message(chat_id=ROZEN_CHATID, text=error_msg[:4000])
 
         try:
             await actualizarRiver(application)
-        except Exception as e:
+        except Exception:
             error_msg = f"Error en actualizarRiver:\n{traceback.format_exc()}"
             await application.bot.send_message(chat_id=ROZEN_CHATID, text=error_msg[:4000])
 
         try:
             await _update_groups(application)
-        except Exception as e:
+        except Exception:
             error_msg = f"Error en update_groups:\n{traceback.format_exc()}"
             await application.bot.send_message(chat_id=ROZEN_CHATID, text=error_msg[:4000])
 
@@ -55,7 +56,7 @@ async def run_update():
                 chat_id=ROZEN_CHATID, 
                 text=f"Cron job finalizado. RAM máxima utilizada: {memory_mb:.2f} MB"
             )
-        except Exception as e:
+        except Exception:
             logging.error(f"Failed to send memory report: {e}")
 
     asyncio.run(run_update())

handlers/db.py

@@ -10,7 +10,7 @@ def get_session():
     try:
         yield session
         session.commit()
-    except:
+    except Exception:
         session.rollback()
         raise
     finally:

handlers/groups.py

@@ -92,7 +92,7 @@ async def agregar(update: Update, context: ContextTypes.DEFAULT_TYPE, grouptype,
             chat_id=update.message.chat.id)
         name = update.message.chat.title
         chat_id = str(update.message.chat.id)
-    except:
+    except Exception:
         await update.message.reply_text(
             text=f"Mirá, no puedo hacerle un link a este grupo, proba haciendome admin")
         return
@@ -134,17 +134,25 @@ async def agregareci(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await agregar(update, context, ECI, "eci")
 
 from telegram.error import Forbidden, BadRequest, RetryAfter, ChatMigrated
+from dataclasses import dataclass
+
+@dataclass
+class GroupUrlResult:
+    chat_id: str | None
+    url: str | None
+    title: str | None
+    validated: bool | None
 
-async def update_group_url(context: ContextTypes.DEFAULT_TYPE, chat_id: str, max_retries: int = 3) -> tuple[str, str, str, bool]:
+async def update_group_url(context: ContextTypes.DEFAULT_TYPE, chat_id: str, max_retries: int = 3) -> GroupUrlResult:
     base_delay = 1
     for attempt in range(max_retries):
         try:
             url = await context.bot.export_chat_invite_link(chat_id=chat_id)
             chat = await context.bot.get_chat(chat_id=chat_id)
-            return chat_id, url, chat.title, True
+            return GroupUrlResult(chat_id=chat_id, url=url, title=chat.title, validated=True)
         except (Forbidden, BadRequest) as e:
             logger.error(f"Bot is no longer allowed to create invite link for {chat_id}: {e}")
-            return None, None, None, False
+            return GroupUrlResult(chat_id=None, url=None, title=None, validated=False)
         except ChatMigrated as e:
             logger.info(f"Group {chat_id} migrated to {e.new_chat_id}. Retrying with new chat id.")
             return await update_group_url(context, str(e.new_chat_id), max_retries)
@@ -158,7 +166,7 @@ async def update_group_url(context: ContextTypes.DEFAULT_TYPE, chat_id: str, max
             await asyncio.sleep(wait_time)
 
     logger.error(f"Max retries reached for {chat_id}. Failing gracefully.")
-    return None, None, None, None
+    return GroupUrlResult(chat_id=None, url=None, title=None, validated=None)
 
 async def _update_groups(context: ContextTypes.DEFAULT_TYPE):
     logger.info("Starting update_groups job")
@@ -175,11 +183,11 @@ async def _update_groups(context: ContextTypes.DEFAULT_TYPE):
 
     for chat_chat_id, db_entries in chats_by_id.items():
         await asyncio.sleep(1)
-        chat_id, url, title, validated = await update_group_url(context, chat_chat_id)
+        result = await update_group_url(context, chat_chat_id)
 
         primary_name = db_entries[0][1]
 
-        if validated is False:
+        if result.validated is False:
             logger.warning(f"Failed to update URL for group '{primary_name}'. De-validating.")
             with get_session() as session:
                 for db_id, _ in db_entries:
@@ -190,19 +198,19 @@ async def _update_groups(context: ContextTypes.DEFAULT_TYPE):
                 await context.bot.send_message(chat_id=DC_GROUP_CHATID, text=f"El grupo {primary_name} murió 💀")
             except Exception as e:
                 logger.error(f"Failed to send death message for {primary_name}: {e}")
-        elif validated is True:
+        elif result.validated is True:
             logger.info(f"Updating URL for group '{primary_name}'")
             with get_session() as session:
                 for db_id, _ in db_entries:
                     c = session.query(Listable).filter_by(id=db_id).first()
                     if c:
-                        c.url = url
-                        if title and c.name != title:
-                            logger.info(f"Updating name for group '{primary_name}' to '{title}'")
-                            c.name = title
-                        if str(c.chat_id) != str(chat_id):
-                            logger.info(f"Updating chat_id for group '{primary_name}' from {c.chat_id} to {chat_id}")
-                            c.chat_id = str(chat_id)
+                        c.url = result.url
+                        if result.title and c.name != result.title:
+                            logger.info(f"Updating name for group '{primary_name}' to '{result.title}'")
+                            c.name = result.title
+                        if str(c.chat_id) != str(result.chat_id):
+                            logger.info(f"Updating chat_id for group '{primary_name}' from {c.chat_id} to {result.chat_id}")
+                            c.chat_id = str(result.chat_id)
     logger.info("Finished update_groups job")
 
 from handlers.admin import admin_ids

main.py

@@ -9,7 +9,8 @@
 from fastapi import FastAPI, Request, Response
 import uvicorn
 
-from bot_logic import COMMANDS, button
+from bot_logic import COMMANDS
+from handlers.callbacks import button
 from tg_ids import ROZEN_CHATID
 from handlers.db import get_session
 from models import ProcessedUpdate

models.py

@@ -3,7 +3,7 @@
 
 import os
 import datetime
-from sqlalchemy import create_engine, Column, Integer, String, Boolean, DateTime, Date, Text, ForeignKey
+from sqlalchemy import create_engine, Column, Integer, String, Boolean, DateTime, Date, Text
 from sqlalchemy.orm import sessionmaker, declarative_base
 from sqlalchemy.types import BigInteger
 

utils/campus.py

@@ -22,7 +22,7 @@ def is_campus_up():
         msg = "Hubo un error de conexión, debe estar caído. Espero no sea época de parciales..."
     except requests.exceptions.HTTPError:
         msg = f"Recibí una respuesta del campus con error. {response.status_code}: {response.reason}"
-    except:
+    except Exception:
         msg = "Hubo un error y no tengo idea de qué fue. Rezale a Shannon."
 
     return msg

utils/conciertos.py

@@ -23,7 +23,7 @@ def parse(evento):
                 titulo,
                 fecha,
             )
-        except:
+        except Exception:
             return None
 
 def fetch_conciertos():

utils/deletablecommandhandler.py

@@ -32,7 +32,7 @@ def handle_update(self, update, dispatcher, check_result, context=None):
                     try:
                         context.bot.delete_message(chat_id=message.chat_id,
                                                    message_id=message.message_id)
-                    except BadRequest as e:
+                    except BadRequest:
                         logger.info("Message already deleted, tabunn")
                     session.delete(message)
 

utils/orga2Utils.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 from contextlib import contextmanager
-from sqlalchemy.orm import sessionmaker
 from sqlalchemy import func
 # Local imports
 import models
@@ -16,7 +15,7 @@ def get_session():
     try:
         yield session
         session.commit()
-    except:
+    except Exception:
         session.rollback()
         raise
     finally: