Update Pyright to v1.1.394

Author: Rapptz

.github/workflows/lint.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Run Pyright
         uses: jakebailey/pyright-action@v1
         with:
-          version: '1.1.351'
+          version: '1.1.394'
           warnings: false
           no-comments: ${{ matrix.python-version != '3.x' }}
 

discord/abc.py

@@ -102,6 +102,9 @@
         GuildChannel as GuildChannelPayload,
         OverwriteType,
     )
+    from .types.guild import (
+        ChannelPositionUpdate,
+    )
     from .types.snowflake import (
         SnowflakeList,
     )
@@ -1232,11 +1235,11 @@ async def move(self, **kwargs: Any) -> None:
             raise ValueError('Could not resolve appropriate move position')
 
         channels.insert(max((index + offset), 0), self)
-        payload = []
+        payload: List[ChannelPositionUpdate] = []
         lock_permissions = kwargs.get('sync_permissions', False)
         reason = kwargs.get('reason')
         for index, channel in enumerate(channels):
-            d = {'id': channel.id, 'position': index}
+            d: ChannelPositionUpdate = {'id': channel.id, 'position': index}
             if parent_id is not MISSING and channel.id == self.id:
                 d.update(parent_id=parent_id, lock_permissions=lock_permissions)
             payload.append(d)

discord/activity.py

@@ -273,7 +273,7 @@ def to_dict(self) -> Dict[str, Any]:
     def start(self) -> Optional[datetime.datetime]:
         """Optional[:class:`datetime.datetime`]: When the user started doing this activity in UTC, if applicable."""
         try:
-            timestamp = self.timestamps['start'] / 1000
+            timestamp = self.timestamps['start'] / 1000  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             return None
         else:
@@ -283,7 +283,7 @@ def start(self) -> Optional[datetime.datetime]:
     def end(self) -> Optional[datetime.datetime]:
         """Optional[:class:`datetime.datetime`]: When the user will stop doing this activity in UTC, if applicable."""
         try:
-            timestamp = self.timestamps['end'] / 1000
+            timestamp = self.timestamps['end'] / 1000  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             return None
         else:
@@ -293,7 +293,7 @@ def end(self) -> Optional[datetime.datetime]:
     def large_image_url(self) -> Optional[str]:
         """Optional[:class:`str`]: Returns a URL pointing to the large image asset of this activity, if applicable."""
         try:
-            large_image = self.assets['large_image']
+            large_image = self.assets['large_image']  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             return None
         else:
@@ -303,7 +303,7 @@ def large_image_url(self) -> Optional[str]:
     def small_image_url(self) -> Optional[str]:
         """Optional[:class:`str`]: Returns a URL pointing to the small image asset of this activity, if applicable."""
         try:
-            small_image = self.assets['small_image']
+            small_image = self.assets['small_image']  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             return None
         else:
@@ -525,7 +525,7 @@ def twitch_name(self) -> Optional[str]:
         """
 
         try:
-            name = self.assets['large_image']
+            name = self.assets['large_image']  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             return None
         else:

discord/app_commands/commands.py

@@ -903,7 +903,7 @@ async def _invoke_autocomplete(self, interaction: Interaction, name: str, namesp
         predicates = getattr(param.autocomplete, '__discord_app_commands_checks__', [])
         if predicates:
             try:
-                passed = await async_all(f(interaction) for f in predicates)
+                passed = await async_all(f(interaction) for f in predicates)  # type: ignore
             except Exception:
                 passed = False
 
@@ -1014,7 +1014,7 @@ async def _check_can_run(self, interaction: Interaction) -> bool:
         if not predicates:
             return True
 
-        return await async_all(f(interaction) for f in predicates)
+        return await async_all(f(interaction) for f in predicates)  # type: ignore
 
     def error(self, coro: Error[GroupT]) -> Error[GroupT]:
         """A decorator that registers a coroutine as a local error handler.
@@ -1308,7 +1308,7 @@ async def _check_can_run(self, interaction: Interaction) -> bool:
         if not predicates:
             return True
 
-        return await async_all(f(interaction) for f in predicates)
+        return await async_all(f(interaction) for f in predicates)  # type: ignore
 
     def _has_any_error_handlers(self) -> bool:
         return self.on_error is not None
@@ -1842,7 +1842,7 @@ def error(self, coro: ErrorFunc) -> ErrorFunc:
         if len(params) != 2:
             raise TypeError('The error handler must have 2 parameters.')
 
-        self.on_error = coro
+        self.on_error = coro  # type: ignore
         return coro
 
     async def interaction_check(self, interaction: Interaction, /) -> bool:

discord/app_commands/transformers.py

@@ -235,7 +235,7 @@ def __call__(self) -> None:
         pass
 
     def __or__(self, rhs: Any) -> Any:
-        return Union[self, rhs]  # type: ignore
+        return Union[self, rhs]
 
     @property
     def type(self) -> AppCommandOptionType:

discord/app_commands/tree.py

@@ -859,7 +859,7 @@ def error(self, coro: ErrorFunc[ClientT]) -> ErrorFunc[ClientT]:
         if len(params) != 2:
             raise TypeError('error handler must have 2 parameters')
 
-        self.on_error = coro
+        self.on_error = coro  # type: ignore
         return coro
 
     def command(

discord/components.py

@@ -196,12 +196,12 @@ def __init__(self, data: ButtonComponentPayload, /) -> None:
         self.label: Optional[str] = data.get('label')
         self.emoji: Optional[PartialEmoji]
         try:
-            self.emoji = PartialEmoji.from_dict(data['emoji'])
+            self.emoji = PartialEmoji.from_dict(data['emoji'])  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             self.emoji = None
 
         try:
-            self.sku_id: Optional[int] = int(data['sku_id'])
+            self.sku_id: Optional[int] = int(data['sku_id'])  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             self.sku_id = None
 
@@ -415,7 +415,7 @@ def emoji(self, value: Optional[Union[str, Emoji, PartialEmoji]]) -> None:
     @classmethod
     def from_dict(cls, data: SelectOptionPayload) -> SelectOption:
         try:
-            emoji = PartialEmoji.from_dict(data['emoji'])
+            emoji = PartialEmoji.from_dict(data['emoji'])  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             emoji = None
 

discord/enums.py

@@ -84,13 +84,13 @@ def _create_value_cls(name: str, comparable: bool):
     # All the type ignores here are due to the type checker being unable to recognise
     # Runtime type creation without exploding.
     cls = namedtuple('_EnumValue_' + name, 'name value')
-    cls.__repr__ = lambda self: f'<{name}.{self.name}: {self.value!r}>'  # type: ignore
-    cls.__str__ = lambda self: f'{name}.{self.name}'  # type: ignore
+    cls.__repr__ = lambda self: f'<{name}.{self.name}: {self.value!r}>'
+    cls.__str__ = lambda self: f'{name}.{self.name}'
     if comparable:
-        cls.__le__ = lambda self, other: isinstance(other, self.__class__) and self.value <= other.value  # type: ignore
-        cls.__ge__ = lambda self, other: isinstance(other, self.__class__) and self.value >= other.value  # type: ignore
-        cls.__lt__ = lambda self, other: isinstance(other, self.__class__) and self.value < other.value  # type: ignore
-        cls.__gt__ = lambda self, other: isinstance(other, self.__class__) and self.value > other.value  # type: ignore
+        cls.__le__ = lambda self, other: isinstance(other, self.__class__) and self.value <= other.value
+        cls.__ge__ = lambda self, other: isinstance(other, self.__class__) and self.value >= other.value
+        cls.__lt__ = lambda self, other: isinstance(other, self.__class__) and self.value < other.value
+        cls.__gt__ = lambda self, other: isinstance(other, self.__class__) and self.value > other.value
     return cls
 
 

discord/ext/commands/bot.py

@@ -172,7 +172,7 @@ def __init__(
         **options: Any,
     ) -> None:
         super().__init__(intents=intents, **options)
-        self.command_prefix: PrefixType[BotT] = command_prefix
+        self.command_prefix: PrefixType[BotT] = command_prefix  # type: ignore
         self.extra_events: Dict[str, List[CoroFunc]] = {}
         # Self doesn't have the ClientT bound, but since this is a mixin it technically does
         self.__tree: app_commands.CommandTree[Self] = tree_cls(self)  # type: ignore
@@ -487,7 +487,7 @@ async def can_run(self, ctx: Context[BotT], /, *, call_once: bool = False) -> bo
         if len(data) == 0:
             return True
 
-        return await discord.utils.async_all(f(ctx) for f in data)
+        return await discord.utils.async_all(f(ctx) for f in data)  # type: ignore
 
     async def is_owner(self, user: User, /) -> bool:
         """|coro|

discord/ext/commands/context.py

@@ -82,7 +82,7 @@ def is_cog(obj: Any) -> TypeGuard[Cog]:
     return hasattr(obj, '__cog_commands__')
 
 
-class DeferTyping:
+class DeferTyping(Generic[BotT]):
     def __init__(self, ctx: Context[BotT], *, ephemeral: bool):
         self.ctx: Context[BotT] = ctx
         self.ephemeral: bool = ephemeral

discord/ext/commands/converter.py

@@ -1125,7 +1125,7 @@ def __class_getitem__(cls, params: Union[Tuple[T], T]) -> Greedy[T]:
 
         args = getattr(converter, '__args__', ())
         if discord.utils.PY_310 and converter.__class__ is types.UnionType:  # type: ignore
-            converter = Union[args]  # type: ignore
+            converter = Union[args]
 
         origin = getattr(converter, '__origin__', None)
 
@@ -1138,7 +1138,7 @@ def __class_getitem__(cls, params: Union[Tuple[T], T]) -> Greedy[T]:
         if origin is Union and type(None) in args:
             raise TypeError(f'Greedy[{converter!r}] is invalid.')
 
-        return cls(converter=converter)
+        return cls(converter=converter)  # type: ignore
 
     @property
     def constructed_converter(self) -> Any:
@@ -1325,7 +1325,7 @@ async def _actual_conversion(ctx: Context[BotT], converter: Any, argument: str,
             else:
                 return await converter().convert(ctx, argument)
         elif isinstance(converter, Converter):
-            return await converter.convert(ctx, argument)  # type: ignore
+            return await converter.convert(ctx, argument)
     except CommandError:
         raise
     except Exception as exc:

discord/ext/commands/core.py

@@ -1285,7 +1285,7 @@ async def can_run(self, ctx: Context[BotT], /) -> bool:
                 # since we have no checks, then we just return True.
                 return True
 
-            return await discord.utils.async_all(predicate(ctx) for predicate in predicates)
+            return await discord.utils.async_all(predicate(ctx) for predicate in predicates)  # type: ignore
         finally:
             ctx.command = original
 

discord/ext/commands/errors.py

@@ -24,18 +24,19 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, List, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Any, Callable, List, Optional, Tuple, Union, Generic
 
 from discord.errors import ClientException, DiscordException
 from discord.utils import _human_join
 
+from ._types import BotT
+
 if TYPE_CHECKING:
     from discord.abc import GuildChannel
     from discord.threads import Thread
     from discord.types.snowflake import Snowflake, SnowflakeList
     from discord.app_commands import AppCommandError
 
-    from ._types import BotT
     from .context import Context
     from .converter import Converter
     from .cooldowns import BucketType, Cooldown
@@ -235,7 +236,7 @@ class CheckFailure(CommandError):
     pass
 
 
-class CheckAnyFailure(CheckFailure):
+class CheckAnyFailure(Generic[BotT], CheckFailure):
     """Exception raised when all predicates in :func:`check_any` fail.
 
     This inherits from :exc:`CheckFailure`.

discord/ext/commands/flags.py

@@ -443,7 +443,7 @@ async def convert_flag(ctx: Context[BotT], argument: str, flag: Flag, annotation
             return await convert_flag(ctx, argument, flag, annotation)
         elif origin is Union and type(None) in annotation.__args__:
             # typing.Optional[x]
-            annotation = Union[tuple(arg for arg in annotation.__args__ if arg is not type(None))]  # type: ignore
+            annotation = Union[tuple(arg for arg in annotation.__args__ if arg is not type(None))]
             return await run_converters(ctx, annotation, argument, param)
         elif origin is dict:
             # typing.Dict[K, V] -> typing.Tuple[K, V]

discord/ext/commands/hybrid.py

@@ -203,9 +203,9 @@ def replace_parameter(
         # Fallback to see if the behaviour needs changing
         origin = getattr(converter, '__origin__', None)
         args = getattr(converter, '__args__', [])
-        if isinstance(converter, Range):
+        if isinstance(converter, Range):  # type: ignore # Range is not an Annotation at runtime
             r = converter
-            param = param.replace(annotation=app_commands.Range[r.annotation, r.min, r.max])
+            param = param.replace(annotation=app_commands.Range[r.annotation, r.min, r.max])  # type: ignore
         elif isinstance(converter, Greedy):
             # Greedy is "optional" in ext.commands
             # However, in here, it probably makes sense to make it required.
@@ -257,7 +257,7 @@ def replace_parameter(
                 inner = args[0]
                 is_inner_transformer = is_transformer(inner)
                 if is_converter(inner) and not is_inner_transformer:
-                    param = param.replace(annotation=Optional[ConverterTransformer(inner, original)])  # type: ignore
+                    param = param.replace(annotation=Optional[ConverterTransformer(inner, original)])
             else:
                 raise
         elif origin:
@@ -424,10 +424,10 @@ async def _check_can_run(self, interaction: discord.Interaction) -> bool:
                 if not ret:
                     return False
 
-        if self.checks and not await async_all(f(interaction) for f in self.checks):
+        if self.checks and not await async_all(f(interaction) for f in self.checks):  # type: ignore
             return False
 
-        if self.wrapped.checks and not await async_all(f(ctx) for f in self.wrapped.checks):
+        if self.wrapped.checks and not await async_all(f(ctx) for f in self.wrapped.checks):  # type: ignore
             return False
 
         return True
@@ -915,7 +915,8 @@ def hybrid_command(
     def decorator(func: CommandCallback[CogT, ContextT, P, T]) -> HybridCommand[CogT, P, T]:
         if isinstance(func, Command):
             raise TypeError('Callback is already a command.')
-        return HybridCommand(func, name=name, with_app_command=with_app_command, **attrs)
+        # Pyright does not allow Command[Any] to be assigned to Command[CogT] despite it being okay here
+        return HybridCommand(func, name=name, with_app_command=with_app_command, **attrs)  # type: ignore
 
     return decorator
 

discord/gateway.py

@@ -831,7 +831,7 @@ def __init__(
         self._close_code: Optional[int] = None
         self.secret_key: Optional[List[int]] = None
         if hook:
-            self._hook = hook
+            self._hook = hook  # type: ignore
 
     async def _hook(self, *args: Any) -> None:
         pass
@@ -893,7 +893,7 @@ async def from_connection_state(
 
         return ws
 
-    async def select_protocol(self, ip: str, port: int, mode: int) -> None:
+    async def select_protocol(self, ip: str, port: int, mode: str) -> None:
         payload = {
             'op': self.SELECT_PROTOCOL,
             'd': {

discord/guild.py

@@ -551,7 +551,8 @@ def _update_voice_state(self, data: GuildVoiceState, channel_id: int) -> Tuple[O
         member = self.get_member(user_id)
         if member is None:
             try:
-                member = Member(data=data['member'], state=self._state, guild=self)
+                member_data = data['member']  # pyright: ignore[reportTypedDictNotRequiredAccess]
+                member = Member(data=member_data, state=self._state, guild=self)
             except KeyError:
                 member = None
 
@@ -573,7 +574,7 @@ def _create_unavailable(cls, *, state: ConnectionState, guild_id: int, data: Opt
 
     def _from_data(self, guild: GuildPayload) -> None:
         try:
-            self._member_count = guild['member_count']
+            self._member_count = guild['member_count']  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             pass
 

discord/interactions.py

@@ -219,14 +219,15 @@ def _from_data(self, data: InteractionPayload):
             int(k): int(v) for k, v in data.get('authorizing_integration_owners', {}).items()
         }
         try:
-            self.context = AppCommandContext._from_value([data['context']])
+            value = data['context']  # pyright: ignore[reportTypedDictNotRequiredAccess]
+            self.context = AppCommandContext._from_value([value])
         except KeyError:
             self.context = AppCommandContext()
 
         self.locale: Locale = try_enum(Locale, data.get('locale', 'en-US'))
         self.guild_locale: Optional[Locale]
         try:
-            self.guild_locale = try_enum(Locale, data['guild_locale'])
+            self.guild_locale = try_enum(Locale, data['guild_locale'])  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             self.guild_locale = None
 

discord/invite.py

@@ -437,7 +437,7 @@ def __init__(
     def from_incomplete(cls, *, state: ConnectionState, data: InvitePayload) -> Self:
         guild: Optional[Union[Guild, PartialInviteGuild]]
         try:
-            guild_data = data['guild']
+            guild_data = data['guild']  # pyright: ignore[reportTypedDictNotRequiredAccess]
         except KeyError:
             # If we're here, then this is a group DM
             guild = None