llm-gemini 0.19.1__py3-none-any.whl → 0.20a1__py3-none-any.whl

{llm_gemini-0.19.1.dist-info → llm_gemini-0.20a1.dist-info}/METADATA

@@ -1,17 +1,16 @@
 Metadata-Version: 2.4
 Name: llm-gemini
-Version: 0.19.1
+Version: 0.20a1
 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

llm_gemini-0.20a1.dist-info/RECORD

@@ -0,0 +1,7 @@
+llm_gemini.py,sha256=sNxkRsDYpg7jwpcJn8tsSeBpvcyCCKW7-p_7lfggtk0,21322
+llm_gemini-0.20a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+llm_gemini-0.20a1.dist-info/METADATA,sha256=LfqVHeYfLTArvNEVZ9TcMmWXsQWH9Z1k_RZIx8RdJXo,8069
+llm_gemini-0.20a1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+llm_gemini-0.20a1.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
+llm_gemini-0.20a1.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
+llm_gemini-0.20a1.dist-info/RECORD,,

{llm_gemini-0.19.1.dist-info → llm_gemini-0.20a1.dist-info}/WHEEL

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

llm_gemini.py

@@ -148,6 +148,7 @@ class _SharedGemini:
     key_env_var = "LLM_GEMINI_KEY"
     can_stream = True
     supports_schema = True
+    supports_tools = True
 
     attachment_types = (
         # Text
@@ -273,14 +274,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 +344,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 +382,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 +410,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 +426,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 +473,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 +508,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.19.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=GJp1oDwcdLXy2QAYwp7jGN0KZsbmj_pJcqktYRC139Q,18700
-llm_gemini-0.19.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.19.1.dist-info/METADATA,sha256=PsXdnxt56uLdmbYnnCF9PZgQUi2EBx9uZEgEFW0l3IQ,8119
-llm_gemini-0.19.1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-llm_gemini-0.19.1.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.19.1.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.19.1.dist-info/RECORD,,