Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion src/config/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
# Copyright (c) NiceBots.xyz
# SPDX-License-Identifier: MIT

from .bot_config import config
from typing import TYPE_CHECKING, Any

from .bot_config import _config
from .models import Config

# Lazy load Config object
if TYPE_CHECKING:
config: Config
else:
_config_obj: Config | None = None

def __getattr__(name: str) -> Any:
if name == "config":
global _config_obj # noqa: PLW0603
if _config_obj is None:
_config_obj = Config(**_config) if _config else Config()
return _config_obj
raise AttributeError(name)


__all__ = ["config"]
19 changes: 1 addition & 18 deletions src/config/bot_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
import contextlib
import os
from collections import defaultdict
from typing import TYPE_CHECKING, Any
from typing import Any

import orjson
import yaml
from dotenv import load_dotenv

from .models import Config

load_dotenv()

SPLIT: str = "__"
Expand Down Expand Up @@ -61,7 +59,6 @@ def load_json_recursive(data: dict[str, Any]) -> dict[str, Any]:
path = "config.yml"

_config: dict[str, Any] = defaultdict(dict) # pyright: ignore [reportExplicitAny]
config: Config


def merge_dicts(dct: dict[str, Any], merge_dct: dict[str, Any]) -> None: # pyright: ignore [reportExplicitAny]
Expand All @@ -77,17 +74,3 @@ def merge_dicts(dct: dict[str, Any], merge_dct: dict[str, Any]) -> None: # pyri
_config.update(yaml.safe_load(f))

merge_dicts(_config, load_from_env())

# Lazy load Config object
if TYPE_CHECKING:
config: Config
else:
_config_obj: Config | None = None

def __getattr__(name: str) -> Any:
if name == "config":
global _config_obj # noqa: PLW0603
if _config_obj is None:
_config_obj = Config(**_config) if _config else Config()
return _config_obj
raise AttributeError(name)