Skip to content
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.

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

cleanup: remove superfluous validator #120

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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: 9 additions & 14 deletions src/sirocco/parsing/_yaml_data_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@ class ConfigCycleTaskOutput(_NamedBaseModel):
def make_named_model_list_converter(
cls: type[NAMED_BASE_T],
) -> typing.Callable[[list[NAMED_BASE_T | str | dict] | None], list[NAMED_BASE_T]]:
def convert_named_model_list(values: list[NAMED_BASE_T | str | dict] | None) -> list[NAMED_BASE_T]:
def convert_named_model_list(
values: list[NAMED_BASE_T | str | dict] | None,
) -> list[NAMED_BASE_T]:
inputs: list[NAMED_BASE_T] = []
if values is None:
return inputs
Expand All @@ -224,13 +226,16 @@ class ConfigCycleTask(_NamedBaseModel):
"""

inputs: Annotated[
list[ConfigCycleTaskInput], BeforeValidator(make_named_model_list_converter(ConfigCycleTaskInput))
list[ConfigCycleTaskInput],
BeforeValidator(make_named_model_list_converter(ConfigCycleTaskInput)),
] = []
outputs: Annotated[
list[ConfigCycleTaskOutput], BeforeValidator(make_named_model_list_converter(ConfigCycleTaskOutput))
list[ConfigCycleTaskOutput],
BeforeValidator(make_named_model_list_converter(ConfigCycleTaskOutput)),
] = []
wait_on: Annotated[
list[ConfigCycleTaskWaitOn], BeforeValidator(make_named_model_list_converter(ConfigCycleTaskWaitOn))
list[ConfigCycleTaskWaitOn],
BeforeValidator(make_named_model_list_converter(ConfigCycleTaskWaitOn)),
] = []


Expand Down Expand Up @@ -535,16 +540,6 @@ class ConfigBaseData(_NamedBaseModel, ConfigBaseDataSpecs):

parameters: list[str] = []

@field_validator("type")
@classmethod
def is_file_or_dir(cls, value: str) -> str:
"""."""
valid_types = ("file", "dir")
if value not in valid_types:
msg = f"Must be one of {valid_types}"
raise ValueError(msg)
return value


class ConfigAvailableData(ConfigBaseData):
pass
Expand Down