llm-gemini 0.18__py3-none-any.whl → 0.18.1__py3-none-any.whl

{llm_gemini-0.18.dist-info → llm_gemini-0.18.1.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+llm_gemini.py,sha256=mPnnJ5gWU1NS8cxmq2JDiKGq7tXaP1oz7lsMtRv3Ae4,18319
+llm_gemini-0.18.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+llm_gemini-0.18.1.dist-info/METADATA,sha256=Y6sJT4JCMXtnk6zP6EaQ6mEEZYL7vwfwOg04IdTI6UU,8049
+llm_gemini-0.18.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+llm_gemini-0.18.1.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
+llm_gemini-0.18.1.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
+llm_gemini-0.18.1.dist-info/RECORD,,

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

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=eoMPxKnWgEN3Li1HDsKIgKnXT5AL4stDhWc1MU6uIRE,17558
-llm_gemini-0.18.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.18.dist-info/METADATA,sha256=X3NSwwbxo8TIAgyf3PA13WUzSWKTxXc38EhpD2VK_ds,8047
-llm_gemini-0.18.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-llm_gemini-0.18.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.18.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.18.dist-info/RECORD,,