llm-gemini 0.18__tar.gz → 0.18.1__tar.gz

{llm_gemini-0.18 → llm_gemini-0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.18
+Version: 0.18.1
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License: Apache-2.0

{llm_gemini-0.18 → llm_gemini-0.18.1}/llm_gemini.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.18
+Version: 0.18.1
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License: Apache-2.0

{llm_gemini-0.18 → llm_gemini-0.18.1}/llm_gemini.py

@@ -36,7 +36,21 @@ GOOGLE_SEARCH_MODELS = {
     "gemini-1.5-flash-002",
     "gemini-2.0-flash-exp",
     "gemini-2.0-flash",
+    "gemini-2.5-pro-preview-03-25",
+    "gemini-2.5-pro-exp-03-25",
 }
+
+# Older Google models used google_search_retrieval instead of google_search
+GOOGLE_SEARCH_MODELS_USING_SEARCH_RETRIEVAL = {
+    "gemini-1.5-pro-latest",
+    "gemini-1.5-flash-latest",
+    "gemini-1.5-pro-001",
+    "gemini-1.5-flash-001",
+    "gemini-1.5-pro-002",
+    "gemini-1.5-flash-002",
+    "gemini-2.0-flash-exp",
+}
+
 THINKING_BUDGET_MODELS = {
     "gemini-2.5-flash-preview-04-17",
 }
@@ -285,7 +299,12 @@ class _SharedGemini:
         if prompt.options and prompt.options.code_execution:
             body["tools"] = [{"codeExecution": {}}]
         if prompt.options and self.can_google_search and prompt.options.google_search:
-            body["tools"] = [{"google_search": {}}]
+            tool_name = (
+                "google_search_retrieval"
+                if self.model_id in GOOGLE_SEARCH_MODELS_USING_SEARCH_RETRIEVAL
+                else "google_search"
+            )
+            body["tools"] = [{tool_name: {}}]
         if prompt.system:
             body["systemInstruction"] = {"parts": [{"text": prompt.system}]}
 
@@ -490,9 +509,12 @@ def register_commands(cli):
     def models(key):
         "List of Gemini models pulled from their API"
         key = llm.get_key(key, "gemini", "LLM_GEMINI_KEY")
-        response = httpx.get(
-            f"https://generativelanguage.googleapis.com/v1beta/models?key={key}",
-        )
+        if not key:
+            raise click.ClickException(
+                "You must set the LLM_GEMINI_KEY environment variable or use --key"
+            )
+        url = f"https://generativelanguage.googleapis.com/v1beta/models"
+        response = httpx.get(url, headers={"x-goog-api-key": key})
         response.raise_for_status()
         click.echo(json.dumps(response.json()["models"], indent=2))
 

{llm_gemini-0.18 → llm_gemini-0.18.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llm-gemini"
-version = "0.18"
+version = "0.18.1"
 description = "LLM plugin to access Google's Gemini family of models"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]

{llm_gemini-0.18 → llm_gemini-0.18.1}/tests/test_gemini.py

@@ -1,4 +1,6 @@
+from click.testing import CliRunner
 import llm
+from llm.cli import cli
 import nest_asyncio
 import json
 import os
@@ -210,3 +212,22 @@ def test_cleanup_schema(schema, expected):
     # Use a deep copy so the original test data remains unchanged.
     result = cleanup_schema(schema)
     assert result == expected
+
+
+@pytest.mark.vcr
+def test_cli_gemini_models(tmpdir, monkeypatch):
+    user_dir = tmpdir / "llm.datasette.io"
+    user_dir.mkdir()
+    monkeypatch.setenv("LLM_USER_PATH", str(user_dir))
+    # With no key set should error nicely
+    runner = CliRunner()
+    result = runner.invoke(cli, ["gemini", "models"])
+    assert result.exit_code == 1
+    assert (
+        "Error: You must set the LLM_GEMINI_KEY environment variable or use --key\n"
+        == result.output
+    )
+    # Try again with --key
+    result2 = runner.invoke(cli, ["gemini", "models", "--key", GEMINI_API_KEY])
+    assert result2.exit_code == 0
+    assert "gemini-1.5-flash-latest" in result2.output