Pydantic v2 #103
Merged
Pydantic v2 #103
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
t20100
commented
Jul 12, 2023
|
|
||
| def check_match_gpu(v: Optional[int], values: dict) -> Optional[int]: | ||
| if v is not None and v > 0 and values.get("gpu") == "": | ||
| def check_match_gpu(v: Optional[int], info: FieldValidationInfo) -> Optional[int]: |
There was a problem hiding this comment.
validator function signature changed
t20100
commented
Jul 12, 2023
| return 0 # GPU explicitly disabled | ||
| return v | ||
|
|
||
|
|
||
| # models | ||
|
|
||
|
|
||
| class PartitionResources(BaseModel, allow_mutation=False, extra=Extra.allow): | ||
| class PartitionResources(BaseModel, frozen=True, extra="allow"): |
There was a problem hiding this comment.
config param names changed and use of Extra.... is deprecated
t20100
commented
Jul 12, 2023
| @@ -44,12 +41,10 @@ class PartitionResources(BaseModel, allow_mutation=False, extra=Extra.allow): | |||
| max_runtime: PositiveInt | |||
|
|
|||
| # validators | |||
| _check_match_gpu = validator("max_ngpus", allow_reuse=True)(check_match_gpu) | |||
| _check_match_gpu = field_validator("max_ngpus")(check_match_gpu) | |||
There was a problem hiding this comment.
Name change and now useless allow_reuse param
t20100
commented
Jul 12, 2023
| """Information about partition description and available environments""" | ||
|
|
||
| architecture = "" | ||
| description = "" | ||
| architecture: str = "" |
There was a problem hiding this comment.
Types looks to be needed for all field even with a default value
t20100
commented
Jul 12, 2023
| """Complete information about a partition: config and resources""" | ||
|
|
||
| pass | ||
| model_config = ConfigDict(frozen=True, extra="allow") |
There was a problem hiding this comment.
Former way of setting this no longer work with multiple inheritance
t20100
commented
Jul 12, 2023
| def check_is_strictly_positive_or_none(cls, v: Optional[int]) -> Optional[int]: | ||
| if v is not None and v <= 0: | ||
| raise ValueError("Value must be strictly positive") | ||
| return v | ||
|
|
||
|
|
||
| class PartitionsTrait(BaseModel, allow_mutation=False, extra=Extra.forbid): | ||
| class PartitionsTrait(RootModel): |
There was a problem hiding this comment.
Use __root__ replaced with inheritance from RootModel
t20100
commented
Jul 12, 2023
|
|
||
| def dict(self, *args, **kwargs): | ||
| return {k: v.dict(*args, **kwargs) for k, v in self.__root__.items()} | ||
| def model_dump(self, *args, **kwargs): |
There was a problem hiding this comment.
dict() renamed model_dump()
t20100
commented
Jul 12, 2023
| @@ -169,9 +169,9 @@ def parse_formdata(cls, formdata: dict[str, list[str]]) -> UserOptions: | |||
| fields["output"] = ( | |||
| "slurm-%j.out" if fields.get("output", "false") == "true" else "/dev/null" | |||
| ) | |||
| return cls.parse_obj(fields) | |||
| return cls.model_validate(fields) | |||
There was a problem hiding this comment.
parse_ob() renamed to model_validate()
t20100
commented
Jul 12, 2023
| def check_memory(cls, v: str) -> str: | ||
| if v and cls._MEM_REGEXP.match(v) is None: | ||
| if v and _MEM_REGEXP.match(v) is None: |
There was a problem hiding this comment.
There was trouble with access to class attribute
Closed
loichuder
approved these changes
Jul 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates the code to run with pydantic v2 which was recently released and breaks a few APIs.
closes #102