Refactor

src/main.py

@@ -1,12 +1,13 @@
 from asyncio import wait, create_task
 import logging
 
-from services.discord import start_discord_sevice
+from modules.games_list import start as start_games_list_module
-from services.twitch.twitch import start_twitch_service
+from modules.scheduler_sync import start as start_scheduler_sync_module
-from services.scheduler_sync import start_synchronizer
+from modules.stream_notifications import start as start_stream_notifications_module
 
 from core.mongo import mongo_manager
 
+
 logging.basicConfig(level=logging.INFO)
 
 logger = logging.getLogger(__name__)
@@ -19,9 +20,9 @@ async def main():
     await mongo_manager.init()
 
     await wait([
-        create_task(start_discord_sevice()),
+        create_task(start_games_list_module()),
-        create_task(start_twitch_service()),
+        create_task(start_scheduler_sync_module()),
-        create_task(start_synchronizer())
+        create_task(start_stream_notifications_module())
     ], return_when="FIRST_COMPLETED")
 
 

src/modules/games_list/__init__.py

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

src/modules/games_list/discord.py

@@ -5,7 +5,7 @@ from discord.abc import Messageable
 from discord import Object
 from discord import app_commands
 
-from services.games_list import GameList, GameItem
+from modules.games_list.games_list import GameList, GameItem
 
 from core.config import config
 

src/modules/scheduler_sync/__init__.py

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

src/modules/scheduler_sync/comparators.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 import logging
 
-from services.scheduler_sync.discord_events import DiscordEvent, CreateDiscordEvent, RecurrenceRule
+from .discord_events import DiscordEvent, CreateDiscordEvent, RecurrenceRule
 
 
 logger = logging.getLogger(__name__)

src/modules/scheduler_sync/discord_events.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, field_serializer, SerializationInfo
 
 from core.config import config
 
-from services.scheduler_sync.twitch_events import TwitchEvent
+from .twitch_events import TwitchEvent
 
 
 logger = logging.getLogger(__name__)

src/modules/scheduler_sync/synchronizer.py

@@ -2,16 +2,16 @@ from asyncio import sleep
 import logging
 from datetime import datetime
 
-from services.scheduler_sync.twitch_events import get_twitch_events, TwitchEvent
+from core.config import config, TwitchConfig
-from services.scheduler_sync.discord_events import (
+
+from .twitch_events import get_twitch_events, TwitchEvent
+from .discord_events import (
     get_discord_events, DiscordEvent,
     delete_discord_event,
     create_discord_event, CreateDiscordEvent,
     edit_discord_event, UpdateDiscordEvent
 )
-from services.scheduler_sync.comparators import compare
+from .comparators import compare
-
-from core.config import config, TwitchConfig
 
 
 logger = logging.getLogger(__name__)

src/modules/stream_notifications/__init__.py

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

src/modules/stream_notifications/notification.py

@@ -4,7 +4,8 @@ from typing import Literal
 from httpx import AsyncClient
 
 from core.config import config, StreamerConfig
-from services.twitch_state import State
+
+from .twitch.state import State
 
 
 logger = logging.getLogger(__name__)

src/modules/stream_notifications/twitch/twitch.py

@@ -9,9 +9,10 @@ from twitchAPI.type import AuthScope
 from twitchAPI.object.eventsub import StreamOnlineEvent, ChannelUpdateEvent
 
 from core.config import config, StreamerConfig
-from services.notification import notify
+from modules.stream_notifications.notification import notify
-from services.twitch_state import State
+
-from services.twitch.token_storage import TokenStorage
+from .state import State
+from .token_storage import TokenStorage
 
 
 logger = logging.getLogger(__name__)

src/services/scheduler_sync/__init__.py

@@ -1,4 +0,0 @@
-from services.scheduler_sync.synchronizer import start_synchronizer
-
-
-__all__ = ["start_synchronizer"]