rename arg_kwargs.rs, more tests

Author: samuelcolvin

src/args_kwargs.rs renamed to src/argument_markers.rs

@@ -61,7 +61,7 @@ impl ArgsKwargs {
     }
 }
 
-pub(crate) const VALIDATED_DATA_KEY: &str = "__validated_data__";
+pub(crate) const VALIDATED_DATA_KEY: &str = "validated_data";
 
 #[pyclass(module = "pydantic_core._pydantic_core", frozen, get_all, freelist = 100)]
 #[derive(Debug, Clone)]

src/input/input_abstract.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use pyo3::prelude::*;
 use pyo3::types::{PyString, PyType};
 
-use crate::args_kwargs::ValidatedData;
+use crate::argument_markers::ValidatedData;
 use crate::errors::{InputValue, LocItem, ValResult};
 use crate::{PyMultiHostUrl, PyUrl};
 

src/input/input_python.rs

@@ -11,7 +11,7 @@ use pyo3::types::{
 use pyo3::types::{PyDictItems, PyDictKeys, PyDictValues};
 use pyo3::{ffi, intern, AsPyPointer, PyTypeInfo};
 
-use crate::args_kwargs::{ValidatedData, VALIDATED_DATA_KEY};
+use crate::argument_markers::{ValidatedData, VALIDATED_DATA_KEY};
 use crate::build_tools::safe_repr;
 use crate::errors::{ErrorType, InputValue, LocItem, ValError, ValResult};
 use crate::{ArgsKwargs, PyMultiHostUrl, PyUrl};

src/lib.rs

@@ -9,7 +9,7 @@ use pyo3::prelude::*;
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-mod args_kwargs;
+mod argument_markers;
 mod build_context;
 mod build_tools;
 mod errors;
@@ -23,7 +23,7 @@ mod validators;
 
 // required for benchmarks
 pub use self::url::{PyMultiHostUrl, PyUrl};
-pub use args_kwargs::ArgsKwargs;
+pub use argument_markers::ArgsKwargs;
 pub use build_tools::SchemaError;
 pub use errors::{list_all_errors, PydanticCustomError, PydanticKnownError, PydanticOmit, ValidationError};
 pub use serializers::{

src/validators/model.rs

@@ -7,7 +7,7 @@ use pyo3::prelude::*;
 use pyo3::types::{PyDict, PySet, PyString, PyTuple, PyType};
 use pyo3::{ffi, intern};
 
-use crate::args_kwargs::{ValidatedData, VALIDATED_DATA_KEY};
+use crate::argument_markers::{ValidatedData, VALIDATED_DATA_KEY};
 use crate::build_tools::{py_err, schema_or_config_same, SchemaDict};
 use crate::errors::{ErrorType, ValError, ValResult};
 use crate::input::{py_error_on_minusone, Input};

tests/validators/test_model.py

@@ -1170,7 +1170,7 @@ class Model:
         __slots__ = '__dict__', '__pydantic_fields_set__'
 
         def __init__(self, **kwargs):
-            validated_data = kwargs['__validated_data__']
+            validated_data = kwargs['validated_data']
             self.a = validated_data.model_dict['a']
             self.b = validated_data.model_dict['b']
             self.__pydantic_fields_set__ = validated_data.fields_set
@@ -1196,4 +1196,67 @@ def __init__(self, **kwargs):
     assert m.a == 1
     assert m.b == 2
     assert m.__pydantic_fields_set__ == {'b'}
-    assert calls == ["{'__validated_data__': ValidatedData(model_dict={'a': 1, 'b': 2}, fields_set={'b'})}"]
+    assert calls == ["{'validated_data': ValidatedData(model_dict={'a': 1, 'b': 2}, fields_set={'b'})}"]
+
+
+def test_custom_init_nested():
+    calls = []
+
+    class ModelInner:
+        __slots__ = '__dict__', '__pydantic_fields_set__'
+        a: int
+        b: int
+
+        def __init__(self, **data):
+            calls.append(f'inner: {data!r}')
+            self.__pydantic_validator__.validate_python(data, self_instance=self)
+
+    inner_schema = core_schema.model_schema(
+        ModelInner,
+        core_schema.typed_dict_schema(
+            {
+                'a': core_schema.typed_dict_field(core_schema.with_default_schema(core_schema.int_schema(), default=1)),
+                'b': core_schema.typed_dict_field(core_schema.int_schema()),
+            },
+            return_fields_set=True,
+        ),
+        custom_init=True,
+    )
+    ModelInner.__pydantic_validator__ = SchemaValidator(inner_schema)
+
+    class ModelOuter:
+        __slots__ = '__dict__', '__pydantic_fields_set__'
+        a: int
+        b: ModelInner
+
+        def __init__(self, **data):
+            calls.append(f'outer: {data!r}')
+            self.__pydantic_validator__.validate_python(data, self_instance=self)
+
+    ModelOuter.__pydantic_validator__ = SchemaValidator(
+        core_schema.model_schema(
+            ModelOuter,
+            core_schema.typed_dict_schema(
+                {
+                    'a': core_schema.typed_dict_field(
+                        core_schema.with_default_schema(core_schema.int_schema(), default=1)
+                    ),
+                    'b': core_schema.typed_dict_field(inner_schema),
+                },
+                return_fields_set=True,
+            ),
+            custom_init=True,
+        )
+    )
+
+    m = ModelOuter(a=2, b={'b': 3})
+    assert m.__pydantic_fields_set__ == {'a', 'b'}
+    assert m.a == 2
+    assert isinstance(m.b, ModelInner)
+    assert m.b.a == 1
+    assert m.b.b == 3
+    # insert_assert(calls)
+    assert calls == [
+        "outer: {'a': 2, 'b': {'b': 3}}",
+        "inner: {'validated_data': ValidatedData(model_dict={'a': 1, 'b': 3}, fields_set={'b'})}",
+    ]