Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow str as argument to Discriminator #8047

Merged
merged 1 commit into from Nov 7, 2023
Merged

Conversation

dmontagu
Copy link
Contributor

@dmontagu dmontagu commented Nov 7, 2023

(Also renamed CallableDiscriminator to Discriminator.)

As discussed @sydney-runkle

Comment on lines +133 to +143
@pytest.mark.parametrize('color_discriminator_kind', ['discriminator', 'field_str', 'field_discriminator'])
@pytest.mark.parametrize('pet_discriminator_kind', ['discriminator', 'field_str', 'field_discriminator'])
def test_discriminated_union_validation(color_discriminator_kind, pet_discriminator_kind):
def _get_str_discriminator(discriminator: str, kind: str):
if kind == 'discriminator':
return Discriminator(discriminator)
elif kind == 'field_str':
return Field(discriminator=discriminator)
elif kind == 'field_discriminator':
return Field(discriminator=Discriminator(discriminator))
raise ValueError(f'Invalid kind: {kind}')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel that this is a fairly thorough test that all the ways to possibly use a str as a discriminator, even together, are working as expected. 🤞

Copy link

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: 235c3ac
Status: ✅  Deploy successful!
Preview URL: https://20cb0889.pydantic-docs2.pages.dev
Branch Preview URL: https://allow-str-discriminator.pydantic-docs2.pages.dev

View logs

Copy link
Member

@sydney-runkle sydney-runkle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks! Glad you added parametrization to that test. 👍

@sydney-runkle sydney-runkle merged commit a9cebd4 into main Nov 7, 2023
60 of 61 checks passed
@sydney-runkle sydney-runkle deleted the allow-str-discriminator branch November 7, 2023 18:45
@sydney-runkle sydney-runkle mentioned this pull request Nov 7, 2023
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants