Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 适配pydantic v1&v2 #110

Merged
merged 1 commit into from
Mar 7, 2024
Merged

fix: 适配pydantic v1&v2 #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/common/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
from abc import ABC
from typing import Any, Optional, List
from pydantic import BaseModel, Extra
from nonebot import get_driver

try:
# pydantic v2
from nonebot import get_plugin_config
except ImportError:
# pydantic v1
from nonebot import get_driver

KEY_JOINER = '.'

Expand Down Expand Up @@ -67,7 +73,12 @@ class PluginConfig(BaseModel, extra=Extra.ignore):
chat_strategy: str = ''


plugin_config = PluginConfig.parse_obj(get_driver().config)
try:
# pydantic v2
plugin_config = get_plugin_config(PluginConfig)
except:
# pydantic v1
plugin_config = PluginConfig.parse_obj(get_driver().config)


class Config(ABC):
Expand Down
Loading