Merge branch 'main' into fix-12273-dict

Author: CloseChoice

.github/workflows/ci.yml

@@ -249,7 +249,7 @@ jobs:
 
       # Run pytest with lax xfail because we often add tests to pydantic
       # which xfail on a pending release of pydantic-core
-      - run: uv run pytest --override-ini=xfail_strict=False
+      - run: uv run --no-sync pytest --override-ini=xfail_strict=False
         working-directory: pydantic
         env:
           PYDANTIC_PRIVATE_ALLOW_UNHANDLED_SCHEMA_TYPES: 1

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pydantic-core"
-version = "2.40.0"
+version = "2.40.1"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/pydantic/pydantic-core"

Cargo.toml

@@ -145,7 +145,7 @@ def context(self) -> ContextT:
         ...
 
     @property
-    def mode(self) -> Literal['python', 'json']:
+    def mode(self) -> Literal['python', 'json'] | str:
         """The serialization mode set during serialization."""
         ...
 

python/pydantic_core/core_schema.py

@@ -195,7 +195,7 @@ impl PydanticSerializationUnexpectedValue {
             if let Some(field_name) = &self.field_name {
                 write!(
                     message,
-                    " [field_name={field_name}, input_value={value_str}, input_type={input_type}]"
+                    " [field_name='{field_name}', input_value={value_str}, input_type={input_type}]"
                 )
                 .expect("writing to string should never fail");
             } else {

src/serializers/errors.rs

@@ -300,11 +300,12 @@ impl ModelValidator {
             }
         }
 
-        let instance = create_class(self.class.bind(py))?;
+        let instance;
 
         if self.root_model {
             let state = &mut state.rebind_extra(|extra| extra.field_name = Some(PyString::new(py, ROOT_FIELD)));
             let output = self.validator.validate(py, input, state)?;
+            instance = create_class(self.class.bind(py))?;
 
             let fields_set = if input.as_python().is_some_and(|py_input| py_input.is(&self.undefined)) {
                 PySet::empty(py)?
@@ -315,6 +316,7 @@ impl ModelValidator {
             force_setattr(py, &instance, intern!(py, ROOT_FIELD), output)?;
         } else {
             let output = self.validator.validate(py, input, state)?;
+            instance = create_class(self.class.bind(py))?;
 
             let (model_dict, model_extra, val_fields_set): (Bound<PyAny>, Bound<PyAny>, Bound<PyAny>) =
                 output.extract(py)?;

src/validators/model.rs

@@ -286,7 +286,7 @@ def test_model_wrong_warn():
 
     with pytest.warns(
         UserWarning,
-        match=r"Expected `int` - serialized value may not be as expected \[field_name=foo, input_value='lorem', input_type=str\]",
+        match=r"Expected `int` - serialized value may not be as expected \[field_name='foo', input_value='lorem', input_type=str\]",
     ):
         assert s.to_python(BasicModel(foo='lorem')) == {'foo': 'lorem'}