Skip to content

Commit

Permalink
Merge pull request #110 from Redmomn/master
Browse files Browse the repository at this point in the history
  • Loading branch information
MistEO authored Mar 7, 2024
2 parents 3d1f384 + 0084ed9 commit 6f0796e
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/common/config/__init__.py
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

0 comments on commit 6f0796e

Please sign in to comment.