Skip to content

Fix argparse conflict for duplicate TypedDict field short aliases #433

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.

Sign up for GitHub

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

Open
wirjo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix argparse conflict for duplicate TypedDict field short aliases #433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion eval_protocol/cli_commands/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,10 @@ def add_args_from_callable_signature(
help = _parse_args_section_from_doc(inspect.getdoc(fn) or "")
hints = typing.get_type_hints(fn, include_extras=True)

# Track registered flags to avoid argparse conflicts when multiple
# TypedDicts share the same field name (e.g. credentials_secret).
_registered_flags: set[str] = set()

for name in sig.parameters.keys():
resolved_type = unwrap_union(hints.get(name))

Expand All @@ -738,10 +742,15 @@ def add_args_from_callable_signature(
prefix = name.replace("_", "-")
field_kebab = field_name.replace("_", "-")
flag_name = f"--{prefix}-{field_kebab}"
flags = [flag_name] + aliases.get(f"{name}.{field_name}", []) + [f"--{field_kebab}"]
short_flag = f"--{field_kebab}"
flags = [flag_name] + aliases.get(f"{name}.{field_name}", [])
# Only add the short alias if it hasn't been registered yet.
if short_flag not in _registered_flags:
flags.append(short_flag)
help_text = help_overrides.get(f"{name}.{field_name}", field_help.get(field_name))

_add_flag(parser, flags, field_hints.get(field_name, field_type), help_text)
_registered_flags.update(flags)
continue

if name in top_level_skip:
Expand All @@ -752,3 +761,4 @@ def add_args_from_callable_signature(
help_text = help_overrides.get(name, help.get(name))

_add_flag(parser, flags, hints.get(name), help_text)
_registered_flags.update(flags)