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.

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

Don't validate ReservoirRfcParameters paths if reservoir forecasts are disabled #802

Merged
merged 3 commits into from
Jul 8, 2024
Merged

Don't validate ReservoirRfcParameters paths if reservoir forecasts are disabled #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b99b61
fix: don't validate ReservoirRfcParameters paths if not used in stric…
aaraney Jul 8, 2024
d372754
fix: update config validation
aaraney Jul 8, 2024
5eb7179
bump troute.config 0.0.2 -> 0.0.3
aaraney Jul 8, 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
2 changes: 1 addition & 1 deletion src/troute-config/troute/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = "0.0.2"
__version__ = "0.0.3"

from .config import Config
12 changes: 9 additions & 3 deletions src/troute-config/troute/config/compute_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pydantic import BaseModel, Field, validator
from datetime import datetime

from typing import Optional, List
from typing import Optional, List, Union
from typing_extensions import Literal

from .types import FilePath, DirectoryPath
Expand Down Expand Up @@ -141,16 +141,22 @@ class ReservoirPersistenceDA(BaseModel, extra='ignore'):


class ReservoirRfcParameters(BaseModel):
reservoir_rfc_forecasts: bool = False
reservoir_rfc_forecasts: Literal[True] = True
reservoir_rfc_forecasts_time_series_path: Optional[DirectoryPath] = None
reservoir_rfc_forecasts_lookback_hours: int = 28
reservoir_rfc_forecasts_offset_hours: int = 28
reservoir_rfc_forecast_persist_days: int = 11


class ReservoirRfcParametersDisabled(BaseModel):
reservoir_rfc_forecasts: Literal[False] = False


class ReservoirDA(BaseModel):
reservoir_persistence_da: Optional[ReservoirPersistenceDA] = None
reservoir_rfc_da: Optional[ReservoirRfcParameters] = None
reservoir_rfc_da: Optional[
Union[ReservoirRfcParameters, ReservoirRfcParametersDisabled]
] = Field(None, discriminator="reservoir_rfc_forecasts")
reservoir_parameter_file: Optional[FilePath] = None


Expand Down
2 changes: 1 addition & 1 deletion src/troute-config/troute/config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def check_rfc_parameters(cls, values):
if reservoir_da:
reservoir_rfc_da = reservoir_da.reservoir_rfc_da
reservoir_rfc_forecasts = False
if reservoir_rfc_da:
if reservoir_rfc_da and reservoir_rfc_da.reservoir_rfc_forecasts:
reservoir_rfc_forecasts = reservoir_rfc_da.reservoir_rfc_forecasts
reservoir_rfc_forecasts_time_series_path = reservoir_rfc_da.reservoir_rfc_forecasts_time_series_path
if reservoir_rfc_forecasts:
Expand Down
Loading