switching to init_self

Author: samuelcolvin

Cargo.lock

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

Cargo.toml

@@ -38,26 +38,26 @@ class SchemaValidator:
     def title(self) -> str: ...
     def __init__(self, schema: CoreSchema, config: 'CoreConfig | None' = None) -> None: ...
     def validate_python(
-        self, input: Any, *, strict: 'bool | None' = None, context: Any = None, init_mode: bool = False
+        self, input: Any, *, strict: 'bool | None' = None, context: Any = None, init_self: 'Any | None' = None
     ) -> Any: ...
     def isinstance_python(
-        self, input: Any, *, strict: 'bool | None' = None, context: Any = None, init_mode: bool = False
+        self, input: Any, *, strict: 'bool | None' = None, context: Any = None, init_self: 'Any | None' = None
     ) -> bool: ...
     def validate_json(
         self,
         input: 'str | bytes | bytearray',
         *,
         strict: 'bool | None' = None,
         context: Any = None,
-        init_mode: bool = False,
+        init_self: 'Any | None' = None,
     ) -> Any: ...
     def isinstance_json(
         self,
         input: 'str | bytes | bytearray',
         *,
         strict: 'bool | None' = None,
         context: Any = None,
-        init_mode: bool = False,
+        init_self: 'Any | None' = None,
     ) -> bool: ...
     def validate_assignment(
         self, field: str, input: Any, data: 'dict[str, Any]', strict: 'bool | None' = None, context: Any = None

pydantic_core/_pydantic_core.pyi

@@ -2392,7 +2392,7 @@ class ModelSchema(TypedDict, total=False):
     type: Required[Literal['model']]
     cls: Required[Type[Any]]
     schema: Required[CoreSchema]
-    call_after_init: str
+    post_init: str
     strict: bool
     config: CoreConfig
     ref: str
@@ -2404,7 +2404,7 @@ def model_schema(
     cls: Type[Any],
     schema: CoreSchema,
     *,
-    call_after_init: str | None = None,
+    post_init: str | None = None,
     strict: bool | None = None,
     config: CoreConfig | None = None,
     ref: str | None = None,
@@ -2440,7 +2440,7 @@ class MyModel:
     Args:
         cls: The class to use for the model
         schema: The schema to use for the model
-        call_after_init: The call after init to use for the model
+        post_init: The call after init to use for the model
         strict: Whether the model is strict
         config: The config to use for the model
         ref: See [TODO] for details
@@ -2451,7 +2451,7 @@ class MyModel:
         type='model',
         cls=cls,
         schema=schema,
-        call_after_init=call_after_init,
+        post_init=post_init,
         strict=strict,
         config=config,
         ref=ref,

pydantic_core/core_schema.py

@@ -37,7 +37,7 @@ impl PyUrl {
     pub fn py_new(py: Python, url: &PyAny) -> PyResult<Self> {
         let schema_obj = SCHEMA_DEFINITION_URL
             .get_or_init(py, || build_schema_validator(py, "url"))
-            .validate_python(py, url, None, None, false)?;
+            .validate_python(py, url, None, None, None)?;
         schema_obj.extract(py)
     }
 
@@ -147,7 +147,7 @@ impl PyMultiHostUrl {
     pub fn py_new(py: Python, url: &PyAny) -> PyResult<Self> {
         let schema_obj = SCHEMA_DEFINITION_MULTI_HOST_URL
             .get_or_init(py, || build_schema_validator(py, "multi-host-url"))
-            .validate_python(py, url, None, None, false)?;
+            .validate_python(py, url, None, None, None)?;
         schema_obj.extract(py)
     }
 

src/url.rs

@@ -12,7 +12,7 @@ use crate::recursion_guard::RecursionGuard;
 use crate::validators::function::convert_err;
 
 use super::arguments::{json_get, json_slice, py_get, py_slice};
-use super::model::create_class;
+use super::model::{create_class, force_setattr};
 use super::with_default::get_default;
 use super::{build_validator, BuildContext, BuildValidator, CombinedValidator, Extra, Validator};
 
@@ -350,7 +350,8 @@ impl Validator for DataclassValidator {
             let input = input.maybe_subclass_dict(class)?;
             let output = self.validator.validate(py, input, extra, slots, recursion_guard)?;
             let (dc_dict, post_init_kwargs): (&PyAny, &PyAny) = output.extract(py)?;
-            let dc = create_class(self.class.as_ref(py), dc_dict, None)?;
+            let dc = create_class(self.class.as_ref(py))?;
+            force_setattr(py, dc.as_ref(py), intern!(py, "__dict__"), dc_dict)?;
 
             if let Some(ref post_init) = self.post_init {
                 let post_init = post_init.as_ref(py);

src/validators/dataclass.rs

@@ -110,24 +110,6 @@ impl Validator for FunctionBeforeValidator {
             .validate(py, value.into_ref(py), extra, slots, recursion_guard)
     }
 
-    fn validate_init<'s, 'data>(
-        &'s self,
-        py: Python<'data>,
-        input: &'data impl Input<'data>,
-        extra: &Extra,
-        slots: &'data [CombinedValidator],
-        recursion_guard: &'s mut RecursionGuard,
-    ) -> ValResult<'data, PyObject> {
-        let info = ValidationInfo::new(py, extra, &self.config);
-        let value = self
-            .func
-            .call1(py, (input.to_object(py), info))
-            .map_err(|e| convert_err(py, e, input))?;
-
-        self.validator
-            .validate_init(py, value.into_ref(py), extra, slots, recursion_guard)
-    }
-
     fn get_name(&self) -> &str {
         &self.name
     }
@@ -166,19 +148,6 @@ impl Validator for FunctionAfterValidator {
         self.func.call1(py, (v, info)).map_err(|e| convert_err(py, e, input))
     }
 
-    fn validate_init<'s, 'data>(
-        &'s self,
-        py: Python<'data>,
-        input: &'data impl Input<'data>,
-        extra: &Extra,
-        slots: &'data [CombinedValidator],
-        recursion_guard: &'s mut RecursionGuard,
-    ) -> ValResult<'data, PyObject> {
-        let v = self.validator.validate_init(py, input, extra, slots, recursion_guard)?;
-        let info = ValidationInfo::new(py, extra, &self.config);
-        self.func.call1(py, (v, info)).map_err(|e| convert_err(py, e, input))
-    }
-
     fn get_name(&self) -> &str {
         &self.name
     }
@@ -258,40 +227,7 @@ impl Validator for FunctionWrapValidator {
         recursion_guard: &'s mut RecursionGuard,
     ) -> ValResult<'data, PyObject> {
         let call_next_validator = ValidatorCallable {
-            validator: InternalValidator::new(
-                py,
-                "ValidatorCallable",
-                &self.validator,
-                slots,
-                extra,
-                recursion_guard,
-                false,
-            ),
-        };
-        let info = ValidationInfo::new(py, extra, &self.config);
-        self.func
-            .call1(py, (input.to_object(py), call_next_validator, info))
-            .map_err(|e| convert_err(py, e, input))
-    }
-
-    fn validate_init<'s, 'data>(
-        &'s self,
-        py: Python<'data>,
-        input: &'data impl Input<'data>,
-        extra: &Extra,
-        slots: &'data [CombinedValidator],
-        recursion_guard: &'s mut RecursionGuard,
-    ) -> ValResult<'data, PyObject> {
-        let call_next_validator = ValidatorCallable {
-            validator: InternalValidator::new(
-                py,
-                "ValidatorCallable",
-                &self.validator,
-                slots,
-                extra,
-                recursion_guard,
-                true,
-            ),
+            validator: InternalValidator::new(py, "ValidatorCallable", &self.validator, slots, extra, recursion_guard),
         };
         let info = ValidationInfo::new(py, extra, &self.config, self.is_field_validator)?;
         self.func

src/validators/function.rs

@@ -57,7 +57,7 @@ impl Validator for GeneratorValidator {
         let validator = self
             .item_validator
             .as_ref()
-            .map(|v| InternalValidator::new(py, "ValidatorIterator", v, slots, extra, recursion_guard, false));
+            .map(|v| InternalValidator::new(py, "ValidatorIterator", v, slots, extra, recursion_guard));
 
         let v_iterator = ValidatorIterator {
             iterator,
@@ -195,8 +195,8 @@ pub struct InternalValidator {
     field: Option<String>,
     strict: Option<bool>,
     context: Option<PyObject>,
+    init_self: Option<PyObject>,
     recursion_guard: RecursionGuard,
-    init_mode: bool,
 }
 
 impl fmt::Debug for InternalValidator {
@@ -213,7 +213,6 @@ impl InternalValidator {
         slots: &[CombinedValidator],
         extra: &Extra,
         recursion_guard: &RecursionGuard,
-        init_mode: bool,
     ) -> Self {
         Self {
             name: name.to_string(),
@@ -223,8 +222,8 @@ impl InternalValidator {
             field: extra.assignee_field.map(|f| f.to_string()),
             strict: extra.strict,
             context: extra.context.map(|d| d.into_py(py)),
+            init_self: extra.init_self.map(|d| d.into_py(py)),
             recursion_guard: recursion_guard.clone(),
-            init_mode,
         }
     }
 
@@ -243,14 +242,10 @@ impl InternalValidator {
             strict: self.strict,
             context: self.context.as_ref().map(|data| data.as_ref(py)),
             field_name: None,
+            init_self: self.init_self.as_ref().map(|data| data.as_ref(py)),
         };
-        let r = if self.init_mode {
-            self.validator
-                .validate_init(py, input, &extra, &self.slots, &mut self.recursion_guard)
-        } else {
-            self.validator
-                .validate(py, input, &extra, &self.slots, &mut self.recursion_guard)
-        };
-        r.map_err(|e| ValidationError::from_val_error(py, self.name.to_object(py), e, outer_location))
+        self.validator
+            .validate(py, input, &extra, &self.slots, &mut self.recursion_guard)
+            .map_err(|e| ValidationError::from_val_error(py, self.name.to_object(py), e, outer_location))
     }
 }