llm-gemini 0.9__py3-none-any.whl → 0.11__py3-none-any.whl

{llm_gemini-0.9.dist-info → llm_gemini-0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: llm-gemini
-Version: 0.9
+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
 
@@ -67,6 +68,9 @@ Other models are:
 - `learnlm-1.5-pro-experimental` - "an experimental task-specific model that has been trained to align with learning science principles" - [more details here](https://ai.google.dev/gemini-api/docs/learnlm).
 - `gemini-2.0-flash-thinking-exp-1219` - experimental "thinking" model from December 2024
 - `gemini-2.0-flash-thinking-exp-01-21` - experimental "thinking" model from January 2025
+- `gemini-2.0-flash` - Gemini 2.0 Flash
+- `gemini-2.0-flash-lite-preview-02-05` - Gemini 2.0 Flash-Lite
+- `gemini-2.0-pro-exp-02-05` - experimental release of Gemini 2.0 Pro
 
 ### Images, audio and video
 

llm_gemini-0.11.dist-info/RECORD

@@ -0,0 +1,7 @@
+llm_gemini.py,sha256=tILVMtCj52Tt8VHK1YsTD0n55CpzzW3nMceavTdC9P8,12896
+llm_gemini-0.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+llm_gemini-0.11.dist-info/METADATA,sha256=L_7OzL0ToVpD-pCTCFIOwZuCNU60CdWbx_9psWgTdlM,7028
+llm_gemini-0.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+llm_gemini-0.11.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
+llm_gemini-0.11.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
+llm_gemini-0.11.dist-info/RECORD,,

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",
 }
 
 
@@ -55,6 +56,10 @@ def register_models(register):
         "learnlm-1.5-pro-experimental",
         "gemini-2.0-flash-thinking-exp-1219",
         "gemini-2.0-flash-thinking-exp-01-21",
+        # Released 5th Feb 2025:
+        "gemini-2.0-flash",
+        "gemini-2.0-flash-lite-preview-02-05",
+        "gemini-2.0-pro-exp-02-05",
     ]:
         can_google_search = model_id in GOOGLE_SEARCH_MODELS
         register(
@@ -216,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}]}
 
@@ -264,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)
@@ -275,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()
@@ -297,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)
@@ -309,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.9.dist-info/RECORD

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=sCouoSbzOe4GoTsskAKJZjhDTxRYqSxgNuODwi2O1z0,12752
-llm_gemini-0.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.9.dist-info/METADATA,sha256=UEr_dRMMSev9YY9U34QMQHnhuyRPM7E7sHT1o8uA0qg,6808
-llm_gemini-0.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-llm_gemini-0.9.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.9.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.9.dist-info/RECORD,,