feat: read bot config (#23)

Author: mtth

src/git_draft/__main__.py

@@ -6,7 +6,14 @@
 import sys
 
 from .bots import Operation, load_bot
-from .common import Config, PROGRAM, Store, ensure_state_home, open_editor
+from .common import (
+    Config,
+    PROGRAM,
+    Store,
+    UnreachableError,
+    ensure_state_home,
+    open_editor,
+)
 from .manager import Manager
 
 
@@ -50,7 +57,6 @@ def callback(_option, _opt, _value, parser) -> None:
         "--bot",
         dest="bot",
         help="bot key",
-        default="openai",
     )
     parser.add_option(
         "-c",
@@ -107,7 +113,16 @@ def main() -> None:
     )
     command = getattr(opts, "command", "generate")
     if command == "generate":
-        bot = load_bot(opts.bot, {})
+        if not config.bots:
+            raise ValueError("No bots configured")
+        if opts.bot:
+            bot_configs = [c for c in config.bots if c.name == opts.bot]
+            if len(bot_configs) != 1:
+                raise ValueError(f"Found {len(bot_configs)} matching bots")
+            bot_config = bot_configs[0]
+        else:
+            bot_config = config.bots[0]
+        bot = load_bot(bot_config)
         prompt = opts.prompt
         if not prompt:
             if sys.stdin.isatty():
@@ -122,7 +137,7 @@ def main() -> None:
     elif command == "discard":
         manager.discard_draft(delete=opts.delete)
     else:
-        assert False, "unreachable"
+        raise UnreachableError()
 
 
 if __name__ == "__main__":

src/git_draft/bots/__init__.py

@@ -3,8 +3,10 @@
 * https://aider.chat/docs/leaderboards/
 """
 
-from typing import Any, Mapping
+import importlib
+import sys
 
+from ..common import BotConfig
 from .common import Action, Bot, Operation, OperationHook, Toolbox
 
 __all__ = [
@@ -16,13 +18,27 @@
 ]
 
 
-def load_bot(entry: str, kwargs: Mapping[str, Any]) -> Bot:
-    if entry == "openai":
-        return _load_openai_bot(**kwargs)
-    raise NotImplementedError()  # TODO
+def load_bot(config: BotConfig) -> Bot:
+    if config.pythonpath and config.pythonpath not in sys.path:
+        sys.path.insert(0, config.pythonpath)
 
+    parts = config.factory.split(":", 1)
+    if len(parts) == 1:
+        module = sys.modules[__name__]  # Default to this module
+        symbol = parts[0]
+    else:
+        module_name, symbol = parts
+        module = importlib.import_module(module_name)
 
-def _load_openai_bot(**kwargs) -> Bot:
+    factory = getattr(module, symbol, None)
+    if not factory:
+        raise NotImplementedError(f"Unknown factory: {factory}")
+
+    kwargs = config.config or {}
+    return factory(**kwargs)
+
+
+def openai_bot(**kwargs) -> Bot:
     from .openai import OpenAIBot
 
     return OpenAIBot(**kwargs)

src/git_draft/common.py

@@ -15,7 +15,7 @@
 import sys
 import tempfile
 import tomllib
-from typing import Any, Iterator, Mapping, Self
+from typing import Any, Iterator, Mapping, Self, Sequence
 import xdg_base_dirs
 
 
@@ -25,17 +25,17 @@
 @dataclasses.dataclass(frozen=True)
 class Config:
     log_level: int
-    bots: Mapping[str, BotConfig]
+    bots: Sequence[BotConfig]
     # TODO: Add (prompt) templates.
 
-    @classmethod
-    def default(cls) -> Self:
-        return cls(logging.INFO, {})
-
     @staticmethod
     def path() -> Path:
         return xdg_base_dirs.xdg_config_home() / PROGRAM / "config.toml"
 
+    @classmethod
+    def default(cls) -> Self:
+        return cls(logging.INFO, [])
+
     @classmethod
     def load(cls) -> Self:
         path = cls.path()
@@ -45,10 +45,9 @@ def load(cls) -> Self:
         except FileNotFoundError:
             return cls.default()
         else:
-            bot_data = data.get("bots", {})
             return cls(
                 log_level=logging.getLevelName(data["log_level"]),
-                bots={k: BotConfig(**v) for k, v in bot_data.items()},
+                bots=[BotConfig(**v) for v in data.get("bots", [])],
             )
 
 
@@ -58,8 +57,9 @@ def load(cls) -> Self:
 
 @dataclasses.dataclass(frozen=True)
 class BotConfig:
-    loader: str
-    kwargs: JSONObject | None = None
+    factory: str
+    name: str | None = None
+    config: JSONObject | None = None
     pythonpath: str | None = None
 
 
@@ -157,3 +157,7 @@ def sql(name: str) -> str:
 
 def random_id(n: int) -> str:
     return "".join(_random.choices(_alphabet, k=n))
+
+
+class UnreachableError(RuntimeError):
+    pass

tests/git_draft/bots/__init___test.py

@@ -0,0 +1,28 @@
+import importlib
+import sys
+import pytest
+
+from git_draft.bots import Bot, load_bot
+from git_draft.common import BotConfig
+
+
+class FakeBot(Bot):
+    pass
+
+
+class TestLoadBot:
+    def test_existing_factory(self, monkeypatch) -> None:
+        def import_module(name):
+            assert name == "fake_module"
+            return sys.modules[__name__]
+
+        monkeypatch.setattr(importlib, "import_module", import_module)
+
+        config = BotConfig(factory="fake_module:FakeBot")
+        bot = load_bot(config)
+        assert isinstance(bot, FakeBot)
+
+    def test_non_existing_factory(self) -> None:
+        config = BotConfig("git_draft:unknown_factory")
+        with pytest.raises(NotImplementedError):
+            load_bot(config)

tests/git_draft/common_test.py

@@ -59,13 +59,14 @@ def test_load_ok(self) -> None:
         text = """\
             log_level = "DEBUG"
 
-            [bots.foo]
-            loader = "foo:load"
+            [[bots]]
+            factory = "foo:load"
             pythonpath = "./abc"
 
-            [bots.bar]
-            loader = "bar"
-            kwargs = {one=1}
+            [[bots]]
+            name = "bar"
+            factory = "bar"
+            config = {one=1}
         """
         path = sut.Config.path()
         path.parent.mkdir(parents=True, exist_ok=True)
@@ -75,10 +76,10 @@ def test_load_ok(self) -> None:
         config = sut.Config.load()
         assert config == sut.Config(
             log_level=logging.DEBUG,
-            bots={
-                "foo": sut.BotConfig(loader="foo:load", pythonpath="./abc"),
-                "bar": sut.BotConfig(loader="bar", kwargs={"one": 1}),
-            },
+            bots=[
+                sut.BotConfig(factory="foo:load", pythonpath="./abc"),
+                sut.BotConfig(factory="bar", name="bar", config={"one": 1}),
+            ],
         )
 
     def test_load_default(self) -> None: