Fix msgspec pattern and optional annotated type #1606
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
The Optional type should wrap the data_type annotated with msgspec.Meta
otherwise msgspec raises a TypeError like:
```
TypeError: Can only set `pattern` on a str type - type `typing.Annotated[typing.Optional[str], msgspec.Meta(pattern='(^arn:([^:]*):([^:]*):([^:]*):(|\\*|[\\d]{12}):(.+)$)|^\\*$
')]` is invalid
```
for more information, see https://pre-commit.ci
Codecov ReportAll modified lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1606 +/- ##
===========================================
Coverage 100.00% 100.00%
===========================================
Files 11 34 +23
Lines 1020 3731 +2711
Branches 201 874 +673
===========================================
+ Hits 1020 3731 +2711
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
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.
Fixes #1605.
Also fixes an issue with the ordering/nesting of the Optional and Annotated types that I discovered while testing the
Meta(pattern='...')constraint.msgspec.Metawithpatternargument can only apply to astrtype not aOptional[str]type as was previously being generated. So it's necessary to override the type hint behaviour when a field is Optional and annotated with amsgspec.Metaconstraint.