diff options
| author | Kyomotoi <[email protected]> | 2022-10-13 22:00:03 +0800 |
|---|---|---|
| committer | Kyomotoi <[email protected]> | 2022-10-13 22:00:03 +0800 |
| commit | afbb48c7fb6536e24961fb1edfe0c57c818ceba1 (patch) | |
| tree | 6a9888a6daced960c78ba40c1b6693e641072b73 /ATRI/configs | |
| parent | 6098b1b82942ef7ac89bbe8d393ba12bfea684df (diff) | |
| parent | 83a9fb95251c173b2394b668aab1b63908af5f29 (diff) | |
| download | ATRI-afbb48c7fb6536e24961fb1edfe0c57c818ceba1.tar.gz ATRI-afbb48c7fb6536e24961fb1edfe0c57c818ceba1.tar.bz2 ATRI-afbb48c7fb6536e24961fb1edfe0c57c818ceba1.zip | |
🔀 Merge branch 'main' of https://github.com/Kyomotoi/ATRI
Diffstat (limited to 'ATRI/configs')
| -rw-r--r-- | ATRI/configs/__init__.py | 2 | ||||
| -rw-r--r-- | ATRI/configs/config.py | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/ATRI/configs/__init__.py b/ATRI/configs/__init__.py index 3558f42..cca5d9b 100644 --- a/ATRI/configs/__init__.py +++ b/ATRI/configs/__init__.py @@ -1 +1 @@ -from .config import Config
\ No newline at end of file +from .config import Config diff --git a/ATRI/configs/config.py b/ATRI/configs/config.py index e944a43..e691c65 100644 --- a/ATRI/configs/config.py +++ b/ATRI/configs/config.py @@ -4,12 +4,7 @@ from pathlib import Path from ATRI.log import log -from .models import ( - BotConfig, - ConfigModel, - WithGoCQHTTP, - RuntimeConfig -) +from .models import BotConfig, ConfigModel, WithGoCQHTTP, RuntimeConfig _DEFAULT_CONFIG_PATH = Path(".") / "ATRI" / "configs" / "default_config.yml" @@ -43,7 +38,7 @@ class Config: def parse(self) -> ConfigModel: return ConfigModel.parse_obj(self.config) - + def get_runtime_conf(self) -> dict: bot_conf = BotConfig.parse_obj(self.config["BotConfig"]) gocq_conf = WithGoCQHTTP.parse_obj(self.config["WithGoCQHTTP"]) @@ -59,5 +54,5 @@ class Config: session_expire_timeout=bot_conf.session_expire_timeout, gocq_accoutns=gocq_conf.accounts, gocq_download_domain=gocq_conf.download_version, - gocq_version=gocq_conf.download_version + gocq_version=gocq_conf.download_version, ).dict() |