Commitf0e1d04

authored

Do not implicitly convert after model validators to class methods (#11957)

1 parentde217f4 commitf0e1d04Copy full SHA for f0e1d04

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -716,8 +716,9 @@ def verify_square(self) -> Self:`
`716`	`716`	`"""`
`717`	`717`
`718`	`718`	`defdec(f:Any)->_decorators.PydanticDescriptorProxy[Any]:`
`719`		`-# auto apply the @classmethod decorator`
`720`		`-f=_decorators.ensure_classmethod_based_on_signature(f)`
	`719`	`+# auto apply the @classmethod decorator (except for after validators, which should be instance methods):`
	`720`	`+ifmode!='after':`
	`721`	`+f=_decorators.ensure_classmethod_based_on_signature(f)`
`721`	`722`	`dec_info=_decorators.ModelValidatorDecoratorInfo(mode=mode)`
`722`	`723`	`return_decorators.PydanticDescriptorProxy(f,dec_info)`
`723`	`724`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`importpytest`
`6`	`6`
`7`		`-frompydanticimportBaseModel,ValidationInfo,ValidatorFunctionWrapHandler,model_validator`
	`7`	`+frompydanticimportBaseModel,PydanticUserError,ValidationInfo,ValidatorFunctionWrapHandler,model_validator`
`8`	`8`
`9`	`9`
`10`	`10`	`deftest_model_validator_wrap()->None:`
`@@ -136,3 +136,13 @@ def validate_model_after(self) -> Model:`
`136`	`136`	`Model.model_validate({'inner': {'inner': {'inner':None}}})`
`137`	`137`	`assertcalls== ['before']3+ ['after']3`
`138`	`138`	`calls.clear()`
	`139`	`+`
	`140`	`+`
	`141`	`+deftest_after_validator_wrong_signature()->None:`
	`142`	`+withpytest.raises(PydanticUserError):`
	`143`	`+`
	`144`	`+classModel(BaseModel):`
	`145`	`+@model_validator(mode='after')`
	`146`	`+# This used to be converted into a classmethod, resulting`
	`147`	`+# in this inconsistent signature still accepted:`
	`148`	`+defvalidator(cls,model,info): ...`

Comments

(0)