Fix

.github/workflows/build_docker_image.yml

@@ -49,26 +49,26 @@ jobs:
         with:
           url: ${{ secrets.WEBHOOK_URL }}
 
-      -
+      # -
-        name: Invoke deployment hook (worker)
+      #   name: Invoke deployment hook (worker)
-        uses: joelwmale/webhook-action@master
+      #   uses: joelwmale/webhook-action@master
-        with:
+      #   with:
-          url: ${{ secrets.WEBHOOK_URL_2 }}
+      #     url: ${{ secrets.WEBHOOK_URL_2 }}
 
-      -
+      # -
-        name: Invoke deployment hook (scheduler)
+      #   name: Invoke deployment hook (scheduler)
-        uses: joelwmale/webhook-action@master
+      #   uses: joelwmale/webhook-action@master
-        with:
+      #   with:
-          url: ${{ secrets.WEBHOOK_URL_3 }}
+      #     url: ${{ secrets.WEBHOOK_URL_3 }}
 
-      -
+      # -
-        name: Invoke deployment hook (stream_notifications)
+      #   name: Invoke deployment hook (stream_notifications)
-        uses: joelwmale/webhook-action@master
+      #   uses: joelwmale/webhook-action@master
-        with:
+      #   with:
-          url: ${{ secrets.WEBHOOK_URL_4 }}
+      #     url: ${{ secrets.WEBHOOK_URL_4 }}
 
-      -
+      # -
-        name: Invoke deployment hook (web_app)
+      #   name: Invoke deployment hook (web_app)
-        uses: joelwmale/webhook-action@master
+      #   uses: joelwmale/webhook-action@master
-        with:
+      #   with:
-          url: ${{ secrets.WEBHOOK_URL_5 }}
+      #     url: ${{ secrets.WEBHOOK_URL_5 }}

.gitignore

@@ -3,3 +3,5 @@
 .DS_Store
 
 .vscode
+
+*.cpython-*.pyc

docker/build.dockerfile

@@ -1,19 +1,22 @@
-FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
+FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim AS builder
+
+WORKDIR /opt/
+COPY ./pyproject.toml ./uv.lock ./
+
+RUN --mount=type=ssh uv venv \
+    && uv sync --frozen
+
+
+FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim
+
+ENV PATH="/opt/venv/bin:$PATH"
+
+COPY ./src /app
+COPY --from=builder /opt/.venv /opt/venv
 
 COPY ./scripts/*.sh /
 RUN chmod +x /*.sh
 
 WORKDIR /app
 
-COPY ./pyproject.toml ./
+ENTRYPOINT ["uv", "run", "-m"]
-COPY ./uv.lock ./
-
-RUN uv venv && uv sync --frozen
-
-COPY ./src ./src
-
-ENV PATH="/app/.venv/bin:$PATH"
-
-EXPOSE 80
-
-CMD ["uv", "run", "src/main.py"]

scripts/start_app.sh

@@ -1,3 +1,5 @@
 #! /usr/bin/env sh
 
-uv run ./src/main.py $1
+cd src
+
+uv run $1

scripts/start_scheduler.sh

@@ -1,3 +0,0 @@
-#! /usr/bin/env sh
-
-uv run --directory src taskiq scheduler core.broker:scheduler modules.tasks

scripts/start_web_app.sh

@@ -1,3 +0,0 @@
-#! /usr/bin/env sh
-
-uv run --directory src uvicorn modules.web_app.app:app --host 0.0.0.0 --port 80

scripts/start_worker.sh

@@ -1,3 +0,0 @@
-#! /usr/bin/env sh
-
-uv run --directory src taskiq worker core.broker:broker modules.tasks

src/applications/common/domain/streamers.py

@@ -1,31 +1,38 @@
 from pydantic import BaseModel
 
+
 class TwitchConfig(BaseModel):
     id: int
     name: str
 
+
 class NotificationsConfig(BaseModel):
     start_stream: str
     change_category: str | None = None
     redemption_reward: str | None = None
 
+
 class GamesListConfig(BaseModel):
     channel_id: int
     message_id: int
 
+
 class DiscordConfig(BaseModel):
     guild_id: int
     notifications_channel_id: int
     games_list: GamesListConfig | None = None
     roles: dict[str, int] | None = None
 
+
 class TelegramConfig(BaseModel):
     notifications_channel_id: int
 
+
 class IntegrationsConfig(BaseModel):
     discord: DiscordConfig | None = None
     telegram: TelegramConfig | None = None
 
+
 class StreamerConfig(BaseModel):
     twitch: TwitchConfig
     notifications: NotificationsConfig

src/applications/common/repositories/streamers.py

@@ -1,4 +1,4 @@
-from domain.streamers import StreamerConfig
+from applications.common.domain.streamers import StreamerConfig
 
 from .base import BaseRepository
 

src/applications/common/repositories/users.py

@@ -1,4 +1,4 @@
-from domain.users import CreateUser, User
+from applications.common.domain.users import CreateUser, User
 
 from .base import BaseRepository
 
@@ -18,10 +18,10 @@ class UserRepository(BaseRepository):
         )
 
     @classmethod
-    async def get_or_create_user(cls, newUser: CreateUser) -> User:
+    async def get_or_create_user(cls, new_user: CreateUser) -> User:
         filter_data = {}
 
-        for provider, data in newUser.oauths.items():
+        for provider, data in new_user.oauths.items():
             filter_data[f"oauths.{provider}.id"] = data.id
 
         async with cls.connect() as collection:
@@ -29,7 +29,7 @@ class UserRepository(BaseRepository):
                 filter_data,
                 {
                     "$setOnInsert": {
-                        **newUser.model_dump(),
+                        **new_user.model_dump(),
                     }
                 },
                 upsert=True,

src/applications/games_list/__main__.py

@@ -0,0 +1,13 @@
+from asyncio import run
+
+from applications.games_list.discord import client, logger
+from core.config import config
+
+
+async def start_discord_sevice():
+    logger.info("Starting Discord service...")
+
+    await client.start(config.DISCORD_BOT_TOKEN)
+
+
+run(start_discord_sevice())

src/applications/games_list/discord.py

@@ -5,13 +5,13 @@ from discord.abc import Messageable
 from discord import Object
 from discord import app_commands
 
-from modules.games_list.games_list import GameList, GameItem
+from applications.common.repositories.streamers import StreamerConfigRepository
-
+from applications.games_list.games_list import GameList, GameItem
 from core.config import config
-from repositories.streamers import StreamerConfigRepository
 
 
 logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
 
 
 async def get_game_list_channel_to_message_map() -> dict[int, int]:
@@ -240,9 +240,3 @@ async def replace(interaction: discord.Interaction, game: str, new: str):
     await game_list.save()
 
     await interaction.response.send_message("Игра заменена!", ephemeral=True)
-
-
-async def start_discord_sevice():
-    logger.info("Starting Discord service...")
-
-    await client.start(config.DISCORD_BOT_TOKEN)

src/main.py

@@ -1,45 +0,0 @@
-import logging
-import sys
-
-from modules.games_list import start as start_games_list_module
-from modules.stream_notifications import start as start_stream_notifications_module
-
-from core.mongo import mongo_manager
-from core.redis import redis_manager
-from core.broker import broker
-
-
-logging.basicConfig(level=logging.INFO)
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-
-async def main():
-    logger.info("Starting services...")
-
-    if len(sys.argv) != 2:
-        raise RuntimeError("Usage: python main.py <module>")
-
-    module = sys.argv[1]
-
-    await mongo_manager.init()
-    await redis_manager.init()
-
-    if not broker.is_worker_process:
-        await broker.startup()
-
-    if module == "games_list":
-        await start_games_list_module()
-    elif module == "stream_notifications":
-        await start_stream_notifications_module()
-    else:
-        raise RuntimeError(f"Unknown module: {module}")
-
-    exit(0)
-
-
-if __name__ == "__main__":
-    from asyncio import run
-
-    run(main())

src/modules/games_list/__init__.py

@@ -1,7 +0,0 @@
-from .discord import start_discord_sevice
-
-
-start = start_discord_sevice
-
-
-__all__ = ["start"]

src/modules/tasks.py

@@ -1,2 +0,0 @@
-from modules.scheduler_sync.tasks import *  # noqa: F403
-from modules.stream_notifications.tasks import * # noqa: F403