Skip to content

Commit 4126bda

Browse files
committed
handle passed-in key
1 parent de3fa6d commit 4126bda

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/any_llm/providers/google/google.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,11 @@ def __init__(self, config: ApiConfig) -> None:
203203
self.client = genai.Client(vertexai=True, project=self.project_id, location=self.location)
204204
else:
205205
# Gemini Developer API configuration
206-
api_key = os.getenv("GEMINI_API_KEY") or os.getenv("GOOGLE_API_KEY")
206+
# Use api_key from config if provided, otherwise fall back to environment variables
207+
api_key = getattr(config, "api_key", None) or os.getenv("GEMINI_API_KEY") or os.getenv("GOOGLE_API_KEY")
207208

208209
if not api_key:
209-
msg = "GEMINI_API_KEY or GOOGLE_API_KEY environment variable is required for Gemini Developer API"
210+
msg = "API key is required for Gemini Developer API. Provide it via ApiConfig or set GEMINI_API_KEY/GOOGLE_API_KEY environment variable"
210211
raise ValueError(msg)
211212

212213
# Initialize client for Gemini Developer API

tests/integration/test_completion.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ def test_providers(provider: str) -> None:
2929
if "API key provided" in str(e):
3030
pytest.skip(f"{provider} API key not provided, skipping")
3131
raise e
32-
except httpx.HTTPStatusError as e:
33-
if e.response.status_code == 404 and provider == "ollama":
32+
except (httpx.HTTPStatusError, httpx.ConnectError):
33+
if provider == "ollama":
3434
pytest.skip("Ollama is not set up, skipping")
35+
raise
3536
assert result.choices[0].message.content is not None

0 commit comments

Comments
 (0)