hand zero division error through

Author: CloseChoice

python/pydantic_core/core_schema.py

@@ -4165,6 +4165,7 @@ def definition_reference_schema(
         IntSchema,
         FloatSchema,
         DecimalSchema,
+        FractionSchema,
         StringSchema,
         BytesSchema,
         DateSchema,
@@ -4224,6 +4225,7 @@ def definition_reference_schema(
     'int',
     'float',
     'decimal',
+    'fraction',
     'str',
     'bytes',
     'date',
@@ -4374,6 +4376,8 @@ def definition_reference_schema(
     'uuid_version',
     'decimal_type',
     'decimal_parsing',
+    'fraction_type',
+    'fraction_parsing',
     'decimal_max_digits',
     'decimal_max_places',
     'decimal_whole_digits',

src/errors/types.rs

@@ -582,8 +582,8 @@ impl ErrorType {
             Self::DecimalMaxDigits {..} => "Decimal input should have no more than {max_digits} digit{expected_plural} in total",
             Self::DecimalMaxPlaces {..} => "Decimal input should have no more than {decimal_places} decimal place{expected_plural}",
             Self::DecimalWholeDigits {..} => "Decimal input should have no more than {whole_digits} digit{expected_plural} before the decimal point",
-            Self::FractionParsing {..} => "Fraction input should be an integer, float, string or Fraction object",
-            Self::FractionType {..} => "Fraction input should be an integer, float, string or Fraction object",
+            Self::FractionParsing {..} => "Fraction input should be a tuple of two integers, a string or a Fraction object",
+            Self::FractionType {..} => "Fraction input should be a tuple of two integers, or a string or Fraction object",
             Self::ComplexType {..} => "Input should be a valid python complex object, a number, or a valid complex string following the rules at https://docs.python.org/3/library/functions.html#complex",
             Self::ComplexStrParsing {..} => "Input should be a valid complex string following the rules at https://docs.python.org/3/library/functions.html#complex",
         }

src/validators/fraction.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use pyo3::exceptions::{PyTypeError, PyValueError};
+use pyo3::exceptions::{PyTypeError, PyValueError, PyZeroDivisionError};
 use pyo3::intern;
 use pyo3::sync::PyOnceLock;
 use pyo3::types::{PyDict, PyString, PyType};
@@ -148,24 +148,20 @@ impl Validator for FractionValidator {
 pub(crate) fn create_fraction<'py>(arg: &Bound<'py, PyAny>, input: impl ToErrorValue) -> ValResult<Bound<'py, PyAny>> {
     let py = arg.py();
     get_fraction_type(py).call1((arg,)).map_err(|e| {
-        let fraction_exception = match py
-            .import("fractions")
-            .and_then(|fraction_module| fraction_module.getattr("FractionException"))
-        {
-            Ok(fraction_exception) => fraction_exception,
-            Err(e) => return ValError::InternalErr(e),
-        };
-        handle_fraction_new_error(input, e, fraction_exception)
+        handle_fraction_new_error(input, e)
     })
 }
 
-fn handle_fraction_new_error(input: impl ToErrorValue, error: PyErr, fraction_exception: Bound<'_, PyAny>) -> ValError {
-    let py = fraction_exception.py();
-    if error.matches(py, fraction_exception).unwrap_or(false) {
-        ValError::new(ErrorTypeDefaults::FractionParsing, input)
-    } else if error.matches(py, PyTypeError::type_object(py)).unwrap_or(false) {
-        ValError::new(ErrorTypeDefaults::FractionType, input)
-    } else {
-        ValError::InternalErr(error)
-    }
+fn handle_fraction_new_error(input: impl ToErrorValue, error: PyErr) -> ValError {
+    Python::with_gil(|py| {
+        if error.matches(py, PyValueError::type_object(py)).unwrap_or(false) {
+            ValError::new(ErrorTypeDefaults::FractionParsing, input)
+        } else if error.matches(py, PyTypeError::type_object(py)).unwrap_or(false) {
+            ValError::new(ErrorTypeDefaults::FractionType, input)
+        } else {
+            // Let ZeroDivisionError and other exceptions bubble up as InternalErr
+            // which will be shown to the user with the original Python error message
+            ValError::InternalErr(error)
+        }
+    })
 }