import pydantic objects from the _pydantic_compat module
#17667
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
this allows `check_pydantic_models.py` to mock those pydantic objects only in the synapse module, and not interfere with pydantic objects in external dependencies
azmeuk
commented
Sep 5, 2024
| @@ -384,7 +380,7 @@ class TypingExtension(RequestBodyModel): | |||
| receipts: Optional[ReceiptsExtension] = None | |||
| typing: Optional[TypingExtension] = None | |||
|
|
|||
| conn_id: Optional[str] | |||
There was a problem hiding this comment.
My modifications revealed an issue with this str type that was rejected by check_pydantic_models. I am not sure if this was wanted though.
There was a problem hiding this comment.
This change seems fine to me. conn_id should be a string.
3 tasks
gotmax23
reviewed
Sep 6, 2024
anoadragon453
approved these changes
Sep 10, 2024
| @@ -384,7 +380,7 @@ class TypingExtension(RequestBodyModel): | |||
| receipts: Optional[ReceiptsExtension] = None | |||
| typing: Optional[TypingExtension] = None | |||
|
|
|||
| conn_id: Optional[str] | |||
There was a problem hiding this comment.
This change seems fine to me. conn_id should be a string.
azmeuk
added a commit
to yaal-coop/synapse
that referenced
this pull request
Nov 13, 2024
This ensures the compatibility with scim2-models. The replaces HAS_PYDANTIC_V2 by PYDANTIC_VERSION, but HAS_PYDANTIC_V2 was not used anymore since element-hq#17667
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.
This PR changes
from pydantic import BaseModeltofrom synapse._pydantic_compat import BaseModel(as well asconstr,conbytes,conint,confloat).It allows
check_pydantic_models.pyto mock those pydantic objects only in the synapse module, and not interfere with pydantic objects in external dependencies.This should solve the CI problems for #17144, which breaks because
check_pydantic_models.pypatches pydantic models from scim2-models./cc @DMRobertson @gotmax23
fixes #17659
Pull Request Checklist
EventStoretoEventWorkerStore.".code blocks.(run the linters)