Bump pydantic to 2.10.0 and remove Base64 workaround #73
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
woodruffw
reviewed
Nov 20, 2024
test/test_impl.py
Outdated
Comment on lines
616
to
631
| class DummyModel(BaseModel): | ||
| base64_bytes: impl.Base64Bytes | ||
|
|
||
|
|
||
| class TestBase64Bytes: | ||
| # See the docstrings for `_impl.Base64Bytes` for more details | ||
| def test_decoding(self) -> None: | ||
| # This raises when using our custom type. When using Pydantic's Base64Bytes, | ||
| # this succeeds | ||
| # The exception message is different in Python 3.9 vs >=3.10 | ||
| with pytest.raises(ValueError, match="Non-base64 digit found|Only base64 data is allowed"): | ||
| DummyModel(base64_bytes=b"a\n\naaa") | ||
|
|
||
| def test_encoding(self) -> None: | ||
| model = DummyModel(base64_bytes=b"aaaa" * 76) | ||
| assert "\\n" not in model.model_dump_json() |
There was a problem hiding this comment.
Can we keep this backstop test, but with the upstream Base64Bytes? I don't expect them to regress here, but it's a good regression test to have in case they do 🙂
There was a problem hiding this comment.
done! I only kept the encoding test, since it's the one we care about. The difference in behavior for decoding was only due to me using validate=true when calling b64decode(validate=True), which Pydantic now doesn't in their new implementation.
|
Thanks @facutuesca! One comment about keeping a test, otherwise LGTM. |
Signed-off-by: Facundo Tuesca <facundo.tuesca@trailofbits.com>
facutuesca
force-pushed
the
ft/remove-pydantic-workaround
branch
from
dece973 to
09f3ca8
Compare
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.
Now that
pydantic2.10.0 was released with the fix for pydantic/pydantic#9072, this PR removes the workaround implemented in #48.Relevant entry in the release notes: https://pydantic.dev/articles/pydantic-v2-10-release#use-b64decode-and-b64encode-for-base64bytes-and-base64str-types