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 model_construct with validation_alias #9144

Merged
merged 1 commit into from Apr 2, 2024
Merged

fix model_construct with validation_alias #9144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions pydantic/main.py
View file
Open in desktop
Expand Up @@ -222,9 +222,12 @@ def model_construct(cls: type[Model], _fields_set: set[str] | None = None, **val
fields_set = set()

for name, field in cls.model_fields.items():
if field.alias and field.alias in values:
if field.alias is not None and field.alias in values:
fields_values[name] = values.pop(field.alias)
fields_set.add(name)
elif field.validation_alias is not None and field.validation_alias in values:
fields_values[name] = values.pop(field.validation_alias)
fields_set.add(name)
elif name in values:
fields_values[name] = values.pop(name)
fields_set.add(name)
Expand All @@ -233,11 +236,9 @@ def model_construct(cls: type[Model], _fields_set: set[str] | None = None, **val
if _fields_set is None:
_fields_set = fields_set

_extra: dict[str, Any] | None = None
if cls.model_config.get('extra') == 'allow':
_extra = {}
for k, v in values.items():
_extra[k] = v
_extra: dict[str, Any] | None = (
{k: v for k, v in values.items()} if cls.model_config.get('extra') == 'allow' else None
)
_object_setattr(m, '__dict__', fields_values)
_object_setattr(m, '__pydantic_fields_set__', _fields_set)
if not cls.__pydantic_root_model__:
Expand Down
20 changes: 20 additions & 0 deletions tests/test_construction.py
View file
Open in desktop
Expand Up @@ -74,6 +74,26 @@ class Foo(BaseModel):
assert instance.model_dump_json() == instance_construct.model_dump_json()


def test_construct_with_aliases():
class MyModel(BaseModel):
x: int = Field(alias='x_alias')

my_model = MyModel.model_construct(x_alias=1)
assert my_model.x == 1
assert my_model.model_fields_set == {'x'}
assert my_model.model_dump() == {'x': 1}


def test_construct_with_validation_aliases():
class MyModel(BaseModel):
x: int = Field(validation_alias='x_alias')

my_model = MyModel.model_construct(x_alias=1)
assert my_model.x == 1
assert my_model.model_fields_set == {'x'}
assert my_model.model_dump() == {'x': 1}


def test_large_any_str():
class Model(BaseModel):
a: bytes
Expand Down