Skip to content

fix(params): avoid calling signature() twice #1059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions disnake/ext/commands/params.py
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ def parse_annotation(self, annotation: Any, converter_mode: bool = False) -> boo
return True

def parse_converter_annotation(self, converter: Callable, fallback_annotation: Any) -> None:
_, parameters = isolate_self(converter)
_, parameters = isolate_self(signature(converter))

if len(parameters) != 1:
raise TypeError(
Expand Down Expand Up @@ -864,11 +864,9 @@ def safe_call(function: Callable[..., T], /, *possible_args: Any, **possible_kwa


def isolate_self(
function: Callable,
sig: inspect.Signature,
) -> Tuple[Tuple[Optional[inspect.Parameter], ...], Dict[str, inspect.Parameter]]:
"""Create parameters without self and the first interaction"""
sig = signature(function)

parameters = dict(sig.parameters)
parametersl = list(sig.parameters.values())

Expand Down Expand Up @@ -924,12 +922,20 @@ def classify_autocompleter(autocompleter: AnyAutocompleter) -> None:

def collect_params(
function: Callable,
sig: Optional[inspect.Signature] = None,
) -> Tuple[Optional[str], Optional[str], List[ParamInfo], Dict[str, Injection]]:
"""Collect all parameters in a function
"""Collect all parameters in a function.

Optionally accepts an `inspect.Signature` object (as an optimization),
calls `signature(function)` if not provided.

Returns: (`cog parameter`, `interaction parameter`, `param infos`, `injections`)
"""
(cog_param, inter_param), parameters = isolate_self(function)
if sig is None:
sig = signature(function)

(cog_param, inter_param), parameters = isolate_self(sig)

doc = disnake.utils.parse_docstring(function)["params"]

paraminfos: List[ParamInfo] = []
Expand Down Expand Up @@ -1053,7 +1059,8 @@ def expand_params(command: AnySlashCommand) -> List[Option]:
Returns the created options
"""
sig = signature(command.callback)
_, inter_param, params, injections = collect_params(command.callback)
# pass `sig` down to avoid having to call `signature(func)` another time
_, inter_param, params, injections = collect_params(command.callback, sig)

if inter_param is None:
raise TypeError(f"Couldn't find an interaction parameter in {command.callback}")
Expand Down