✨ Make it run

Author: Paillat-dev

discord/app/cache.py

@@ -23,14 +23,12 @@
 """
 
 from collections import OrderedDict, defaultdict, deque
-from typing import Deque, Protocol, TypeVar
+from typing import TYPE_CHECKING, Deque, Protocol, TypeVar
 
 from discord import utils
-from discord.app.state import ConnectionState
 from discord.member import Member
 from discord.message import Message
 
-from ..abc import MessageableChannel, PrivateChannel
 from ..channel import DMChannel
 from ..emoji import AppEmoji, GuildEmoji
 from ..guild import Guild
@@ -45,10 +43,28 @@
 from ..ui.view import View
 from ..user import User
 
+if TYPE_CHECKING:
+    from discord.app.state import ConnectionState
+
+    from ..abc import MessageableChannel, PrivateChannel
+
 T = TypeVar("T")
 
 
 class Cache(Protocol):
+    def __init__(self):
+        self.__state: ConnectionState | None = None
+
+    @property
+    def _state(self) -> "ConnectionState":
+        if self.__state is None:
+            raise RuntimeError("Cache state has not been initialized.")
+        return self.__state
+
+    @_state.setter
+    def _state(self, state: "ConnectionState") -> None:
+        self.__state = state
+
     # users
     async def get_all_users(self) -> list[User]: ...
 
@@ -114,17 +130,17 @@ async def store_poll(self, poll: Poll, message_id: int) -> None: ...
 
     # private channels
 
-    async def get_private_channels(self) -> list[PrivateChannel]: ...
+    async def get_private_channels(self) -> "list[PrivateChannel]": ...
 
-    async def get_private_channel(self, channel_id: int) -> PrivateChannel: ...
+    async def get_private_channel(self, channel_id: int) -> "PrivateChannel": ...
 
-    async def get_private_channel_by_user(self, user_id: int) -> PrivateChannel | None: ...
+    async def get_private_channel_by_user(self, user_id: int) -> "PrivateChannel | None": ...
 
-    async def store_private_channel(self, channel: PrivateChannel) -> None: ...
+    async def store_private_channel(self, channel: "PrivateChannel") -> None: ...
 
     # messages
 
-    async def store_message(self, message: MessagePayload, channel: MessageableChannel) -> Message: ...
+    async def store_message(self, message: MessagePayload, channel: "MessageableChannel") -> Message: ...
 
     async def upsert_message(self, message: Message) -> None: ...
 
@@ -152,8 +168,8 @@ async def clear(self, views: bool = True) -> None: ...
 
 
 class MemoryCache(Cache):
-    def __init__(self, max_messages: int | None = None, *, state: ConnectionState):
-        self._state = state
+    def __init__(self, max_messages: int | None = None) -> None:
+        self.__state: ConnectionState | None = None
         self.max_messages = max_messages
         self._users: dict[int, User] = {}
         self._guilds: dict[int, Guild] = {}
@@ -312,10 +328,10 @@ async def store_poll(self, poll: Poll, message_id: int) -> None:
 
     # private channels
 
-    async def get_private_channels(self) -> list[PrivateChannel]:
+    async def get_private_channels(self) -> "list[PrivateChannel]":
         return list(self._private_channels.values())
 
-    async def get_private_channel(self, channel_id: int) -> PrivateChannel | None:
+    async def get_private_channel(self, channel_id: int) -> "PrivateChannel | None":
         try:
             channel = self._private_channels[channel_id]
         except KeyError:
@@ -324,7 +340,7 @@ async def get_private_channel(self, channel_id: int) -> PrivateChannel | None:
             self._private_channels.move_to_end(channel_id)
             return channel
 
-    async def store_private_channel(self, channel: PrivateChannel) -> None:
+    async def store_private_channel(self, channel: "PrivateChannel") -> None:
         channel_id = channel.id
         self._private_channels[channel_id] = channel
 
@@ -336,15 +352,15 @@ async def store_private_channel(self, channel: PrivateChannel) -> None:
         if isinstance(channel, DMChannel) and channel.recipient:
             self._private_channels_by_user[channel.recipient.id] = channel
 
-    async def get_private_channel_by_user(self, user_id: int) -> PrivateChannel | None:
+    async def get_private_channel_by_user(self, user_id: int) -> "PrivateChannel | None":
         return self._private_channels_by_user.get(user_id)
 
     # messages
 
     async def upsert_message(self, message: Message) -> None:
         self._messages.append(message)
 
-    async def store_message(self, message: MessagePayload, channel: MessageableChannel) -> Message:
+    async def store_message(self, message: MessagePayload, channel: "MessageableChannel") -> Message:
         msg = await Message._from_data(state=self._state, channel=channel, data=message)
         self._messages.append(msg)
         return msg

discord/app/event_emitter.py

@@ -26,9 +26,12 @@
 from abc import ABC, abstractmethod
 from asyncio import Future
 from collections import defaultdict
-from typing import Any, Callable, Self, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, TypeVar
 
-from .state import ConnectionState
+from typing_extensions import Self
+
+if TYPE_CHECKING:
+    from .state import ConnectionState
 
 T = TypeVar("T", bound="Event")
 
@@ -38,11 +41,11 @@ class Event(ABC):
 
     @classmethod
     @abstractmethod
-    async def __load__(cls, data: Any, state: ConnectionState) -> Self | None: ...
+    async def __load__(cls, data: Any, state: "ConnectionState") -> Self | None: ...
 
 
 class EventEmitter:
-    def __init__(self, state: ConnectionState) -> None:
+    def __init__(self, state: "ConnectionState") -> None:
         self._listeners: dict[type[Event], list[Callable]] = {}
         self._events: dict[str, list[type[Event]]]
         self._wait_fors: dict[type[Event], list[Future]] = defaultdict(list)

discord/app/state.py

@@ -238,6 +238,7 @@ def __init__(
         self._activity: ActivityPayload | None = activity
         self._status: str | None = status
         self._intents: Intents = intents
+        self._voice_clients: dict[int, VoiceClient] = {}
 
         if not intents.members or cache_flags._empty:
             self.store_user = self.create_user  # type: ignore
@@ -247,12 +248,13 @@ def __init__(
 
         self.emitter = EventEmitter(self)
 
-        self.cache: Cache = self.cache
+        self.cache: Cache = cache
+        self.cache._state = self
 
     async def clear(self, *, views: bool = True) -> None:
         self.user: ClientUser | None = None
         await self.cache.clear()
-        self._voice_clients: dict[int, VoiceClient] = {}
+        self._voice_clients = {}
 
     async def process_chunk_requests(
         self, guild_id: int, nonce: str | None, members: list[Member], complete: bool

discord/client.py

@@ -39,6 +39,7 @@
 
 from . import utils
 from .activity import ActivityTypes, BaseActivity, create_activity
+from .app.cache import Cache, MemoryCache
 from .app.state import ConnectionState
 from .appinfo import AppInfo, PartialAppInfo
 from .application_role_connection import ApplicationRoleConnectionMetadata
@@ -309,6 +310,7 @@ def _get_state(self, **options: Any) -> ConnectionState:
             hooks=self._hooks,
             http=self.http,
             loop=self.loop,
+            cache=MemoryCache(),
             **options,
         )
 
@@ -1022,7 +1024,7 @@ async def get_stage_instance(self, id: int, /) -> StageInstance | None:
         Optional[:class:`.StageInstance`]
             The stage instance or ``None`` if not found.
         """
-        from .channel import StageChannel  # noqa: PLC0415
+        from .channel import StageChannel
 
         channel = await self._connection.get_channel(id)
 

discord/events/guild.py

@@ -25,7 +25,9 @@
 import asyncio
 import copy
 import logging
-from typing import TYPE_CHECKING, Any, Self
+from typing import TYPE_CHECKING, Any
+
+from typing_extensions import Self
 
 from discord import Role
 from discord.app.event_emitter import Event

discord/guild.py

@@ -36,14 +36,15 @@
     List,
     NamedTuple,
     Optional,
-    Self,
     Sequence,
     Tuple,
     Union,
     cast,
     overload,
 )
 
+from typing_extensions import Self
+
 from . import abc, utils
 from .asset import Asset
 from .automod import AutoModAction, AutoModRule, AutoModTriggerMetadata
@@ -2565,7 +2566,7 @@ async def templates(self) -> list[Template]:
         Forbidden
             You don't have permissions to get the templates.
         """
-        from .template import Template  # noqa: PLC0415
+        from .template import Template
 
         data = await self._state.http.guild_templates(self.id)
         return [await Template.from_data(data=d, state=self._state) for d in data]
@@ -2588,7 +2589,7 @@ async def webhooks(self) -> list[Webhook]:
             You don't have permissions to get the webhooks.
         """
 
-        from .webhook import Webhook  # noqa: PLC0415
+        from .webhook import Webhook  # circular import
 
         data = await self._state.http.guild_webhooks(self.id)
         return [Webhook.from_state(d, state=self._state) for d in data]
@@ -2678,7 +2679,7 @@ async def create_template(self, *, name: str, description: str | utils.Undefined
         description: :class:`str`
             The description of the template.
         """
-        from .template import Template  # noqa: PLC0415
+        from .template import Template  # circular import
 
         payload = {"name": name}
 

discord/member.py

@@ -30,7 +30,9 @@
 import itertools
 import sys
 from operator import attrgetter
-from typing import TYPE_CHECKING, Any, Self, TypeVar, Union
+from typing import TYPE_CHECKING, Any, TypeVar, Union
+
+from typing_extensions import Self
 
 import discord.abc
 

discord/message.py

@@ -35,14 +35,15 @@
     Any,
     Callable,
     ClassVar,
-    Self,
     Sequence,
     TypeVar,
     Union,
     overload,
 )
 from urllib.parse import parse_qs, urlparse
 
+from typing_extensions import Self
+
 from . import utils
 from .channel import PartialMessageable
 from .components import _component_factory

discord/raw_models.py

@@ -26,7 +26,9 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Self
+from typing import TYPE_CHECKING
+
+from typing_extensions import Self
 
 from .automod import AutoModAction, AutoModTriggerType
 from .enums import (

discord/shard.py

@@ -33,6 +33,7 @@
 
 from .app.state import AutoShardedConnectionState
 from .backoff import ExponentialBackoff
+from .client import Client
 from .enums import Status
 from .errors import (
     ClientException,
@@ -48,7 +49,6 @@
     from .gateway import DiscordWebSocket
 
     EI = TypeVar("EI", bound="EventItem")
-
 __all__ = (
     "AutoShardedClient",
     "ShardInfo",