Skip to content

Commit

Permalink
Use updated FieldInfo from pydantic/pydantic#5800 (#59)
Browse files Browse the repository at this point in the history
Co-authored-by: Hasan Ramezani <hasan.r67@gmail.com>
  • Loading branch information
dmontagu and hramezani committed May 22, 2023
1 parent 411b88f commit 1307656
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions pydantic_settings/sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
from collections import deque
from dataclasses import is_dataclass
from pathlib import Path
from typing import TYPE_CHECKING, Any, List, Mapping, Sequence, Tuple, Union
from typing import TYPE_CHECKING, Any, List, Mapping, Sequence, Tuple, Union, cast

from pydantic import BaseModel
from pydantic import AliasChoices, AliasPath, BaseModel
from pydantic._internal._typing_extra import origin_is_union
from pydantic._internal._utils import deep_update, lenient_issubclass
from pydantic.fields import FieldInfo
Expand Down Expand Up @@ -122,19 +122,23 @@ def _extract_field_info(self, field: FieldInfo, field_name: str) -> list[tuple[s
field_name (str): The field name.
Returns:
list[tuple[str, str, bool]]: List of tuples, each tuple contanis field_key, env_name, and value_is_complex.
list[tuple[str, str, bool]]: List of tuples, each tuple contains field_key, env_name, and value_is_complex.
"""
field_info: list[tuple[str, str, bool]] = []
v_alias = field.validation_alias
if isinstance(field.validation_alias, (AliasChoices, AliasPath)):
v_alias: str | list[str | int] | list[list[str | int]] | None = field.validation_alias.convert_to_aliases()
else:
v_alias = field.validation_alias

if v_alias:
if isinstance(v_alias, list): # AliasChoices, AliasPath
for alias in v_alias:
if isinstance(alias, str): # AliasPath
field_info.append((alias, self._apply_case_sensitive(alias), True if len(alias) > 1 else False))
elif isinstance(alias, list): # AliasChoices
first_arg = cast(str, alias[0]) # first item of an AliasChoices must be a str
field_info.append(
(alias[0], self._apply_case_sensitive(alias[0]), True if len(alias) > 1 else False)
(first_arg, self._apply_case_sensitive(first_arg), True if len(alias) > 1 else False)
)
else: # string validation alias
field_info.append((v_alias, self._apply_case_sensitive(v_alias), False))
Expand Down

0 comments on commit 1307656

Please sign in to comment.