Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cecli/helpers/llms/domains/gemini.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ async def gemini_complete(
url = f"{resolved['api_base']}/v1beta/models/{resolved['route']}:generateContent"
payload = gemini_payload(resolved, messages, tools, kwargs)
hdrs = {"Content-Type": "application/json", **headers}
params = {"key": key} if key else {}
params: Dict[str, str] = {}

async with make_client(timeout=DEFAULT_TIMEOUT, verify=VERIFY_SSL) as client:
resp = await client.post(url, json=payload, headers=hdrs, params=params)
Expand All @@ -215,7 +215,7 @@ async def gemini_stream(
url = f"{resolved['api_base']}/v1beta/models/{resolved['route']}:streamGenerateContent"
payload = gemini_payload(resolved, messages, tools, kwargs)
hdrs = {"Content-Type": "application/json", **headers}
params = {"key": key, "alt": "sse"} if key else {"alt": "sse"}
params = {"alt": "sse"}
has_seen_tool_calls = False
_stream_state["tool_indices"] = {}

Expand Down
17 changes: 9 additions & 8 deletions cecli/helpers/llms/providers/gemini.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"""Gemini provider adapter for the llms package.

Gemini authenticates via the ``key`` query parameter (or ``X-Goog-Api-Key``
header), NOT via an ``Authorization: Bearer`` header. The base
:class:`ProviderAdapter` adds a Bearer header whenever a key is present, which
Google rejects with 401 for API keys, so this adapter overrides
:meth:`build_headers` to skip it (the domain adapter passes ``key`` as a query
param itself).
Gemini authenticates via the ``x-goog-api-key`` header, NOT via an
``Authorization: Bearer`` header. The base :class:`ProviderAdapter` adds a
Bearer header whenever a key is present, which Google rejects with 401 for API
keys, so this adapter overrides :meth:`build_headers` to set ``x-goog-api-key``
instead.
"""

from __future__ import annotations
Expand All @@ -16,7 +15,7 @@


class GeminiProvider(ProviderAdapter):
"""Gemini: key via query param; no Authorization header."""
"""Gemini: key via x-goog-api-key header; no Authorization header."""

provider: str = "gemini"

Expand All @@ -27,10 +26,12 @@ def build_headers(
family: str,
headers: Dict[str, str],
) -> Dict[str, str]:
"""Return headers without an Authorization header (key is a query param)."""
"""Return headers with x-goog-api-key set instead of Authorization."""
merged = dict(headers)

merged.setdefault("Content-Type", "application/json")
if key:
merged["x-goog-api-key"] = key
return merged


Expand Down
80 changes: 80 additions & 0 deletions tests/helpers/test_llms_gemini_auth.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
from unittest.mock import AsyncMock, MagicMock, patch

import pytest

from cecli.helpers.llms.domains.gemini import gemini_complete
from cecli.helpers.llms.providers.gemini import GeminiProvider


def test_gemini_provider_build_headers():
provider = GeminiProvider()
headers = provider.build_headers(
resolved={"provider": "gemini"},
key="my-secret-gemini-key",
family="gemini",
headers={"Custom-Header": "value"},
)

assert headers["x-goog-api-key"] == "my-secret-gemini-key"
assert headers["Content-Type"] == "application/json"
assert headers["Custom-Header"] == "value"
assert "Authorization" not in headers


def test_gemini_provider_build_headers_no_key():
provider = GeminiProvider()
headers = provider.build_headers(
resolved={"provider": "gemini"},
key=None,
family="gemini",
headers={},
)

assert "x-goog-api-key" not in headers
assert "Authorization" not in headers


@pytest.mark.asyncio
async def test_gemini_complete_sends_x_goog_api_key_header():
mock_response = MagicMock()
mock_response.raise_for_status = MagicMock()
mock_response.json.return_value = {
"responseId": "resp-123",
"candidates": [
{
"content": {"parts": [{"text": "Hello world"}]},
"finishReason": "STOP",
}
],
}

mock_client = AsyncMock()
mock_client.post.return_value = mock_response

mock_make_client = MagicMock()
mock_make_client.return_value.__aenter__.return_value = mock_client

with patch("cecli.helpers.llms.domains.gemini.make_client", mock_make_client):
resolved = {
"api_base": "https://generativelanguage.googleapis.com",
"route": "gemini-2.0-flash",
"model": "gemini/gemini-2.0-flash",
}
messages = [{"role": "user", "content": "Hi"}]
headers = {"x-goog-api-key": "my-secret-gemini-key"}

resp = await gemini_complete(
resolved=resolved,
messages=messages,
tools=None,
key="my-secret-gemini-key",
headers=headers,
kwargs={},
)

assert resp.choices[0].message.content == "Hello world"
mock_client.post.assert_called_once()
_, kwargs = mock_client.post.call_args
assert kwargs["headers"]["x-goog-api-key"] == "my-secret-gemini-key"
assert "Authorization" not in kwargs["headers"]
assert kwargs["params"] == {}