Skip to content

Commit dfdbfcb

Browse files
committed
Enforce the max_digits whole-digits limit in the Python Decimal validator
Backport of: #13972
1 parent e2456d3 commit dfdbfcb

3 files changed

Lines changed: 47 additions & 4 deletions

File tree

‎pydantic/_internal/_known_annotated_metadata.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,12 @@ def _apply_constraint_with_incompatibility_info(
264264
else:
265265
js_constraint_key = constraint
266266

267+
validator_kwargs = {constraint: value}
268+
if constraint == 'decimal_places' and schema_update.get('max_digits') is not None:
269+
# The whole digits limit depends on both constraints, and is checked alongside `decimal_places`:
270+
validator_kwargs['max_digits'] = schema_update['max_digits']
267271
schema = cs.no_info_after_validator_function(
268-
partial(NUMERIC_VALIDATOR_LOOKUP[constraint], **{constraint: value}), schema
272+
partial(NUMERIC_VALIDATOR_LOOKUP[constraint], **validator_kwargs), schema
269273
)
270274
metadata = schema.get('metadata', {})
271275
if (existing_json_schema_updates := metadata.get('pydantic_js_updates')) is not None:

‎pydantic/_internal/_validators.py‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,25 @@ def max_digits_validator(x: Any, max_digits: Any) -> Any:
395395
raise TypeError(f"Unable to apply constraint 'max_digits' to supplied value {x}")
396396

397397

398-
def decimal_places_validator(x: Any, decimal_places: Any) -> Any:
398+
def decimal_places_validator(x: Any, decimal_places: Any, max_digits: Any = None) -> Any:
399399
try:
400-
(decimal_places_, _), (normalized_decimal_places, _) = _extract_decimal_digits_info(x)
400+
(decimal_places_, num_digits), (normalized_decimal_places, normalized_num_digits) = (
401+
_extract_decimal_digits_info(x)
402+
)
401403
if (decimal_places_ > decimal_places) and (normalized_decimal_places > decimal_places):
402404
raise PydanticKnownError(
403405
'decimal_max_places',
404406
{'decimal_places': decimal_places},
405407
)
408+
if max_digits is not None:
409+
max_whole_digits = max(max_digits - decimal_places, 0)
410+
if (num_digits - decimal_places_ > max_whole_digits) and (
411+
normalized_num_digits - normalized_decimal_places > max_whole_digits
412+
):
413+
raise PydanticKnownError(
414+
'decimal_whole_digits',
415+
{'whole_digits': max_whole_digits},
416+
)
406417
return x
407418
except TypeError:
408419
raise TypeError(f"Unable to apply constraint 'decimal_places' to supplied value {x}")

‎tests/types/test_decimal.py‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55
from pydantic_core import SchemaError
66

7-
from pydantic import AllowInfNan, BaseModel, Field, TypeAdapter, ValidationError
7+
from pydantic import AfterValidator, AllowInfNan, BaseModel, Field, TypeAdapter, ValidationError
88

99
pos_int_values = 'Inf', '+Inf', 'Infinity', '+Infinity'
1010
neg_int_values = '-Inf', '-Infinity'
@@ -345,6 +345,34 @@ class Model(BaseModel):
345345
assert Model(foo=value).foo == result
346346

347347

348+
@pytest.mark.parametrize(
349+
['value', 'result'],
350+
[
351+
(Decimal('1.23'), Decimal('1.23')),
352+
(Decimal('12.3'), 'decimal_whole_digits'),
353+
(Decimal('0.123'), 'decimal_max_places'),
354+
(Decimal('1234'), 'decimal_max_digits'),
355+
],
356+
)
357+
def test_decimal_constraints_python_validators(value: Decimal, result: Decimal | str) -> None:
358+
"""https://github.com/pydantic/pydantic/issues/13965"""
359+
360+
ta = TypeAdapter(Annotated[Decimal, AfterValidator(lambda v: v), Field(max_digits=3, decimal_places=2)])
361+
core_ta = TypeAdapter(Annotated[Decimal, Field(max_digits=3, decimal_places=2)])
362+
363+
if isinstance(result, Decimal):
364+
assert ta.validate_python(value) == result
365+
else:
366+
with pytest.raises(ValidationError) as exc_info:
367+
ta.validate_python(value)
368+
with pytest.raises(ValidationError) as core_exc_info:
369+
core_ta.validate_python(value)
370+
371+
errors = exc_info.value.errors(include_url=False)
372+
assert errors[0]['type'] == result
373+
assert errors == core_exc_info.value.errors(include_url=False)
374+
375+
348376
@pytest.mark.parametrize(
349377
'value,result',
350378
[

0 commit comments

Comments
 (0)