mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-28 04:06:00 +00:00
ebad618bf0
This PR changes `from pydantic import BaseModel` to `from synapse._pydantic_compat import BaseModel` (as well as `constr`, `conbytes`, `conint`, `confloat`). It allows `check_pydantic_models.py` to 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.py` patches pydantic models from [scim2-models](https://scim2-models.readthedocs.io/). /cc @DMRobertson @gotmax23 fixes #17659 ### Pull Request Checklist <!-- Please read https://element-hq.github.io/synapse/latest/development/contributing_guide.html before submitting your pull request --> * [x] Pull request is based on the develop branch * [x] Pull request includes a [changelog file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog). The entry should: - Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from `EventStore` to `EventWorkerStore`.". - Use markdown where necessary, mostly for `code blocks`. - End with either a period (.) or an exclamation mark (!). - Start with a capital letter. - Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry. * [x] [Code style](https://element-hq.github.io/synapse/latest/code_style.html) is correct (run the [linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))
96 lines
2.2 KiB
Python
96 lines
2.2 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2023 Maxwell G <maxwell@gtmx.me>
|
|
# Copyright (C) 2023 New Vector, Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# See the GNU Affero General Public License for more details:
|
|
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
#
|
|
# Originally licensed under the Apache License, Version 2.0:
|
|
# <http://www.apache.org/licenses/LICENSE-2.0>.
|
|
#
|
|
# [This file includes modifications made by New Vector Limited]
|
|
#
|
|
#
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
from packaging.version import Version
|
|
|
|
try:
|
|
from pydantic import __version__ as pydantic_version
|
|
except ImportError:
|
|
import importlib.metadata
|
|
|
|
pydantic_version = importlib.metadata.version("pydantic")
|
|
|
|
HAS_PYDANTIC_V2: bool = Version(pydantic_version).major == 2
|
|
|
|
if TYPE_CHECKING or HAS_PYDANTIC_V2:
|
|
from pydantic.v1 import (
|
|
BaseModel,
|
|
Extra,
|
|
Field,
|
|
MissingError,
|
|
PydanticValueError,
|
|
StrictBool,
|
|
StrictInt,
|
|
StrictStr,
|
|
ValidationError,
|
|
conbytes,
|
|
confloat,
|
|
conint,
|
|
constr,
|
|
parse_obj_as,
|
|
validator,
|
|
)
|
|
from pydantic.v1.error_wrappers import ErrorWrapper
|
|
from pydantic.v1.typing import get_args
|
|
else:
|
|
from pydantic import (
|
|
BaseModel,
|
|
Extra,
|
|
Field,
|
|
MissingError,
|
|
PydanticValueError,
|
|
StrictBool,
|
|
StrictInt,
|
|
StrictStr,
|
|
ValidationError,
|
|
conbytes,
|
|
confloat,
|
|
conint,
|
|
constr,
|
|
parse_obj_as,
|
|
validator,
|
|
)
|
|
from pydantic.error_wrappers import ErrorWrapper
|
|
from pydantic.typing import get_args
|
|
|
|
__all__ = (
|
|
"HAS_PYDANTIC_V2",
|
|
"BaseModel",
|
|
"constr",
|
|
"conbytes",
|
|
"conint",
|
|
"confloat",
|
|
"ErrorWrapper",
|
|
"Extra",
|
|
"Field",
|
|
"get_args",
|
|
"MissingError",
|
|
"parse_obj_as",
|
|
"PydanticValueError",
|
|
"StrictBool",
|
|
"StrictInt",
|
|
"StrictStr",
|
|
"ValidationError",
|
|
"validator",
|
|
)
|