Connect new settings api

Author: djcopley

shelloracle/config/config.py

@@ -1,43 +1,58 @@
+from collections.abc import MutableMapping
 from pathlib import Path
-from typing import TextIO
 
-from tomlkit import document, table, load
+import tomlkit
 
 data_home = Path.home() / "Library/Application Support" / "shelloracle"
 
 
-def _default_config():
-    doc = document()
-    shelloracle = table()
-    shelloracle.add("provider", "ollama")
-    doc.add("shelloracle", shelloracle)
-    return doc
+def _default_config() -> tomlkit.TOMLDocument:
+    config = tomlkit.document()
+    shor_table = tomlkit.table()
+    shor_table.add("provider", "Ollama")
+    config.add("shelloracle", shor_table)
+    return config
 
 
-class SingletonMeta(type):
-    _instances = {}
+class Configuration(MutableMapping):
+    filepath = data_home / "config.toml"
 
-    def __call__(cls, *args, **kwargs):
-        if cls not in cls._instances:
-            cls._instances[cls] = super().__call__(*args, **kwargs)
-        return cls._instances[cls]
+    def __init__(self) -> None:
+        self._ensure_config_exists()
 
+    def __getitem__(self, item):
+        with self.filepath.open("r") as file:
+            config = tomlkit.load(file)
+        return config[item]
 
-class Configuration(metaclass=SingletonMeta):
-    filepath = data_home / "config.toml"
+    def __setitem__(self, key, value):
+        with self.filepath.open("r") as file:
+            config = tomlkit.load(file)
+        config[key] = value
+        config.multiline = True
+        with self.filepath.open("w") as file:
+            tomlkit.dump(config, file)
 
-    def __init__(self):
-        self.file: TextIO | None = None
-        self._ensure_config_exists()
+    def __delitem__(self, key):
+        raise NotImplementedError()
 
-    def _ensure_config_exists(self):
-        if not self.filepath.exists():
-            data_home.mkdir(exist_ok=True)
-            self.filepath.write_text(_default_config())
+    def __iter__(self):
+        raise NotImplementedError()
+
+    def __len__(self) -> int:
+        raise NotImplementedError()
+
+    def _ensure_config_exists(self) -> None:
+        if self.filepath.exists():
+            return
+        data_home.mkdir(exist_ok=True)
+        config = _default_config()
+        with self.filepath.open("w") as file:
+            tomlkit.dump(config, file)
 
     @property
     def provider(self) -> str | None:
-        with self.filepath.open("r") as config_file:
-            file = load(config_file)
-        return file.get("shelloracle", {}).get("provider", None)
+        return self["shelloracle"]["provider"]
+
 
+global_config = Configuration()

shelloracle/config/setting.py

@@ -2,21 +2,27 @@
 
 from typing import TypeVar, Generic, TYPE_CHECKING
 
+from . import config
+
 if TYPE_CHECKING:
     from ..provider import Provider
 
 T = TypeVar("T")
 
 
 class Setting(Generic[T]):
-    def __init__(self, *, default: T | None = None):
+    def __init__(self, *, default: T | None = None) -> None:
         self.default = default
 
-    def __set_name__(self, owner: Provider, name: str) -> None:
+    def __set_name__(self, owner: type[Provider], name: str) -> None:
         self.name = name
+        # Set the default value in the config dictionary
+        provider_table = config.global_config.get("provider", {})
+        provider_table.setdefault(owner.name, {}).setdefault(name, self.default)
+        config.global_config["provider"] = provider_table
 
     def __get__(self, instance: Provider, owner: type[Provider]) -> T:
-        return self.default
+        return config.global_config.get("provider", {}).get(instance.name, {})[self.name]
 
     def __set__(self, instance: Provider, value: T) -> None:
-        self.default = value
+        config.global_config.setdefault("provider", {}).setdefault(instance.name, {})[self.name] = value

shelloracle/provider/ollama.py

@@ -48,22 +48,22 @@ class GenerateRequest:
     history yourself. JSON mode"""
 
 
-system_prompt = (
-    "Based on the following user description, generate a corresponding Bash command. Focus solely on interpreting "
-    "the requirements and translating them into a single, executable Bash command. Ensure accuracy and relevance "
-    "to the user's description. The output should be a valid Bash command that directly aligns with the user's "
-    "intent, ready for execution in a command-line environment. Output nothing except for the command. No code "
-    "block, no English explanation, no start/end tags."
-)
-
-
 class Ollama(Provider):
     name = "Ollama"
 
     host = Setting(default="localhost")
     port = Setting(default=11434)
     model = Setting(default="codellama:13b")
-    system_prompt = Setting(default=system_prompt)
+    system_prompt = Setting(
+        default=(
+            "Based on the following user description, generate a corresponding Bash command. Focus solely "
+            "on interpreting the requirements and translating them into a single, executable Bash command. "
+            "Ensure accuracy and relevance to the user's description. The output should be a valid Bash "
+            "command that directly aligns with the user's intent, ready for execution in a command-line "
+            "environment. Output nothing except for the command. No code block, no English explanation, "
+            "no start/end tags."
+        )
+    )
 
     @property
     def endpoint(self):

shelloracle/shelloracle.py

@@ -6,9 +6,11 @@
 from prompt_toolkit.application import create_app_session_from_tty
 from prompt_toolkit.history import FileHistory
 
-from .config import Configuration, data_home
+from .config import data_home
 from .provider import get_provider
 
+from .config import config
+
 
 async def prompt_user(default_prompt: str | None = None) -> str:
     with create_app_session_from_tty():
@@ -47,8 +49,7 @@ async def shell_oracle() -> None:
 
     :returns: None
     """
-    config = Configuration()
-    provider = get_provider(config.provider)()
+    provider = get_provider(config.global_config.provider)()
 
     if not (prompt := get_query_from_pipe()):
         default_prompt = os.environ.get("SHOR_DEFAULT_PROMPT")