Backtestspydanticrun-20261007-130130#13780
Concurrent TypeAdapter construction raises RuntimeError on free-threaded Python
Our patch was judged better than the merged fix.
In this judgment, Patch B = our agent, Patch A = the merged fix.
Both patches fix the root cause the same way. Each iterates over `vars(typ).copy()` in `_decorator_infos_for_class` and copies class namespaces in `LazyLocalNamespace.data`, so on correctness for the reported issue they are about equal. Patch B also hardens `collect_known_metadata` in the same way, which is low-risk. Patch A also rewrites the force-rebuild path of `BaseModel.model_rebuild` in main.py. It replaces the conditional `delattr` of the schema, validator and serializer with `set_model_mocks` when the model is already complete. That is a behavioral change outside the issue, which concerns TypeAdapter on a TypedDict. It touches a sensitive code path and adds risk without being needed for the reported bug. Tests favor B clearly. All of Patch A's new tests sit behind `skipif(not is_free_threaded)`, so on standard CI builds they never run and give no regression protection. Patch B adds deterministic tests that run on every build. One uses a `__class__` property that mutates the TypedDict's namespace during the `isinstance` checks in decorator collection. The other uses a key whose `__hash__` mutates the namespace during the `LazyLocalNamespace` merge. Both would raise `RuntimeError: dictionary changed size during iteration` before the fix and pass after it. Patch B also includes the issue's concurrent reproduction as an additional test. Overall, B is narrower, carries less risk and has stronger tests.
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
10m 30s
Wall-clock time in the container
Full test suite
No new failures
12,714 passed · 509 skipped · 13,223 total
Contamination audit
Clean
No sign the agent saw the real fix
Patch size
98vs 198 merged
Changed lines, ours vs merged
The issue
View on GitHubInitial Checks
- I confirm that I'm using Pydantic V2
Description
Constructing separate TypeAdapter instances concurrently for the same new TypedDict can raise RuntimeError: dictionary changed size during iteration on free-threaded Python.
A full run produced 91 failures in 800 attempts with the GIL disabled and none with PYTHON_GIL=1. It also reproduces on Pydantic main at 1c8a330acc3077e77da64e3672c7c875fb4c6eaa.
Lazy annotation evaluation adds __annotations_cache__ while another thread iterates vars(typ).items() in _decorator_infos_for_class.
Example Code
from __future__ import annotations
import threading
from concurrent.futures import ThreadPoolExecutor
from pydantic import TypeAdapter
from typing_extensions import TypedDict
def run_round() -> None:
class Record(TypedDict):
value: int
for index in range(1000):
setattr(Record, f'metadata_{index}', index)
barrier = threading.Barrier(8)
def build(_: int) -> None:
barrier.wait()
TypeAdapter(Record).validate_python({'value': '42'})
with ThreadPoolExecutor(max_workers=8) as executor:
list(executor.map(build, range(8)))
for _ in range(100):
run_round()
The synthetic attributes only widen the iteration window. They are not modified after the threads start.
Python, Pydantic & OS Version
pydantic version: 2.13.5
pydantic-core version: 2.46.5
python version: 3.14.3 free-threading build
platform: macOS-26.6.2-arm64
related packages: typing_extensions-4.15.0The two patches
pydantic/_internal/_decorators.pyindex 160a18c0..4d82e201 100644@@ -535,7 +535,9 @@ def _decorator_infos_for_class( res = DecoratorInfos() to_replace: list[tuple[str, Any]] = [] - for var_name, var_value in vars(typ).items():+ # Iterate over a copy of the class namespace: it may be mutated concurrently (e.g. on free-threaded+ # Python, lazy annotations evaluation adds `__annotations_cache__` to the class `__dict__`):+ for var_name, var_value in vars(typ).copy().items(): if isinstance(var_value, PydanticDescriptorProxy): info = var_value.decorator_info if isinstance(info, ValidatorDecoratorInfo):pydantic/_internal/_known_annotated_metadata.pyindex dc18e579..617d746f 100644@@ -370,7 +370,7 @@ def collect_known_metadata(annotations: Iterable[Any]) -> tuple[dict[str, Any], elif isinstance(annotation, type) and issubclass(annotation, PydanticMetadata): # also support PydanticMetadata classes being used without initialisation, # e.g. `Annotated[int, Strict]` as well as `Annotated[int, Strict()]`- res.update({k: v for k, v in vars(annotation).items() if not k.startswith('_')})+ res.update({k: v for k, v in vars(annotation).copy().items() if not k.startswith('_')}) else: remaining.append(annotation) # Nones can sneak in but pydantic-core will reject thempydantic/_internal/_namespace_utils.pyindex d308f7e4..582cc1cd 100644@@ -4,6 +4,7 @@ import sys from collections.abc import Callable, Generator, Iterator, Mapping from contextlib import contextmanager from functools import cached_property+from types import MappingProxyType from typing import Any, NamedTuple, TypeAlias, TypeVar from typing_extensions import ParamSpec, TypeAliasType, TypeVarTuple@@ -88,7 +89,12 @@ class LazyLocalNamespace(Mapping[str, Any]): @cached_property def data(self) -> dict[str, Any]:- return {k: v for ns in self._namespaces for k, v in ns.items()}+ data: dict[str, Any] = {}+ for ns in self._namespaces:+ # Class namespaces (`vars(cls)`) may be mutated concurrently (e.g. on free-threaded Python,+ # lazy annotations evaluation adds `__annotations_cache__`), so take an atomic copy first:+ data.update(ns.copy() if isinstance(ns, (dict, MappingProxyType)) else ns)+ return data def __len__(self) -> int: return len(self.data)tests/test_decorators.pyindex 667ff813..7e82e833 100644@@ -1,6 +1,11 @@+import sys+import threading+from concurrent.futures import ThreadPoolExecutor+ import pytest+from typing_extensions import TypedDict -from pydantic import BaseModel, PydanticUserError, computed_field+from pydantic import BaseModel, PydanticUserError, TypeAdapter, computed_field from pydantic._internal._decorators import inspect_annotated_serializer, inspect_field_serializer, inspect_validator @@ -138,3 +143,54 @@ def test_decorator_info_not_mutated() -> None: assert A.__pydantic_decorators__.computed_fields['func'].info.title is None assert B.__pydantic_decorators__.computed_fields['func'].info.title == 'test'+++def test_decorator_collection_tolerates_class_namespace_mutation() -> None:+ """The class namespace can be mutated while decorators are being collected (e.g. on free-threaded Python,+ lazy annotations evaluation adds `__annotations_cache__` from another thread).++ Simulate this deterministically: `isinstance()` checks performed during collection trigger a `__class__`+ lookup on the attribute below, which adds a new attribute to the class.+ """++ class Record(TypedDict):+ value: int++ class Mutator:+ @property+ def __class__(self) -> type:+ if not hasattr(Record, 'added_during_collection'):+ Record.added_during_collection = 1+ return Mutator++ Record.mutator = Mutator()++ assert TypeAdapter(Record).validate_python({'value': '42'}) == {'value': 42}+ assert Record.added_during_collection == 1+++@pytest.mark.skipif(sys.platform == 'emscripten', reason='no threading on emscripten')+def test_concurrent_type_adapter_construction_for_new_typed_dict() -> None:+ """https://github.com/pydantic/pydantic/issues/13780: on free-threaded Python, concurrently building+ `TypeAdapter`s for the same new `TypedDict` used to raise `RuntimeError: dictionary changed size during iteration`.+ """++ def run_round() -> None:+ class Record(TypedDict):+ value: int++ # Widen the window during which the class namespace is iterated:+ for index in range(1000):+ setattr(Record, f'metadata_{index}', index)++ barrier = threading.Barrier(8)++ def build(_: int) -> dict[str, int]:+ barrier.wait()+ return TypeAdapter(Record).validate_python({'value': '42'})++ with ThreadPoolExecutor(max_workers=8) as executor:+ assert list(executor.map(build, range(8))) == [{'value': 42}] * 8++ for _ in range(20):+ run_round()tests/test_forward_ref.pyindex 59ebb6a9..39adaf74 100644@@ -1144,6 +1144,32 @@ def test_lazy_local_namespace_len() -> None: assert len(namespace) == 2 +def test_lazy_local_namespace_tolerates_namespace_mutation() -> None:+ """Namespaces (e.g. `vars(cls)`) can be mutated concurrently while being merged (e.g. on free-threaded Python,+ lazy annotations evaluation adds `__annotations_cache__` from another thread).++ Simulate this deterministically: hashing the key below (when inserted in a new dict) mutates the namespace.+ """++ ns: dict[str, Any] = {}+ armed = False++ class MutatingKey(str):+ def __hash__(self) -> int:+ if armed and 'added' not in ns:+ ns['added'] = 1+ return str.__hash__(self)++ ns[MutatingKey('a')] = int+ ns['b'] = str+ armed = True++ namespace = LazyLocalNamespace(ns)++ assert namespace['a'] is int+ assert namespace['b'] is str++ @pytest.mark.xfail( reason='While `get_cls_type_hints` uses the correct module ns for each base, `collect_model_fields` ' 'will still use the `FieldInfo` instances from each base (see the `parent_fields_lookup` logic). '
pydantic/_internal/_decorators.pyindex 160a18c00..72b668c53 100644@@ -535,7 +535,12 @@ def _decorator_infos_for_class( res = DecoratorInfos() to_replace: list[tuple[str, Any]] = [] - for var_name, var_value in vars(typ).items():+ # Iterate on the vars with a copy to avoid changes in dictionary size during iteration.+ # This can happen if a concurrent thread has Pydantic processing the same `typ` (e.g. two+ # concurrent threads doing `TypeAdapter(SomeClassType)`), and such thread reads annotations+ # for the first time during the iteration here in the other thread (since 3.14, reading annotations+ # can set attributes such as `__annotations_cache__` or `__annotate_func__` to the type).+ for var_name, var_value in vars(typ).copy().items(): if isinstance(var_value, PydanticDescriptorProxy): info = var_value.decorator_info if isinstance(info, ValidatorDecoratorInfo):pydantic/_internal/_namespace_utils.pyindex d308f7e4c..495f17da6 100644@@ -4,6 +4,7 @@ import sys from collections.abc import Callable, Generator, Iterator, Mapping from contextlib import contextmanager from functools import cached_property+from types import MappingProxyType from typing import Any, NamedTuple, TypeAlias, TypeVar from typing_extensions import ParamSpec, TypeAliasType, TypeVarTuple@@ -88,7 +89,12 @@ class LazyLocalNamespace(Mapping[str, Any]): @cached_property def data(self) -> dict[str, Any]:- return {k: v for ns in self._namespaces for k, v in ns.items()}+ # In rare scenarios, a race condition can happen when iterating over class namespaces (i.e. created with `var(SomeClass)`),+ # if another thread accesses the type annotations for the first time (since 3.14, reading annotations can set attributes+ # such as `__annotations_cache__` or `__annotate_func__` to the type).+ return {+ k: v for ns in self._namespaces for k, v in (ns.copy() if isinstance(ns, MappingProxyType) else ns).items()+ } def __len__(self) -> int: return len(self.data)pydantic/main.pyindex 1c0258c69..395c3c85f 100644@@ -711,16 +711,12 @@ class BaseModel(metaclass=_model_construction.ModelMetaclass): cls.__pydantic_complete__ = False - for attr in ('__pydantic_core_schema__', '__pydantic_validator__', '__pydantic_serializer__'):- if attr in cls.__dict__ and not isinstance(- getattr(cls, attr), (_mock_val_ser.MockCoreSchema, _mock_val_ser.MockValSer)- ):- # Deleting the validator/serializer is necessary as otherwise they can get reused in- # pydantic-core. Same applies for the core schema that can be reused in schema generation.- # We do so only if they aren't mock instances, otherwise concurrent reads of these attributes- # — performed without holding the rebuild lock (e.g. when instantiating the model) — can- # resolve them from the parent class.- delattr(cls, attr)+ if already_complete:+ # The existing validator/serializer must not be reused in pydantic-core, and the core schema+ # must not be reused in schema generation. If the model is already complete (i.e. `force=True`),+ # we set back mocks for the model (we could also delete the complete core schema/validator/serializer,+ # but this isn't thread-safe).+ _mock_val_ser.set_model_mocks(cls) if _types_namespace is not None: rebuild_ns = _types_namespacetests/conftest.pyindex b066a013a..694c5855b 100644@@ -23,6 +23,11 @@ from pydantic import BaseModel from pydantic._internal._generate_schema import GenerateSchema from pydantic.json_schema import GenerateJsonSchema +try:+ is_free_threaded = not sys._is_gil_enabled()+except AttributeError:+ is_free_threaded = False+ def pytest_addoption(parser: pytest.Parser): parser.addoption('--test-mypy', action='store_true', help='run mypy tests')tests/test_freethreaded.pynew file mode 100644index 000000000..af4ef4929@@ -0,0 +1,162 @@+import sys+import threading+from collections.abc import Callable+from concurrent.futures import ThreadPoolExecutor+from typing import Any++import pytest+from typing_extensions import TypedDict++import pydantic.dataclasses+from pydantic import BaseModel, TypeAdapter, field_validator++from .conftest import is_free_threaded++pytestmark = [+ pytest.mark.skipif(sys.platform == 'emscripten', reason='no threading on emscripten'),+ pytest.mark.skipif(not is_free_threaded, reason='only relevant on free-threaded builds'),+]+++def run_concurrently(+ setup: Callable[[], Any], target: Callable[[Any, int], Any], *, rounds: int = 100, threads: int = 8+):+ """Run `target` in `threads` threads at once, `rounds` times, with a fresh `setup()` result each round."""+ for _ in range(rounds):+ ctx = setup()+ barrier = threading.Barrier(threads)++ def work(index: int) -> None:+ barrier.wait()+ target(ctx, index)++ with ThreadPoolExecutor(max_workers=threads) as executor:+ for future in [executor.submit(work, i) for i in range(threads)]:+ future.result()+++def test_typed_dict_concurrent_type_adapter() -> None:+ def setup():+ class Record(TypedDict):+ value: int++ return Record++ def target(Record, _):+ assert TypeAdapter(Record).validate_python({'value': '42'}) == {'value': 42}++ run_concurrently(setup, target)+++def test_base_model_concurrent_creation_with_shared_base() -> None:+ def setup():+ class Mixin:+ a: int = 1++ @field_validator('a')+ @classmethod+ def val_a_1(cls, v: int) -> int:+ return v++ @field_validator('a')+ @classmethod+ def val_a_2(cls, v: int) -> int:+ return v++ @field_validator('a')+ @classmethod+ def val_a_3(cls, v: int) -> int:+ return v++ return Mixin++ def target(Mixin, _):+ class Model(BaseModel, Mixin):+ b: int++ assert Model(b='1').b == 1++ run_concurrently(setup, target)+++def test_dataclass_concurrent_creation_with_shared_base() -> None:+ def setup():+ class Base:+ a: int = 1++ @field_validator('a')+ @classmethod+ def val_a_1(cls, v: int) -> int:+ return v++ @field_validator('a')+ @classmethod+ def val_a_2(cls, v: int) -> int:+ return v++ @field_validator('a')+ @classmethod+ def val_a_3(cls, v: int) -> int:+ return v++ return Base++ def target(Base, _):+ @pydantic.dataclasses.dataclass+ class Sub(Base):+ b: int++ assert Sub(b='1').b == 1++ run_concurrently(setup, target)+++def test_model_rebuild_concurrent_subclass_creation(monkeypatch: pytest.MonkeyPatch) -> None:+ """Test targeted at our `LazyLocalNamespace.data` property implementation."""++ def setup():+ monkeypatch.delitem(globals(), 'Later', raising=False)++ class Model(BaseModel):+ # `Later` isn't defined yet, so the field is deferred and no annotations cache is set on the class:+ x: Later # noqa: F821 # pyright: ignore[reportUndefinedVariable]++ # Widen the class dict so that iterating over it takes long enough for the race to happen:+ for i in range(3000):+ setattr(Model, f'attr_{i}', i)++ # Dynamically set the item in globals instead of a simple assignment to force `ForwardRef.evaluate()` into looking at the+ # provided namespace during evaluation (otherwise it doesn't look at globals/locals and uses `ForwardRef.__cell__` directly)+ monkeypatch.setitem(globals(), 'Later', int)+ return Model++ def target(Model, index: int):+ if index == 0:+ # Collecting the fields of the subclass reads the annotations of `Model` for the first time:+ class Sub(Model):+ pass++ assert Sub(x='1').x == 1+ else:+ Model.model_rebuild(force=True)++ run_concurrently(setup, target)+++def test_model_force_rebuild_concurrent_instantiation() -> None:+ """Test targeted at our logic in `model_rebuild()`, when we set back mocks on already complete models."""++ def setup():+ class Model(BaseModel):+ x: int++ assert Model(x=1).x == 1 # `Model` is complete, with a real validator set on the class+ return Model++ def target(Model, index):+ if index == 0:+ Model.model_rebuild(force=True)+ else:+ assert Model(x='1').x == 1++ run_concurrently(setup, target)