llm-gemini 0.12__tar.gz → 0.13__tar.gz

{llm_gemini-0.12 → llm_gemini-0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: llm-gemini
-Version: 0.12
+Version: 0.13
 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.22
+Requires-Dist: llm>=0.23
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test

{llm_gemini-0.12 → llm_gemini-0.13}/llm_gemini.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: llm-gemini
-Version: 0.12
+Version: 0.13
 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.22
+Requires-Dist: llm>=0.23
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test

{llm_gemini-0.12 → llm_gemini-0.13}/llm_gemini.egg-info/requires.txt

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

{llm_gemini-0.12 → llm_gemini-0.13}/llm_gemini.py

@@ -1,3 +1,4 @@
+import copy
 import httpx
 import ijson
 import llm
@@ -64,8 +65,16 @@ def register_models(register):
     ]:
         can_google_search = model_id in GOOGLE_SEARCH_MODELS
         register(
-            GeminiPro(model_id, can_google_search=can_google_search),
-            AsyncGeminiPro(model_id, can_google_search=can_google_search),
+            GeminiPro(
+                model_id,
+                can_google_search=can_google_search,
+                can_schema="flash-thinking" not in model_id,
+            ),
+            AsyncGeminiPro(
+                model_id,
+                can_google_search=can_google_search,
+                can_schema="flash-thinking" not in model_id,
+            ),
         )
 
 
@@ -79,10 +88,26 @@ def resolve_type(attachment):
     return mime_type
 
 
+def cleanup_schema(schema):
+    "Gemini supports only a subset of JSON schema"
+    keys_to_remove = ("$schema", "additionalProperties")
+    # Recursively remove them
+    if isinstance(schema, dict):
+        for key in keys_to_remove:
+            schema.pop(key, None)
+        for value in schema.values():
+            cleanup_schema(value)
+    elif isinstance(schema, list):
+        for value in schema:
+            cleanup_schema(value)
+    return schema
+
+
 class _SharedGemini:
     needs_key = "gemini"
     key_env_var = "LLM_GEMINI_KEY"
     can_stream = True
+    supports_schema = True
 
     attachment_types = (
         # Text
@@ -169,9 +194,10 @@ class _SharedGemini:
             default=None,
         )
 
-    def __init__(self, model_id, can_google_search=False):
+    def __init__(self, model_id, can_google_search=False, can_schema=False):
         self.model_id = model_id
         self.can_google_search = can_google_search
+        self.supports_schema = can_schema
         if can_google_search:
             self.Options = self.OptionsWithGoogleSearch
 
@@ -226,6 +252,12 @@ class _SharedGemini:
         if prompt.system:
             body["systemInstruction"] = {"parts": [{"text": prompt.system}]}
 
+        if prompt.schema:
+            body["generationConfig"] = {
+                "response_mime_type": "application/json",
+                "response_schema": cleanup_schema(copy.deepcopy(prompt.schema)),
+            }
+
         config_map = {
             "temperature": "temperature",
             "max_output_tokens": "maxOutputTokens",

{llm_gemini-0.12 → llm_gemini-0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llm-gemini"
-version = "0.12"
+version = "0.13"
 description = "LLM plugin to access Google's Gemini family of models"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
@@ -9,7 +9,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License"
 ]
 dependencies = [
-    "llm>=0.22",
+    "llm>=0.23",
     "httpx",
     "ijson"
 ]