llm-gemini 0.25__py3-none-any.whl → 0.26.1__py3-none-any.whl

{llm_gemini-0.25.dist-info → llm_gemini-0.26.1.dist-info}/METADATA

@@ -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.26.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+llm_gemini.py,sha256=Vfc-zIRxYL81JDGtbu-GNLDlCmbcHUXZT84w2adrRjw,25748
+llm_gemini-0.26.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+llm_gemini-0.26.1.dist-info/METADATA,sha256=YtjWlmRIImrzbxjghVYMYcUw8OBCkpu3toXo59oGvZg,11949
+llm_gemini-0.26.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llm_gemini-0.26.1.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
+llm_gemini-0.26.1.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
+llm_gemini-0.26.1.dist-info/RECORD,,

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.dist-info/RECORD

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=uItceU020Z6RMurfvvBCnQ25dfxfr-V_dW1h0YsLBOM,24194
-llm_gemini-0.25.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.25.dist-info/METADATA,sha256=sFpTVF87sHt8ldPlmTteoZ-Yg1KDIDmVgztjAshWKGA,11565
-llm_gemini-0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llm_gemini-0.25.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.25.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.25.dist-info/RECORD,,