Fix for #239: Union inside List or Dict is not deserialized as the correspond… #464
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
|
It would be good to add some test scenarios like the one in the mentioned issue. |
There was a problem hiding this comment.
Hello @pawelwilczewski ! Thank you for the contribution - please add unit tests that back your claim the issue is fixed - and re-request a review ;)
|
Stole a little bit of test code from the issue - hopefully the author a-mckinley doesn't mind |
|
@george-zubrienko done! Let me know if anything else needs changing! |
|
I noticed it won't work with |
|
I'd think a fix similar to what I did could be implemented in the |
I'll review what is here this week, then we'll open a new issue and somebody can pick it up ;) |
would love to see this one go through as we have another PR that adds more support for undiscriminated unions we would like to go in after this pawelwilczewski#1 |
|
Not too sure why the poetry installation might have failed... |
|
Merging #476 will fix, sorry for delays in reviewing, on my todo |
|
No worries at all, and no pressure! |
george-zubrienko
previously approved these changes
Sep 1, 2023
Co-authored-by: George Zubrienko <[email protected]>
|
Seems like there were some issues with the refactor. I'll roll back and you can automatically merge - unless you'd like to give it another go. Cheers! |
|
I'll take a look why and suggest a new one. The one I added was from the phone so might have missed the |
|
Yeah I gave it an attempt but kinda just skimmed through it relying on github actions rather than properly testing |
|
If you can fix would be great, if not I'll prepare a proper suggestion within next 2 days. I want this to be included in 0.6.0 :) |
|
I believe this does it now |
george-zubrienko
approved these changes
Sep 1, 2023
|
Awesome, thanks a lot for the contribution, will be released this weekend! |
|
Happy to contribute. Thanks a lot for your overall and this PR's input! |
renovate bot
referenced
this pull request
in ixm-one/pytest-cmake-presets
Dec 10, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [dataclasses-json](https://togithub.com/lidatong/dataclasses-json) ([changelog](https://togithub.com/lidatong/dataclasses-json/releases)) | `^0.5.7` -> `^0.6.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the warning logs for more information. --- ### Release Notes <details> <summary>lidatong/dataclasses-json (dataclasses-json)</summary> ### [`v0.6.3`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.6.3) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.6.2...v0.6.3) #### What's Changed - Fixes catchall inheritance issue by [@​jasonrock-a3](https://togithub.com/jasonrock-a3) in [https://github.com/lidatong/dataclasses-json/pull/500](https://togithub.com/lidatong/dataclasses-json/pull/500) #### New Contributors - [@​jasonrock-a3](https://togithub.com/jasonrock-a3) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/500](https://togithub.com/lidatong/dataclasses-json/pull/500) **Full Changelog**: lidatong/dataclasses-json@v0.6.2...v0.6.3 ### [`v0.6.2`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.6.2) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.6.1...v0.6.2) #### What's Changed - fix: allow using CatchAll with postponed evaluation of annotations by [@​2ynn](https://togithub.com/2ynn) in [https://github.com/lidatong/dataclasses-json/pull/490](https://togithub.com/lidatong/dataclasses-json/pull/490) - Fix PEP 0673 before 3.11 by [@​george-zubrienko](https://togithub.com/george-zubrienko) in [https://github.com/lidatong/dataclasses-json/pull/487](https://togithub.com/lidatong/dataclasses-json/pull/487) - fix mypy error when assigning to dataclass_json_config by [@​MickaelBergem](https://togithub.com/MickaelBergem) in [https://github.com/lidatong/dataclasses-json/pull/486](https://togithub.com/lidatong/dataclasses-json/pull/486) - Fix an issue introduced with hetero tuple decode by [@​george-zubrienko](https://togithub.com/george-zubrienko) in [https://github.com/lidatong/dataclasses-json/pull/493](https://togithub.com/lidatong/dataclasses-json/pull/493) #### New Contributors - [@​2ynn](https://togithub.com/2ynn) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/490](https://togithub.com/lidatong/dataclasses-json/pull/490) - [@​MickaelBergem](https://togithub.com/MickaelBergem) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/486](https://togithub.com/lidatong/dataclasses-json/pull/486) **Full Changelog**: lidatong/dataclasses-json@v0.6.1...v0.6.2 ### [`v0.6.1`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.6.1) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.6.0...v0.6.1) ##### What's Changed - Add links to make PyPI a better maintainer reference by [@​pydanny](https://togithub.com/pydanny) in [https://github.com/lidatong/dataclasses-json/pull/482](https://togithub.com/lidatong/dataclasses-json/pull/482) - improve Union deserialization when "\__type" field specifier is not present by [@​idbentley](https://togithub.com/idbentley) in [https://github.com/lidatong/dataclasses-json/pull/478](https://togithub.com/lidatong/dataclasses-json/pull/478) ##### New Contributors - [@​pydanny](https://togithub.com/pydanny) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/482](https://togithub.com/lidatong/dataclasses-json/pull/482) - [@​idbentley](https://togithub.com/idbentley) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/478](https://togithub.com/lidatong/dataclasses-json/pull/478) **Full Changelog**: lidatong/dataclasses-json@v0.6.0...v0.6.1 ### [`v0.6.0`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.6.0) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.5.14...v0.6.0) ##### What's Changed - Improve dataclass_json and \_process_class type annotations by [@​ringohoffman](https://togithub.com/ringohoffman) in [https://github.com/lidatong/dataclasses-json/pull/475](https://togithub.com/lidatong/dataclasses-json/pull/475) - Update Poetry version used for 3.7 test suite and change Requires-Python boundary by [@​george-zubrienko](https://togithub.com/george-zubrienko) in [https://github.com/lidatong/dataclasses-json/pull/476](https://togithub.com/lidatong/dataclasses-json/pull/476) - Fix for [#​239](https://togithub.com/lidatong/dataclasses-json/issues/239): Union inside List or Dict is not deserialized as the correspond… by [@​pawelwilczewski](https://togithub.com/pawelwilczewski) in [https://github.com/lidatong/dataclasses-json/pull/464](https://togithub.com/lidatong/dataclasses-json/pull/464) Due to a behaviour change discovered in [https://github.com/lidatong/dataclasses-json/issues/466](https://togithub.com/lidatong/dataclasses-json/issues/466) and also as a matter of preparation for full deprecation of Py3.7, we are bumping the minor version to 0.6.0. Most important change is that since 0.5.9 builtins are coerced automatically without throwing an exception. Please visit the issue for more info :) ##### New Contributors - [@​ringohoffman](https://togithub.com/ringohoffman) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/475](https://togithub.com/lidatong/dataclasses-json/pull/475) - [@​pawelwilczewski](https://togithub.com/pawelwilczewski) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/464](https://togithub.com/lidatong/dataclasses-json/pull/464) **Full Changelog**: lidatong/dataclasses-json@v0.5.15...v0.6.0 ### [`v0.5.14`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.5.14) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.5.13...v0.5.14) #### What's Changed - Temporarily disable code coverage publish for fork PRs by [@​george-zubrienko](https://togithub.com/george-zubrienko) in [https://github.com/lidatong/dataclasses-json/pull/444](https://togithub.com/lidatong/dataclasses-json/pull/444) - fix mashmallow fields.Tuple creation by [@​healthmatrice](https://togithub.com/healthmatrice) in [https://github.com/lidatong/dataclasses-json/pull/434](https://togithub.com/lidatong/dataclasses-json/pull/434) - Allow the global config dictionary keys to also be Optional\[type] by [@​sumnerevans](https://togithub.com/sumnerevans) in [https://github.com/lidatong/dataclasses-json/pull/255](https://togithub.com/lidatong/dataclasses-json/pull/255) - Fix global_config.mm_fields having no effect by [@​sigmunau](https://togithub.com/sigmunau) in [https://github.com/lidatong/dataclasses-json/pull/253](https://togithub.com/lidatong/dataclasses-json/pull/253) - Fixes recursion bug related to enum flags by [@​matt035343](https://togithub.com/matt035343) in [https://github.com/lidatong/dataclasses-json/pull/447](https://togithub.com/lidatong/dataclasses-json/pull/447) - Update Python version boundaries to include 3.12 by [@​cdce8p](https://togithub.com/cdce8p) in [https://github.com/lidatong/dataclasses-json/pull/449](https://togithub.com/lidatong/dataclasses-json/pull/449) #### New Contributors - [@​healthmatrice](https://togithub.com/healthmatrice) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/434](https://togithub.com/lidatong/dataclasses-json/pull/434) - [@​sigmunau](https://togithub.com/sigmunau) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/253](https://togithub.com/lidatong/dataclasses-json/pull/253) - [@​cdce8p](https://togithub.com/cdce8p) made their first contribution in [https://github.com/lidatong/dataclasses-json/pull/449](https://togithub.com/lidatong/dataclasses-json/pull/449) **Full Changelog**: lidatong/dataclasses-json@v0.5.13...v0.5.14 ### [`v0.5.13`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.5.13) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.5.12...v0.5.13) #### What's Changed - Fixes bug related to Tuples defined with ellipsis by [@​matt035343](https://togithub.com/matt035343) in [https://github.com/lidatong/dataclasses-json/pull/440](https://togithub.com/lidatong/dataclasses-json/pull/440) - Revert type hint in annotation call by [@​george-zubrienko](https://togithub.com/george-zubrienko) in [https://github.com/lidatong/dataclasses-json/pull/441](https://togithub.com/lidatong/dataclasses-json/pull/441) **Full Changelog**: lidatong/dataclasses-json@v0.5.12...v0.5.13 ### [`v0.5.12`](https://togithub.com/lidatong/dataclasses-json/releases/tag/v0.5.12) [Compare Source](https://togithub.com/lidatong/dataclasses-json/compare/v0.5.9...v0.5.12) #### What's Changed - Fix multiline scripts in CI by [@​george-zubrienko](https://togithub.com/george-zubrienko) in [https://github.com/lidatong/dataclasses-json/pull/439](https://togithub.com/lidatong/dataclasses-json/pull/439) **Full Changelog**: lidatong/dataclasses-json@v0.5.11...v0.5.12 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/ixm-one/pytest-cmake-presets). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi43OS4xIiwidXBkYXRlZEluVmVyIjoiMzcuODEuMyIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Izzy Muerte <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Izzy Muerte <[email protected]>
](https://renovatebot.com){kind=link}
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.
Fixed the issue described in #239.
I'm not sure this is the best way of fixing this as the comment suggests the type should have already been decoded but this is my best attempt.
Frankly, I haven't tested it properly (works for my use cases) but it seems to me the logic is valid.
I am not very familiar with the repo, so please let me know if I'm violating some of the rules set here and I'll try to adhere.