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

Jump to bottom

Refactor root_validator to model_validator #37

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Refactor root_validator to model_validator #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions feo/osemosys/schemas/commodity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import ClassVar, List, Union

import pandas as pd
from pydantic import BaseModel, root_validator
from pydantic import BaseModel, model_validator

from feo.osemosys.schemas.validation.commodity_validation import demand_profile_sums_one
from feo.osemosys.utils import group_to_json
Expand Down Expand Up @@ -48,7 +48,7 @@ class Commodity(OSeMOSYSBase):
},
}

@root_validator(pre=True)
@model_validator(mode="before")
def validation(cls, values):
values = demand_profile_sums_one(values)
return values
Expand Down
4 changes: 2 additions & 2 deletions feo/osemosys/schemas/impact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import ClassVar, List, Union

import pandas as pd
from pydantic import BaseModel, root_validator
from pydantic import BaseModel, model_validator

from feo.osemosys.schemas.validation.impact_validation import (
exogenous_annual_within_constraint,
Expand Down Expand Up @@ -66,7 +66,7 @@ class Impact(OSeMOSYSBase):
},
}

@root_validator(pre=True)
@model_validator(mode="before")
def validator(cls, values):
values = exogenous_annual_within_constraint(values)
values = exogenous_total_within_constraint(values)
Expand Down
4 changes: 2 additions & 2 deletions feo/osemosys/schemas/region.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import ClassVar, List, Union

import pandas as pd
from pydantic import BaseModel, conlist, root_validator
from pydantic import BaseModel, conlist, model_validator

from feo.osemosys.schemas.validation.region_validation import (
discount_rate_as_decimals,
Expand Down Expand Up @@ -83,7 +83,7 @@ class Region(OSeMOSYSBase):
},
}

@root_validator(pre=True)
@model_validator(mode="before")
def validation(cls, values):
values = reserve_margin_fully_defined(values)
values = discount_rate_as_decimals(values)
Expand Down
6 changes: 3 additions & 3 deletions feo/osemosys/schemas/technology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import ClassVar, List, Union

import pandas as pd
from pydantic import BaseModel, root_validator
from pydantic import BaseModel, model_validator

from feo.osemosys.schemas.validation.technology_validation import (
min_activity_lower_than_max,
Expand Down Expand Up @@ -227,7 +227,7 @@ class Technology(OSeMOSYSBase):
},
}

@root_validator(pre=True)
@model_validator(mode="before")
def validator(cls, values):
values = min_activity_lower_than_max(values)
values = min_capacity_lower_than_max(values)
Expand Down Expand Up @@ -440,7 +440,7 @@ class TechnologyStorage(OSeMOSYSBase):
},
}

@root_validator(pre=True)
@model_validator(mode="before")
def validator(cls, values):
values = technology_storage_validation(values)
return values
Expand Down
4 changes: 2 additions & 2 deletions feo/osemosys/schemas/time_definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import ClassVar, List, Union

import pandas as pd
from pydantic import BaseModel, conlist, root_validator
from pydantic import BaseModel, conlist, model_validator

from feo.osemosys.schemas.validation.timedefinition_validation import (
construct_adjacency_matrices,
Expand Down Expand Up @@ -101,7 +101,7 @@ class TimeDefinition(OSeMOSYSBase):

# TODO: post-validation that everything has the right keys and sums,etc.

@root_validator(pre=True)
@model_validator(mode="before")
def validation(cls, values):
# Validation if timeslice is provided
values = timeslice_match_timeslice_in_set(values)
Expand Down
Loading