Another tiny PR :awesome:

redbot/core/apis/audio/__init__.py

@@ -1,11 +1,20 @@
-from . import abstract as abstract
 from . import constants as constants
 from . import errors as errors
-from . import nodes
 from . import regex as regex
-from . import sql as sql
+from ._internal.wavelink.overwrites import (
-from . import wavelink as wavelink
+    LoadType as LoadType,
-from .setting_cache import SettingCacheManager as SettingCacheManager
+    PlayerStatus as PlayerStatus,
-from . import playlists
+    RedClient as RedClient,
+    RedEqualizer as RedEqualizer,
+    RedNode as RedNode,
+    RedPlayer as RedPlayer,
+    RedTrack as RedTrack,
+    RedTrackPlaylist as RedTrackPlaylist,
+    Votes as Votes,
+)
+from ._internal.wavelink.events import QueueEnd as QueueEnd
+from ._internal.playlists.enums import PlaylistScope as PlaylistScope
+
 from . import config
 from .config import _init as _init
+

redbot/core/apis/audio/_internal/__init__.py

@@ -0,0 +1,6 @@
+from . import nodes as nodes
+from . import setting_cache as setting_cache
+from . import playlists as playlists
+from . import sql as sql
+from . import wavelink as wavelink
+from . import abstract as abstract

redbot/core/apis/audio/_internal/nodes/connection.py

@@ -4,8 +4,8 @@ import copy
 import typing
 
 from .managed import managed_lavalink_connect_task_event
-from .. import constants
+from redbot.core.apis.audio import constants
-from .. import config
+from redbot.core.apis.audio import config
 
 if typing.TYPE_CHECKING:
     from redbot.core.bot import Red

redbot/core/apis/audio/_internal/nodes/events.py

@@ -8,8 +8,8 @@ import wavelink
 
 from redbot.core import commands
 from redbot.core.bot import Red
-from ..wavelink.events import QueueEnd
+from redbot.core.apis.audio._internal.wavelink.events import QueueEnd
-from ..wavelink.overwrites import RedNode
+from redbot.core.apis.audio._internal.wavelink import RedNode
 
 log = logging.getLogger("red.core.apis.audio.nodes")
 

redbot/core/apis/audio/_internal/nodes/managed.py

@@ -15,7 +15,7 @@ import aiohttp
 from tqdm import tqdm
 
 from redbot.core import Config
-from .. import constants, regex, errors
+from redbot.core.apis.audio import constants, regex, errors
 
 __all__ = [
     "managed_lavalink_connect_task_event",

redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py

@@ -7,7 +7,7 @@ import discord
 from redbot.core import Config
 from redbot.core.bot import Red
 
-from ..abstract import CacheLevel
+from redbot.core.apis.audio._internal.abstract import CacheLevel
 
 
 class LocalCacheLevelManager:

redbot/core/apis/audio/_internal/wavelink/overwrites.py

@@ -22,7 +22,7 @@ from discord.http import Route
 
 from redbot.core import commands
 
-from .. import regex, constants
+from ... import regex, constants
 from .events import QueueEnd
 
 __all__ = [

redbot/core/apis/audio/config.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Optional
 from redbot.core import Config
 
 from . import SettingCacheManager, constants
-from .playlists.enums import PlaylistScope
+from ._internal.playlists.enums import PlaylistScope
 
 if TYPE_CHECKING:
     from redbot.core.bot import Red

redbot/core/bot.py

@@ -3,7 +3,6 @@ import inspect
 import logging
 import os
 import platform
-import re
 import shutil
 import sys
 import contextlib
@@ -19,7 +18,6 @@ from typing import (
     Dict,
     NoReturn,
     Set,
-    Coroutine,
     TypeVar,
     Callable,
     Awaitable,
@@ -30,7 +28,6 @@ from types import MappingProxyType
 import discord
 from discord.ext import commands as dpy_commands
 from discord.ext.commands import when_mentioned_or
-from discord.ext.commands.bot import BotBase
 
 from . import Config, i18n, commands, errors, drivers, modlog, bank
 from .cog_manager import CogManager, CogManagerUI
@@ -191,7 +188,7 @@ class RedBase(
         self._permissions_hooks: List[commands.CheckPredicate] = []
         self._red_ready = asyncio.Event()
         self._red_before_invoke_objs: Set[PreInvokeCoroutine] = set()
-        from .apis.audio.wavelink.overwrites import (
+        from redbot.core.apis.audio._internal.wavelink import (
             RedClient,
         )  # This is needed to avoid objects not being ready
 
@@ -593,7 +590,7 @@ class RedBase(
         from .apis import audio  # This is needed to avoid objects not being ready
 
         await audio._init(self)
-        self.add_cog(audio.nodes.AudioAPIEvents(self))
+        self.add_cog(redbot.core.apis.audio._internal.nodes.AudioAPIEvents(self))
 
         packages = []