tests for info.data

Author: samuelcolvin

src/validators/function.rs

@@ -1,7 +1,7 @@
 use pyo3::exceptions::{PyAssertionError, PyAttributeError, PyRuntimeError, PyTypeError, PyValueError};
 use pyo3::intern;
 use pyo3::prelude::*;
-use pyo3::types::{PyAny, PyDict};
+use pyo3::types::{PyAny, PyDict, PyString};
 
 use crate::build_tools::{function_name, py_err, SchemaDict};
 use crate::errors::{
@@ -354,17 +354,18 @@ impl ValidationInfo {
 #[pymethods]
 impl ValidationInfo {
     #[getter]
-    fn get_data(&self) -> PyResult<Py<PyDict>> {
-        self.data
-            .as_ref()
-            .cloned()
-            .ok_or_else(|| PyAttributeError::new_err("No attribute named 'data'"))
+    fn get_data(&self, py: Python) -> PyResult<Py<PyDict>> {
+        match self.data {
+            Some(ref data) => Ok(data.clone_ref(py)),
+            None => Err(PyAttributeError::new_err("No attribute named 'data'")),
+        }
     }
+
     #[getter]
-    fn get_field_name(&self) -> PyResult<String> {
-        self.field_name
-            .as_ref()
-            .cloned()
-            .ok_or_else(|| PyAttributeError::new_err("No attribute named 'field_name'"))
+    fn get_field_name<'py>(&self, py: Python<'py>) -> PyResult<&'py PyString> {
+        match self.field_name {
+            Some(ref field_name) => Ok(PyString::new(py, field_name)),
+            None => Err(PyAttributeError::new_err("No attribute named 'field_name'")),
+        }
     }
 }

tests/validators/test_function.py

@@ -716,3 +716,36 @@ def f(*args: Any, **kwargs: Any) -> Any:  # pragma: no cover
         match='This validator expected to be run inside the context of a model field but no model field was found',
     ):
         v.validate_python(123)
+
+
+def test_typed_dict_data() -> None:
+    info_stuff = None
+
+    def f(input_value: Any, info: core_schema.ModelFieldValidationInfo) -> Any:
+        nonlocal info_stuff
+        info_stuff = {'field_name': info.field_name, 'data': info.data.copy()}
+        assert isinstance(input_value, str)
+        return f'input: {input_value}'
+
+    v = SchemaValidator(
+        core_schema.typed_dict_schema(
+            {
+                'a': core_schema.typed_dict_field(core_schema.int_schema()),
+                'b': core_schema.typed_dict_field(core_schema.int_schema()),
+                'c': core_schema.typed_dict_field(
+                    core_schema.field_after_validation_function(f, core_schema.str_schema())
+                ),
+            }
+        )
+    )
+
+    data = v.validate_python({'a': 1, 'b': '2', 'c': b'foo'})
+    assert data == {'a': 1, 'b': 2, 'c': 'input: foo'}
+    assert info_stuff == {'field_name': 'c', 'data': {'a': 1, 'b': 2}}
+
+    info_stuff = None
+
+    with pytest.raises(ValidationError, match=r'b\s+Input should be a valid integer'):
+        v.validate_python({'a': 1, 'b': 'wrong', 'c': b'foo'})
+
+    assert info_stuff == {'field_name': 'c', 'data': {'a': 1}}