2025 Edition (#32)

Just a technical update, bumped dependencies, switched to a new naming
schema.

Important: the next version (no estimates, but definitely Q1 or Q2 2025)
will switch to using TOML files as config.

Author: MasterGroosha

Dockerfile

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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2024 Groosha (also known as MasterGroosha on GitHub)
+Copyright (c) 2019-present Aleksandr K. (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

bot/__main__.py

@@ -21,13 +21,13 @@ async def main():
     structlog.configure(**get_structlog_config(log_config))
 
     bot = Bot(
-        bot_config.bot_token.get_secret_value(),
+        token=bot_config.bot_token.get_secret_value(),
         default=DefaultBotProperties(
             parse_mode=ParseMode.HTML,
         )
     )
 
-    # Setup dispatcher and bind routers to it
+    # Setup dispatcher
     dp = Dispatcher()
 
     dispenser = FluentDispenser(
@@ -52,9 +52,13 @@ async def main():
     await set_bot_commands(bot, dispenser)
 
     # Run bot
-    await logger.awarning("Starting bot")
+    await logger.awarning(
+        "Important! This version is the last one to use environment variables for configuration. "
+        "The next version is going to use TOML file. Be careful when upgrading bot version in the future."
+    )
+    await logger.ainfo("Starting bot")
     await dp.start_polling(bot, allowed_updates=dp.resolve_used_update_types())
-    await logger.awarning("Bot stopped")
+    await logger.ainfo("Bot stopped")
 
 
 if __name__ == "__main__":

bot/config_reader.py

@@ -1,12 +1,12 @@
-from enum import StrEnum, auto
+from enum import Enum
 
 from pydantic import SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
-class LoggingRenderer(StrEnum):
-    JSON = auto()
-    CONSOLE = auto()
+class LoggingRenderer(str, Enum):
+    JSON = "json"
+    CONSOLE = "console"
 
 
 class LoggingSettings(BaseSettings):
@@ -18,7 +18,7 @@ class LoggingSettings(BaseSettings):
 
     model_config = SettingsConfigDict(
         env_file=".env",
-        env_file_encoding="UTF-8",
+        env_file_encoding="utf-8",
         env_prefix="LOGGING_",
         extra="allow",
     )
@@ -29,7 +29,7 @@ class BotSettings(BaseSettings):
 
     model_config = SettingsConfigDict(
         env_file=".env",
-        env_file_encoding="UTF-8",
+        env_file_encoding="utf-8",
         extra="allow",
     )
 

requirements.txt

@@ -1,56 +1,60 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile requirements.in -o requirements.txt
-aiofiles==23.2.1
+#    uv pip compile -o requirements.txt requirements.in
+aiofiles==24.1.0
     # via aiogram
-aiogram==3.12.0
+aiogram==3.18.0
     # via -r requirements.in
-aiohappyeyeballs==2.3.5
+aiohappyeyeballs==2.4.6
     # via aiohttp
-aiohttp==3.10.3
+aiohttp==3.11.13
     # via aiogram
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via aiohttp
 annotated-types==0.7.0
     # via pydantic
-attrs==24.2.0
+attrs==25.1.0
     # via
     #   aiohttp
     #   fluent-runtime
-babel==2.16.0
+babel==2.17.0
     # via fluent-runtime
-cachetools==5.4.0
+cachetools==5.5.2
     # via -r requirements.in
-certifi==2024.7.4
+certifi==2025.1.31
     # via aiogram
 fluent-runtime==0.4.0
     # via -r requirements.in
 fluent-syntax==0.19.0
     # via fluent-runtime
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   aiohttp
     #   aiosignal
-idna==3.7
+idna==3.10
     # via yarl
 magic-filter==1.0.12
     # via aiogram
-multidict==6.0.5
+multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
-pydantic==2.8.2
+propcache==0.3.0
+    # via
+    #   aiohttp
+    #   yarl
+pydantic==2.10.6
     # via
     #   aiogram
     #   pydantic-settings
-pydantic-core==2.20.1
+pydantic-core==2.27.2
     # via pydantic
 pydantic-settings==2.4.0
     # via -r requirements.in
 python-dotenv==1.0.1
     # via pydantic-settings
-pytz==2024.1
+pytz==2025.1
     # via fluent-runtime
-structlog==24.4.0
+structlog==25.1.0
     # via -r requirements.in
 typing-extensions==4.12.2
     # via
@@ -59,5 +63,5 @@ typing-extensions==4.12.2
     #   fluent-syntax
     #   pydantic
     #   pydantic-core
-yarl==1.9.4
+yarl==1.18.3
     # via aiohttp