llm-gemini 0.10__tar.gz → 0.11__tar.gz

{llm_gemini-0.10 → llm_gemini-0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: llm-gemini
-Version: 0.10
+Version: 0.11
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License: Apache-2.0
@@ -11,12 +11,13 @@ Project-URL: CI, https://github.com/simonw/llm-gemini/actions
 Classifier: License :: OSI Approved :: Apache Software License
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: llm>=0.19
+Requires-Dist: llm>=0.22
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-recording; extra == "test"
+Requires-Dist: nest-asyncio; extra == "test"
 
 # llm-gemini
 

{llm_gemini-0.10 → llm_gemini-0.11}/llm_gemini.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: llm-gemini
-Version: 0.10
+Version: 0.11
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License: Apache-2.0
@@ -11,12 +11,13 @@ Project-URL: CI, https://github.com/simonw/llm-gemini/actions
 Classifier: License :: OSI Approved :: Apache Software License
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: llm>=0.19
+Requires-Dist: llm>=0.22
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-recording; extra == "test"
+Requires-Dist: nest-asyncio; extra == "test"
 
 # llm-gemini
 

{llm_gemini-0.10 → llm_gemini-0.11}/llm_gemini.egg-info/requires.txt

@@ -1,7 +1,8 @@
-llm>=0.19
+llm>=0.22
 httpx
 ijson
 
 [test]
 pytest
 pytest-recording
+nest-asyncio

{llm_gemini-0.10 → llm_gemini-0.11}/llm_gemini.py

@@ -32,6 +32,7 @@ GOOGLE_SEARCH_MODELS = {
     "gemini-1.5-pro-002",
     "gemini-1.5-flash-002",
     "gemini-2.0-flash-exp",
+    "gemini-2.0-flash",
 }
 
 
@@ -220,7 +221,7 @@ 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_retrieval": {}}]
+            body["tools"] = [{"google_search": {}}]
         if prompt.system:
             body["systemInstruction"] = {"parts": [{"text": prompt.system}]}
 
@@ -268,9 +269,8 @@ class _SharedGemini:
             pass
 
 
-class GeminiPro(_SharedGemini, llm.Model):
-    def execute(self, prompt, stream, response, conversation):
-        key = self.get_key()
+class GeminiPro(_SharedGemini, llm.KeyModel):
+    def execute(self, prompt, stream, response, conversation, key):
         url = f"https://generativelanguage.googleapis.com/v1beta/models/{self.model_id}:streamGenerateContent"
         gathered = []
         body = self.build_request_body(prompt, conversation)
@@ -279,7 +279,7 @@ class GeminiPro(_SharedGemini, llm.Model):
             "POST",
             url,
             timeout=None,
-            headers={"x-goog-api-key": key},
+            headers={"x-goog-api-key": self.get_key(key)},
             json=body,
         ) as http_response:
             events = ijson.sendable_list()
@@ -301,9 +301,8 @@ class GeminiPro(_SharedGemini, llm.Model):
         self.set_usage(response)
 
 
-class AsyncGeminiPro(_SharedGemini, llm.AsyncModel):
-    async def execute(self, prompt, stream, response, conversation):
-        key = self.get_key()
+class AsyncGeminiPro(_SharedGemini, llm.AsyncKeyModel):
+    async def execute(self, prompt, stream, response, conversation, key):
         url = f"https://generativelanguage.googleapis.com/v1beta/models/{self.model_id}:streamGenerateContent"
         gathered = []
         body = self.build_request_body(prompt, conversation)
@@ -313,7 +312,7 @@ class AsyncGeminiPro(_SharedGemini, llm.AsyncModel):
                 "POST",
                 url,
                 timeout=None,
-                headers={"x-goog-api-key": key},
+                headers={"x-goog-api-key": self.get_key(key)},
                 json=body,
             ) as http_response:
                 events = ijson.sendable_list()

{llm_gemini-0.10 → llm_gemini-0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llm-gemini"
-version = "0.10"
+version = "0.11"
 description = "LLM plugin to access Google's Gemini family of models"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
@@ -9,7 +9,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License"
 ]
 dependencies = [
-    "llm>=0.19",
+    "llm>=0.22",
     "httpx",
     "ijson"
 ]
@@ -24,4 +24,4 @@ CI = "https://github.com/simonw/llm-gemini/actions"
 gemini = "llm_gemini"
 
 [project.optional-dependencies]
-test = ["pytest", "pytest-recording"]
+test = ["pytest", "pytest-recording", "nest-asyncio"]

{llm_gemini-0.10 → llm_gemini-0.11}/tests/test_gemini.py

@@ -1,7 +1,10 @@
 import llm
+import nest_asyncio
 import os
 import pytest
 
+nest_asyncio.apply()
+
 GEMINI_API_KEY = os.environ.get("PYTEST_GEMINI_API_KEY", None) or "gm-..."
 
 
@@ -9,15 +12,14 @@ GEMINI_API_KEY = os.environ.get("PYTEST_GEMINI_API_KEY", None) or "gm-..."
 @pytest.mark.asyncio
 async def test_prompt():
     model = llm.get_model("gemini-1.5-flash-latest")
-    model.key = model.key or GEMINI_API_KEY
-    response = model.prompt("Name for a pet pelican, just the name")
+    response = model.prompt("Name for a pet pelican, just the name", key=GEMINI_API_KEY)
     assert str(response) == "Percy"
     assert response.response_json == [
         {
             "candidates": [
                 {"content": {"parts": [{"text": "Percy"}], "role": "model"}}
             ],
-            "modelVersion": "gemini-1.5-flash-002",
+            "modelVersion": "gemini-1.5-flash-latest",
         }
     ]
     assert response.token_details is None
@@ -28,7 +30,8 @@ async def test_prompt():
 
     # And try it async too
     async_model = llm.get_async_model("gemini-1.5-flash-latest")
-    async_model.key = async_model.key or GEMINI_API_KEY
-    response = await async_model.prompt("Name for a pet pelican, just the name")
+    response = await async_model.prompt(
+        "Name for a pet pelican, just the name", key=GEMINI_API_KEY
+    )
     text = await response.text()
     assert text == "Percy"