llm-gemini 0.25__tar.gz → 0.26.1__tar.gz

{llm_gemini-0.25 → llm_gemini-0.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.25
+Version: 0.26.1
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License-Expression: Apache-2.0
@@ -10,7 +10,7 @@ Project-URL: Issues, https://github.com/simonw/llm-gemini/issues
 Project-URL: CI, https://github.com/simonw/llm-gemini/actions
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: llm>=0.26
+Requires-Dist: llm>=0.27
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
@@ -75,6 +75,9 @@ result = runner.invoke(cli.cli, ["models", "-q", "gemini/"])
 lines = reversed(result.output.strip().split("\n"))
 to_output = []
 NOTES = {
+    "gemini/gemini-flash-latest": "Latest Gemini Flash",
+    "gemini/gemini-flash-lite-latest": "Latest Gemini Flash Lite",
+    "gemini/gemini-2.5-flash": "Gemini 2.5 Flash",
     "gemini/gemini-2.5-pro": "Gemini 2.5 Pro",
     "gemini/gemini-2.5-flash": "Gemini 2.5 Flash",
     "gemini/gemini-2.5-flash-lite": "Gemini 2.5 Flash Lite",
@@ -93,6 +96,10 @@ for line in lines:
     )
 cog.out("\n".join(to_output))
 ]]] -->
+- `gemini/gemini-2.5-flash-lite-preview-09-2025`
+- `gemini/gemini-2.5-flash-preview-09-2025`
+- `gemini/gemini-flash-lite-latest`: Latest Gemini Flash Lite
+- `gemini/gemini-flash-latest`: Latest Gemini Flash
 - `gemini/gemini-2.5-flash-lite`: Gemini 2.5 Flash Lite
 - `gemini/gemini-2.5-pro`: Gemini 2.5 Pro
 - `gemini/gemini-2.5-flash`: Gemini 2.5 Flash

{llm_gemini-0.25 → llm_gemini-0.26.1}/README.md

@@ -52,6 +52,9 @@ result = runner.invoke(cli.cli, ["models", "-q", "gemini/"])
 lines = reversed(result.output.strip().split("\n"))
 to_output = []
 NOTES = {
+    "gemini/gemini-flash-latest": "Latest Gemini Flash",
+    "gemini/gemini-flash-lite-latest": "Latest Gemini Flash Lite",
+    "gemini/gemini-2.5-flash": "Gemini 2.5 Flash",
     "gemini/gemini-2.5-pro": "Gemini 2.5 Pro",
     "gemini/gemini-2.5-flash": "Gemini 2.5 Flash",
     "gemini/gemini-2.5-flash-lite": "Gemini 2.5 Flash Lite",
@@ -70,6 +73,10 @@ for line in lines:
     )
 cog.out("\n".join(to_output))
 ]]] -->
+- `gemini/gemini-2.5-flash-lite-preview-09-2025`
+- `gemini/gemini-2.5-flash-preview-09-2025`
+- `gemini/gemini-flash-lite-latest`: Latest Gemini Flash Lite
+- `gemini/gemini-flash-latest`: Latest Gemini Flash
 - `gemini/gemini-2.5-flash-lite`: Gemini 2.5 Flash Lite
 - `gemini/gemini-2.5-pro`: Gemini 2.5 Pro
 - `gemini/gemini-2.5-flash`: Gemini 2.5 Flash

{llm_gemini-0.25 → llm_gemini-0.26.1}/llm_gemini.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.25
+Version: 0.26.1
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License-Expression: Apache-2.0
@@ -10,7 +10,7 @@ Project-URL: Issues, https://github.com/simonw/llm-gemini/issues
 Project-URL: CI, https://github.com/simonw/llm-gemini/actions
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: llm>=0.26
+Requires-Dist: llm>=0.27
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
@@ -75,6 +75,9 @@ result = runner.invoke(cli.cli, ["models", "-q", "gemini/"])
 lines = reversed(result.output.strip().split("\n"))
 to_output = []
 NOTES = {
+    "gemini/gemini-flash-latest": "Latest Gemini Flash",
+    "gemini/gemini-flash-lite-latest": "Latest Gemini Flash Lite",
+    "gemini/gemini-2.5-flash": "Gemini 2.5 Flash",
     "gemini/gemini-2.5-pro": "Gemini 2.5 Pro",
     "gemini/gemini-2.5-flash": "Gemini 2.5 Flash",
     "gemini/gemini-2.5-flash-lite": "Gemini 2.5 Flash Lite",
@@ -93,6 +96,10 @@ for line in lines:
     )
 cog.out("\n".join(to_output))
 ]]] -->
+- `gemini/gemini-2.5-flash-lite-preview-09-2025`
+- `gemini/gemini-2.5-flash-preview-09-2025`
+- `gemini/gemini-flash-lite-latest`: Latest Gemini Flash Lite
+- `gemini/gemini-flash-latest`: Latest Gemini Flash
 - `gemini/gemini-2.5-flash-lite`: Gemini 2.5 Flash Lite
 - `gemini/gemini-2.5-pro`: Gemini 2.5 Pro
 - `gemini/gemini-2.5-flash`: Gemini 2.5 Flash

{llm_gemini-0.25 → llm_gemini-0.26.1}/llm_gemini.egg-info/requires.txt

@@ -1,4 +1,4 @@
-llm>=0.26
+llm>=0.27
 httpx
 ijson
 

{llm_gemini-0.25 → llm_gemini-0.26.1}/llm_gemini.py

@@ -45,6 +45,10 @@ GOOGLE_SEARCH_MODELS = {
     "gemini-2.5-pro",
     "gemini-2.5-flash",
     "gemini-2.5-flash-lite",
+    "gemini-flash-latest",
+    "gemini-flash-lite-latest",
+    "gemini-2.5-flash-preview-09-2025",
+    "gemini-2.5-flash-lite-preview-09-2025",
 }
 
 # Older Google models used google_search_retrieval instead of google_search
@@ -70,6 +74,10 @@ THINKING_BUDGET_MODELS = {
     "gemini-2.5-pro",
     "gemini-2.5-flash",
     "gemini-2.5-flash-lite",
+    "gemini-flash-latest",
+    "gemini-flash-lite-latest",
+    "gemini-2.5-flash-preview-09-2025",
+    "gemini-2.5-flash-lite-preview-09-2025",
 }
 
 NO_VISION_MODELS = {"gemma-3-1b-it", "gemma-3n-e4b-it"}
@@ -156,6 +164,11 @@ def register_models(register):
         "gemini-2.5-pro",
         # 22nd July 2025:
         "gemini-2.5-flash-lite",
+        # 25th Spetember 2025:
+        "gemini-flash-latest",
+        "gemini-flash-lite-latest",
+        "gemini-2.5-flash-preview-09-2025",
+        "gemini-2.5-flash-lite-preview-09-2025",
     ):
         can_google_search = model_id in GOOGLE_SEARCH_MODELS
         can_thinking_budget = model_id in THINKING_BUDGET_MODELS
@@ -194,6 +207,11 @@ def cleanup_schema(schema, in_properties=False):
     "Gemini supports only a subset of JSON schema"
     keys_to_remove = ("$schema", "additionalProperties", "title")
 
+    # First pass: resolve $ref references using $defs
+    if isinstance(schema, dict) and "$defs" in schema:
+        defs = schema.pop("$defs")
+        _resolve_refs(schema, defs)
+
     if isinstance(schema, dict):
         # Only remove keys if we're not inside a 'properties' block.
         if not in_properties:
@@ -211,6 +229,26 @@ def cleanup_schema(schema, in_properties=False):
     return schema
 
 
+def _resolve_refs(schema, defs):
+    """Recursively resolve $ref references in schema using definitions."""
+    if isinstance(schema, dict):
+        if "$ref" in schema:
+            # Extract the reference path (e.g., "#/$defs/Dog" -> "Dog")
+            ref_path = schema.pop("$ref")
+            if ref_path.startswith("#/$defs/"):
+                def_name = ref_path.split("/")[-1]
+                if def_name in defs:
+                    # Replace the $ref with the actual definition
+                    schema.update(copy.deepcopy(defs[def_name]))
+
+        # Recursively resolve refs in nested structures
+        for value in schema.values():
+            _resolve_refs(value, defs)
+    elif isinstance(schema, list):
+        for item in schema:
+            _resolve_refs(item, defs)
+
+
 class _SharedGemini:
     needs_key = "gemini"
     key_env_var = "LLM_GEMINI_KEY"
@@ -543,6 +581,8 @@ class GeminiPro(_SharedGemini, llm.KeyModel):
                         gathered.append(event)
                     events.clear()
         response.response_json = gathered[-1]
+        resolved_model = gathered[-1]["modelVersion"]
+        response.set_resolved_model(resolved_model)
         self.set_usage(response)
 
 

{llm_gemini-0.25 → llm_gemini-0.26.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "llm-gemini"
-version = "0.25"
+version = "0.26.1"
 description = "LLM plugin to access Google's Gemini family of models"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
 license = "Apache-2.0"
 classifiers = []
 dependencies = [
-    "llm>=0.26",
+    "llm>=0.27",
     "httpx",
     "ijson"
 ]

llm_gemini-0.26.1/tests/test_gemini.py

@@ -0,0 +1,583 @@
+from click.testing import CliRunner
+import llm
+from llm.cli import cli
+import nest_asyncio
+import json
+import os
+import pytest
+import pydantic
+from pydantic import BaseModel
+from typing import List, Optional
+from llm_gemini import cleanup_schema
+
+nest_asyncio.apply()
+
+GEMINI_API_KEY = os.environ.get("PYTEST_GEMINI_API_KEY", None) or "gm-..."
+
+
+@pytest.mark.vcr
+@pytest.mark.asyncio
+async def test_prompt():
+    model = llm.get_model("gemini-1.5-flash-latest")
+    response = model.prompt("Name for a pet pelican, just the name", key=GEMINI_API_KEY)
+    assert str(response) == "Percy\n"
+    assert response.response_json == {
+        "candidates": [
+            {
+                "finishReason": "STOP",
+                "safetyRatings": [
+                    {
+                        "category": "HARM_CATEGORY_HATE_SPEECH",
+                        "probability": "NEGLIGIBLE",
+                    },
+                    {
+                        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
+                        "probability": "NEGLIGIBLE",
+                    },
+                    {
+                        "category": "HARM_CATEGORY_HARASSMENT",
+                        "probability": "NEGLIGIBLE",
+                    },
+                    {
+                        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+                        "probability": "NEGLIGIBLE",
+                    },
+                ],
+            }
+        ],
+        "modelVersion": "gemini-1.5-flash-latest",
+    }
+    assert response.token_details == {
+        "candidatesTokenCount": 2,
+        "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 9}],
+        "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 2}],
+    }
+    assert response.input_tokens == 9
+    assert response.output_tokens == 2
+
+    # And try it async too
+    async_model = llm.get_async_model("gemini-1.5-flash-latest")
+    response = await async_model.prompt(
+        "Name for a pet pelican, just the name", key=GEMINI_API_KEY
+    )
+    text = await response.text()
+    assert text == "Percy\n"
+
+
+@pytest.mark.vcr
+@pytest.mark.asyncio
+async def test_prompt_with_pydantic_schema():
+    class Dog(pydantic.BaseModel):
+        name: str
+        age: int
+        bio: str
+
+    class Dogs(BaseModel):
+        dogs: List[Dog]
+
+    model = llm.get_model("gemini-1.5-flash-latest")
+    response = model.prompt(
+        "Invent a cool dog", key=GEMINI_API_KEY, schema=Dog, stream=False
+    )
+    assert json.loads(response.text()) == {
+        "age": 3,
+        "bio": "A fluffy Samoyed with exceptional intelligence and a love for belly rubs. He's mastered several tricks, including fetching the newspaper and opening doors.",
+        "name": "Cloud",
+    }
+    assert response.response_json == {
+        "candidates": [
+            {
+                "finishReason": "STOP",
+                "safetyRatings": [
+                    {
+                        "category": "HARM_CATEGORY_HATE_SPEECH",
+                        "probability": "NEGLIGIBLE",
+                    },
+                    {
+                        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
+                        "probability": "NEGLIGIBLE",
+                    },
+                    {
+                        "category": "HARM_CATEGORY_HARASSMENT",
+                        "probability": "NEGLIGIBLE",
+                    },
+                    {
+                        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+                        "probability": "NEGLIGIBLE",
+                    },
+                ],
+            }
+        ],
+        "modelVersion": "gemini-1.5-flash-latest",
+    }
+    assert response.input_tokens == 10
+
+
+@pytest.mark.vcr
+@pytest.mark.asyncio
+async def test_prompt_with_multiple_dogs():
+    class Dog(pydantic.BaseModel):
+        name: str
+        age: int
+        bio: str
+
+    class Dogs(BaseModel):
+        dogs: List[Dog]
+
+    model = llm.get_model("gemini-2.0-flash")
+    response = model.prompt(
+        "Invent 3 cool dogs", key=GEMINI_API_KEY, schema=Dogs, stream=False
+    )
+    result = json.loads(response.text())
+
+    # Verify we got 3 dogs
+    assert "dogs" in result
+    assert len(result["dogs"]) == 3
+
+    # Verify each dog has the required fields
+    for dog in result["dogs"]:
+        assert "name" in dog
+        assert "age" in dog
+        assert "bio" in dog
+        assert isinstance(dog["name"], str)
+        assert isinstance(dog["age"], int)
+        assert isinstance(dog["bio"], str)
+
+
+@pytest.mark.vcr
+@pytest.mark.parametrize(
+    "model_id",
+    (
+        "gemini-embedding-exp-03-07",
+        "gemini-embedding-exp-03-07-128",
+        "gemini-embedding-exp-03-07-512",
+    ),
+)
+def test_embedding(model_id, monkeypatch):
+    monkeypatch.setenv("LLM_GEMINI_KEY", GEMINI_API_KEY)
+    model = llm.get_embedding_model(model_id)
+    response = model.embed("Some text goes here")
+    expected_length = 3072
+    if model_id.endswith("-128"):
+        expected_length = 128
+    elif model_id.endswith("-512"):
+        expected_length = 512
+    assert len(response) == expected_length
+
+
+@pytest.mark.parametrize(
+    "schema,expected",
+    [
+        # Test 1: Top-level keys removal
+        (
+            {
+                "$schema": "http://json-schema.org/draft-07/schema#",
+                "title": "Example Schema",
+                "additionalProperties": False,
+                "type": "object",
+            },
+            {"type": "object"},
+        ),
+        # Test 2: Preserve keys within a "properties" block
+        (
+            {
+                "type": "object",
+                "properties": {
+                    "authors": {"type": "string"},
+                    "title": {"type": "string"},
+                    "reference": {"type": "string"},
+                    "year": {"type": "string"},
+                },
+                "title": "This should be removed from the top-level",
+            },
+            {
+                "type": "object",
+                "properties": {
+                    "authors": {"type": "string"},
+                    "title": {"type": "string"},
+                    "reference": {"type": "string"},
+                    "year": {"type": "string"},
+                },
+            },
+        ),
+        # Test 3: Nested keys outside and inside properties block
+        (
+            {
+                "definitions": {
+                    "info": {
+                        "title": "Info title",  # should be removed because it's not inside a "properties" block
+                        "description": "A description",
+                        "properties": {
+                            "name": {
+                                "title": "Name Title",
+                                "type": "string",
+                            },  # title here should be preserved
+                            "$schema": {
+                                "type": "string"
+                            },  # should be preserved as it's within properties
+                        },
+                    }
+                },
+                "$schema": "http://example.com/schema",
+            },
+            {
+                "definitions": {
+                    "info": {
+                        "description": "A description",
+                        "properties": {
+                            "name": {"title": "Name Title", "type": "string"},
+                            "$schema": {"type": "string"},
+                        },
+                    }
+                }
+            },
+        ),
+        # Test 4: List of schemas
+        (
+            [
+                {
+                    "$schema": "http://json-schema.org/draft-07/schema#",
+                    "type": "object",
+                },
+                {"title": "Should be removed", "type": "array"},
+            ],
+            [{"type": "object"}, {"type": "array"}],
+        ),
+    ],
+)
+def test_cleanup_schema(schema, expected):
+    # Use a deep copy so the original test data remains unchanged.
+    result = cleanup_schema(schema)
+    assert result == expected
+
+
+# Tests for $ref resolution - patterns that now work with nested models
+@pytest.mark.parametrize(
+    "schema,expected",
+    [
+        # Test 1: Direct model reference (Person with Address)
+        (
+            {
+                "properties": {
+                    "name": {"type": "string"},
+                    "address": {"$ref": "#/$defs/Address"},
+                },
+                "required": ["name", "address"],
+                "type": "object",
+                "$defs": {
+                    "Address": {
+                        "properties": {
+                            "street": {"type": "string"},
+                            "city": {"type": "string"},
+                        },
+                        "required": ["street", "city"],
+                        "type": "object",
+                    }
+                },
+            },
+            {
+                "properties": {
+                    "name": {"type": "string"},
+                    "address": {
+                        "properties": {
+                            "street": {"type": "string"},
+                            "city": {"type": "string"},
+                        },
+                        "required": ["street", "city"],
+                        "type": "object",
+                    },
+                },
+                "required": ["name", "address"],
+                "type": "object",
+            },
+        ),
+        # Test 2: List of models (Dogs with List[Dog])
+        (
+            {
+                "properties": {
+                    "dogs": {"items": {"$ref": "#/$defs/Dog"}, "type": "array"}
+                },
+                "required": ["dogs"],
+                "type": "object",
+                "$defs": {
+                    "Dog": {
+                        "properties": {
+                            "name": {"type": "string"},
+                            "age": {"type": "integer"},
+                        },
+                        "required": ["name", "age"],
+                        "type": "object",
+                    }
+                },
+            },
+            {
+                "properties": {
+                    "dogs": {
+                        "items": {
+                            "properties": {
+                                "name": {"type": "string"},
+                                "age": {"type": "integer"},
+                            },
+                            "required": ["name", "age"],
+                            "type": "object",
+                        },
+                        "type": "array",
+                    }
+                },
+                "required": ["dogs"],
+                "type": "object",
+            },
+        ),
+        # Test 3: Optional model field
+        (
+            {
+                "properties": {
+                    "name": {"type": "string"},
+                    "employer": {
+                        "anyOf": [{"$ref": "#/$defs/Company"}, {"type": "null"}]
+                    },
+                },
+                "required": ["name"],
+                "type": "object",
+                "$defs": {
+                    "Company": {
+                        "properties": {"company_name": {"type": "string"}},
+                        "required": ["company_name"],
+                        "type": "object",
+                    }
+                },
+            },
+            {
+                "properties": {
+                    "name": {"type": "string"},
+                    "employer": {
+                        "anyOf": [
+                            {
+                                "properties": {"company_name": {"type": "string"}},
+                                "required": ["company_name"],
+                                "type": "object",
+                            },
+                            {"type": "null"},
+                        ]
+                    },
+                },
+                "required": ["name"],
+                "type": "object",
+            },
+        ),
+        # Test 4: Nested composition (Customer -> List[Order] -> List[Item])
+        (
+            {
+                "properties": {
+                    "name": {"type": "string"},
+                    "orders": {"items": {"$ref": "#/$defs/Order"}, "type": "array"},
+                },
+                "required": ["name", "orders"],
+                "type": "object",
+                "$defs": {
+                    "Order": {
+                        "properties": {
+                            "items": {
+                                "items": {"$ref": "#/$defs/Item"},
+                                "type": "array",
+                            }
+                        },
+                        "required": ["items"],
+                        "type": "object",
+                    },
+                    "Item": {
+                        "properties": {
+                            "product_name": {"type": "string"},
+                            "quantity": {"type": "integer"},
+                        },
+                        "required": ["product_name", "quantity"],
+                        "type": "object",
+                    },
+                },
+            },
+            {
+                "properties": {
+                    "name": {"type": "string"},
+                    "orders": {
+                        "items": {
+                            "properties": {
+                                "items": {
+                                    "items": {
+                                        "properties": {
+                                            "product_name": {"type": "string"},
+                                            "quantity": {"type": "integer"},
+                                        },
+                                        "required": ["product_name", "quantity"],
+                                        "type": "object",
+                                    },
+                                    "type": "array",
+                                }
+                            },
+                            "required": ["items"],
+                            "type": "object",
+                        },
+                        "type": "array",
+                    },
+                },
+                "required": ["name", "orders"],
+                "type": "object",
+            },
+        ),
+    ],
+)
+def test_cleanup_schema_with_refs(schema, expected):
+    """Test that $ref resolution works for various nested model patterns."""
+    import copy
+
+    result = cleanup_schema(copy.deepcopy(schema))
+    assert result == expected
+
+
+@pytest.mark.vcr
+def test_nested_model_direct_reference():
+    """Test Pattern 1: Direct model reference (Person with Address)"""
+
+    class Address(BaseModel):
+        street: str
+        city: str
+
+    class Person(BaseModel):
+        name: str
+        address: Address
+
+    model = llm.get_model("gemini-2.0-flash")
+    response = model.prompt(
+        "Create a person named Alice living in San Francisco",
+        key=GEMINI_API_KEY,
+        schema=Person,
+        stream=False,
+    )
+    result = json.loads(response.text())
+    assert "name" in result
+    assert "address" in result
+    assert "street" in result["address"]
+    assert "city" in result["address"]
+
+
+@pytest.mark.vcr
+def test_nested_model_list():
+    """Test Pattern 2: List of models (already covered by test_prompt_with_multiple_dogs)"""
+    pass  # Covered by test_prompt_with_multiple_dogs
+
+
+@pytest.mark.vcr
+def test_nested_model_optional():
+    """Test Pattern 3: Optional model field"""
+
+    class Company(BaseModel):
+        company_name: str
+
+    class Person(BaseModel):
+        name: str
+        employer: Optional[Company]
+
+    model = llm.get_model("gemini-2.0-flash")
+    response = model.prompt(
+        "Create a person named Bob who works at TechCorp",
+        key=GEMINI_API_KEY,
+        schema=Person,
+        stream=False,
+    )
+    result = json.loads(response.text())
+    assert "name" in result
+    assert "employer" in result
+    if result["employer"] is not None:
+        assert "company_name" in result["employer"]
+
+
+@pytest.mark.vcr
+def test_nested_model_deep_composition():
+    """Test Pattern 4: Nested composition (Customer -> Orders -> Items)"""
+
+    class Item(BaseModel):
+        product_name: str
+        quantity: int
+
+    class Order(BaseModel):
+        items: List[Item]
+
+    class Customer(BaseModel):
+        name: str
+        orders: List[Order]
+
+    model = llm.get_model("gemini-2.0-flash")
+    response = model.prompt(
+        "Create a customer named Carol with 2 orders, each containing 2 items",
+        key=GEMINI_API_KEY,
+        schema=Customer,
+        stream=False,
+    )
+    result = json.loads(response.text())
+    assert "name" in result
+    assert "orders" in result
+    assert len(result["orders"]) > 0
+    for order in result["orders"]:
+        assert "items" in order
+        assert len(order["items"]) > 0
+        for item in order["items"]:
+            assert "product_name" in item
+            assert "quantity" in item
+
+
+@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
+    # And with --method
+    result3 = runner.invoke(
+        cli, ["gemini", "models", "--key", GEMINI_API_KEY, "--method", "embedContent"]
+    )
+    assert result3.exit_code == 0
+    models = json.loads(result3.output)
+    for model in models:
+        assert "embedContent" in model["supportedGenerationMethods"]
+
+
+@pytest.mark.vcr
+def test_resolved_model():
+    model = llm.get_model("gemini-flash-latest")
+    response = model.prompt("hi", key=GEMINI_API_KEY)
+    response.text()
+    assert response.resolved_model == "gemini-2.5-flash-preview-09-2025"
+
+
+@pytest.mark.vcr
+def test_tools():
+    model = llm.get_model("gemini-2.0-flash")
+    names = ["Charles", "Sammy"]
+    chain_response = model.chain(
+        "Two names for a pet pelican",
+        tools=[
+            llm.Tool.function(lambda: names.pop(0), name="pelican_name_generator"),
+        ],
+        key=GEMINI_API_KEY,
+    )
+    text = chain_response.text()
+    assert text == "Okay, here are two names for a pet pelican: Charles and Sammy.\n"
+    # This one did three
+    assert len(chain_response._responses) == 3
+    first, second, third = chain_response._responses
+    assert len(first.tool_calls()) == 1
+    assert first.tool_calls()[0].name == "pelican_name_generator"
+    assert len(second.tool_calls()) == 1
+    assert second.tool_calls()[0].name == "pelican_name_generator"
+    assert second.prompt.tool_results[0].output == "Charles"
+    assert third.prompt.tool_results[0].output == "Sammy"

llm_gemini-0.25/tests/test_gemini.py

@@ -1,266 +0,0 @@
-from click.testing import CliRunner
-import llm
-from llm.cli import cli
-import nest_asyncio
-import json
-import os
-import pytest
-import pydantic
-from llm_gemini import cleanup_schema
-
-nest_asyncio.apply()
-
-GEMINI_API_KEY = os.environ.get("PYTEST_GEMINI_API_KEY", None) or "gm-..."
-
-
-@pytest.mark.vcr
-@pytest.mark.asyncio
-async def test_prompt():
-    model = llm.get_model("gemini-1.5-flash-latest")
-    response = model.prompt("Name for a pet pelican, just the name", key=GEMINI_API_KEY)
-    assert str(response) == "Percy\n"
-    assert response.response_json == {
-        "candidates": [
-            {
-                "finishReason": "STOP",
-                "safetyRatings": [
-                    {
-                        "category": "HARM_CATEGORY_HATE_SPEECH",
-                        "probability": "NEGLIGIBLE",
-                    },
-                    {
-                        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-                        "probability": "NEGLIGIBLE",
-                    },
-                    {
-                        "category": "HARM_CATEGORY_HARASSMENT",
-                        "probability": "NEGLIGIBLE",
-                    },
-                    {
-                        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-                        "probability": "NEGLIGIBLE",
-                    },
-                ],
-            }
-        ],
-        "modelVersion": "gemini-1.5-flash-latest",
-    }
-    assert response.token_details == {
-        "candidatesTokenCount": 2,
-        "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 9}],
-        "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 2}],
-    }
-    assert response.input_tokens == 9
-    assert response.output_tokens == 2
-
-    # And try it async too
-    async_model = llm.get_async_model("gemini-1.5-flash-latest")
-    response = await async_model.prompt(
-        "Name for a pet pelican, just the name", key=GEMINI_API_KEY
-    )
-    text = await response.text()
-    assert text == "Percy\n"
-
-
-@pytest.mark.vcr
-@pytest.mark.asyncio
-async def test_prompt_with_pydantic_schema():
-    class Dog(pydantic.BaseModel):
-        name: str
-        age: int
-        bio: str
-
-    model = llm.get_model("gemini-1.5-flash-latest")
-    response = model.prompt(
-        "Invent a cool dog", key=GEMINI_API_KEY, schema=Dog, stream=False
-    )
-    assert json.loads(response.text()) == {
-        "age": 3,
-        "bio": "A fluffy Samoyed with exceptional intelligence and a love for belly rubs. He's mastered several tricks, including fetching the newspaper and opening doors.",
-        "name": "Cloud",
-    }
-    assert response.response_json == {
-        "candidates": [
-            {
-                "finishReason": "STOP",
-                "safetyRatings": [
-                    {
-                        "category": "HARM_CATEGORY_HATE_SPEECH",
-                        "probability": "NEGLIGIBLE",
-                    },
-                    {
-                        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-                        "probability": "NEGLIGIBLE",
-                    },
-                    {
-                        "category": "HARM_CATEGORY_HARASSMENT",
-                        "probability": "NEGLIGIBLE",
-                    },
-                    {
-                        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-                        "probability": "NEGLIGIBLE",
-                    },
-                ],
-            }
-        ],
-        "modelVersion": "gemini-1.5-flash-latest",
-    }
-    assert response.input_tokens == 10
-
-
-@pytest.mark.vcr
-@pytest.mark.parametrize(
-    "model_id",
-    (
-        "gemini-embedding-exp-03-07",
-        "gemini-embedding-exp-03-07-128",
-        "gemini-embedding-exp-03-07-512",
-    ),
-)
-def test_embedding(model_id, monkeypatch):
-    monkeypatch.setenv("LLM_GEMINI_KEY", GEMINI_API_KEY)
-    model = llm.get_embedding_model(model_id)
-    response = model.embed("Some text goes here")
-    expected_length = 3072
-    if model_id.endswith("-128"):
-        expected_length = 128
-    elif model_id.endswith("-512"):
-        expected_length = 512
-    assert len(response) == expected_length
-
-
-@pytest.mark.parametrize(
-    "schema,expected",
-    [
-        # Test 1: Top-level keys removal
-        (
-            {
-                "$schema": "http://json-schema.org/draft-07/schema#",
-                "title": "Example Schema",
-                "additionalProperties": False,
-                "type": "object",
-            },
-            {"type": "object"},
-        ),
-        # Test 2: Preserve keys within a "properties" block
-        (
-            {
-                "type": "object",
-                "properties": {
-                    "authors": {"type": "string"},
-                    "title": {"type": "string"},
-                    "reference": {"type": "string"},
-                    "year": {"type": "string"},
-                },
-                "title": "This should be removed from the top-level",
-            },
-            {
-                "type": "object",
-                "properties": {
-                    "authors": {"type": "string"},
-                    "title": {"type": "string"},
-                    "reference": {"type": "string"},
-                    "year": {"type": "string"},
-                },
-            },
-        ),
-        # Test 3: Nested keys outside and inside properties block
-        (
-            {
-                "definitions": {
-                    "info": {
-                        "title": "Info title",  # should be removed because it's not inside a "properties" block
-                        "description": "A description",
-                        "properties": {
-                            "name": {
-                                "title": "Name Title",
-                                "type": "string",
-                            },  # title here should be preserved
-                            "$schema": {
-                                "type": "string"
-                            },  # should be preserved as it's within properties
-                        },
-                    }
-                },
-                "$schema": "http://example.com/schema",
-            },
-            {
-                "definitions": {
-                    "info": {
-                        "description": "A description",
-                        "properties": {
-                            "name": {"title": "Name Title", "type": "string"},
-                            "$schema": {"type": "string"},
-                        },
-                    }
-                }
-            },
-        ),
-        # Test 4: List of schemas
-        (
-            [
-                {
-                    "$schema": "http://json-schema.org/draft-07/schema#",
-                    "type": "object",
-                },
-                {"title": "Should be removed", "type": "array"},
-            ],
-            [{"type": "object"}, {"type": "array"}],
-        ),
-    ],
-)
-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
-    # And with --method
-    result3 = runner.invoke(
-        cli, ["gemini", "models", "--key", GEMINI_API_KEY, "--method", "embedContent"]
-    )
-    assert result3.exit_code == 0
-    models = json.loads(result3.output)
-    for model in models:
-        assert "embedContent" in model["supportedGenerationMethods"]
-
-
-@pytest.mark.vcr
-def test_tools():
-    model = llm.get_model("gemini-2.0-flash")
-    names = ["Charles", "Sammy"]
-    chain_response = model.chain(
-        "Two names for a pet pelican",
-        tools=[
-            llm.Tool.function(lambda: names.pop(0), name="pelican_name_generator"),
-        ],
-        key=GEMINI_API_KEY,
-    )
-    text = chain_response.text()
-    assert text == "Okay, here are two names for a pet pelican: Charles and Sammy.\n"
-    # This one did three
-    assert len(chain_response._responses) == 3
-    first, second, third = chain_response._responses
-    assert len(first.tool_calls()) == 1
-    assert first.tool_calls()[0].name == "pelican_name_generator"
-    assert len(second.tool_calls()) == 1
-    assert second.tool_calls()[0].name == "pelican_name_generator"
-    assert second.prompt.tool_results[0].output == "Charles"
-    assert third.prompt.tool_results[0].output == "Sammy"