Feedback

Co-authored-by: David Hewitt <[email protected]>

Author: Viicos

python/pydantic_core/core_schema.py

@@ -3372,7 +3372,7 @@ def arguments_parameter(
     return _dict_not_none(name=name, schema=schema, mode=mode, alias=alias)
 
 
-VarKwargsMode: TypeAlias = Literal['single', 'unpacked-typed-dict']
+VarKwargsMode: TypeAlias = Literal['uniform', 'unpacked-typed-dict']
 
 
 class ArgumentsSchema(TypedDict, total=False):
@@ -3419,7 +3419,7 @@ def arguments_schema(
         arguments: The arguments to use for the arguments schema
         populate_by_name: Whether to populate by name
         var_args_schema: The variable args schema to use for the arguments schema
-        var_kwargs_mode: The validation mode to use for variadic keyword arguments. If `'single'`, every value of the
+        var_kwargs_mode: The validation mode to use for variadic keyword arguments. If `'uniform'`, every value of the
             keyword arguments will be validated against the `var_kwargs_schema` schema. If `'unpacked-typed-dict'`,
             the `schema` argument must be a [`typed_dict_schema`][pydantic_core.core_schema.typed_dict_schema]
         var_kwargs_schema: The variable kwargs schema to use for the arguments schema

src/validators/arguments.rs

@@ -19,7 +19,7 @@ use super::{build_validator, BuildValidator, CombinedValidator, DefinitionsBuild
 
 #[derive(Debug, PartialEq)]
 enum VarKwargsMode {
-    Single,
+    Uniform,
     UnpackedTypedDict,
 }
 
@@ -28,10 +28,10 @@ impl FromStr for VarKwargsMode {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "single" => Ok(Self::Single),
+            "uniform" => Ok(Self::Uniform),
             "unpacked-typed-dict" => Ok(Self::UnpackedTypedDict),
             s => py_schema_err!(
-                "Invalid var_kwargs mode: `{}`, expected `single` or `unpacked-typed-dict`",
+                "Invalid var_kwargs mode: `{}`, expected `uniform` or `unpacked-typed-dict`",
                 s
             ),
         }
@@ -319,8 +319,8 @@ impl Validator for ArgumentsValidator {
                     };
                     if !used_kwargs.contains(either_str.as_cow()?.as_ref()) {
                         match self.var_kwargs_mode {
-                            VarKwargsMode::Single => match self.var_kwargs_validator {
-                                Some(ref validator) => match validator.validate(py, value.borrow_input(), state) {
+                            VarKwargsMode::Uniform => match &self.var_kwargs_validator {
+                                Some(validator) => match validator.validate(py, value.borrow_input(), state) {
                                     Ok(value) => {
                                         output_kwargs
                                             .set_item(either_str.as_py_string(py, state.cache_str()), value)?;
@@ -362,9 +362,7 @@ impl Validator for ArgumentsValidator {
                             output_kwargs.update(value.downcast_bound::<PyDict>(py).unwrap().as_mapping())?;
                         }
                         Err(ValError::LineErrors(line_errors)) => {
-                            for error in line_errors {
-                                errors.push(error);
-                            }
+                            errors.extend(line_errors);
                         }
                         Err(err) => return Err(err),
                     }

tests/validators/test_arguments.py

@@ -791,7 +791,7 @@ def test_build_missing_var_kwargs():
     ],
     ids=repr,
 )
-def test_kwargs_single(py_and_json: PyAndJson, input_value, expected):
+def test_kwargs_uniform(py_and_json: PyAndJson, input_value, expected):
     v = py_and_json(
         {
             'type': 'arguments',