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.

Sign up for GitHub

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

Jump to bottom

Fix json validation for NameEmail #8650

Merged
merged 3 commits into from Jan 29, 2024
Merged

Fix json validation for NameEmail #8650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec18bb1
Fix json validation for NameEmail
Holi0317 Jan 26, 2024
a1e0d5c
adding one additional test case
sydney-runkle Jan 29, 2024
603d1b4
fixing my linting issue
sydney-runkle Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions pydantic/networks.py
View file
Open in desktop
Expand Up @@ -479,14 +479,18 @@ def __get_pydantic_core_schema__(
_handler: GetCoreSchemaHandler,
) -> core_schema.CoreSchema:
import_email_validator()

return core_schema.no_info_after_validator_function(
cls._validate,
core_schema.union_schema(
[core_schema.is_instance_schema(cls), core_schema.str_schema()],
custom_error_type='name_email_type',
custom_error_message='Input is not a valid NameEmail',
core_schema.json_or_python_schema(
json_schema=core_schema.str_schema(),
python_schema=core_schema.union_schema(
[core_schema.is_instance_schema(cls), core_schema.str_schema()],
custom_error_type='name_email_type',
custom_error_message='Input is not a valid NameEmail',
),
serialization=core_schema.to_string_ser_schema(),
),
serialization=core_schema.to_string_ser_schema(),
)

@classmethod
Expand Down
9 changes: 9 additions & 0 deletions tests/test_networks.py
View file
Open in desktop
Expand Up @@ -850,9 +850,18 @@ class Model(BaseModel):

assert str(Model(v=NameEmail('foo bar', 'foobaR@example.com')).v) == 'foo bar <foobaR@example.com>'
assert str(Model(v='foo bar <foobaR@example.com>').v) == 'foo bar <foobaR@example.com>'
assert str(Model(v='foobaR@example.com').v) == 'foobaR <foobaR@example.com>'
assert NameEmail('foo bar', 'foobaR@example.com') == NameEmail('foo bar', 'foobaR@example.com')
assert NameEmail('foo bar', 'foobaR@example.com') != NameEmail('foo bar', 'different@example.com')

assert Model.model_validate_json('{"v":"foo bar <foobaR@example.com>"}').v == NameEmail(
'foo bar', 'foobaR@example.com'
)
sydney-runkle marked this conversation as resolved.
Show resolved Hide resolved
assert str(Model.model_validate_json('{"v":"foobaR@example.com"}').v) == 'foobaR <foobaR@example.com>'
assert (
Model(v=NameEmail('foo bar', 'foobaR@example.com')).model_dump_json() == '{"v":"foo bar <foobaR@example.com>"}'
)

with pytest.raises(ValidationError) as exc_info:
Model(v=1)
assert exc_info.value.errors() == [
Expand Down