Dependencies update: August 2024 (#28)

* Updated dependencies
* Updated code to use new pydantic-settings and new aiogram
* Using distroless docker image to run bot

Author: MasterGroosha

Dockerfile

@@ -1,15 +1,15 @@
 # Separate "build" image
-FROM python:3.11-slim-bullseye as compile-image
+FROM python:3.11-slim-bookworm as compile-image
 RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 COPY requirements.txt .
 RUN pip install --no-cache-dir --upgrade pip \
  && pip install --no-cache-dir -r requirements.txt
 
 # "Run" image
-FROM python:3.11-slim-bullseye
-COPY --from=compile-image /opt/venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
+FROM gcr.io/distroless/python3
 WORKDIR /app
+COPY --from=compile-image /opt/venv /app/venv
+ENV PYTHONPATH="/app/venv/lib/python3.11/site-packages"
 COPY bot /app/bot
-CMD ["python", "-m", "bot"]
+CMD ["-m", "bot"]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2023 Groosha (also known as MasterGroosha on GitHub)
+Copyright (c) 2019-2024 Groosha (also known as MasterGroosha on GitHub)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -15,7 +15,7 @@ This is a simple bot written with [aiogram 3.x](https://github.com/aiogram/aiogr
 * Group to supergroup migrate information (both old and new ID).
 
 ## Requirements:
-* Python 3.9 and newer;  
+* Python 3.11 and newer;  
 * Linux (should work on Windows, but not tested);   
 * Systemd init system (optional).  
 * Docker (optional).

bot/__main__.py

@@ -3,6 +3,8 @@
 
 import structlog
 from aiogram import Bot, Dispatcher
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import ParseMode
 from structlog.typing import FilteringBoundLogger
 
 from bot.config_reader import bot_config, log_config
@@ -18,7 +20,12 @@
 async def main():
     structlog.configure(**get_structlog_config(log_config))
 
-    bot = Bot(bot_config.bot_token.get_secret_value(), parse_mode="HTML")
+    bot = Bot(
+        bot_config.bot_token.get_secret_value(),
+        default=DefaultBotProperties(
+            parse_mode=ParseMode.HTML,
+        )
+    )
 
     # Setup dispatcher and bind routers to it
     dp = Dispatcher()

bot/config_reader.py

@@ -1,16 +1,12 @@
-from enum import Enum
+from enum import StrEnum, auto
 
-from pydantic import BaseSettings, SecretStr
+from pydantic import SecretStr
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
-class ModeEnum(str, Enum):
-    DEVELOPMENT = "dev"
-    PRODUCTION = "prod"
-
-
-class LoggingRenderer(str, Enum):
-    JSON = "json"
-    CONSOLE = "console"
+class LoggingRenderer(StrEnum):
+    JSON = auto()
+    CONSOLE = auto()
 
 
 class LoggingSettings(BaseSettings):
@@ -20,18 +16,22 @@ class LoggingSettings(BaseSettings):
     renderer: LoggingRenderer = LoggingRenderer.JSON
     log_unhandled: bool = False
 
-    class Config:
-        env_file = '.env'
-        env_file_encoding = 'utf-8'
-        env_prefix = "LOGGING_"
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_file_encoding="UTF-8",
+        env_prefix="LOGGING_",
+        extra="allow",
+    )
 
 
 class BotSettings(BaseSettings):
     bot_token: SecretStr
 
-    class Config:
-        env_file = '.env'
-        env_file_encoding = 'utf-8'
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_file_encoding="UTF-8",
+        extra="allow",
+    )
 
 
 bot_config = BotSettings()

my-id-bot.example.service

@@ -5,6 +5,7 @@ After=network.target
 [Service]
 Type=simple
 WorkingDirectory=/home/user/my-id-bot
+EnvironmentFile=/home/user/my-id-bot/.env
 ExecStart=/home/user/my-id-bot/venv/bin/python -m bot
 KillMode=process
 Restart=always

requirements.txt

@@ -1,6 +1,63 @@
-aiogram==3.0.0b7
-cachetools==5.3.0
-python-dotenv==1.0.0
-pydantic==1.10.6
-fluent.runtime==0.4.0
-structlog==22.3.0
+# This file was autogenerated by uv via the following command:
+#    uv pip compile requirements.in -o requirements.txt
+aiofiles==23.2.1
+    # via aiogram
+aiogram==3.12.0
+    # via -r requirements.in
+aiohappyeyeballs==2.3.5
+    # via aiohttp
+aiohttp==3.10.3
+    # via aiogram
+aiosignal==1.3.1
+    # via aiohttp
+annotated-types==0.7.0
+    # via pydantic
+attrs==24.2.0
+    # via
+    #   aiohttp
+    #   fluent-runtime
+babel==2.16.0
+    # via fluent-runtime
+cachetools==5.4.0
+    # via -r requirements.in
+certifi==2024.7.4
+    # via aiogram
+fluent-runtime==0.4.0
+    # via -r requirements.in
+fluent-syntax==0.19.0
+    # via fluent-runtime
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
+idna==3.7
+    # via yarl
+magic-filter==1.0.12
+    # via aiogram
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
+pydantic==2.8.2
+    # via
+    #   aiogram
+    #   pydantic-settings
+pydantic-core==2.20.1
+    # via pydantic
+pydantic-settings==2.4.0
+    # via -r requirements.in
+python-dotenv==1.0.1
+    # via pydantic-settings
+pytz==2024.1
+    # via fluent-runtime
+structlog==24.4.0
+    # via -r requirements.in
+typing-extensions==4.12.2
+    # via
+    #   aiogram
+    #   fluent-runtime
+    #   fluent-syntax
+    #   pydantic
+    #   pydantic-core
+yarl==1.9.4
+    # via aiohttp