✨ Allow for functools.partials and such as autocomplete

Author: Paillat-dev

discord/commands/core.py

@@ -1095,13 +1095,13 @@ async def invoke_autocomplete_callback(self, ctx: AutocompleteContext):
                 ctx.value = op.get("value")
                 ctx.options = values
 
-                if len(inspect.signature(option.autocomplete).parameters) == 2:
+                if option.autocomplete._is_instance_method:
                     instance = getattr(option.autocomplete, "__self__", ctx.cog)
                     result = option.autocomplete(instance, ctx)
                 else:
                     result = option.autocomplete(ctx)
 
-                if asyncio.iscoroutinefunction(option.autocomplete):
+                if inspect.isawaitable(result):
                     result = await result
 
                 choices = [

discord/commands/options.py

@@ -27,7 +27,7 @@
 import inspect
 import logging
 from enum import Enum
-from typing import TYPE_CHECKING, Literal, Optional, Type, Union
+from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, Type, Union
 
 from ..abc import GuildChannel, Mentionable
 from ..channel import (
@@ -272,6 +272,7 @@ def __init__(
         )
         self.default = kwargs.pop("default", None)
 
+        self._autocomplete: Callable[[Any], Any, Any] | None = None
         self.autocomplete = kwargs.pop("autocomplete", None)
         if len(enum_choices) > 25:
             self.choices: list[OptionChoice] = []
@@ -390,6 +391,27 @@ def to_dict(self) -> dict:
     def __repr__(self):
         return f"<discord.commands.{self.__class__.__name__} name={self.name}>"
 
+    @property
+    def autocomplete(self) -> Callable[[Any], Any, Any] | None:
+        return self._autocomplete
+
+    @autocomplete.setter
+    def autocomplete(self, value: Callable[[Any], Any, Any] | None) -> None:
+        self._autocomplete = value
+        # this is done here so it does not have to be computed every time the autocomplete is invoked
+        if self._autocomplete is not None:
+            self._autocomplete._is_instance_method = (
+                sum(
+                    1
+                    for param in inspect.signature(
+                        self.autocomplete
+                    ).parameters.values()
+                    if param.default == param.empty
+                    and param.kind not in (param.VAR_POSITIONAL, param.VAR_KEYWORD)
+                )
+                == 2
+            )
+
 
 class OptionChoice:
     """