add docker compose & ruff

Author: BushlanovDev

.dockerignore

@@ -0,0 +1,89 @@
+# Git
+.git
+.gitignore
+.gitattributes
+
+
+# CI
+.codeclimate.yml
+.travis.yml
+.taskcluster.yml
+
+# Docker
+docker-compose.yml
+Dockerfile
+.docker
+.dockerignore
+
+# Byte-compiled / optimized / DLL files
+**/__pycache__/
+**/*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Virtual environment
+.env
+.venv/
+venv/
+
+# PyCharm
+.idea
+
+# Python mode for VIM
+.ropeproject
+**/.ropeproject
+
+# Vim swap files
+**/*.swp
+
+# VS Code
+.vscode/

.env.example

@@ -1,3 +1,4 @@
+APP__DEBUG=true
 APP__PORT=8080
 APP__URL=https://my.domain
 APP__WEBHOOK_PATH=/webhook/tg

Dockerfile

@@ -0,0 +1,32 @@
+FROM python:3.12-slim-bullseye AS base
+
+ENV PYTHONFAULTHANDLER=1
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONHASHSEED=random
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PIP_NO_CACHE_DIR=off
+ENV PIP_DISABLE_PIP_VERSION_CHECK=on
+ENV PIP_DEFAULT_TIMEOUT=100
+
+
+FROM base AS builder
+
+COPY requirements.txt requirements.txt
+
+ENV VIRTUAL_ENV=/opt/venv
+RUN python -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+RUN pip install --no-cache-dir -r requirements.txt
+
+
+FROM base
+ENV VIRTUAL_ENV=/opt/venv
+COPY --from=builder $VIRTUAL_ENV $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+WORKDIR /app
+COPY . /app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python", "main.py"]

bot/configs/config.py

@@ -1,10 +1,11 @@
-from typing import Any, Dict
+from typing import Any
 
 from pydantic import SecretStr
 from pydantic_settings import BaseSettings
 
 
 class App(BaseSettings):
+    debug: bool = True
     port: int = 8080
     url: str = 'https://my.domain'
     webhook_path: str = '/webhook/tg'
@@ -17,16 +18,13 @@ class TgBot(BaseSettings):
 class Settings(BaseSettings):
     app: App
     tg_bot: TgBot
-    logging: Dict[str, Any] = {
+    logging: dict[str, Any] = {
         'version': 1,
         'disable_existing_loggers': True,
         'formatters': {
             'default': {
                 'format': '%(levelname)-8s [%(asctime)s] [%(name)s] %(message)s',
             },
-            'uvicorn_access': {
-                'format': '%(levelname)-8s [%(asctime)s] [%(name)s] - %(client_addr)s - "%(request_line)s" %(status_code)s',
-            },
         },
         'handlers': {
             'default': {

bot/handlers/handlers.py

@@ -1,9 +1,7 @@
-from typing import Optional
-
 from aiogram import Bot
 from aiogram.enums import ChatAction
 from aiogram.fsm.context import FSMContext
-from aiogram.types import Message, CallbackQuery
+from aiogram.types import CallbackQuery, Message
 
 from bot.callbacks.callback import SaveCallbackFactory
 from bot.keyboards.keyboards import Keyboards
@@ -12,7 +10,6 @@
 
 
 class Handlers:
-
     def __init__(self, bot: Bot, kb: Keyboards, bot_service: BotService):
         self.bot = bot
         self.kb = kb
@@ -38,8 +35,8 @@ async def answer_fsm_state_1(self, message: Message, state: FSMContext):
 
     async def answer_fsm_state_2(self, message: Message, state: FSMContext):
         await state.update_data(step_2=message.text)
-        data = await  state.get_data()
-        await message.answer(f"Step 1: {data['step_1']}\n" f"Step 2: {data['step_2']}")
+        data = await state.get_data()
+        await message.answer(f"Step 1: {data['step_1']}\nStep 2: {data['step_2']}")
         await state.clear()
 
     async def answer_inline_button(self, message: Message):
@@ -53,7 +50,7 @@ async def process_any_inline_button_press(self, callback: CallbackQuery, callbac
         await callback.message.answer(text=callback_data.pack())
         await callback.answer()
 
-    async def __send_message(self, chat_id: int, text: str, reply_to_message_id: Optional[int] = None) -> int:
+    async def __send_message(self, chat_id: int, text: str, reply_to_message_id: int | None = None) -> int:
         await self.bot.send_chat_action(chat_id, ChatAction.TYPING)
         message = await self.bot.send_message(chat_id=chat_id, text=text, reply_to_message_id=reply_to_message_id)
 

bot/keyboards/keyboards.py

@@ -1,10 +1,7 @@
-from typing import Optional
-
-from aiogram.types import ReplyKeyboardMarkup, KeyboardButton, InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup, KeyboardButton, ReplyKeyboardMarkup
 
 
 class Keyboards:
-
     def __init__(self):
         pass
 
@@ -16,7 +13,7 @@ def get_start_button(self) -> ReplyKeyboardMarkup:
 
         return ReplyKeyboardMarkup(keyboard=kb_list, resize_keyboard=True, one_time_keyboard=True)
 
-    def get_inline_button(self, callback_data: Optional[str] = None) -> InlineKeyboardMarkup:
+    def get_inline_button(self, callback_data: str | None = None) -> InlineKeyboardMarkup:
         inline_kb_list = [
             [
                 InlineKeyboardButton(text='Save', callback_data=callback_data),

bot/middlewares/throttling.py

@@ -1,22 +1,22 @@
 import logging
-from typing import Any, Awaitable, Callable, Dict
+from collections.abc import Awaitable, Callable
+from typing import Any
 
 from aiogram import BaseMiddleware
 from aiogram.types import TelegramObject, User
 from cachetools import TTLCache
 
 logger = logging.getLogger(__name__)
 
-CACHE = TTLCache(maxsize=10_000, ttl=2)  # Максимальный размер кэша - 10000 ключей, а время жизни ключа - 5 секунд
+CACHE = TTLCache(maxsize=10_000, ttl=2)  # Максимальный размер кэша - 10000 ключей, время жизни ключа - 5 секунд
 
 
 class ThrottlingMiddleware(BaseMiddleware):
-
     async def __call__(
             self,
-            handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
+            handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
             event: TelegramObject,
-            data: Dict[str, Any],
+            data: dict[str, Any],
     ) -> Any:
         user: User = data.get('event_from_user')
 

bot/services/bot_service.py

@@ -1,5 +1,4 @@
 class BotService:
-
     def __init__(self):
         pass
 

bot/states/bot_state.py

@@ -1,4 +1,4 @@
-from aiogram.fsm.state import StatesGroup, State
+from aiogram.fsm.state import State, StatesGroup
 
 
 class BotState(StatesGroup):

docker-compose.yml

@@ -0,0 +1,15 @@
+services:
+
+  telegram-bot:
+    image: telegram-bot
+    container_name: telegram-bot
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    restart: always
+    stop_signal: SIGINT
+    working_dir: /app
+    volumes:
+      - .env:/app/.env:ro