Move web and bot packages to a consolidated ui package

zyrarbot/application.py

@@ -7,8 +7,8 @@ import uvicorn
 
 from zyrarbot.audio.media_probe import MediaProbe
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.client import MusicBot
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.client import MusicBot
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.music.notification_channel_resolver import NotificationChannelResolver
 from zyrarbot.music.track_embed_factory import TrackEmbedFactory
@@ -17,7 +17,7 @@ from zyrarbot.storage.guild_config_repository import GuildConfigRepository
 from zyrarbot.storage.history_repository import HistoryRepository
 from zyrarbot.storage.json_file_store import JsonFileStore
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.factory import create_app
+from zyrarbot.ui.web.factory import create_app
 
 logger = logging.getLogger(__name__)
 

zyrarbot/ui/__init__.py

@@ -0,0 +1 @@
+"""Komunikacja użytkownika z odtwarzaczem"""

zyrarbot/ui/bot/client.py

@@ -6,7 +6,7 @@ import discord
 from discord.ext import commands
 
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.cogs.music_cog import MusicCog
+from zyrarbot.ui.bot.cogs.music_cog import MusicCog
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.uploads_repository import UploadsRepository

zyrarbot/ui/web/dependencies.py

@@ -4,14 +4,14 @@ import discord
 from fastapi import HTTPException, Request, WebSocket
 
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.guild_config_repository import GuildConfigRepository
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.status_service import StatusService
 
 NO_GUILD_DETAIL = "Bot has no active server context"
 

zyrarbot/ui/web/factory.py

@@ -9,13 +9,13 @@ from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 
 from zyrarbot.audio.track_factory import TrackFactory
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.guild_config_repository import GuildConfigRepository
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.routers import (
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.routers import (
     playback_router,
     queue_router,
     settings_router,
@@ -24,8 +24,8 @@ from zyrarbot.web.routers import (
     voice_router,
     websocket_router,
 )
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.status_service import StatusService
 
 logger = logging.getLogger(__name__)
 

zyrarbot/ui/web/routers/playback_router.py

@@ -10,18 +10,18 @@ from zyrarbot.audio.track_factory import TrackFactory
 from zyrarbot.music.loop_mode import LoopMode
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_active_guild,
     get_broadcaster,
     get_player,
     get_tracks,
     get_uploads,
 )
-from zyrarbot.web.schemas.loop_request import LoopRequest
-from zyrarbot.web.schemas.play_file_request import PlayFileRequest
-from zyrarbot.web.schemas.play_request import PlayRequest
-from zyrarbot.web.schemas.volume_request import VolumeRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.loop_request import LoopRequest
+from zyrarbot.ui.web.schemas.play_file_request import PlayFileRequest
+from zyrarbot.ui.web.schemas.play_request import PlayRequest
+from zyrarbot.ui.web.schemas.volume_request import VolumeRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 logger = logging.getLogger(__name__)
 

zyrarbot/ui/web/routers/queue_router.py

@@ -7,17 +7,17 @@ from fastapi import APIRouter, Depends, HTTPException
 
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_active_guild,
     get_broadcaster,
     get_player,
     get_settings,
 )
-from zyrarbot.web.schemas.jump_request import JumpRequest
-from zyrarbot.web.schemas.remove_request import RemoveRequest
-from zyrarbot.web.schemas.reorder_request import ReorderRequest
-from zyrarbot.web.schemas.track_plays_request import TrackPlaysRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.jump_request import JumpRequest
+from zyrarbot.ui.web.schemas.remove_request import RemoveRequest
+from zyrarbot.ui.web.schemas.reorder_request import ReorderRequest
+from zyrarbot.ui.web.schemas.track_plays_request import TrackPlaysRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 router = APIRouter(prefix="/api", tags=["queue"])
 

zyrarbot/ui/web/routers/settings_router.py

@@ -6,20 +6,20 @@ from typing import Any
 import discord
 from fastapi import APIRouter, Depends, HTTPException
 
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.settings import Settings
 from zyrarbot.storage.guild_config_repository import GuildConfigRepository
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_broadcaster,
     get_config,
     get_guilds,
     get_player,
     get_settings,
 )
-from zyrarbot.web.schemas.default_plays_request import DefaultPlaysRequest
-from zyrarbot.web.schemas.text_channel_request import TextChannelRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.default_plays_request import DefaultPlaysRequest
+from zyrarbot.ui.web.schemas.text_channel_request import TextChannelRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 logger = logging.getLogger(__name__)
 

zyrarbot/ui/web/routers/status_router.py

@@ -4,8 +4,8 @@ from typing import Any
 
 from fastapi import APIRouter, Depends
 
-from zyrarbot.web.dependencies import get_status_service
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.dependencies import get_status_service
+from zyrarbot.ui.web.status_service import StatusService
 
 router = APIRouter(prefix="/api", tags=["status"])
 

zyrarbot/ui/web/routers/uploads_router.py

@@ -5,7 +5,7 @@ from typing import Any
 from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
 
 from zyrarbot.storage.uploads_repository import UploadsRepository
-from zyrarbot.web.dependencies import get_uploads
+from zyrarbot.ui.web.dependencies import get_uploads
 
 router = APIRouter(prefix="/api", tags=["uploads"])
 

zyrarbot/ui/web/routers/voice_router.py

@@ -3,17 +3,17 @@ from __future__ import annotations
 import discord
 from fastapi import APIRouter, Depends, HTTPException
 
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.music.notification_channel_resolver import NotificationChannelResolver
-from zyrarbot.web.dependencies import (
+from zyrarbot.ui.web.dependencies import (
     get_active_guild,
     get_broadcaster,
     get_guilds,
     get_player,
 )
-from zyrarbot.web.schemas.connect_request import ConnectRequest
-from zyrarbot.web.status_broadcaster import StatusBroadcaster
+from zyrarbot.ui.web.schemas.connect_request import ConnectRequest
+from zyrarbot.ui.web.status_broadcaster import StatusBroadcaster
 
 router = APIRouter(prefix="/api", tags=["voice"])
 

zyrarbot/ui/web/routers/websocket_router.py

@@ -4,9 +4,9 @@ import logging
 
 from fastapi import APIRouter, Depends, WebSocket, WebSocketDisconnect
 
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.dependencies import get_connections, get_socket_status_service
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.dependencies import get_connections, get_socket_status_service
+from zyrarbot.ui.web.status_service import StatusService
 
 logger = logging.getLogger(__name__)
 

zyrarbot/ui/web/status_broadcaster.py

@@ -4,8 +4,8 @@ import asyncio
 import contextlib
 import logging
 
-from zyrarbot.web.connection_manager import ConnectionManager
-from zyrarbot.web.status_service import StatusService
+from zyrarbot.ui.web.connection_manager import ConnectionManager
+from zyrarbot.ui.web.status_service import StatusService
 
 logger = logging.getLogger(__name__)
 

zyrarbot/ui/web/status_service.py

@@ -5,7 +5,7 @@ from typing import Any
 import discord
 
 from zyrarbot.audio.ytdl_source import YTDLSource
-from zyrarbot.bot.guild_resolver import GuildResolver
+from zyrarbot.ui.bot.guild_resolver import GuildResolver
 from zyrarbot.music.music_player import MusicPlayer
 from zyrarbot.music.notification_channel_resolver import NotificationChannelResolver