chore: upgrade to pydantic v2 #86
Merged
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
mark-koch
reviewed
Jan 10, 2024
guppy/hugr/tys.py
Outdated
Comment on lines
121
to
123
| class Sum(ABC, BaseModel): | ||
| """Sum type, variants are tagged by their position in the type row""" | ||
| # class Sum(ABC, BaseModel): | ||
| # """Sum type, variants are tagged by their position in the type row""" | ||
|
|
||
| t: Literal["Sum"] = "Sum" | ||
| # t: Literal["Sum"] = "Sum" |
There was a problem hiding this comment.
You can probably delete this
guppy/hugr/tys.py
Outdated
Comment on lines
144
to
145
| SumUnion = UnitSum | GeneralSum | ||
| Sum = Annotated[SumUnion, Field(discriminator="s")] |
There was a problem hiding this comment.
Is there a reason you define the alias SumUnion instead of inlining it below?
There was a problem hiding this comment.
to use it in in the isinstance check (annotated unions don't work)
guppy/hugr/tys.py
Outdated
| @@ -24,7 +23,7 @@ class TypeParam(BaseModel): | |||
|
|
|||
| class BoundedNatParam(BaseModel): | |||
| tp: Literal["BoundedNat"] = "BoundedNat" | |||
| bound: int | None | |||
| bound: int | None = None | |||
There was a problem hiding this comment.
Is this default needed for deserialisation?
There was a problem hiding this comment.
the migration code added it automatically (bump_pydantic)
There was a problem hiding this comment.
Ok, I'd remove it then (so that you have to make a conscious choice when passing None)
ss2165
force-pushed
the
chore/pydantic2
branch
from
d7e1a41 to
12ee66c
Compare
ss2165
force-pushed
the
chore/pydantic2
branch
from
12ee66c to
33a7a50
Compare
mark-koch
reviewed
Jan 10, 2024
guppy/hugr/tys.py
Outdated
| @@ -24,7 +23,7 @@ class TypeParam(BaseModel): | |||
|
|
|||
| class BoundedNatParam(BaseModel): | |||
| tp: Literal["BoundedNat"] = "BoundedNat" | |||
| bound: int | None | |||
| bound: int | None = None | |||
There was a problem hiding this comment.
Ok, I'd remove it then (so that you have to make a conscious choice when passing None)
guppy/hugr/val.py
Outdated
| @@ -18,7 +18,7 @@ class FunctionVal(BaseModel): | |||
| """A higher-order function value.""" | |||
|
|
|||
| v: Literal["Function"] = "Function" | |||
| hugr: Any # TODO | |||
| hugr: Any = None # TODO | |||
ss2165
force-pushed
the
chore/pydantic2
branch
from
c10daee to
c022c71
Compare
mark-koch
approved these changes
Jan 10, 2024
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.
No description provided.