skip reusing wrap validators

Author: sydney-runkle

src/common/prebuilt.rs

@@ -8,7 +8,7 @@ pub fn get_prebuilt<T>(
     type_: &str,
     schema: &Bound<'_, PyDict>,
     prebuilt_attr_name: &str,
-    extractor: impl FnOnce(Bound<'_, PyAny>) -> PyResult<T>,
+    extractor: impl FnOnce(Bound<'_, PyAny>) -> PyResult<Option<T>>,
 ) -> PyResult<Option<T>> {
     let py = schema.py();
 
@@ -40,5 +40,5 @@ pub fn get_prebuilt<T>(
 
     // Retrieve the prebuilt validator / serializer if available
     let prebuilt: Bound<'_, PyAny> = class_dict.get_item(prebuilt_attr_name)?;
-    extractor(prebuilt).map(Some)
+    extractor(prebuilt)
 }

src/serializers/prebuilt.rs

@@ -17,9 +17,11 @@ pub struct PrebuiltSerializer {
 impl PrebuiltSerializer {
     pub fn try_get_from_schema(type_: &str, schema: &Bound<'_, PyDict>) -> PyResult<Option<CombinedSerializer>> {
         get_prebuilt(type_, schema, "__pydantic_serializer__", |py_any| {
-            py_any
-                .extract::<Py<SchemaSerializer>>()
-                .map(|schema_serializer| Self { schema_serializer }.into())
+            let schema_serializer = py_any.extract::<Py<SchemaSerializer>>()?;
+            if matches!(schema_serializer.get().serializer, CombinedSerializer::FunctionWrap(_)) {
+                return Ok(None);
+            }
+            Ok(Some(Self { schema_serializer }.into()))
         })
     }
 }

src/validators/prebuilt.rs

@@ -16,9 +16,11 @@ pub struct PrebuiltValidator {
 impl PrebuiltValidator {
     pub fn try_get_from_schema(type_: &str, schema: &Bound<'_, PyDict>) -> PyResult<Option<CombinedValidator>> {
         get_prebuilt(type_, schema, "__pydantic_validator__", |py_any| {
-            py_any
-                .extract::<Py<SchemaValidator>>()
-                .map(|schema_validator| Self { schema_validator }.into())
+            let schema_validator = py_any.extract::<Py<SchemaValidator>>()?;
+            if matches!(schema_validator.get().validator, CombinedValidator::FunctionWrap(_)) {
+                return Ok(None);
+            }
+            Ok(Some(Self { schema_validator }.into()))
         })
     }
 }