queue to telegram retry
Signed-off-by: Omar Sánchez Pizarro <omar.sanchez@pistacero.net>
This commit is contained in:
@@ -6,6 +6,7 @@ from managers.telegram_manager import TelegramManager
|
||||
|
||||
MESSAGE_DELAY = 3.0 # Tiempo de espera entre mensajes en segundos
|
||||
NOTIFIED_ARTICLES_LIMIT = 300 # Límite de artículos notificados a mantener en memoria
|
||||
RETRY_TIMES = 3
|
||||
|
||||
class QueueManager:
|
||||
def __init__(self):
|
||||
@@ -19,14 +20,14 @@ class QueueManager:
|
||||
self._processor_thread = threading.Thread(target=self._process_queue, daemon=True)
|
||||
self._processor_thread.start()
|
||||
|
||||
def add_to_queue(self, article, search_name=None, thread_id=None):
|
||||
def add_to_queue(self, article, search_name=None, thread_id=None, retry_times=RETRY_TIMES):
|
||||
# Verificar si el artículo ya ha sido enviado
|
||||
if article in self._notified_articles:
|
||||
return
|
||||
|
||||
if search_name is None:
|
||||
search_name = "Unknown"
|
||||
self._queue.put((search_name, article, thread_id))
|
||||
self._queue.put((search_name, article, thread_id, retry_times))
|
||||
self.logger.debug(f"Artículo añadido a la cola: {article.get_title()}")
|
||||
|
||||
self.add_to_notified_articles(article)
|
||||
@@ -45,16 +46,19 @@ class QueueManager:
|
||||
try:
|
||||
# Esperar hasta que haya un elemento en la cola (timeout de 1 segundo)
|
||||
try:
|
||||
search_name, article, thread_id = self._queue.get(timeout=1.0)
|
||||
search_name, article, thread_id, retry_times = self._queue.get(timeout=1.0)
|
||||
except queue.Empty:
|
||||
continue
|
||||
|
||||
# Procesar el artículo
|
||||
try:
|
||||
self._telegram_manager.send_telegram_article(search_name, article, thread_id)
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(f"Error al enviar artículo a Telegram: {e}")
|
||||
if retry_times > 0:
|
||||
self._queue.put((search_name, article, thread_id, retry_times - 1))
|
||||
else:
|
||||
self.logger.error(f"Artículo no enviado después de {RETRY_TIMES} intentos")
|
||||
finally:
|
||||
self._queue.task_done()
|
||||
|
||||
|
||||
@@ -83,29 +83,9 @@ class TelegramManager:
|
||||
)
|
||||
images_url = article.get_images()
|
||||
|
||||
media = []
|
||||
for idx, image_url in enumerate(images_url):
|
||||
if idx == 0:
|
||||
media.append(
|
||||
telegram.InputMediaPhoto(
|
||||
media=image_url,
|
||||
caption=message,
|
||||
parse_mode="HTML"
|
||||
)
|
||||
)
|
||||
else:
|
||||
media.append(
|
||||
telegram.InputMediaPhoto(
|
||||
media=image_url
|
||||
)
|
||||
)
|
||||
# Envía solo la primera imagen usando sendPhoto en vez de un álbum/media group
|
||||
first_image_url = images_url[0] if images_url else None
|
||||
|
||||
# Enviar el media group
|
||||
sent_messages = await self._bot.send_media_group(
|
||||
chat_id=self._channel,
|
||||
media=media,
|
||||
message_thread_id=thread_id
|
||||
)
|
||||
|
||||
# Crear botones inline para el primer mensaje del grupo
|
||||
keyboard = [
|
||||
@@ -119,9 +99,10 @@ class TelegramManager:
|
||||
# Enviar un mensaje adicional con los botones (reply al primer mensaje del grupo)
|
||||
await self._bot.send_message(
|
||||
chat_id=self._channel,
|
||||
text="💾 Acciones",
|
||||
photo=first_image_url,
|
||||
text=message,
|
||||
parse_mode="HTML",
|
||||
reply_markup=reply_markup,
|
||||
reply_to_message_id=sent_messages[0].message_id,
|
||||
message_thread_id=thread_id
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user