use pyo3-signature for serializer defautls (#534)

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

Author: samuelcolvin

src/errors/validation_exception.rs

@@ -141,7 +141,7 @@ impl ValidationError {
         include_context: Option<bool>,
     ) -> PyResult<&'py PyString> {
         let state = SerializationState::new(None, None);
-        let extra = state.extra(py, &SerMode::Json, None, None, None, Some(true), None);
+        let extra = state.extra(py, &SerMode::Json, true, false, false, true, None);
         let serializer = ValidationErrorSerializer {
             py,
             line_errors: &self.line_errors,

src/serializers/extra.rs

@@ -23,7 +23,7 @@ pub(crate) struct SerializationState {
 
 impl SerializationState {
     pub fn new(timedelta_mode: Option<&str>, bytes_mode: Option<&str>) -> Self {
-        let warnings = CollectWarnings::new(None);
+        let warnings = CollectWarnings::new(false);
         let rec_guard = SerRecursionGuard::default();
         let config = SerializationConfig::from_args(timedelta_mode, bytes_mode).unwrap();
         Self {
@@ -38,10 +38,10 @@ impl SerializationState {
         &'py self,
         py: Python<'py>,
         mode: &'py SerMode,
-        by_alias: Option<bool>,
-        exclude_none: Option<bool>,
-        round_trip: Option<bool>,
-        serialize_unknown: Option<bool>,
+        by_alias: bool,
+        exclude_none: bool,
+        round_trip: bool,
+        serialize_unknown: bool,
         fallback: Option<&'py PyAny>,
     ) -> Extra<'py> {
         Extra::new(
@@ -50,8 +50,8 @@ impl SerializationState {
             &[],
             by_alias,
             &self.warnings,
-            None,
-            None,
+            false,
+            false,
             exclude_none,
             round_trip,
             &self.config,
@@ -98,33 +98,33 @@ impl<'a> Extra<'a> {
         py: Python<'a>,
         mode: &'a SerMode,
         slots: &'a [CombinedSerializer],
-        by_alias: Option<bool>,
+        by_alias: bool,
         warnings: &'a CollectWarnings,
-        exclude_unset: Option<bool>,
-        exclude_defaults: Option<bool>,
-        exclude_none: Option<bool>,
-        round_trip: Option<bool>,
+        exclude_unset: bool,
+        exclude_defaults: bool,
+        exclude_none: bool,
+        round_trip: bool,
         config: &'a SerializationConfig,
         rec_guard: &'a SerRecursionGuard,
-        serialize_unknown: Option<bool>,
+        serialize_unknown: bool,
         fallback: Option<&'a PyAny>,
     ) -> Self {
         Self {
             mode,
             slots,
             ob_type_lookup: ObTypeLookup::cached(py),
             warnings,
-            by_alias: by_alias.unwrap_or(true),
-            exclude_unset: exclude_unset.unwrap_or(false),
-            exclude_defaults: exclude_defaults.unwrap_or(false),
-            exclude_none: exclude_none.unwrap_or(false),
-            round_trip: round_trip.unwrap_or(false),
+            by_alias,
+            exclude_unset,
+            exclude_defaults,
+            exclude_none,
+            round_trip,
             config,
             rec_guard,
             check: SerCheck::None,
             model: None,
             field_name: None,
-            serialize_unknown: serialize_unknown.unwrap_or(false),
+            serialize_unknown,
             fallback,
         }
     }
@@ -267,9 +267,9 @@ pub(crate) struct CollectWarnings {
 }
 
 impl CollectWarnings {
-    pub(crate) fn new(active: Option<bool>) -> Self {
+    pub(crate) fn new(active: bool) -> Self {
         Self {
-            active: active.unwrap_or(true),
+            active,
             warnings: RefCell::new(None),
         }
     }

src/serializers/mod.rs

@@ -50,7 +50,7 @@ impl SchemaSerializer {
     }
 
     #[allow(clippy::too_many_arguments)]
-    #[pyo3(signature = (value, *, mode = None, include = None, exclude = None, by_alias = None,
+    #[pyo3(signature = (value, *, mode = None, include = None, exclude = None, by_alias = true,
         exclude_unset = false, exclude_defaults = false, exclude_none = false, round_trip = false, warnings = true,
         fallback = None))]
     pub fn to_python(
@@ -60,12 +60,12 @@ impl SchemaSerializer {
         mode: Option<&str>,
         include: Option<&PyAny>,
         exclude: Option<&PyAny>,
-        by_alias: Option<bool>,
-        exclude_unset: Option<bool>,
-        exclude_defaults: Option<bool>,
-        exclude_none: Option<bool>,
-        round_trip: Option<bool>,
-        warnings: Option<bool>,
+        by_alias: bool,
+        exclude_unset: bool,
+        exclude_defaults: bool,
+        exclude_none: bool,
+        round_trip: bool,
+        warnings: bool,
         fallback: Option<&PyAny>,
     ) -> PyResult<PyObject> {
         let mode: SerMode = mode.into();
@@ -83,7 +83,7 @@ impl SchemaSerializer {
             round_trip,
             &self.config,
             &rec_guard,
-            None,
+            false,
             fallback,
         );
         let v = self.serializer.to_python(value, include, exclude, &extra)?;
@@ -92,7 +92,7 @@ impl SchemaSerializer {
     }
 
     #[allow(clippy::too_many_arguments)]
-    #[pyo3(signature = (value, *, indent = None, include = None, exclude = None, by_alias = None,
+    #[pyo3(signature = (value, *, indent = None, include = None, exclude = None, by_alias = true,
         exclude_unset = false, exclude_defaults = false, exclude_none = false, round_trip = false, warnings = true,
         fallback = None))]
     pub fn to_json(
@@ -102,12 +102,12 @@ impl SchemaSerializer {
         indent: Option<usize>,
         include: Option<&PyAny>,
         exclude: Option<&PyAny>,
-        by_alias: Option<bool>,
-        exclude_unset: Option<bool>,
-        exclude_defaults: Option<bool>,
-        exclude_none: Option<bool>,
-        round_trip: Option<bool>,
-        warnings: Option<bool>,
+        by_alias: bool,
+        exclude_unset: bool,
+        exclude_defaults: bool,
+        exclude_none: bool,
+        round_trip: bool,
+        warnings: bool,
         fallback: Option<&PyAny>,
     ) -> PyResult<PyObject> {
         let warnings = CollectWarnings::new(warnings);
@@ -124,7 +124,7 @@ impl SchemaSerializer {
             round_trip,
             &self.config,
             &rec_guard,
-            None,
+            false,
             fallback,
         );
         let bytes = to_json_bytes(
@@ -177,18 +177,18 @@ pub fn to_json(
     indent: Option<usize>,
     include: Option<&PyAny>,
     exclude: Option<&PyAny>,
-    exclude_none: Option<bool>,
-    round_trip: Option<bool>,
+    exclude_none: bool,
+    round_trip: bool,
     timedelta_mode: Option<&str>,
     bytes_mode: Option<&str>,
-    serialize_unknown: Option<bool>,
+    serialize_unknown: bool,
     fallback: Option<&PyAny>,
 ) -> PyResult<PyObject> {
     let state = SerializationState::new(timedelta_mode, bytes_mode);
     let extra = state.extra(
         py,
         &SerMode::Json,
-        None,
+        true,
         exclude_none,
         round_trip,
         serialize_unknown,
@@ -203,19 +203,19 @@ pub fn to_json(
 
 #[allow(clippy::too_many_arguments)]
 #[pyfunction]
-#[pyo3(signature = (value, *, include = None, exclude = None, by_alias = None, exclude_none = false, round_trip = false,
+#[pyo3(signature = (value, *, include = None, exclude = None, by_alias = true, exclude_none = false, round_trip = false,
     timedelta_mode = None, bytes_mode = None, serialize_unknown = false, fallback = None))]
 pub fn to_jsonable_python(
     py: Python,
     value: &PyAny,
     include: Option<&PyAny>,
     exclude: Option<&PyAny>,
-    by_alias: Option<bool>,
-    exclude_none: Option<bool>,
-    round_trip: Option<bool>,
+    by_alias: bool,
+    exclude_none: bool,
+    round_trip: bool,
     timedelta_mode: Option<&str>,
     bytes_mode: Option<&str>,
-    serialize_unknown: Option<bool>,
+    serialize_unknown: bool,
     fallback: Option<&PyAny>,
 ) -> PyResult<PyObject> {
     let state = SerializationState::new(timedelta_mode, bytes_mode);