Merge remote-tracking branch 'git.udochudo.ru/master'

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.3-slim
+FROM python:3.13.1-slim
 LABEL authors="UdoChudo"
 # Установим необходимые пакеты
 RUN apt-get update && apt-get install -y \

telezab.py

@@ -1,16 +1,11 @@
 import os
 from functools import partial
-from gc import callbacks
-
 from flask import Flask, request, jsonify, render_template
-import schedule
 from dotenv import load_dotenv
 import hashlib
 import telebot
 from telebot import types
 import logging
-from logging.config import dictConfig
-import zipfile
 from threading import Thread, Lock
 import sqlite3
 import time
@@ -23,7 +18,7 @@ from concurrent.futures import ThreadPoolExecutor
 from pyzabbix import ZabbixAPI
 import requests
 from pytz import timezone
-from datetime import datetime, timedelta
+from datetime import datetime
 import re
 import urllib.parse
 
@@ -49,7 +44,7 @@ RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'localhost')
 RABBITMQ_QUEUE = 'telegram_notifications'
 RABBITMQ_LOGIN = os.getenv('RABBITMQ_LOGIN')
 RABBITMQ_PASS = os.getenv('RABBITMQ_PASS')
-RABBITMQ_URL = "amqp://"+ RABBITMQ_LOGIN + ":" + RABBITMQ_PASS + "@" + RABBITMQ_HOST +"/"  # Замените на ваш URL RabbitMQ
+RABBITMQ_URL_FULL = f"amqp://{RABBITMQ_LOGIN}:{RABBITMQ_PASS}@{RABBITMQ_HOST}/"
 # Инициализируем класс RegionApi
 region_api = RegionAPI(DB_PATH)
 # Инициализируем класс UserStateManager
@@ -869,7 +864,7 @@ async def consume_from_queue():
     while True:  # Бесконечный цикл для переподключения
         try:
             # Подключение к RabbitMQ
-            connection = await aio_pika.connect_robust(RABBITMQ_URL)
+            connection = await aio_pika.connect_robust(RABBITMQ_URL_FULL)
             async with connection:
                 # Открываем канал
                 channel = await connection.channel()