Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f0375ca
Fix #8926: ListSerializer preserves instance for many=True during val…
zainnadeem786 Jan 25, 2026
ac82e50
Update rest_framework/serializers.py
auvipy Feb 24, 2026
07de4b8
Merge branch 'main' into improve-many-true-validation-guidance
auvipy Feb 24, 2026
c402a57
Fix #8926 with minimal ListSerializer instance matching changes
zainnadeem786 Feb 24, 2026
66b8012
Keep virtualenv ignored in .gitignore
zainnadeem786 Feb 24, 2026
90e1a24
Fix Copilot/auvipy review: safe iterable check, restore save() assert…
zainnadeem786 Feb 24, 2026
0acf49a
Refine ListSerializer review follow-ups and cleanup
zainnadeem786 Feb 24, 2026
1484520
Restore serializers docstrings from upstream main
zainnadeem786 Feb 25, 2026
ef7e976
Update rest_framework/serializers.py
auvipy Feb 25, 2026
c665595
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Feb 25, 2026
b61b472
Remove unreachable return in ListSerializer.to_internal_value
zainnadeem786 Feb 25, 2026
22caa96
Update rest_framework/serializers.py
auvipy Feb 25, 2026
de40cb5
Merge branch 'main' into improve-many-true-validation-guidance
browniebroke Feb 26, 2026
5176e44
Merge branch 'main' into improve-many-true-validation-guidance
auvipy Mar 2, 2026
c9665dd
Address review follow-ups in ListSerializer internals
zainnadeem786 Mar 2, 2026
83e9965
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Mar 14, 2026
21417c8
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Mar 17, 2026
781cf7e
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Mar 27, 2026
5bdf57e
Merge branch 'main' into improve-many-true-validation-guidance
auvipy Mar 31, 2026
f08921e
Fix ListSerializer run_child_validation and save() issues
zainnadeem786 Mar 31, 2026
bb6b3bb
Merge branch 'improve-many-true-validation-guidance' of https://githu…
zainnadeem786 Mar 31, 2026
dcb4ad1
Merge branch 'main' into improve-many-true-validation-guidance
auvipy Apr 5, 2026
2fa19ed
Refine ListSerializer instance matching: reduce scope, add fallback b…
zainnadeem786 Apr 7, 2026
dd07e02
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Apr 13, 2026
2a84879
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Apr 30, 2026
7ce5b8f
Potential fix for pull request finding
auvipy May 3, 2026
e0129a3
Merge branch 'main' into improve-many-true-validation-guidance
auvipy Jun 9, 2026
341665c
Merge branch 'main' into improve-many-true-validation-guidance
zainnadeem786 Jun 9, 2026
be54fe2
Address ListSerializer instance map review feedback
zainnadeem786 Jun 9, 2026
71ad671
Merge branch 'main' into improve-many-true-validation-guidance
auvipy Jun 10, 2026
c5f6024
Remove unrelated not_a_list error change
zainnadeem786 Jun 10, 2026
8156fd6
Address ListSerializer lookup field review feedback
zainnadeem786 Jun 11, 2026
7ed28ae
Fix child initial_data during ListSerializer validation
zainnadeem786 Jun 11, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/env/
MANIFEST
coverage.*
venv/
.coverage
.cache/

Expand Down
3 changes: 3 additions & 0 deletions docs/api-guide/serializers.md
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,8 @@ To support multiple updates you'll need to do so explicitly. When writing your m

You will need to add an explicit `id` field to the instance serializer. The default implicitly-generated `id` field is marked as `read_only`. This causes it to be removed on updates. Once you declare it explicitly, it will be available in the list serializer's `update` method.

During validation, `ListSerializer` matches each input item to an existing instance using `pk` by default. To use another identifier, such as `id` or `uuid`, set `lookup_field` on the child serializer's `Meta` class.

Here's an example of how you might choose to implement multiple updates:

class BookListSerializer(serializers.ListSerializer):
Expand Down Expand Up @@ -831,6 +833,7 @@ Here's an example of how you might choose to implement multiple updates:

class Meta:
list_serializer_class = BookListSerializer
lookup_field = 'id'

### Customizing ListSerializer initialization

Expand Down
103 changes: 89 additions & 14 deletions rest_framework/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,40 @@ def run_child_validation(self, data):
self.child.initial_data = data
return super().run_child_validation(data)
"""
return self.child.run_validation(data)
if not hasattr(self.child, 'instance'):
return self.child.run_validation(data)

if not (
hasattr(self, '_list_serializer_instance_map') and
isinstance(data, Mapping)
):
return self.child.run_validation(data)

lookup_field = getattr(getattr(self.child, 'Meta', None), 'lookup_field', 'pk')
data_pk = data.get(lookup_field)

if data_pk is None:
return self.child.run_validation(data)

child_instance = self._list_serializer_instance_map.get(str(data_pk))
if child_instance is None:
return self.child.run_validation(data)

original_instance = self.child.instance
has_initial_data = hasattr(self.child, 'initial_data')
if has_initial_data:
original_initial_data = self.child.initial_data

try:
self.child.instance = child_instance
self.child.initial_data = data
return self.child.run_validation(data)
finally:
self.child.instance = original_instance
Comment thread
zainnadeem786 marked this conversation as resolved.
if has_initial_data:
self.child.initial_data = original_initial_data
elif hasattr(self.child, 'initial_data'):
delattr(self.child, 'initial_data')

def to_internal_value(self, data):
"""
Expand Down Expand Up @@ -702,19 +735,50 @@ def to_internal_value(self, data):
ret = []
errors = []

for item in data:
try:
validated = self.run_child_validation(item)
except ValidationError as exc:
errors.append(exc.detail)
else:
ret.append(validated)
errors.append({})
# Build a primary key lookup for instance matching in many=True updates.
instance_map = None
if self.instance is not None:
if isinstance(self.instance, Mapping):
instance_map = {str(k): v for k, v in self.instance.items()}
Comment thread
zainnadeem786 marked this conversation as resolved.
elif isinstance(self.instance, (list, tuple, models.query.QuerySet)):
instance_map = {}
Comment on lines +740 to +744

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@auvipy Thanks for pointing this out.

I verified that a related manager is not currently included in the instance-matching path, while to_representation() does normalize managers via .all().

The observation looks valid, but given the earlier feedback around keeping the scope focused, I wasn't sure whether manager/queryset parity should be included in this PR or handled separately.

Would you prefer support for BaseManager to be added here, or would a follow-up change be more appropriate?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think this should be aligned with the changes in this PR. @browniebroke please let me know if otherwise

lookup_field = getattr(getattr(self.child, 'Meta', None), 'lookup_field', 'pk')

if any(errors):
raise ValidationError(errors)
for obj in self.instance:
pk = getattr(obj, lookup_field, None)

return ret
if pk is not None:
key = str(pk)
# If duplicate keys are present, keep the last value,
# matching standard mapping assignment behavior.
instance_map[key] = obj
Comment thread
zainnadeem786 marked this conversation as resolved.

has_instance_map = hasattr(self, '_list_serializer_instance_map')
if has_instance_map:
original_instance_map = self._list_serializer_instance_map

if instance_map is not None:
self._list_serializer_instance_map = instance_map

try:
for item in data:
try:
validated = self.run_child_validation(item)
except ValidationError as exc:
errors.append(exc.detail)
else:
ret.append(validated)
errors.append({})

if any(errors):
raise ValidationError(errors)

return ret
finally:
if instance_map is not None and has_instance_map:
self._list_serializer_instance_map = original_instance_map
elif instance_map is not None and hasattr(self, '_list_serializer_instance_map'):
delattr(self, '_list_serializer_instance_map')

def to_representation(self, data):
"""
Expand Down Expand Up @@ -749,16 +813,27 @@ def save(self, **kwargs):
"""
Save and return a list of object instances.
"""
assert hasattr(self, '_errors'), (
'You must call `.is_valid()` before calling `.save()`.'
)
assert not self.errors, (
'You cannot call `.save()` on a serializer with invalid data.'
)
Comment thread
zainnadeem786 marked this conversation as resolved.

# Guard against incorrect use of `serializer.save(commit=False)`
assert 'commit' not in kwargs, (
"'commit' is not a valid keyword argument to the 'save()' method. "
"If you need to access data before committing to the database then "
"inspect 'serializer.validated_data' instead. "
"You can also pass additional keyword arguments to 'save()' if you "
"need to set extra attributes on the saved model instance. "
"For example: 'serializer.save(owner=request.user)'.'"
"For example: 'serializer.save(owner=request.user)'."
)
assert not hasattr(self, '_data'), (
"You cannot call `.save()` after accessing `serializer.data`. "
"If you need to access data before committing to the database then "
"inspect 'serializer.validated_data' instead. "
)
Comment thread
zainnadeem786 marked this conversation as resolved.

validated_data = [
{**attrs, **kwargs} for attrs in self.validated_data
]
Expand Down
208 changes: 208 additions & 0 deletions tests/test_serializer_lists.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,182 @@ def update(self, instance, validated_data):
assert updated_instances == expected_output


class TestListSerializerInstanceMatching:
def test_matching_with_default_lookup_field(self):
seen_instances = []

class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

def validate(self, attrs):
seen_instances.append(self.instance)
return attrs

instance = [
BasicObject(pk=1),
BasicObject(pk=2),
]
input_data = [
{'pk': 1},
{'pk': 2},
]

serializer = TestSerializer(instance, data=input_data, many=True)
assert serializer.is_valid()
assert seen_instances == instance

def test_field_validation_receives_item_initial_data(self):
seen_initial_data = []

class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

def validate_pk(self, value):
seen_initial_data.append(self.initial_data)
return value

instance = [BasicObject(pk=1), BasicObject(pk=2)]
input_data = [{'pk': 1}, {'pk': 2}]

serializer = TestSerializer(instance, data=input_data, many=True)
assert serializer.is_valid()
assert seen_initial_data == input_data

def test_object_validation_receives_item_initial_data(self):
seen_initial_data = []

class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

def validate(self, attrs):
seen_initial_data.append(self.initial_data)
return attrs

instance = [BasicObject(pk=1), BasicObject(pk=2)]
input_data = [{'pk': 1}, {'pk': 2}]

serializer = TestSerializer(instance, data=input_data, many=True)
assert serializer.is_valid()
assert seen_initial_data == input_data

def test_child_initial_data_state_is_restored_after_validation(self):
class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

instance = [BasicObject(pk=1)]
input_data = [{'pk': 1}]
serializer = TestSerializer(instance, data=input_data, many=True)
original_initial_data = serializer.child.initial_data

assert serializer.is_valid()
assert serializer.child.initial_data is original_initial_data

child = TestSerializer()
serializer = serializers.ListSerializer(
child=child, instance=instance, data=input_data
)

assert not hasattr(child, 'initial_data')
assert serializer.is_valid()
assert not hasattr(child, 'initial_data')

def test_mapping_instance_matching(self):
seen_instances = []

class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

def validate(self, attrs):
seen_instances.append(self.instance)
return attrs

obj1 = BasicObject(pk=1)
obj2 = BasicObject(pk=2)
instance = {
'1': obj1,
'2': obj2,
}
input_data = [
{'pk': 1},
{'pk': 2},
]

serializer = TestSerializer(instance, data=input_data, many=True)
assert serializer.is_valid()
assert seen_instances == [obj1, obj2]

def test_unsupported_instance_type_preserves_original_behavior(self):
seen_instances = []

class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

def validate(self, attrs):
seen_instances.append(self.instance)
return attrs

serializer = TestSerializer(instance=123, data=[{'pk': 1}], many=True)
assert serializer.is_valid()
assert seen_instances == [123]

def test_missing_lookup_field_in_data_does_not_assign_instance(self):
seen_instances = []

class TestSerializer(serializers.Serializer):
id = serializers.IntegerField(required=False)

class Meta:
lookup_field = 'uuid'
Comment thread
zainnadeem786 marked this conversation as resolved.

def validate(self, attrs):
seen_instances.append(self.instance)
return attrs

class TestListSerializer(serializers.ListSerializer):
child = TestSerializer()

serializer = TestListSerializer(
instance=[BasicObject(id=1, uuid='uuid-1')],
data=[{'id': 1}],
)
assert serializer.is_valid()
assert seen_instances == [None]

def test_matching_with_configurable_lookup_field(self):
seen_instances = []

class TestSerializer(serializers.Serializer):
id = serializers.IntegerField(required=False)
uuid = serializers.CharField()

class Meta:
lookup_field = 'uuid'

def validate(self, attrs):
seen_instances.append(self.instance)
return attrs

obj1 = BasicObject(id=1, uuid='uuid-1')
obj2 = BasicObject(id=2, uuid='uuid-2')
input_data = [{'id': 1, 'uuid': 'uuid-2'}]

serializer = TestSerializer([obj1, obj2], data=input_data, many=True)
assert serializer.is_valid()
assert seen_instances == [obj2]

def test_existing_instance_map_is_restored_after_validation(self):
class TestSerializer(serializers.Serializer):
pk = serializers.IntegerField()

instance = [BasicObject(pk=1)]
original_instance_map = {'sentinel': BasicObject(pk=2)}
serializer = TestSerializer(instance, data=[{'pk': 1}], many=True)
serializer._list_serializer_instance_map = original_instance_map

assert serializer.is_valid()
assert serializer._list_serializer_instance_map is original_instance_map


class TestNestedListSerializer:
"""
Tests for using a ListSerializer as a field.
Expand Down Expand Up @@ -883,3 +1059,35 @@ def test(self):
queryset = NullableOneToOneSource.objects.all()
serializer = self.serializer(queryset, many=True)
assert serializer.data


def test_many_true_instance_level_validation_uses_matched_instance():
class Obj:
def __init__(self, id, valid):
Comment thread
zainnadeem786 marked this conversation as resolved.
self.id = id
self.valid = valid

class TestSerializer(serializers.Serializer):
id = serializers.IntegerField()
status = serializers.CharField()

class Meta:
lookup_field = 'id'

def validate_status(self, value):
if self.instance is None:
raise serializers.ValidationError("Instance not matched")
if not self.instance.valid:
raise serializers.ValidationError("Invalid instance")
return value

objs = [Obj(1, True), Obj(2, False)]
serializer = TestSerializer(
instance=objs,
data=[{"id": 1, "status": "ok"}, {"id": 2, "status": "fail"}],
many=True,
partial=True,
)

assert not serializer.is_valid()
assert serializer.errors == [{}, {'status': ['Invalid instance']}]
Loading