fix(local): honor configured SQL provider in UI

Author: JuliaEdom

README.md

@@ -80,7 +80,14 @@ uv run streamlit run app/streamlit_app.py
 # or: make ui
 ```
 
-`MISTRAL_API_KEY` is required for embeddings (`mistral-embed`) even if SQL generation uses `GITHUB_TOKEN`, `GROQ_API_KEY`, or Ollama. Supply your own Mistral key; external API calls are subject to your provider quotas (not claimed free here).
+`MISTRAL_API_KEY` is required for embeddings (`mistral-embed`). Supply your own Mistral key;
+external API calls are subject to your provider quotas (not claimed free here).
+
+Choose SQL generation independently in `.env` with
+`NL_SQL_DEFAULT_PROVIDER=mistral|github_models|groq|ollama`. Hosted alternatives
+use your matching `GITHUB_TOKEN` or `GROQ_API_KEY`; Ollama needs no generation
+key but must be running with `NL_SQL_OLLAMA_GEN_MODEL` pulled. This setting
+changes SQL/explanation generation only—query embeddings still use Mistral.
 
 Postgres is optional (local/CI). The public HF Space is SQLite-only.
 

app/bootstrap.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import Any
 
 import chromadb
@@ -15,6 +14,7 @@
 from nl_sql.llm.providers import build_provider
 from nl_sql.llm.providers.base import EmbeddingProvider, LLMProvider
 from nl_sql.llm.providers.mistral import MistralProvider
+from nl_sql.paths import under_root
 from nl_sql.schema_index.indexer import SchemaIndex
 
 
@@ -23,12 +23,12 @@ def bootstrap() -> tuple[DatabaseRegistry, SchemaIndex, LLMProvider, LLMProvider
     settings = get_settings()
     if not settings.mistral_api_key:
         raise RuntimeError(
-            "MISTRAL_API_KEY is not set in .env — required for codestral + mistral-embed."
+            "MISTRAL_API_KEY is not set in .env — required for embeddings."
         )
 
     registry = get_default_registry()
 
-    persist_dir = Path("chroma_data")
+    persist_dir = under_root("chroma_data")
     if not persist_dir.is_dir():
         raise RuntimeError(
             f"Chroma persist dir {persist_dir!r} not found. "
@@ -49,7 +49,7 @@ def bootstrap() -> tuple[DatabaseRegistry, SchemaIndex, LLMProvider, LLMProvider
     )
     schema_index = SchemaIndex(persist_dir=persist_dir, embedder=embedder, client=chroma_client)
 
-    raw_sql = build_provider("mistral", settings=settings)
+    raw_sql = build_provider(settings.default_provider, settings=settings)
     sql_provider: LLMProvider = CachingLLMProvider(
         raw_sql,
         cache_dir=settings.llm_cache_dir,

tests/app/test_bootstrap.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+import importlib
+import sys
+import types
+from pathlib import Path
+from types import SimpleNamespace
+from typing import Any
+
+import pytest
+
+
+class _FakeStreamlit(types.ModuleType):
+    def __init__(self) -> None:
+        super().__init__("streamlit")
+
+    def cache_resource(self, **_: Any) -> Any:
+        return lambda function: function
+
+
+@pytest.fixture
+def bootstrap_module(monkeypatch: pytest.MonkeyPatch) -> Any:
+    monkeypatch.delitem(sys.modules, "app.bootstrap", raising=False)
+    monkeypatch.setitem(sys.modules, "streamlit", _FakeStreamlit())
+    return importlib.import_module("app.bootstrap")
+
+
+def _settings(tmp_path: Path, **overrides: Any) -> SimpleNamespace:
+    values = {
+        "default_provider": "ollama",
+        "mistral_api_key": "embed-key",
+        "mistral_gen_model": "codestral-latest",
+        "mistral_embed_model": "mistral-embed",
+        "mistral_base_url": "https://api.mistral.ai/v1",
+        "llm_cache_dir": tmp_path / "cache",
+        "llm_cache_size_limit_gb": 1.0,
+    }
+    values.update(overrides)
+    return SimpleNamespace(**values)
+
+
+def test_bootstrap_uses_configured_sql_provider(
+    bootstrap_module: Any,
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+) -> None:
+    settings = _settings(tmp_path)
+    persist_dir = tmp_path / "repo" / "chroma_data"
+    persist_dir.mkdir(parents=True)
+    foreign_cwd = tmp_path / "foreign"
+    foreign_cwd.mkdir()
+    monkeypatch.chdir(foreign_cwd)
+
+    registry = object()
+    schema_index = object()
+    sql_provider = object()
+    provider_calls: list[tuple[str, object]] = []
+    client_paths: list[str] = []
+
+    monkeypatch.setattr(bootstrap_module, "get_settings", lambda: settings)
+    monkeypatch.setattr(
+        bootstrap_module,
+        "under_root",
+        lambda *parts: persist_dir.parent.joinpath(*parts),
+        raising=False,
+    )
+    monkeypatch.setattr(bootstrap_module, "get_default_registry", lambda: registry)
+    monkeypatch.setattr(
+        bootstrap_module.chromadb,
+        "PersistentClient",
+        lambda **kwargs: client_paths.append(kwargs["path"]) or object(),
+    )
+    monkeypatch.setattr(bootstrap_module, "MistralProvider", lambda **_: object())
+    monkeypatch.setattr(bootstrap_module, "CachingEmbeddingProvider", lambda *_, **__: object())
+    monkeypatch.setattr(bootstrap_module, "SchemaIndex", lambda **_: schema_index)
+    monkeypatch.setattr(
+        bootstrap_module,
+        "build_provider",
+        lambda name, settings: provider_calls.append((name, settings)) or object(),
+    )
+    monkeypatch.setattr(
+        bootstrap_module,
+        "CachingLLMProvider",
+        lambda *_, **__: sql_provider,
+    )
+
+    result = bootstrap_module.bootstrap()
+
+    assert provider_calls == [("ollama", settings)]
+    assert client_paths == [str(persist_dir)]
+    assert result == (registry, schema_index, sql_provider, sql_provider)
+
+
+def test_bootstrap_reports_mistral_key_is_for_embeddings(
+    bootstrap_module: Any,
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+) -> None:
+    monkeypatch.setattr(
+        bootstrap_module,
+        "get_settings",
+        lambda: _settings(tmp_path, mistral_api_key=""),
+    )
+
+    with pytest.raises(RuntimeError, match="required for embeddings"):
+        bootstrap_module.bootstrap()

tests/test_readme_local_first.py

@@ -39,6 +39,7 @@ def test_readme_quick_start_local_first_contract() -> None:
     assert "uv run python scripts/build_index.py --db all" in section
 
     assert "required for embeddings" in section
+    assert "NL_SQL_DEFAULT_PROVIDER" in section
     assert "GITHUB_TOKEN" in section
     assert "GROQ_API_KEY" in section
     assert "Ollama" in section