Refactor configuration and improve error messaging

src/shelloracle/__main__.py

@@ -2,6 +2,7 @@
 import logging
 from importlib.metadata import version
 
+from shelloracle.config import initialize_config
 from . import shelloracle
 from .settings import Settings
 
@@ -42,6 +43,7 @@ def main() -> None:
     if action := getattr(args, "action", None):
         action()
         exit(0)
+    initialize_config()
 
     shelloracle.cli()
 

src/shelloracle/bootstrap.py

@@ -12,7 +12,7 @@
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.shortcuts import confirm
 
-from .config import Configuration
+from .config import get_config
 from .providers import Provider, Setting, list_providers, get_provider
 
 
@@ -118,7 +118,7 @@ def write_shelloracle_config(provider: type[Provider], settings: dict[str, Any])
         provider_configuration_table.add(setting, value)
     provider_table.add(provider.name, provider_configuration_table)
 
-    with Configuration.filepath.open("w") as config_file:
+    with get_config().filepath.open("w") as config_file:
         tomlkit.dump(config, config_file)
 
 

src/shelloracle/config.py

@@ -1,40 +1,36 @@
 from __future__ import annotations
 
 import logging
-import os
 import sys
 from collections.abc import Mapping, Iterator
 from pathlib import Path
 from typing import Any
 
 from yaspin.spinners import SPINNERS_DATA
 
+from shelloracle.settings import Settings
+
 if sys.version_info < (3, 11):
     import tomli as tomllib
 else:
     import tomllib
 
-from .settings import Settings
-
 logger = logging.getLogger(__name__)
 
 
 class Configuration(Mapping):
-    """ShellOracle application configuration
 
-    The configuration is loaded at program startup, and persisted for the life of the application. Any changes made
-    to the configuration while the application is running, will have no effect.
-    """
-    if "SHELLORACLE_CONFIG" in os.environ:
-        filepath = Path(os.environ["SHELLORACLE_CONFIG"]).absolute()
-    else:
-        filepath = Settings.shelloracle_home / "config.toml"
+    def __init__(self, filepath: Path) -> None:
+        """ShellOracle application configuration
 
-    def __init__(self) -> None:
-        with self.filepath.open("rb") as config_file:
+        :param filepath: Path to the configuration file
+        :raises FileNotFoundError: if the configuration file does not exist
+        """
+        self.filepath = filepath
+        with filepath.open("rb") as config_file:
             self._config = tomllib.load(config_file)
 
-    def __getitem__(self, key) -> Any:
+    def __getitem__(self, key: str) -> Any:
         return self._config[key]
 
     def __len__(self) -> int:
@@ -43,6 +39,12 @@ def __len__(self) -> int:
     def __iter__(self) -> Iterator[Any]:
         return iter(self._config)
 
+    def __str__(self):
+        return f"Configuration({self._config})"
+
+    def __repr__(self) -> str:
+        return str(self)
+
     @property
     def provider(self) -> str:
         return self["shelloracle"]["provider"]
@@ -61,14 +63,25 @@ def spinner_style(self) -> str | None:
 _config: Configuration | None = None
 
 
+def initialize_config() -> None:
+    """Initialize the configuration file
+
+    :raises RuntimeError: if the config is already initialized
+    :raises FileNotFoundError: if the config file is not found
+    """
+    global _config
+    if _config:
+        raise RuntimeError("Configuration already initialized")
+    filepath = Settings.shelloracle_home / "config.toml"
+    _config = Configuration(filepath)
+
+
 def get_config() -> Configuration:
     """Returns the global configuration object.
 
-    Creates global configuration from the configuration toml the first time the function is called.
-
     :return: the global configuration
+    :raises RuntimeError: if the configuration is not initialized
     """
-    global _config
     if _config is None:
-        _config = Configuration()
+        raise RuntimeError("Configuration not initialized")
     return _config