v2.17.0 (#822)

Co-authored-by: Clément Sirieix <clement.sirieix@mistral.ai>
Co-authored-by: Guillaume LE GOFF <guillaume.lgf@gmail.com>
Co-authored-by: Hdandria <henri.dandria@mistral.ai>
Co-authored-by: Ivana Dunisijevic <ivana.dunisijevic@mistral.ai>
Co-authored-by: Jean Burellier <sheplu@users.noreply.github.com>
Co-authored-by: Mathias Gesbert <mathias.gesbert@mistral.ai>
Co-authored-by: Mert Unsal <mert.unsal@mistral.ai>
Co-authored-by: Michel Thomazo <51709227+michelTho@users.noreply.github.com>
Co-authored-by: Paul VEZIA <166131032+le-codeur-rapide@users.noreply.github.com>
Co-authored-by: Pierre Rossinès <pierre.rossines@mistral.ai>
Co-authored-by: Val <102326092+vdeva@users.noreply.github.com>
Co-authored-by: Vincent G <10739306+VinceOPS@users.noreply.github.com>
Co-authored-by: renovate-mistral[bot] <253709520+renovate-mistral[bot]@users.noreply.github.com>
Co-authored-by: Mistral Vibe <vibe@mistral.ai>

tests/core/test_resolve_api_key.py

@@ -0,0 +1,138 @@
+from __future__ import annotations
+
+import keyring
+from keyring.errors import KeyringError
+import pytest
+
+from tests.conftest import build_test_vibe_config
+from vibe.core.config import MissingAPIKeyError, ProviderConfig, resolve_api_key
+from vibe.core.llm.backend.mistral import MistralBackend
+from vibe.core.types import Backend
+
+
+def test_resolve_returns_env_value_without_consulting_keyring(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("CUSTOM_API_KEY", "env-key")
+
+    def _fail(service: str, username: str) -> str | None:
+        raise AssertionError("keyring must not be consulted when env is set")
+
+    monkeypatch.setattr(keyring, "get_password", _fail)
+
+    assert resolve_api_key("CUSTOM_API_KEY") == "env-key"
+
+
+def test_resolve_falls_back_to_keyring_when_env_unset(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CUSTOM_API_KEY", raising=False)
+    monkeypatch.setattr(
+        keyring, "get_password", lambda service, username: "keyring-key"
+    )
+
+    assert resolve_api_key("CUSTOM_API_KEY") == "keyring-key"
+
+
+def test_resolve_returns_none_when_env_unset_and_keyring_empty(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CUSTOM_API_KEY", raising=False)
+    monkeypatch.setattr(keyring, "get_password", lambda service, username: None)
+
+    assert resolve_api_key("CUSTOM_API_KEY") is None
+
+
+def test_resolve_returns_none_when_keyring_raises(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("CUSTOM_API_KEY", raising=False)
+
+    def _unavailable(service: str, username: str) -> str | None:
+        raise KeyringError("no keyring")
+
+    monkeypatch.setattr(keyring, "get_password", _unavailable)
+
+    assert resolve_api_key("CUSTOM_API_KEY") is None
+
+
+def test_resolve_returns_none_for_empty_env_key(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    def _fail(service: str, username: str) -> str | None:
+        raise AssertionError("keyring must not be consulted for an empty env key")
+
+    monkeypatch.setattr(keyring, "get_password", _fail)
+
+    assert resolve_api_key("") is None
+
+
+def test_check_api_key_accepts_keyring_only_key(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("MISTRAL_API_KEY", raising=False)
+    monkeypatch.setattr(
+        keyring, "get_password", lambda service, username: "keyring-key"
+    )
+
+    # Should not raise MissingAPIKeyError despite the env var being unset.
+    config = build_test_vibe_config()
+
+    assert config.get_active_provider().api_key_env_var == "MISTRAL_API_KEY"
+
+
+def test_check_api_key_raises_when_neither_env_nor_keyring(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("MISTRAL_API_KEY", raising=False)
+    monkeypatch.setattr(keyring, "get_password", lambda service, username: None)
+
+    with pytest.raises(MissingAPIKeyError):
+        build_test_vibe_config()
+
+
+def test_mistral_backend_reads_keyring_only_key(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("MISTRAL_API_KEY", raising=False)
+    monkeypatch.setattr(
+        keyring, "get_password", lambda service, username: "keyring-key"
+    )
+    provider = ProviderConfig(
+        name="mistral",
+        api_base="https://api.mistral.ai/v1",
+        api_key_env_var="MISTRAL_API_KEY",
+        backend=Backend.MISTRAL,
+    )
+
+    backend = MistralBackend(provider)
+
+    assert backend._api_key == "keyring-key"
+
+
+def test_vibe_code_api_key_resolves_from_keyring(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("MISTRAL_API_KEY", raising=False)
+    monkeypatch.setattr(
+        keyring, "get_password", lambda service, username: "keyring-key"
+    )
+
+    config = build_test_vibe_config()
+
+    assert config.vibe_code_api_key == "keyring-key"
+
+
+def test_vibe_code_api_key_empty_when_unresolved(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("MISTRAL_API_KEY", raising=False)
+    monkeypatch.setattr(
+        keyring, "get_password", lambda service, username: "keyring-key"
+    )
+    config = build_test_vibe_config()
+
+    # Nothing resolves the key anymore; the property must return "" (not None).
+    monkeypatch.setattr(keyring, "get_password", lambda service, username: None)
+
+    assert config.vibe_code_api_key == ""