Fix Validator::complete not being implemented properly for all validator types

generate_self_schema.py

@@ -166,7 +166,7 @@ def type_dict_schema(typed_dict) -> dict[str, Any]:  # noqa: C901
     return {'type': 'typed-dict', 'fields': fields, 'extra_behavior': 'forbid'}
 
 
-def union_schema(union_type: UnionType) -> core_schema.UnionSchema | core_schema.RecursiveReferenceSchema:
+def union_schema(union_type: UnionType) -> core_schema.UnionSchema | core_schema.DefinitionReferenceSchema:
     return {'type': 'union', 'choices': [get_schema(arg) for arg in union_type.__args__]}
 
 

src/build_context.rs

@@ -132,7 +132,7 @@ impl<T: Clone + std::fmt::Debug> BuildContext<T> {
     }
 
     /// find a validator/serializer by `slot_id` - this used in `Validator.complete`,
-    /// specifically `RecursiveRefValidator` to set its name
+    /// specifically `DefinitionRefValidator` to set its name
     pub fn find_validator(&self, slot_id: usize) -> PyResult<&T> {
         match self.slots.get(slot_id) {
             Some(slot) => match slot.op_val_ser {

src/validators/arguments.rs

@@ -323,4 +323,17 @@ impl Validator for ArgumentsValidator {
     fn get_name(&self) -> &str {
         Self::EXPECTED_TYPE
     }
+
+    fn complete(&mut self, build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
+        self.parameters
+            .iter_mut()
+            .try_for_each(|parameter| parameter.validator.complete(build_context))?;
+        if let Some(v) = &mut self.var_args_validator {
+            v.complete(build_context)?;
+        }
+        if let Some(v) = &mut self.var_kwargs_validator {
+            v.complete(build_context)?;
+        };
+        Ok(())
+    }
 }

src/validators/call.rs

@@ -85,4 +85,12 @@ impl Validator for CallValidator {
     fn get_name(&self) -> &str {
         &self.name
     }
+
+    fn complete(&mut self, build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
+        self.arguments_validator.complete(build_context)?;
+        match &mut self.return_validator {
+            Some(v) => v.complete(build_context),
+            None => Ok(()),
+        }
+    }
 }

src/validators/dataclass.rs

@@ -295,6 +295,12 @@ impl Validator for DataclassArgsValidator {
         &self.validator_name
     }
 
+    fn complete(&mut self, build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
+        self.fields
+            .iter_mut()
+            .try_for_each(|field| field.validator.complete(build_context))
+    }
+
     fn validate_assignment<'s, 'data: 's>(
         &'s self,
         py: Python<'data>,

src/validators/mod.rs

@@ -641,7 +641,7 @@ pub trait Validator: Send + Sync + Clone + Debug {
     }
 
     /// this method must be implemented for any validator which holds references to other validators,
-    /// it is used by `RecursiveRefValidator` to set its name
+    /// it is used by `DefinitionRefValidator` to set its name
     fn complete(&mut self, _build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
         Ok(())
     }

src/validators/model.rs

@@ -128,6 +128,10 @@ impl Validator for ModelValidator {
         &self.name
     }
 
+    fn complete(&mut self, build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
+        self.validator.complete(build_context)
+    }
+
     fn validate_assignment<'s, 'data: 's>(
         &'s self,
         py: Python<'data>,

src/validators/tuple.rs

@@ -230,6 +230,10 @@ impl Validator for TuplePositionalValidator {
     fn complete(&mut self, build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
         self.items_validators
             .iter_mut()
-            .try_for_each(|v| v.complete(build_context))
+            .try_for_each(|v| v.complete(build_context))?;
+        match &mut self.extra_validator {
+            Some(v) => v.complete(build_context),
+            None => Ok(()),
+        }
     }
 }

src/validators/typed_dict.rs

@@ -326,7 +326,11 @@ impl Validator for TypedDictValidator {
     fn complete(&mut self, build_context: &BuildContext<CombinedValidator>) -> PyResult<()> {
         self.fields
             .iter_mut()
-            .try_for_each(|f| f.validator.complete(build_context))
+            .try_for_each(|f| f.validator.complete(build_context))?;
+        match &mut self.extra_validator {
+            Some(v) => v.complete(build_context),
+            None => Ok(()),
+        }
     }
 
     fn validate_assignment<'s, 'data: 's>(