fix big int parsing problems from str

Author: sydney-runkle

src/input/input_json.rs

@@ -1,7 +1,6 @@
 use std::borrow::Cow;
 
 use jiter::{JsonArray, JsonValue};
-use num_bigint::BigInt;
 use pyo3::prelude::*;
 use pyo3::types::{PyDict, PyString};
 use speedate::MicrosecondsPrecisionOverflowBehavior;
@@ -371,13 +370,7 @@ impl<'a> Input<'a> for String {
     }
 
     fn validate_int(&'a self, _strict: bool) -> ValResult<ValidationMatch<EitherInt<'a>>> {
-        if let Ok(i) = self.parse::<i64>() {
-            Ok(ValidationMatch::strict(EitherInt::I64(i)))
-        } else if let Ok(b) = self.parse::<BigInt>() {
-            Ok(ValidationMatch::exact(EitherInt::BigInt(b.clone())))
-        } else {
-            Err(ValError::new(ErrorTypeDefaults::IntParsing, self))
-        }
+        str_as_int(self, self).map(ValidationMatch::lax)
     }
 
     fn validate_float(&'a self, _strict: bool) -> ValResult<ValidationMatch<EitherFloat<'a>>> {

src/input/input_string.rs

@@ -1,4 +1,3 @@
-use num_bigint::BigInt;
 use pyo3::prelude::*;
 use pyo3::types::{PyDict, PyString};
 
@@ -12,7 +11,7 @@ use crate::validators::decimal::create_decimal;
 use super::datetime::{
     bytes_as_date, bytes_as_datetime, bytes_as_time, bytes_as_timedelta, EitherDate, EitherDateTime, EitherTime,
 };
-use super::shared::{str_as_bool, str_as_float};
+use super::shared::{str_as_bool, str_as_float, str_as_int};
 use super::{
     BorrowInput, EitherBytes, EitherFloat, EitherInt, EitherString, EitherTimedelta, GenericArguments, GenericIterable,
     GenericIterator, GenericMapping, Input, ValidationMatch,
@@ -113,16 +112,7 @@ impl<'a> Input<'a> for StringMapping<'a> {
 
     fn validate_int(&'a self, _strict: bool) -> ValResult<ValidationMatch<EitherInt<'a>>> {
         match self {
-            Self::String(s) => {
-                let str_val = py_string_str(s)?;
-                if let Ok(i) = str_val.parse::<i64>() {
-                    Ok(ValidationMatch::strict(EitherInt::I64(i)))
-                } else if let Ok(b) = str_val.parse::<BigInt>() {
-                    Ok(ValidationMatch::exact(EitherInt::BigInt(b.clone())))
-                } else {
-                    Err(ValError::new(ErrorTypeDefaults::IntParsing, self))
-                }
-            },
+            Self::String(s) => str_as_int(self, py_string_str(s)?).map(ValidationMatch::strict),
             Self::Mapping(_) => Err(ValError::new(ErrorTypeDefaults::IntType, self)),
         }
     }

tests/validators/test_int.py

@@ -504,15 +504,10 @@ def test_allow_inf_nan_false_json() -> None:
     with pytest.raises(ValidationError, match=r'Input should be a finite number \[type=finite_number'):
         v.validate_json('-Infinity')
 
+
 def test_json_big_int_key():
     v = SchemaValidator({'type': 'dict', 'keys_schema': {'type': 'int'}, 'values_schema': {'type': 'str'}})
     big_integer = 1433352099889938534014333520998899385340
     assert v.validate_python({big_integer: 'x'}) == {big_integer: 'x'}
-
     assert v.validate_json('{"' + str(big_integer) + '": "x"}') == {big_integer: 'x'}
-    """
-    pydantic_core._pydantic_core.ValidationError: 1 validation error for dict[int,str]
-    1433352099889938534014333520998899385340.[key]
-        Input should be a valid integer, unable to parse string as an integer [type=int_parsing, input_value='1433352099889938534014333520998899385340', input_type=str]
-            For further information visit https://errors.pydantic.dev/latest/v/int_parsing
-    """
+    assert v.validate_strings({str(big_integer): 'x'}) == {big_integer: 'x'}