diff --git a/tests/agents_tests/test_agent_sessions.py b/tests/agents_tests/test_agent_sessions.py index 7ef69e2..2127019 100644 --- a/tests/agents_tests/test_agent_sessions.py +++ b/tests/agents_tests/test_agent_sessions.py @@ -125,7 +125,7 @@ def test_opencode_agent_prompt_no_text_output(): def test_gemini_agent_prompt(settings): - settings.GOOGLE_API_KEY = "test-key" + settings.GOOGLE_AI_API_KEY = "test-key" settings.LLM_MODEL = "gemini-2.5-flash" fake = MagicMock() fake.raise_for_status = MagicMock() @@ -147,13 +147,13 @@ def test_gemini_agent_prompt(settings): def test_gemini_agent_prompt_missing_key(settings): - settings.GOOGLE_API_KEY = "" - with pytest.raises(ValueError, match="VROBBLER_GOOGLE_API_KEY is not set"): + settings.GOOGLE_AI_API_KEY = "" + with pytest.raises(ValueError, match="VROBBLER_GOOGLE_AI_API_KEY is not set"): gemini_agent_prompt("hi") def test_gemini_agent_prompt_bad_response(settings): - settings.GOOGLE_API_KEY = "test-key" + settings.GOOGLE_AI_API_KEY = "test-key" fake = MagicMock() fake.raise_for_status = MagicMock() fake.json.return_value = {"unexpected": True} @@ -163,7 +163,7 @@ def test_gemini_agent_prompt_bad_response(settings): def test_gemini_agent_prompt_with_history(settings): - settings.GOOGLE_API_KEY = "test-key" + settings.GOOGLE_AI_API_KEY = "test-key" fake = MagicMock() fake.raise_for_status = MagicMock() fake.json.return_value = {"candidates": [{"content": {"parts": [{"text": "12"}]}}]} @@ -211,7 +211,7 @@ def test_agent_prompt_unknown_provider(settings): def test_agent_prompt_defaults_to_configured_provider(settings): settings.AGENT_PROVIDER = "gemini" - settings.GOOGLE_API_KEY = "test-key" + settings.GOOGLE_AI_API_KEY = "test-key" with patch("agents.providers.gemini_agent_prompt", return_value={"text": "x"}) as m: agent_prompt("hi") m.assert_called_once_with("hi", history=None) diff --git a/vrobbler.conf.example b/vrobbler.conf.example index eac266b..db25078 100644 --- a/vrobbler.conf.example +++ b/vrobbler.conf.example @@ -24,6 +24,7 @@ VROBBLER_COMICVINE_API_KEY="" VROBBLER_TODOIST_CLIENT_ID="" VROBBLER_TODOIST_CLIENT_SECRET="" VROBBLER_GOOGLE_API_KEY="" +VROBBLER_GOOGLE_AI_API_KEY="" VROBBLER_LICHESS_API_KEY = "" VROBBLER_FASTCORK_API_KEY="fc_" diff --git a/vrobbler/apps/agents/providers.py b/vrobbler/apps/agents/providers.py index d492678..e4599b4 100644 --- a/vrobbler/apps/agents/providers.py +++ b/vrobbler/apps/agents/providers.py @@ -45,9 +45,9 @@ def _gemini_contents(prompt: str, history: list[dict] | None) -> list[dict]: def gemini_agent_prompt(prompt: str, history: list[dict] | None = None) -> dict: - api_key = settings.GOOGLE_API_KEY + api_key = settings.GOOGLE_AI_API_KEY if not api_key: - raise ValueError("VROBBLER_GOOGLE_API_KEY is not set") + raise ValueError("VROBBLER_GOOGLE_AI_API_KEY is not set") model = settings.LLM_MODEL response = httpx.post( diff --git a/vrobbler/settings.py b/vrobbler/settings.py index 8674596..0bd74e1 100644 --- a/vrobbler/settings.py +++ b/vrobbler/settings.py @@ -80,6 +80,7 @@ TODOIST_CLIENT_ID = os.getenv("VROBBLER_TODOIST_CLIENT_ID", "") TODOIST_CLIENT_SECRET = os.getenv("VROBBLER_TODOIST_CLIENT_SECRET", "") GOOGLE_API_KEY = os.getenv("VROBBLER_GOOGLE_API_KEY", "") +GOOGLE_AI_API_KEY = os.getenv("VROBBLER_GOOGLE_AI_API_KEY", "") LICHESS_API_KEY = os.getenv("VROBBLER_LICHESS_API_KEY", "") AGENT_PROVIDER = os.getenv("VROBBLER_AGENT_PROVIDER", "gemini")