Skip to content

Commit da97728

Browse files
fix mypy
1 parent a28234d commit da97728

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

packages/settings-library/src/settings_library/base.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ def __pydantic_init_subclass__(cls, **kwargs: Any):
102102
for name, field in cls.model_fields.items():
103103
auto_default_from_env = (
104104
field.json_schema_extra is not None
105-
and field.json_schema_extra.get("auto_default_from_env", False)
106-
) # type: ignore[union-attr]
105+
and field.json_schema_extra.get( # type: ignore[union-attr]
106+
"auto_default_from_env", False
107+
)
108+
)
107109
field_type = _get_type(field)
108110

109111
# Avoids issubclass raising TypeError. SEE test_issubclass_type_error_with_pydantic_models

packages/settings-library/src/settings_library/docker_registry.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from functools import cached_property
22
from typing import Any
33

4-
from pydantic import ConfigDict, Field, SecretStr, field_validator
4+
from pydantic import Field, SecretStr, field_validator
5+
from pydantic_settings import SettingsConfigDict
56

67
from .base import BaseCustomSettings
78

@@ -36,7 +37,7 @@ def resolved_registry_url(self) -> str:
3637
def api_url(self) -> str:
3738
return f"{self.REGISTRY_URL}/v2"
3839

39-
model_config = ConfigDict(
40+
model_config = SettingsConfigDict(
4041
json_schema_extra={
4142
"examples": [
4243
{

packages/settings-library/src/settings_library/prometheus.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ def origin(self) -> str:
2424
@cached_property
2525
def api_url(self) -> str:
2626
assert self.PROMETHEUS_URL.host # nosec
27-
prometheus_url: str = AnyUrl.build(
28-
scheme=self.PROMETHEUS_URL.scheme,
29-
user=self.PROMETHEUS_USERNAME,
30-
password=self.PROMETHEUS_PASSWORD.get_secret_value()
31-
if self.PROMETHEUS_PASSWORD
32-
else None,
33-
host=self.PROMETHEUS_URL.host,
34-
port=self.PROMETHEUS_URL.port,
35-
path=self.PROMETHEUS_URL.path,
27+
prometheus_url: str = str(
28+
AnyUrl.build(
29+
scheme=self.PROMETHEUS_URL.scheme,
30+
username=self.PROMETHEUS_USERNAME,
31+
password=self.PROMETHEUS_PASSWORD.get_secret_value()
32+
if self.PROMETHEUS_PASSWORD
33+
else None,
34+
host=self.PROMETHEUS_URL.host,
35+
port=self.PROMETHEUS_URL.port,
36+
path=self.PROMETHEUS_URL.path,
37+
)
3638
)
3739
return prometheus_url

packages/settings-library/src/settings_library/utils_cli.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ def print_as_envfile(
2525
exclude_unset = pydantic_export_options.get("exclude_unset", False)
2626

2727
for name, field in settings_obj.model_fields.items():
28-
auto_default_from_env = (
29-
field.json_schema_extra is not None
30-
and field.json_schema_extra.get("auto_default_from_env", False)
31-
) # type: ignore[union-attr]
28+
auto_default_from_env = field.json_schema_extra is not None and field.json_schema_extra.get(
29+
"auto_default_from_env", False # type: ignore[union-attr]
30+
)
3231

3332
value = getattr(settings_obj, name)
3433

0 commit comments

Comments
 (0)