Fix type annotations to adhere to latest pyright release

Author: bijij

.github/workflows/lint.yml

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

discord/app_commands/commands.py

@@ -771,8 +771,7 @@ async def _check_can_run(self, interaction: Interaction) -> bool:
         if not predicates:
             return True
 
-        # Type checker does not understand negative narrowing cases like this function
-        return await async_all(f(interaction) for f in predicates)  # type: ignore
+        return await async_all(f(interaction) for f in predicates)
 
     def error(self, coro: Error[GroupT]) -> Error[GroupT]:
         """A decorator that registers a coroutine as a local error handler.
@@ -997,8 +996,7 @@ async def _check_can_run(self, interaction: Interaction) -> bool:
         if not predicates:
             return True
 
-        # Type checker does not understand negative narrowing cases like this function
-        return await async_all(f(interaction) for f in predicates)  # type: ignore
+        return await async_all(f(interaction) for f in predicates)
 
     def _has_any_error_handlers(self) -> bool:
         return self.on_error is not None

discord/app_commands/models.py

@@ -96,14 +96,14 @@ class AllChannels:
     __slots__ = ('guild',)
 
     def __init__(self, guild: Guild):
-        self.guild = guild
+        self.guild: Guild = guild
 
     @property
     def id(self) -> int:
         """:class:`int`: The ID sentinel used to represent all channels. Equivalent to the guild's ID minus 1."""
         return self.guild.id - 1
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f'<AllChannels guild={self.guild}>'
 
 

discord/errors.py

@@ -27,13 +27,9 @@
 
 if TYPE_CHECKING:
     from aiohttp import ClientResponse, ClientWebSocketResponse
+    from requests import Response
 
-    try:
-        from requests import Response
-
-        _ResponseType = Union[ClientResponse, Response]
-    except ModuleNotFoundError:
-        _ResponseType = ClientResponse
+    _ResponseType = Union[ClientResponse, Response]
 
     from .interactions import Interaction
 

discord/ext/commands/_types.py

@@ -59,7 +59,7 @@
 ContextT_co = TypeVar('ContextT_co', bound='Context[Any]', covariant=True)
 
 
-class Check(Protocol[ContextT_co]):
+class Check(Protocol[ContextT_co]):  # type: ignore # TypeVar is expected to be invariant
 
     predicate: Callable[[ContextT_co], Coroutine[Any, Any, bool]]
 

discord/ext/commands/bot.py

@@ -460,8 +460,7 @@ async def can_run(self, ctx: Context[BotT], /, *, call_once: bool = False) -> bo
         if len(data) == 0:
             return True
 
-        # type-checker doesn't distinguish between functions and methods
-        return await discord.utils.async_all(f(ctx) for f in data)  # type: ignore
+        return await discord.utils.async_all(f(ctx) for f in data)
 
     async def is_owner(self, user: User, /) -> bool:
         """|coro|

discord/ext/commands/context.py

@@ -35,7 +35,7 @@
 from ._types import BotT
 
 if TYPE_CHECKING:
-    from typing_extensions import Self, ParamSpec
+    from typing_extensions import Self, ParamSpec, TypeGuard
 
     from discord.abc import MessageableChannel
     from discord.guild import Guild
@@ -77,6 +77,10 @@
     P = TypeVar('P')
 
 
+def is_cog(obj: Any) -> TypeGuard[Cog]:
+    return hasattr(obj, '__cog_commands__')
+
+
 class DeferTyping:
     def __init__(self, ctx: Context[BotT], *, ephemeral: bool):
         self.ctx: Context[BotT] = ctx
@@ -526,7 +530,7 @@ async def send_help(self, *args: Any) -> Any:
         await cmd.prepare_help_command(self, entity.qualified_name)
 
         try:
-            if hasattr(entity, '__cog_commands__'):
+            if is_cog(entity):
                 injected = wrap_callback(cmd.send_cog_help)
                 return await injected(entity)
             elif isinstance(entity, Group):

discord/ext/commands/converter.py

@@ -234,6 +234,7 @@ async def convert(self, ctx: Context[BotT], argument: str) -> discord.Member:
         guild = ctx.guild
         result = None
         user_id = None
+
         if match is None:
             # not a mention...
             if guild:
@@ -247,7 +248,7 @@ async def convert(self, ctx: Context[BotT], argument: str) -> discord.Member:
             else:
                 result = _get_from_guilds(bot, 'get_member', user_id)
 
-        if result is None:
+        if not isinstance(result, discord.Member):
             if guild is None:
                 raise MemberNotFound(argument)
 
@@ -1182,7 +1183,7 @@ async def _actual_conversion(ctx: Context[BotT], converter: Any, argument: str,
     except CommandError:
         raise
     except Exception as exc:
-        raise ConversionError(converter, exc) from exc
+        raise ConversionError(converter, exc) from exc  # type: ignore
 
     try:
         return converter(argument)

discord/ext/commands/core.py

@@ -354,8 +354,8 @@ def __new__(cls, *args: Any, **kwargs: Any) -> Self:
     def __init__(
         self,
         func: Union[
-            Callable[Concatenate[CogT, ContextT, P], Coro[T]],
-            Callable[Concatenate[ContextT, P], Coro[T]],
+            Callable[Concatenate[CogT, Context[Any], P], Coro[T]],
+            Callable[Concatenate[Context[Any], P], Coro[T]],
         ],
         /,
         **kwargs: Any,
@@ -399,7 +399,7 @@ def __init__(
         except AttributeError:
             checks = kwargs.get('checks', [])
 
-        self.checks: List[UserCheck[ContextT]] = checks
+        self.checks: List[UserCheck[Context[Any]]] = checks
 
         try:
             cooldown = func.__commands_cooldown__
@@ -479,7 +479,7 @@ def callback(
 
         self.params: Dict[str, Parameter] = get_signature_parameters(function, globalns)
 
-    def add_check(self, func: UserCheck[ContextT], /) -> None:
+    def add_check(self, func: UserCheck[Context[Any]], /) -> None:
         """Adds a check to the command.
 
         This is the non-decorator interface to :func:`.check`.
@@ -500,7 +500,7 @@ def add_check(self, func: UserCheck[ContextT], /) -> None:
 
         self.checks.append(func)
 
-    def remove_check(self, func: UserCheck[ContextT], /) -> None:
+    def remove_check(self, func: UserCheck[Context[Any]], /) -> None:
         """Removes a check from the command.
 
         This function is idempotent and will not raise an exception
@@ -1249,7 +1249,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)  # type: ignore
+            return await discord.utils.async_all(predicate(ctx) for predicate in predicates)
         finally:
             ctx.command = original
 
@@ -1448,7 +1448,7 @@ def command(
     def command(
         self: GroupMixin[CogT],
         name: str = ...,
-        cls: Type[CommandT] = ...,
+        cls: Type[CommandT] = ...,  # type: ignore  # previous overload handles case where cls is not set
         *args: Any,
         **kwargs: Any,
     ) -> Callable[
@@ -1508,7 +1508,7 @@ def group(
     def group(
         self: GroupMixin[CogT],
         name: str = ...,
-        cls: Type[GroupT] = ...,
+        cls: Type[GroupT] = ...,  # type: ignore  # previous overload handles case where cls is not set
         *args: Any,
         **kwargs: Any,
     ) -> Callable[
@@ -1700,7 +1700,7 @@ def command(
 @overload
 def command(
     name: str = ...,
-    cls: Type[CommandT] = ...,
+    cls: Type[CommandT] = ...,  # type: ignore  # previous overload handles case where cls is not set
     **attrs: Any,
 ) -> Callable[
     [
@@ -1770,7 +1770,7 @@ def group(
 @overload
 def group(
     name: str = ...,
-    cls: Type[GroupT] = ...,
+    cls: Type[GroupT] = ...,  # type: ignore  # previous overload handles case where cls is not set
     **attrs: Any,
 ) -> Callable[
     [
@@ -1878,9 +1878,9 @@ async def only_me(ctx):
         The predicate to check if the command should be invoked.
     """
 
-    def decorator(func: Union[Command, CoroFunc]) -> Union[Command, CoroFunc]:
+    def decorator(func: Union[Command[Any, ..., Any], CoroFunc]) -> Union[Command[Any, ..., Any], CoroFunc]:
         if isinstance(func, Command):
-            func.checks.append(predicate)
+            func.checks.append(predicate)  # type: ignore
         else:
             if not hasattr(func, '__commands_checks__'):
                 func.__commands_checks__ = []

discord/ext/commands/help.py

@@ -61,7 +61,6 @@
 
     from ._types import (
         UserCheck,
-        ContextT,
         BotT,
         _Bot,
     )
@@ -378,7 +377,7 @@ def _remove_from_bot(self, bot: BotBase) -> None:
         bot.remove_command(self._command_impl.name)
         self._command_impl._eject_cog()
 
-    def add_check(self, func: UserCheck[ContextT], /) -> None:
+    def add_check(self, func: UserCheck[Context[Any]], /) -> None:
         """
         Adds a check to the help command.
 
@@ -398,7 +397,7 @@ def add_check(self, func: UserCheck[ContextT], /) -> None:
 
         self._command_impl.add_check(func)
 
-    def remove_check(self, func: UserCheck[ContextT], /) -> None:
+    def remove_check(self, func: UserCheck[Context[Any]], /) -> None:
         """
         Removes a check from the help command.