Skip to content

adapt to pydantic v2 #323

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

adapt to pydantic v2 #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd4ffcd
pyproject.toml: add pydantic-settings
johanneskastl Aug 3, 2024
9aa8e5e
robusta_krr/core/models/config.py: import pydantic_settings and use i…
johanneskastl Aug 3, 2024
5eb2136
robusta_krr/core/models/config.py: file_output_dynamic
johanneskastl Aug 3, 2024
4a8b5fc
robusta_krr/main.py: adapt field_meta to work with new pydantic
johanneskastl Aug 3, 2024
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
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ krr = "robusta_krr.main:run"
python = ">=3.9,<=3.12.3"
typer = { extras = ["all"], version = "^0.7.0" }
pydantic = "^1.10.7"
pydantic-settings = "^2.0.0"
kubernetes = "^26.1.0"
prometheus-api-client = "0.5.3"
numpy = ">=1.26.4,<1.27.0"
Expand Down
5 changes: 3 additions & 2 deletions robusta_krr/core/models/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Any, Literal, Optional, Union

import pydantic as pd
import pydantic_settings as pds
from kubernetes import config
from kubernetes.config.config_exception import ConfigException
from rich.console import Console
Expand All @@ -17,7 +18,7 @@
logger = logging.getLogger("krr")


class Config(pd.BaseSettings):
class Config(pds.BaseSettings):
quiet: bool = pd.Field(False)
verbose: bool = pd.Field(False)

Expand Down Expand Up @@ -61,7 +62,7 @@ class Config(pd.BaseSettings):

# Output Settings
file_output: Optional[str] = pd.Field(None)
file_output_dynamic = bool = pd.Field(False)
file_output_dynamic: bool = pd.Field(False)
slack_output: Optional[str] = pd.Field(None)

other_args: dict[str, Any]
Expand Down
4 changes: 2 additions & 2 deletions robusta_krr/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,10 @@ def run_strategy(
default=OptionInfo(
default=field_meta.default,
param_decls=list(set([f"--{field_name}", f"--{field_name.replace('_', '-')}"])),
help=f"{field_meta.field_info.description}",
help=f"{field_meta.description}",
rich_help_panel="Strategy Settings",
),
annotation=__process_type(field_meta.type_),
annotation=__process_type(field_meta.annotation),
)
for field_name, field_meta in strategy_type.get_settings_type().__fields__.items()
]
Expand Down