♻️ Fix optional fields in BotConfig and Config models; improve module validation

Author: Paillat-dev

src/config/bot_config.py

@@ -62,10 +62,11 @@ def load_json_recursive(data: dict[str, Any]) -> dict[str, Any]:
     path = "config.yml"
 
 _config: Any
+config: Config
 if path:
     with open(path, encoding="utf-8") as f:
         _config = yaml.safe_load(f)
 else:
     _config = load_from_env()
 
-config: Config = Config(**_config)
+config = Config(**_config) if _config else Config()

src/config/models.py

@@ -45,7 +45,7 @@ class BotConfig(BaseModel):
     public_key: str | None = None
     prefix: PrefixConfig | str = PrefixConfig(prefix="!", enabled=False)
     slash: SlashConfig = SlashConfig(enabled=False)
-    cache: CacheConfig
+    cache: CacheConfig = CacheConfig()
     rest: bool = False
 
 
@@ -65,7 +65,7 @@ class DbConfig(BaseModel):
 
 class Config(BaseModel):
     db: DbConfig = DbConfig(url="", enabled=False)
-    bot: BotConfig
+    bot: BotConfig = BotConfig(token="")
     logging: LoggingConfig = LoggingConfig()
     use: UseConfig = UseConfig()
     extensions: dict[str, Extension] = {}

src/utils/extensions.py

@@ -12,7 +12,6 @@
 
 import discord
 from quart import Quart
-from schema import Schema, SchemaError
 
 from src.log import logger
 
@@ -40,8 +39,7 @@ def check_func(module: ModuleType, func: Callable, max_args: int, types: dict[st
     # check_typing(module, func, types) # temporarily disabled due to unwanted behavior  # noqa: ERA001
 
 
-# noinspection DuplicatedCode
-def validate_module(module: ModuleType, config: dict[str, Any] | None = None) -> None:
+def validate_module(module: ModuleType, config: dict[str, Any] | None = None) -> None:  # pyright: ignore [reportUnusedParameter] # noqa: ARG001
     """Validate the module to ensure it has the required functions and attributes to be loaded as an extension.
 
     :param module: The module to validate
@@ -77,26 +75,6 @@ def validate_module(module: ModuleType, config: dict[str, Any] | None = None) ->
     assert "enabled" in module.default, (
         f"Extension {module.__name__} does not have an enabled key in its default configuration"
     )
-    if hasattr(module, "schema"):
-        assert isinstance(
-            module.schema,
-            Schema | dict,
-        ), f"Extension {module.__name__} has a schema of type {type(module.schema)} instead of Schema or dict"
-
-        if isinstance(module.schema, dict):
-            module.schema = Schema(module.schema)
-        if config:
-            module.schema.validate(config)
-        else:
-            try:
-                module.schema.validate(module.default)
-            except SchemaError as e:
-                warnings.warn(
-                    f"Default configuration for extension {module.__name__} does not match schema: {e}",
-                    stacklevel=1,
-                )
-    else:
-        warnings.warn(f"Extension {module.__name__} does not have a schema", stacklevel=1)
 
 
 def unzip_extensions() -> None:

src/utils/misc.py

@@ -1,5 +1,6 @@
 # Copyright (c) NiceBots.xyz
 # SPDX-License-Identifier: MIT
+from collections.abc import Callable
 
 import discord
 
@@ -10,3 +11,14 @@ def mention_command(*command: str, bot: discord.Bot) -> str:
     if isinstance(command, discord.SlashCommand):
         return command.mention
     raise ValueError("Command not found")
+
+
+class LazyProxy[T]:
+    def __init__(self, func: Callable[..., T]) -> None:
+        self._func: Callable[..., T] = func
+        self._value: T | None = None
+
+    def __getattr__(self, name: str) -> T:
+        if self._value is None:
+            self._value = self._func()
+        return getattr(self._value, name)