llm-gemini 0.20a0__tar.gz → 0.20a2__tar.gz

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/PKG-INFO

@@ -1,17 +1,16 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.20a0
+Version: 0.20a2
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/simonw/llm-gemini
 Project-URL: Changelog, https://github.com/simonw/llm-gemini/releases
 Project-URL: Issues, https://github.com/simonw/llm-gemini/issues
 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.23
+Requires-Dist: llm>=0.26a0
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
@@ -67,7 +66,8 @@ llm "A joke about a pelican and a walrus"
 Other models are:
 
 - `gemini-2.5-pro-preview-05-06` - latest paid Gemini 2.5 Pro preview
-- `gemini-2.5-flash-preview-04-17` - Gemini 2.5 Flash preview
+- `gemini-2.5-flash-preview-05-20` - Gemini 2.5 Flash preview
+- `gemini-2.5-flash-preview-04-17` - Earlier Gemini 2.5 Flash preview
 - `gemini-2.5-pro-exp-03-25` - free experimental release of Gemini 2.5 Pro
 - `gemini-2.5-pro-preview-03-25` - paid preview of Gemini 2.5 Pro
 - `gemma-3-27b-it` - [Gemma 3](https://blog.google/technology/developers/gemma-3/) 27B

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/README.md

@@ -44,7 +44,8 @@ llm "A joke about a pelican and a walrus"
 Other models are:
 
 - `gemini-2.5-pro-preview-05-06` - latest paid Gemini 2.5 Pro preview
-- `gemini-2.5-flash-preview-04-17` - Gemini 2.5 Flash preview
+- `gemini-2.5-flash-preview-05-20` - Gemini 2.5 Flash preview
+- `gemini-2.5-flash-preview-04-17` - Earlier Gemini 2.5 Flash preview
 - `gemini-2.5-pro-exp-03-25` - free experimental release of Gemini 2.5 Pro
 - `gemini-2.5-pro-preview-03-25` - paid preview of Gemini 2.5 Pro
 - `gemma-3-27b-it` - [Gemma 3](https://blog.google/technology/developers/gemma-3/) 27B

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/llm_gemini.egg-info/PKG-INFO

@@ -1,17 +1,16 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.20a0
+Version: 0.20a2
 Summary: LLM plugin to access Google's Gemini family of models
 Author: Simon Willison
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/simonw/llm-gemini
 Project-URL: Changelog, https://github.com/simonw/llm-gemini/releases
 Project-URL: Issues, https://github.com/simonw/llm-gemini/issues
 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.23
+Requires-Dist: llm>=0.26a0
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
@@ -67,7 +66,8 @@ llm "A joke about a pelican and a walrus"
 Other models are:
 
 - `gemini-2.5-pro-preview-05-06` - latest paid Gemini 2.5 Pro preview
-- `gemini-2.5-flash-preview-04-17` - Gemini 2.5 Flash preview
+- `gemini-2.5-flash-preview-05-20` - Gemini 2.5 Flash preview
+- `gemini-2.5-flash-preview-04-17` - Earlier Gemini 2.5 Flash preview
 - `gemini-2.5-pro-exp-03-25` - free experimental release of Gemini 2.5 Pro
 - `gemini-2.5-pro-preview-03-25` - paid preview of Gemini 2.5 Pro
 - `gemma-3-27b-it` - [Gemma 3](https://blog.google/technology/developers/gemma-3/) 27B

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/llm_gemini.egg-info/requires.txt

@@ -1,4 +1,4 @@
-llm>=0.23
+llm>=0.26a0
 httpx
 ijson
 

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/llm_gemini.py

@@ -40,6 +40,7 @@ GOOGLE_SEARCH_MODELS = {
     "gemini-2.5-pro-exp-03-25",
     "gemini-2.5-flash-preview-04-17",
     "gemini-2.5-pro-preview-05-06",
+    "gemini-2.5-flash-preview-05-20",
 }
 
 # Older Google models used google_search_retrieval instead of google_search
@@ -55,6 +56,7 @@ GOOGLE_SEARCH_MODELS_USING_SEARCH_RETRIEVAL = {
 
 THINKING_BUDGET_MODELS = {
     "gemini-2.5-flash-preview-04-17",
+    "gemini-2.5-flash-preview-05-20",
 }
 
 
@@ -93,6 +95,8 @@ def register_models(register):
         "gemini-2.5-flash-preview-04-17",
         # 6th May 2025:
         "gemini-2.5-pro-preview-05-06",
+        # 20th May 2025:
+        "gemini-2.5-flash-preview-05-20",
     ]:
         can_google_search = model_id in GOOGLE_SEARCH_MODELS
         can_thinking_budget = model_id in THINKING_BUDGET_MODELS
@@ -148,6 +152,7 @@ class _SharedGemini:
     key_env_var = "LLM_GEMINI_KEY"
     can_stream = True
     supports_schema = True
+    supports_tools = True
 
     attachment_types = (
         # Text
@@ -273,14 +278,57 @@ class _SharedGemini:
                     )
                 if response.prompt.prompt:
                     parts.append({"text": response.prompt.prompt})
+                if response.prompt.tool_results:
+                    parts.extend(
+                        [
+                            {
+                                "function_response": {
+                                    "name": tool_result.name,
+                                    "response": {
+                                        "output": tool_result.output,
+                                    },
+                                }
+                            }
+                            for tool_result in response.prompt.tool_results
+                        ]
+                    )
                 messages.append({"role": "user", "parts": parts})
-                messages.append(
-                    {"role": "model", "parts": [{"text": response.text_or_raise()}]}
-                )
+                model_parts = []
+                response_text = response.text_or_raise()
+                if response_text:
+                    model_parts.append({"text": response_text})
+                tool_calls = response.tool_calls_or_raise()
+                if tool_calls:
+                    model_parts.extend(
+                        [
+                            {
+                                "function_call": {
+                                    "name": tool_call.name,
+                                    "args": tool_call.arguments,
+                                }
+                            }
+                            for tool_call in tool_calls
+                        ]
+                    )
+                messages.append({"role": "model", "parts": model_parts})
 
         parts = []
         if prompt.prompt:
             parts.append({"text": prompt.prompt})
+        if prompt.tool_results:
+            parts.extend(
+                [
+                    {
+                        "function_response": {
+                            "name": tool_result.name,
+                            "response": {
+                                "output": tool_result.output,
+                            },
+                        }
+                    }
+                    for tool_result in prompt.tool_results
+                ]
+            )
         for attachment in prompt.attachments:
             mime_type = resolve_type(attachment)
             parts.append(
@@ -300,17 +348,34 @@ class _SharedGemini:
             "contents": self.build_messages(prompt, conversation),
             "safetySettings": SAFETY_SETTINGS,
         }
+        if prompt.system:
+            body["systemInstruction"] = {"parts": [{"text": prompt.system}]}
+
+        tools = []
         if prompt.options and prompt.options.code_execution:
-            body["tools"] = [{"codeExecution": {}}]
+            tools.append({"codeExecution": {}})
         if prompt.options and self.can_google_search and prompt.options.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}]}
+            tools.append({tool_name: {}})
+        if prompt.tools:
+            tools.append(
+                {
+                    "functionDeclarations": [
+                        {
+                            "name": tool.name,
+                            "description": tool.description,
+                            "parameters": tool.input_schema,
+                        }
+                        for tool in prompt.tools
+                    ]
+                }
+            )
+        if tools:
+            body["tools"] = tools
 
         generation_config = {}
 
@@ -321,6 +386,7 @@ class _SharedGemini:
                     "response_schema": cleanup_schema(copy.deepcopy(prompt.schema)),
                 }
             )
+
         if self.can_thinking_budget and prompt.options.thinking_budget is not None:
             generation_config["thinking_config"] = {
                 "thinking_budget": prompt.options.thinking_budget
@@ -348,7 +414,14 @@ class _SharedGemini:
 
         return body
 
-    def process_part(self, part):
+    def process_part(self, part, response):
+        if "functionCall" in part:
+            response.add_tool_call(
+                llm.ToolCall(
+                    name=part["functionCall"]["name"],
+                    arguments=part["functionCall"]["args"],
+                )
+            )
         if "text" in part:
             return part["text"]
         elif "executableCode" in part:
@@ -357,10 +430,10 @@ class _SharedGemini:
             return f'```\n{part["codeExecutionResult"]["output"].strip()}\n```\n'
         return ""
 
-    def process_candidates(self, candidates):
+    def process_candidates(self, candidates, response):
         # We only use the first candidate
         for part in candidates[0]["content"]["parts"]:
-            yield self.process_part(part)
+            yield self.process_part(part, response)
 
     def set_usage(self, response):
         try:
@@ -404,7 +477,9 @@ class GeminiPro(_SharedGemini, llm.KeyModel):
                         if isinstance(event, dict) and "error" in event:
                             raise llm.ModelError(event["error"]["message"])
                         try:
-                            yield from self.process_candidates(event["candidates"])
+                            yield from self.process_candidates(
+                                event["candidates"], response
+                            )
                         except KeyError:
                             yield ""
                         gathered.append(event)
@@ -437,7 +512,7 @@ class AsyncGeminiPro(_SharedGemini, llm.AsyncKeyModel):
                                 raise llm.ModelError(event["error"]["message"])
                             try:
                                 for chunk in self.process_candidates(
-                                    event["candidates"]
+                                    event["candidates"], response
                                 ):
                                     yield chunk
                             except KeyError:

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/pyproject.toml

@@ -1,15 +1,13 @@
 [project]
 name = "llm-gemini"
-version = "0.20a0"
+version = "0.20a2"
 description = "LLM plugin to access Google's Gemini family of models"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
-license = {text = "Apache-2.0"}
-classifiers = [
-    "License :: OSI Approved :: Apache Software License"
-]
+license = "Apache-2.0"
+classifiers = []
 dependencies = [
-    "llm>=0.23",
+    "llm>=0.26a0",
     "httpx",
     "ijson"
 ]

{llm_gemini-0.20a0 → llm_gemini-0.20a2}/tests/test_gemini.py

@@ -232,3 +232,27 @@ def test_cli_gemini_models(tmpdir, monkeypatch):
     result2 = runner.invoke(cli, ["gemini", "models", "--key", GEMINI_API_KEY])
     assert result2.exit_code == 0
     assert "gemini-1.5-flash-latest" in result2.output
+
+
+@pytest.mark.vcr
+def test_tools():
+    model = llm.get_model("gemini-2.0-flash")
+    names = ["Charles", "Sammy"]
+    chain_response = model.chain(
+        "Two names for a pet pelican",
+        tools=[
+            llm.Tool.function(lambda: names.pop(0), name="pelican_name_generator"),
+        ],
+        key=GEMINI_API_KEY,
+    )
+    text = chain_response.text()
+    assert text == "Okay, here are two names for a pet pelican: Charles and Sammy.\n"
+    # This one did three
+    assert len(chain_response._responses) == 3
+    first, second, third = chain_response._responses
+    assert len(first.tool_calls()) == 1
+    assert first.tool_calls()[0].name == "pelican_name_generator"
+    assert len(second.tool_calls()) == 1
+    assert second.tool_calls()[0].name == "pelican_name_generator"
+    assert second.prompt.tool_results[0].output == "Charles"
+    assert third.prompt.tool_results[0].output == "Sammy"