Skip to content

Commit 9842e13

Browse files
committed
formatting with ruff
1 parent 4d13cd7 commit 9842e13

File tree

4 files changed

+37
-27
lines changed

4 files changed

+37
-27
lines changed

pydantic_settings/main.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
T = TypeVar('T')
3636

37+
3738
class SettingsConfigDict(ConfigDict, total=False):
3839
case_sensitive: bool
3940
nested_model_default_partial_update: bool | None
@@ -259,7 +260,7 @@ def _settings_build_values(
259260
_cli_ignore_unknown_args: bool | None = None,
260261
_cli_kebab_case: bool | None = None,
261262
_secrets_dir: PathType | None = None,
262-
_validate_each_source: bool | None = None
263+
_validate_each_source: bool | None = None,
263264
) -> dict[str, Any]:
264265
# Determine settings config values
265266
case_sensitive = _case_sensitive if _case_sensitive is not None else self.model_config.get('case_sensitive')
@@ -335,7 +336,11 @@ def _settings_build_values(
335336

336337
secrets_dir = _secrets_dir if _secrets_dir is not None else self.model_config.get('secrets_dir')
337338

338-
validate_each_source = _validate_each_source if _validate_each_source is not None else self.model_config.get('validate_each_source')
339+
validate_each_source = (
340+
_validate_each_source
341+
if _validate_each_source is not None
342+
else self.model_config.get('validate_each_source')
343+
)
339344

340345
# Configure built-in sources
341346
default_settings = DefaultSettingsSource(
@@ -440,8 +445,7 @@ def _settings_build_values(
440445

441446
if all_line_errors:
442447
raise ValidationError.from_exception_data(
443-
title=self.__class__.__name__,
444-
line_errors=all_line_errors
448+
title=self.__class__.__name__, line_errors=all_line_errors
445449
)
446450

447451
return state

pydantic_settings/sources.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,11 +1785,13 @@ def _add_parser_args(
17851785
if isinstance(group, dict):
17861786
group = self._add_group(parser, **group)
17871787
added_args += list(arg_names)
1788-
self._add_argument(group, *(f'{flag_prefix[:len(name)]}{name}' for name in arg_names), **kwargs)
1788+
self._add_argument(
1789+
group, *(f'{flag_prefix[: len(name)]}{name}' for name in arg_names), **kwargs
1790+
)
17891791
else:
17901792
added_args += list(arg_names)
17911793
self._add_argument(
1792-
parser, *(f'{flag_prefix[:len(name)]}{name}' for name in arg_names), **kwargs
1794+
parser, *(f'{flag_prefix[: len(name)]}{name}' for name in arg_names), **kwargs
17931795
)
17941796

17951797
self._add_parser_alias_paths(parser, alias_path_args, added_args, arg_prefix, subcommand_prefix, group)
@@ -2246,7 +2248,7 @@ def _load_env_vars(self) -> Mapping[str, Optional[str]]:
22462248
return AzureKeyVaultMapping(secret_client)
22472249

22482250
def __repr__(self) -> str:
2249-
return f'{self.__class__.__name__}(url={self._url!r}, ' f'env_nested_delimiter={self.env_nested_delimiter!r})'
2251+
return f'{self.__class__.__name__}(url={self._url!r}, env_nested_delimiter={self.env_nested_delimiter!r})'
22502252

22512253

22522254
def _get_env_var_key(key: str, case_sensitive: bool = False) -> str:

tests/test_multi_source.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ class Nested(BaseModel):
2929

3030
class Settings(BaseSettings):
3131
model_config = SettingsConfigDict(
32-
json_file=p,
33-
env_prefix='SETTINGS_',
34-
env_nested_delimiter='__',
35-
validate_each_source=True
32+
json_file=p, env_prefix='SETTINGS_', env_nested_delimiter='__', validate_each_source=True
3633
)
3734
foobar: str
3835
nested: Nested
@@ -48,11 +45,7 @@ def settings_customise_sources(
4845
dotenv_settings: PydanticBaseSettingsSource,
4946
file_secret_settings: PydanticBaseSettingsSource,
5047
) -> Tuple[PydanticBaseSettingsSource, ...]:
51-
return (
52-
JsonConfigSettingsSource(settings_cls),
53-
env_settings,
54-
init_settings
55-
)
48+
return (JsonConfigSettingsSource(settings_cls), env_settings, init_settings)
5649

5750
with pytest.raises(ValidationError) as exc_info:
5851
_ = Settings(null_field=0)
@@ -61,7 +54,10 @@ def settings_customise_sources(
6154
{
6255
'ctx': {'source': 'JsonConfigSettingsSource'},
6356
'input': 0,
64-
'loc': ('JsonConfigSettingsSource', 'foobar',),
57+
'loc': (
58+
'JsonConfigSettingsSource',
59+
'foobar',
60+
),
6561
'msg': 'Input should be a valid string',
6662
'type': 'string_type',
6763
},
@@ -70,19 +66,22 @@ def settings_customise_sources(
7066
'input': 'a',
7167
'loc': ('EnvSettingsSource', 'nested', 'nested_field'),
7268
'msg': 'Input should be a valid integer, unable to parse string as an integer',
73-
'type': 'int_parsing'
69+
'type': 'int_parsing',
7470
},
7571
{
7672
'ctx': {'source': 'InitSettingsSource'},
7773
'input': 0,
78-
'loc': ('InitSettingsSource', 'null_field',),
74+
'loc': (
75+
'InitSettingsSource',
76+
'null_field',
77+
),
7978
'msg': 'Input should be a valid string',
80-
'type': 'string_type'
79+
'type': 'string_type',
8180
},
8281
{
8382
'input': {'foobar': 0, 'nested': {'nested_field': 'a'}, 'null_field': None},
8483
'loc': ('extra',),
8584
'msg': 'Field required',
86-
'type': 'missing'
87-
}
85+
'type': 'missing',
86+
},
8887
]

tests/test_settings.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,10 @@ class AnnotatedComplexSettings(BaseSettings, validate_each_source=True):
487487
{
488488
'ctx': {'actual_length': 1, 'field_type': 'List', 'min_length': 2, 'source': 'EnvSettingsSource'},
489489
'input': ['russet'],
490-
'loc': ('EnvSettingsSource', 'apples',),
490+
'loc': (
491+
'EnvSettingsSource',
492+
'apples',
493+
),
491494
'msg': 'List should have at least 2 items after validation, not 1',
492495
'type': 'too_short',
493496
}
@@ -1141,10 +1144,13 @@ class Settings(BaseSettings):
11411144
assert exc_info.value.errors(include_url=False) == [
11421145
{
11431146
'type': 'extra_forbidden',
1144-
'loc': ('DotEnvSettingsSource', 'f',),
1147+
'loc': (
1148+
'DotEnvSettingsSource',
1149+
'f',
1150+
),
11451151
'msg': 'Extra inputs are not permitted',
11461152
'input': 'random value',
1147-
'ctx': {'source': 'DotEnvSettingsSource'}
1153+
'ctx': {'source': 'DotEnvSettingsSource'},
11481154
}
11491155
]
11501156

@@ -1925,8 +1931,7 @@ def test_builtins_settings_source_repr():
19251931
== "EnvSettingsSource(env_nested_delimiter='__', env_prefix_len=0)"
19261932
)
19271933
assert repr(DotEnvSettingsSource(BaseSettings, env_file='.env', env_file_encoding='utf-8')) == (
1928-
"DotEnvSettingsSource(env_file='.env', env_file_encoding='utf-8', "
1929-
'env_nested_delimiter=None, env_prefix_len=0)'
1934+
"DotEnvSettingsSource(env_file='.env', env_file_encoding='utf-8', env_nested_delimiter=None, env_prefix_len=0)"
19301935
)
19311936
assert (
19321937
repr(SecretsSettingsSource(BaseSettings, secrets_dir='/secrets'))

0 commit comments

Comments
 (0)