Skip to content

CLI metavar fix #553

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

Closed
wants to merge 3 commits into from
Closed

CLI metavar fix #553

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cdeee5
Metavar fix.
kschwab Feb 25, 2025
605cc75
Add local copy of is_type_alias_type.
kschwab Feb 25, 2025
de77024
Merge branch 'main' into metavar-generation
kschwab Feb 25, 2025
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
23 changes: 20 additions & 3 deletions pydantic_settings/sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,7 @@ def _metavar_format_recurse(self, obj: Any) -> str:
return '...'
elif isinstance(obj, Representation):
return repr(obj)
elif isinstance(obj, typing_extensions.TypeAliasType):
elif isinstance(obj, typing.ForwardRef) or _is_type_alias_type(obj):
return str(obj)

if not isinstance(obj, (typing_base, WithArgsTypes, type)):
Expand All @@ -2009,9 +2009,12 @@ def _metavar_format_recurse(self, obj: Any) -> str:
elif lenient_issubclass(obj, Enum):
return self._metavar_format_choices([val.name for val in obj])
elif isinstance(obj, WithArgsTypes):
if hasattr(obj, '__qualname__'):
obj_qualname = obj.__qualname__
else:
obj_qualname = str(obj).replace('typing.', '').replace('typing_extensions.', '').split('[')[0]
return self._metavar_format_choices(
list(map(self._metavar_format_recurse, self._get_modified_args(obj))),
obj_qualname=obj.__qualname__ if hasattr(obj, '__qualname__') else str(obj),
list(map(self._metavar_format_recurse, self._get_modified_args(obj))), obj_qualname=obj_qualname
)
elif obj is type(None):
return self.cli_parse_none_str
Expand Down Expand Up @@ -2432,3 +2435,17 @@ def _get_alias_names(

def _is_function(obj: Any) -> bool:
return isinstance(obj, (FunctionType, BuiltinFunctionType))


# _TYPE_ALIAS_TYPES is copied from `pydantic._internal._typing_extra`.
_TYPE_ALIAS_TYPES: tuple[type[typing_extensions.TypeAliasType], ...] = (typing_extensions.TypeAliasType,)
if sys.version_info >= (3, 12):
_TYPE_ALIAS_TYPES = (*_TYPE_ALIAS_TYPES, typing.TypeAliasType)


def _is_type_alias_type(tp: Any, /) -> typing_extensions.TypeIs[typing_extensions.TypeAliasType]:
"""
Return whether the provided argument is an instance of `TypeAliasType`.
Copied from `pydantic._internal._typing_extra`.
"""
return isinstance(tp, _TYPE_ALIAS_TYPES)
Loading