llm-gemini 0.4.1__py3-none-any.whl → 0.5__py3-none-any.whl

{llm_gemini-0.4.1.dist-info → llm_gemini-0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llm-gemini
-Version: 0.4.1
+Version: 0.5
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License: Apache-2.0
@@ -11,12 +11,12 @@ 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.18
+Requires-Dist: llm>=0.19
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pytest-recording ; extra == 'test'
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-recording; extra == "test"
 
 # llm-gemini
 
@@ -60,7 +60,8 @@ Other models are:
 
 - `gemini-1.5-flash-latest`
 - `gemini-1.5-flash-8b-latest` - the least expensive
-- `gemini-exp-1114` - recent experimental
+- `gemini-exp-1114` - recent experimental #1
+- `gemini-exp-1121` - recent experimental #2
 
 ### Images, audio and video
 
@@ -157,3 +158,16 @@ To run the tests:
 ```bash
 pytest
 ```
+
+This project uses [pytest-recording](https://github.com/kiwicom/pytest-recording) to record Gemini API responses for the tests.
+
+If you add a new test that calls the API you can capture the API response like this:
+```bash
+PYTEST_GEMINI_API_KEY="$(llm keys get gemini)" pytest --record-mode once
+```
+You will need to have stored a valid Gemini API key using this command first:
+```bash
+llm keys set gemini
+# Paste key here
+```
+

llm_gemini-0.5.dist-info/RECORD

@@ -0,0 +1,7 @@
+llm_gemini.py,sha256=GFAYIFWCRyM1FhMbvZhm9DvRPmW-GUNlzgkBY-Gcq7g,11295
+llm_gemini-0.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+llm_gemini-0.5.dist-info/METADATA,sha256=Ipci7xoIduAqjP-73H2jstoqj5Qp0KmnMUNifHp8JXg,5335
+llm_gemini-0.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+llm_gemini-0.5.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
+llm_gemini-0.5.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
+llm_gemini-0.5.dist-info/RECORD,,

{llm_gemini-0.4.1.dist-info → llm_gemini-0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

llm_gemini.py

@@ -38,6 +38,7 @@ def register_models(register):
         "gemini-1.5-flash-8b-latest",
         "gemini-1.5-flash-8b-001",
         "gemini-exp-1114",
+        "gemini-exp-1121",
     ]:
         register(GeminiPro(model_id), AsyncGeminiPro(model_id))
 
@@ -210,6 +211,19 @@ class _SharedGemini:
             return f'```\n{part["codeExecutionResult"]["output"].strip()}\n```\n'
         return ""
 
+    def set_usage(self, response):
+        try:
+            usage = response.response_json[-1].pop("usageMetadata")
+            input_tokens = usage.pop("promptTokenCount", None)
+            output_tokens = usage.pop("candidatesTokenCount", None)
+            usage.pop("totalTokenCount", None)
+            if input_tokens is not None:
+                response.set_usage(
+                    input=input_tokens, output=output_tokens, details=usage or None
+                )
+        except (IndexError, KeyError):
+            pass
+
 
 class GeminiPro(_SharedGemini, llm.Model):
     def execute(self, prompt, stream, response, conversation):
@@ -241,6 +255,7 @@ class GeminiPro(_SharedGemini, llm.Model):
                     gathered.append(event)
                     events.clear()
         response.response_json = gathered
+        self.set_usage(response)
 
 
 class AsyncGeminiPro(_SharedGemini, llm.AsyncModel):
@@ -274,6 +289,7 @@ class AsyncGeminiPro(_SharedGemini, llm.AsyncModel):
                         gathered.append(event)
                         events.clear()
         response.response_json = gathered
+        self.set_usage(response)
 
 
 @llm.hookimpl

llm_gemini-0.4.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=_7yQ14ffRpyK3ChAOc6M2ufylg2kUKTQK4C3VKOiUgM,10672
-llm_gemini-0.4.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.4.1.dist-info/METADATA,sha256=OhySg0uA_de-JRZrYIJFZu_uSYVKXEGs4W_x3LkQUvE,4864
-llm_gemini-0.4.1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-llm_gemini-0.4.1.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.4.1.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.4.1.dist-info/RECORD,,