ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-07-17 03:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix: 修改遗漏的过时 Pydantic 方法 (#2577)

Browse Source
This commit is contained in:
Ju4tCode
2024-02-16 21:16:46 +08:00
committed by GitHub
parent 5ab418a3cf
commit ffbd1f9aeb
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nonebot/__init__.py
View File

@ -49,6 +49,7 @@ from typing import Any, Dict, Type, Union, TypeVar, Optional, overload
import loguru
from nonebot.compat import model_dump
from nonebot.log import logger as logger
from nonebot.adapters import Bot, Adapter
from nonebot.config import DOTENV_TYPE, Env, Config
@ -310,7 +311,7 @@ def init(*, _env_file: Optional[DOTENV_TYPE] = None, **kwargs: Any) -> None:
f"Current <y><b>Env: {escape_tag(env.environment)}</b></y>"
)
logger.opt(colors=True).debug(
f"Loaded <y><b>Config</b></y>: {escape_tag(str(config.dict()))}"
f"Loaded <y><b>Config</b></y>: {escape_tag(str(model_dump(config)))}"
)
DriverClass = _resolve_combine_expr(config.driver)

6
nonebot/compat.py
View File

@ -194,8 +194,9 @@ if PYDANTIC_V2: # pragma: pydantic-v2
model: BaseModel,
include: Optional[Set[str]] = None,
exclude: Optional[Set[str]] = None,
by_alias: bool = False,
) -> Dict[str, Any]:
return model.model_dump(include=include, exclude=exclude)
return model.model_dump(include=include, exclude=exclude, by_alias=by_alias)
def type_validate_python(type_: Type[T], data: Any) -> T:
"""Validate data with given type."""
@ -339,8 +340,9 @@ else: # pragma: pydantic-v1
model: BaseModel,
include: Optional[Set[str]] = None,
exclude: Optional[Set[str]] = None,
by_alias: bool = False,
) -> Dict[str, Any]:
return model.dict(include=include, exclude=exclude)
return model.dict(include=include, exclude=exclude, by_alias=by_alias)
def type_validate_python(type_: Type[T], data: Any) -> T:
"""Validate data with given type."""

3
nonebot/drivers/fastapi.py
View File

@ -31,6 +31,7 @@ from nonebot.drivers import Driver as BaseDriver
from nonebot.config import Config as NoneBotConfig
from nonebot.drivers import Request as BaseRequest
from nonebot.drivers import WebSocket as BaseWebSocket
from nonebot.compat import model_dump, type_validate_python
from nonebot.drivers import HTTPServerSetup, WebSocketServerSetup
try:
@ -89,7 +90,7 @@ class Driver(BaseDriver, ASGIMixin):
def __init__(self, env: Env, config: NoneBotConfig):
super().__init__(env, config)
self.fastapi_config: Config = Config(**config.dict())
self.fastapi_config: Config = type_validate_python(Config, model_dump(config))
self._server_app = FastAPI(
lifespan=self._lifespan_manager,

3
nonebot/drivers/quart.py
View File

@ -30,6 +30,7 @@ from nonebot.drivers import Driver as BaseDriver
from nonebot.config import Config as NoneBotConfig
from nonebot.drivers import Request as BaseRequest
from nonebot.drivers import WebSocket as BaseWebSocket
from nonebot.compat import model_dump, type_validate_python
from nonebot.drivers import HTTPServerSetup, WebSocketServerSetup
try:
@ -81,7 +82,7 @@ class Driver(BaseDriver, ASGIMixin):
def __init__(self, env: Env, config: NoneBotConfig):
super().__init__(env, config)
self.quart_config = Config(**config.dict())
self.quart_config = type_validate_python(Config, model_dump(config))
self._server_app = Quart(
self.__class__.__qualname__, **self.quart_config.quart_extra