Backtestspydanticrun-20260930-183947#13601

Issue #13601 Merged fix PR #13702 Run 30 Sep 2026 · run-20260930-183947 pydantic/pydantic

model_dump(exclude=...) is silently ignored in python mode when a wrap model_serializer is gated with when_used="json"

Better

Our patch was judged better than the merged fix.

In this judgment, Patch A = our agent, Patch B = the merged fix.

Both patches fix the root cause the same way. Before, the function serializer always cleared include/exclude before calling the next serializer, even when `when_used` meant the user function never ran and the fallback serializer was used. Both now clear include/exclude only when the function actually ran (`Ok((true, v))`) and keep the caller's include/exclude on the fallback path. Both apply this to `to_python`, `json_key` and `serde_serialize`, so they behave the same.

Patch A restructures each match arm and passes the original `state` straight to the fallback serializer. Patch B keeps the original shape and adds an `include_exclude()` accessor on `SerializationState` that clones the value, which is then re-scoped. B's diff is slightly smaller, but it adds a public accessor and an extra clone. Neither is risky.

The difference is in the tests. Patch A covers:
- the issue's exact scenario (wrap `model_serializer` whose function calls the handler) for both `when_used='json'` and `'json-unless-none'`, checking python mode, json mode and `model_dump_json`;
- plain `model_serializer`;
- nested include/exclude through `field_serializer` in plain and wrap modes;
- the gated fallback path directly at the pydantic-core `SchemaSerializer` level.

Patch B has a single test, covering only `when_used='json'`. Its wrap function never calls the handler, so it does not reproduce the issue's `handler(self)` case, although it does exercise the fallback path. Both test sets would fail before the fix and pass after. Patch A's are broader and closer to the reported scenario, so A wins on testing with correctness equal.

The judge saw only the two patches, labelled A and B in random order, with issue links and version numbers removed. The reasoning above is shown verbatim.

Solve

16m 4s

Wall-clock time in the container

Full test suite

No new failures

12,404 passed · 501 skipped · 12,905 total

Contamination audit

Clean

No sign the agent saw the real fix

Patch size

154vs 59 merged

Changed lines, ours vs merged

Initial Checks

  • I confirm that I'm using Pydantic V2

Description

When a model declares @model_serializer(mode="wrap") with when_used="json" (or "json-unless-none"), the runtime exclude argument passed to model_dump() is silently ignored in python mode. The same call in JSON mode behaves correctly.

Expected: model_dump(exclude={"b"}) omits b regardless of when_used, since the gate concerns which serializer runs and not which fields the caller asked to drop.

Actual: b is present in python mode.

Example Code

from pydantic import BaseModel, SerializerFunctionWrapHandler, model_serializer


class Gated(BaseModel):
    a: int
    b: int

    @model_serializer(mode="wrap", when_used="json")
    def _serialize(self, handler: SerializerFunctionWrapHandler) -> object:
        return handler(self)


class Always(BaseModel):
    a: int
    b: int

    @model_serializer(mode="wrap")
    def _serialize(self, handler: SerializerFunctionWrapHandler) -> object:
        return handler(self)


  # Gated to JSON: python mode ignores exclude.
  print(Gated(a=1, b=2).model_dump(exclude={"b"}))               # {'a': 1, 'b': 2}  <-- expected {'a': 1}
  print(Gated(a=1, b=2).model_dump(mode="json", exclude={"b"}))  # {'a': 1}          <-- correct

  # Identical model without the gate: python mode honours exclude.
  print(Always(a=1, b=2).model_dump(exclude={"b"}))              # {'a': 1}

  Output:

  gated  python: {'a': 1, 'b': 2}
  gated  json  : {'a': 1}
  always python: {'a': 1}

Python, Pydantic & OS Version

pydantic version: 2.13.2
          pydantic-core version: 2.46.2
            pydantic-core build: profile=release pgo=false
                 python version: 3.13.12 (main, Mar 25 2026, 02:48:22) [Clang 22.1.1 ]
                       platform: macOS-26.6-arm64-arm-64bit-Mach-O
               related packages: mypy-2.1.0 typing_extensions-4.15.0

Reproducible in 2.13.3 and 2.13.4 as well.

The two patches

Our patch+128 −26
pydantic-core/src/serializers/type_serializers/function.rsindex 5944310c..7046138a 100644@@ -217,17 +217,20 @@ macro_rules! function_type_serializer {                 state: &mut SerializationState<'py>,             ) -> PyResult<Py<PyAny>> {                 let py = value.py();-                let (ret_serializer, v) = match self.call(value, state) {-                    Ok((true, v)) => (&*self.return_serializer, v),-                    Ok((false, v)) => (self.get_fallback_serializer(), v),+                match self.call(value, state) {+                    Ok((true, v)) => {+                        // None for include/exclude here, as filtering should be done+                        // by the function+                        let state = &mut state.scoped_include_exclude(IncludeExclude::empty());+                        self.return_serializer.to_python(v.bind(py), state)+                    }+                    // the function was not called, so the fallback serializer must apply include/exclude+                    Ok((false, v)) => self.get_fallback_serializer().to_python(v.bind(py), state),                     Err(err) => {                         on_error(py, err, &self.function_name, state)?;-                        return infer_to_python(value, state);+                        infer_to_python(value, state)                     }-                };-                // None for include/exclude here, as filtering should be done-                let state = &mut state.scoped_include_exclude(IncludeExclude::empty());-                ret_serializer.to_python(v.bind(py), state)+                }             }              fn json_key<'a, 'py>(@@ -236,19 +239,25 @@ macro_rules! function_type_serializer {                 state: &mut SerializationState<'py>,             ) -> PyResult<Cow<'a, str>> {                 let py = key.py();-                let (ret_serializer, v) = match self.call(key, state) {-                    Ok((true, v)) => (&*self.return_serializer, v),-                    Ok((false, v)) => (self.get_fallback_serializer(), v),+                match self.call(key, state) {+                    Ok((true, v)) => {+                        // None for include/exclude here, as filtering should be done+                        // by the function+                        let state = &mut state.scoped_include_exclude(IncludeExclude::empty());+                        self.return_serializer+                            .json_key(v.bind(py), state)+                            .map(|cow| Cow::Owned(cow.into_owned()))+                    }+                    // the function was not called, so the fallback serializer must apply include/exclude+                    Ok((false, v)) => self+                        .get_fallback_serializer()+                        .json_key(v.bind(py), state)+                        .map(|cow| Cow::Owned(cow.into_owned())),                     Err(err) => {                         on_error(py, err, &self.function_name, state)?;-                        return infer_json_key(key, state);+                        infer_json_key(key, state)                     }-                };-                // None for include/exclude here, as filtering should be done-                let state = &mut state.scoped_include_exclude(IncludeExclude::empty());-                ret_serializer-                    .json_key(v.bind(py), state)-                    .map(|cow| Cow::Owned(cow.into_owned()))+                }             }              fn serde_serialize<'py, S: serde::ser::Serializer>(@@ -258,17 +267,23 @@ macro_rules! function_type_serializer {                 state: &mut SerializationState<'py>,             ) -> Result<S::Ok, S::Error> {                 let py = value.py();-                let (ret_serializer, v) = match self.call(value, state) {-                    Ok((true, v)) => (&*self.return_serializer, v),-                    Ok((false, v)) => (self.get_fallback_serializer(), v),+                match self.call(value, state) {+                    Ok((true, v)) => {+                        // None for include/exclude here, as filtering should be done+                        // by the function+                        let mut state = state.scoped_include_exclude(IncludeExclude::empty());+                        self.return_serializer+                            .serde_serialize(v.bind(py), serializer, &mut state)+                    }+                    // the function was not called, so the fallback serializer must apply include/exclude+                    Ok((false, v)) => self+                        .get_fallback_serializer()+                        .serde_serialize(v.bind(py), serializer, state),                     Err(err) => {                         on_error(py, err, &self.function_name, state).map_err(py_err_se_err)?;-                        return infer_serialize(value, serializer, state);+                        infer_serialize(value, serializer, state)                     }-                };-                // None for include/exclude here, as filtering should be done-                let mut state = state.scoped_include_exclude(IncludeExclude::empty());-                ret_serializer.serde_serialize(v.bind(py), serializer, &mut state)+                }             }              fn get_name(&self) -> &str {pydantic-core/tests/serializers/test_functions.pyindex b6bd900e..7eacff78 100644@@ -304,6 +304,33 @@ def test_function_only_json():     assert s.to_json(4) == b'8'  +@pytest.mark.parametrize('when_used', ['json', 'json-unless-none'])+def test_function_when_used_fallback_respects_include_exclude(when_used):+    s = SchemaSerializer(+        core_schema.dict_schema(+            core_schema.str_schema(),+            core_schema.int_schema(),+            serialization=core_schema.wrap_serializer_function_ser_schema(+                lambda v, handler: handler(v), when_used=when_used+            ),+        )+    )+    assert s.to_python({'a': 1, 'b': 2}, exclude={'b'}) == {'a': 1}+    assert s.to_python({'a': 1, 'b': 2}, include={'a'}) == {'a': 1}+    assert s.to_python({'a': 1, 'b': 2}, mode='json', exclude={'b'}) == {'a': 1}+    assert s.to_json({'a': 1, 'b': 2}, exclude={'b'}) == b'{"a":1}'++    s = SchemaSerializer(+        core_schema.dict_schema(+            core_schema.str_schema(),+            core_schema.int_schema(),+            serialization=core_schema.plain_serializer_function_ser_schema(lambda v: 'custom', when_used=when_used),+        )+    )+    assert s.to_python({'a': 1, 'b': 2}, exclude={'b'}) == {'a': 1}+    assert s.to_python({'a': 1, 'b': 2}, include={'a'}) == {'a': 1}++ def test_function_unless_none():     s = SchemaSerializer(         core_schema.any_schema(tests/test_serialize.pyindex 57832ca0..a31f5687 100644@@ -1437,3 +1437,63 @@ def test_model_serializer_index_key_type_error() -> None:         match="Error calling function `_serialize`: TypeError: 'index_key' is expected to be an integer or a string, got 'b'not_a_valid_type_for_index_key''",     ):         m.model_dump(include={'f'})+++@pytest.mark.parametrize('when_used', ['json', 'json-unless-none'])+def test_wrap_model_serializer_when_used_json_respects_include_exclude(when_used: str) -> None:+    class Model(BaseModel):+        a: int+        b: int++        @model_serializer(mode='wrap', when_used=when_used)+        def _serialize(self, handler: SerializerFunctionWrapHandler) -> Any:+            return handler(self)++    m = Model(a=1, b=2)+    assert m.model_dump(exclude={'b'}) == {'a': 1}+    assert m.model_dump(include={'a'}) == {'a': 1}+    assert m.model_dump(mode='json', exclude={'b'}) == {'a': 1}+    assert m.model_dump_json(exclude={'b'}) == '{"a":1}'+++def test_plain_model_serializer_when_used_json_respects_include_exclude() -> None:+    class Model(BaseModel):+        a: int+        b: int++        @model_serializer(when_used='json')+        def _serialize(self) -> Any:+            return {'custom': self.a}++    m = Model(a=1, b=2)+    assert m.model_dump(exclude={'b'}) == {'a': 1}+    assert m.model_dump(include={'a'}) == {'a': 1}+++@pytest.mark.parametrize('mode', ['plain', 'wrap'])+def test_field_serializer_when_used_json_respects_nested_include_exclude(mode: str) -> None:+    class Inner(BaseModel):+        a: int+        b: int++    if mode == 'plain':++        class Outer(BaseModel):+            inner: Inner++            @field_serializer('inner', when_used='json')+            def _ser_inner(self, v: Inner) -> Any:+                return 'custom'++    else:++        class Outer(BaseModel):+            inner: Inner++            @field_serializer('inner', mode='wrap', when_used='json')+            def _ser_inner(self, v: Inner, handler: SerializerFunctionWrapHandler) -> Any:+                return handler(v)++    m = Outer(inner=Inner(a=1, b=2))+    assert m.model_dump(exclude={'inner': {'b'}}) == {'inner': {'a': 1}}+    assert m.model_dump(include={'inner': {'a'}}) == {'inner': {'a': 1}} 
Merged fix · PR #13702+44 −15
pydantic-core/src/serializers/extra.rsindex e54b05732..1551057bc 100644@@ -146,6 +146,10 @@ impl<'py> SerializationState<'py> {         self.field_name.as_ref()     } +    pub fn include_exclude(&self) -> IncludeExclude<'py> {+        self.include_exclude.clone()+    }+     pub fn include(&self) -> Option<&Bound<'py, PyAny>> {         self.include_exclude.include.as_ref()     }pydantic-core/src/serializers/type_serializers/function.rsindex 5944310cc..736763775 100644@@ -217,16 +217,16 @@ macro_rules! function_type_serializer {                 state: &mut SerializationState<'py>,             ) -> PyResult<Py<PyAny>> {                 let py = value.py();-                let (ret_serializer, v) = match self.call(value, state) {-                    Ok((true, v)) => (&*self.return_serializer, v),-                    Ok((false, v)) => (self.get_fallback_serializer(), v),+                let (ret_serializer, v, include_exclude) = match self.call(value, state) {+                    // Filtering was done by the function, so drop include/exclude for the return serializer:+                    Ok((true, v)) => (&*self.return_serializer, v, IncludeExclude::empty()),+                    Ok((false, v)) => (self.get_fallback_serializer(), v, state.include_exclude()),                     Err(err) => {                         on_error(py, err, &self.function_name, state)?;                         return infer_to_python(value, state);                     }                 };-                // None for include/exclude here, as filtering should be done-                let state = &mut state.scoped_include_exclude(IncludeExclude::empty());+                let state = &mut state.scoped_include_exclude(include_exclude);                 ret_serializer.to_python(v.bind(py), state)             } @@ -236,16 +236,16 @@ macro_rules! function_type_serializer {                 state: &mut SerializationState<'py>,             ) -> PyResult<Cow<'a, str>> {                 let py = key.py();-                let (ret_serializer, v) = match self.call(key, state) {-                    Ok((true, v)) => (&*self.return_serializer, v),-                    Ok((false, v)) => (self.get_fallback_serializer(), v),+                let (ret_serializer, v, include_exclude) = match self.call(key, state) {+                    // Filtering was done by the function, so drop include/exclude for the return serializer:+                    Ok((true, v)) => (&*self.return_serializer, v, IncludeExclude::empty()),+                    Ok((false, v)) => (self.get_fallback_serializer(), v, state.include_exclude()),                     Err(err) => {                         on_error(py, err, &self.function_name, state)?;                         return infer_json_key(key, state);                     }                 };-                // None for include/exclude here, as filtering should be done-                let state = &mut state.scoped_include_exclude(IncludeExclude::empty());+                let state = &mut state.scoped_include_exclude(include_exclude);                 ret_serializer                     .json_key(v.bind(py), state)                     .map(|cow| Cow::Owned(cow.into_owned()))@@ -258,16 +258,16 @@ macro_rules! function_type_serializer {                 state: &mut SerializationState<'py>,             ) -> Result<S::Ok, S::Error> {                 let py = value.py();-                let (ret_serializer, v) = match self.call(value, state) {-                    Ok((true, v)) => (&*self.return_serializer, v),-                    Ok((false, v)) => (self.get_fallback_serializer(), v),+                let (ret_serializer, v, include_exclude) = match self.call(value, state) {+                    // Filtering was done by the function, so drop include/exclude for the return serializer:+                    Ok((true, v)) => (&*self.return_serializer, v, IncludeExclude::empty()),+                    Ok((false, v)) => (self.get_fallback_serializer(), v, state.include_exclude()),                     Err(err) => {                         on_error(py, err, &self.function_name, state).map_err(py_err_se_err)?;                         return infer_serialize(value, serializer, state);                     }                 };-                // None for include/exclude here, as filtering should be done-                let mut state = state.scoped_include_exclude(IncludeExclude::empty());+                let mut state = state.scoped_include_exclude(include_exclude);                 ret_serializer.serde_serialize(v.bind(py), serializer, &mut state)             } tests/test_serialize.pyindex 57832ca0a..1c9e8cb7b 100644@@ -1437,3 +1437,28 @@ def test_model_serializer_index_key_type_error() -> None:         match="Error calling function `_serialize`: TypeError: 'index_key' is expected to be an integer or a string, got 'b'not_a_valid_type_for_index_key''",     ):         m.model_dump(include={'f'})+++def test_model_serializer_when_used_fallback_respects_include_exclude() -> None:+    """https://github.com/pydantic/pydantic/issues/13601"""++    class Plain(BaseModel):+        a: int+        b: int++        @model_serializer(mode='plain', when_used='json')+        def _serialize(self) -> Any:+            return {'ser': True}++    class Wrap(BaseModel):+        a: int+        b: int++        @model_serializer(mode='wrap', when_used='json')+        def _serialize(self, handler: SerializerFunctionWrapHandler) -> Any:+            return {'ser': True}++    for m in (Plain(a=1, b=2), Wrap(a=1, b=2)):+        assert m.model_dump(exclude={'b'}) == {'a': 1}+        assert m.model_dump(include={'a'}) == {'a': 1}+        assert m.model_dump(mode='json', exclude={'b'}) == {'ser': True}