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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llm-gemini
-Version: 0.4.2
+Version: 0.5
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
 License: Apache-2.0
@@ -11,7 +11,7 @@ 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

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.py

@@ -211,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):
@@ -242,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):
@@ -275,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.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=1lyC3SDLVTgRxsxC6T_l0P3xchq2NjqpFslgjPl83Bg,10699
-llm_gemini-0.4.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.4.2.dist-info/METADATA,sha256=oNq8S0QhfgEDc2st90DplNFDbNy7-5NyxLSGq7e0P_w,5337
-llm_gemini-0.4.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-llm_gemini-0.4.2.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.4.2.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.4.2.dist-info/RECORD,,