Make ModelWrapValidator protocols generic #7154
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deploying with
|
| Latest commit: |
ed1fcd2
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://eea9d29c.pydantic-docs2.pages.dev |
| Branch Preview URL: | https://dmontagu-model-wrap-validato.pydantic-docs2.pages.dev |
adriangb
approved these changes
Aug 17, 2023
adriangb
reviewed
Aug 17, 2023
| @@ -423,7 +423,7 @@ def __call__( # noqa: D102 | |||
| ModelAfterValidator = Callable[[_ModelType, _core_schema.ValidationInfo], _ModelType] | |||
| """A `@model_validator` decorated function signature. This is used when `mode='after'`.""" | |||
|
|
|||
| _AnyModelWrapValidator = Union[ModelWrapValidator, ModelWrapValidatorWithoutInfo] | |||
| _AnyModelWrapValidator = Union[ModelWrapValidator[_ModelType], ModelWrapValidatorWithoutInfo[_ModelType]] | |||
There was a problem hiding this comment.
Doesn't this need to be parametrized later?
There was a problem hiding this comment.
From my testing, adding the _ModelType parameter to the overload return type on line 435 seems to give the right results for a correct and incorrect validator (and the after overload does the same thing already):
) -> Callable[[_AnyModelWrapValidator[_ModelType]], _decorators.PydanticDescriptorProxy[_decorators.ModelValidatorDecoratorInfo]]:That appears to be the only place where these types are used.
|
Unfortunately adding tests for these things is not easy. If the original example now works locally with mypy and pyright let's merge this. |
samuelcolvin
approved these changes
Aug 22, 2023
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #7152
@samuelcolvin @adriangb is there any good way to add a test for this? Do we care enough to bother?