feat: Upgrade to Pydantic V2 #3134
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
michael-genson
changed the title
michael-genson
commented
Feb 10, 2024
| @property | ||
| def db_url(self) -> str: | ||
| host = f"{self.POSTGRES_SERVER}:{self.POSTGRES_PORT}" | ||
| return PostgresDsn.build( |
There was a problem hiding this comment.
PostgresDsn changes, pretty sure this is right
michael-genson
commented
Feb 10, 2024
| @@ -47,6 +46,25 @@ def _cbv(router: APIRouter, cls: type[T], *urls: str, instance: Any | None = Non | |||
| return cls | |||
|
|
|||
|
|
|||
| # copied from Pydantic V1 Source: https://github.com/pydantic/pydantic/blob/1c91c8627b541b22354b9ed56b9ef1bb21ac6fbd/pydantic/v1/typing.py | |||
There was a problem hiding this comment.
Gross copy from Pydantic V1
michael-genson
commented
Feb 10, 2024
| @@ -0,0 +1,252 @@ | |||
| """ | |||
There was a problem hiding this comment.
Copied from Pydantic V1. I wasn't sure where to put it so I put it in schema/_mealie
|
I tried to highlight some of the bigger changes in the comments, but this PR is pretty massive |
hay-kot
previously approved these changes
Feb 11, 2024
Optimistic |
hay-kot
approved these changes
Feb 11, 2024
6 tasks
anoadragon453
added a commit
to anoadragon453/nixpkgs
that referenced
this pull request
May 6, 2024
In mealie v1.3.0, the dependency on pydantic was bumped from v1 to v2: mealie-recipes/mealie#3134 Thus the workaround for using pydantic v1 can be removed.
anoadragon453
added a commit
to anoadragon453/nixpkgs
that referenced
this pull request
May 7, 2024
* authlib was required in v1.4.0 (mealie-recipes/mealie#3280) * pillow-heif was required in v1.5.0 (mealie-recipes/mealie#3409) * pydantic-settings was required in v1.3.0 (mealie-recipes/mealie#3134 - same PR as pydantic v2 bump) * pyjwt was required in v1.6.0 (mealie-recipes/mealie#3521)
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.
What type of PR is this?
(REQUIRED)
What this PR does / why we need it:
(REQUIRED)
This PR is a monster. Pydantic provides a tool to make some model changes (
bump-pydantic), but it doesn't cover most things. Thankfully, their migration guide covers just about everything, save for some of the grosser stuff: https://docs.pydantic.dev/latest/migration/Most changes are pretty straightforward, but there are a few... "special" changes that are a bit hacky:
is_classvarfor this, but that doesn't exist anymore. Rather than attempt to figure out how that part of the codebase works, I just copied it over from Pydantic V1datetime_parsemodule/method to handle this. I tried using a recommended substitution, but got different results than we were expecting (timezones were getting mishmashed somewhere and tests were failing) so I, again, just copied Pydantic V1's implementationGetterDictisn't a thing anymore, so all of our custom getter-dicts had to be replaced. I basically replaced them with field validators (Pydantic V2's replacement for@validator), and fixed some other edgecases (particularly withGroup/User.groupbeing the group name)Also, Somehow the format for
PostgresDsnchanged. I had to tweak it to get postgres to work right, but if you could take a look and make sure I didn't screw that up, that'd be great.Which issue(s) this PR fixes:
(REQUIRED)
N/A, will close some renovate bot PRs