llm-gemini 0.2__py3-none-any.whl → 0.3a0__py3-none-any.whl

{llm_gemini-0.2.dist-info → llm_gemini-0.3a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llm-gemini
-Version: 0.2
+Version: 0.3a0
 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
+Requires-Dist: llm >=0.17a0
 Requires-Dist: httpx
 Requires-Dist: ijson
 Provides-Extra: test
@@ -43,23 +43,39 @@ llm keys set gemini
 <paste key here>
 ```
 
-Now run the model using `-m gemini-pro`, for example:
+Now run the model using `-m gemini-1.5-pro-latest`, for example:
 
 ```bash
-llm -m gemini-pro "A joke about a pelican and a walrus"
+llm -m gemini-1.5-pro-latest "A joke about a pelican and a walrus"
 ```
 
-> Why did the pelican get mad at the walrus?
+> A pelican walks into a seafood restaurant with a huge fish hanging out of its beak.  The walrus, sitting at the bar, eyes it enviously.
 >
-> Because he called him a hippo-crit.
+> "Hey," the walrus says, "That looks delicious! What kind of fish is that?"
+>
+> The pelican taps its beak thoughtfully. "I believe," it says, "it's a billfish."
 
 To chat interactively with the model, run `llm chat`:
 
 ```bash
-llm chat -m gemini-pro
+llm chat -m gemini-1.5-pro-latest
 ```
 
-If you have access to the Gemini 1.5 Pro preview you can use `-m gemini-1.5-pro-latest` to work with that model.
+Other models are:
+
+- `gemini-1.5-flash-latest`
+- gemini-1.5-flash-8b-latest` - the least expensive
+
+Gemini models are multi-modal. You can provide images, audio or video files as input like this:
+
+```bash
+llm -m gemini-1.5-flash-latest 'extract text' -a image.jpg
+```
+Or with a URL:
+```bash
+llm -m gemini-1.5-flash-8b-latest 'describe image' \
+  -a https://static.simonwillison.net/static/2024/pelicans.jpg
+```
 
 ### Embeddings
 

llm_gemini-0.3a0.dist-info/RECORD

@@ -0,0 +1,7 @@
+llm_gemini.py,sha256=nmatZLQyVUUwoaiUloPycKKDbLMzGo4mcXeJwjzAENA,5881
+llm_gemini-0.3a0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+llm_gemini-0.3a0.dist-info/METADATA,sha256=pIxt4pF2XgDJSVi2RNuaOc4fgU2pRYWnasijmry8d_E,3618
+llm_gemini-0.3a0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+llm_gemini-0.3a0.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
+llm_gemini-0.3a0.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
+llm_gemini-0.3a0.dist-info/RECORD,,

{llm_gemini-0.2.dist-info → llm_gemini-0.3a0.dist-info}/WHEEL

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

llm_gemini.py

@@ -37,22 +37,81 @@ def register_models(register):
     register(GeminiPro("gemini-1.5-flash-8b-001"))
 
 
+def resolve_type(attachment):
+    mime_type = attachment.resolve_type()
+    # https://github.com/simonw/llm/issues/587#issuecomment-2439785140
+    if mime_type == "audio/mpeg":
+        mime_type = "audio/mp3"
+    return mime_type
+
+
 class GeminiPro(llm.Model):
     can_stream = True
 
+    attachment_types = (
+        # PDF
+        "application/pdf",
+        # Images
+        "image/png",
+        "image/jpeg",
+        "image/webp",
+        "image/heic",
+        "image/heif",
+        # Audio
+        "audio/wav",
+        "audio/mp3",
+        "audio/aiff",
+        "audio/aac",
+        "audio/ogg",
+        "audio/flac",
+        "audio/mpeg",  # Treated as audio/mp3
+        # Video
+        "video/mp4",
+        "video/mpeg",
+        "video/mov",
+        "video/avi",
+        "video/x-flv",
+        "video/mpg",
+        "video/webm",
+        "video/wmv",
+        "video/3gpp",
+    )
+
     def __init__(self, model_id):
         self.model_id = model_id
 
     def build_messages(self, prompt, conversation):
-        if not conversation:
-            return [{"role": "user", "parts": [{"text": prompt.prompt}]}]
         messages = []
-        for response in conversation.responses:
-            messages.append(
-                {"role": "user", "parts": [{"text": response.prompt.prompt}]}
+        if conversation:
+            for response in conversation.responses:
+                parts = []
+                for attachment in response.attachments:
+                    mime_type = resolve_type(attachment)
+                    parts.append(
+                        {
+                            "inlineData": {
+                                "data": attachment.base64_content(),
+                                "mimeType": mime_type,
+                            }
+                        }
+                    )
+                parts.append({"text": response.prompt.prompt})
+                messages.append({"role": "user", "parts": parts})
+                messages.append({"role": "model", "parts": [{"text": response.text()}]})
+
+        parts = [{"text": prompt.prompt}]
+        for attachment in prompt.attachments:
+            mime_type = resolve_type(attachment)
+            parts.append(
+                {
+                    "inlineData": {
+                        "data": attachment.base64_content(),
+                        "mimeType": mime_type,
+                    }
+                }
             )
-            messages.append({"role": "model", "parts": [{"text": response.text()}]})
-        messages.append({"role": "user", "parts": [{"text": prompt.prompt}]})
+
+        messages.append({"role": "user", "parts": parts})
         return messages
 
     def execute(self, prompt, stream, response, conversation):

llm_gemini-0.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-llm_gemini.py,sha256=38ONnvzgDWJIE17ODeQd87UWsgvJSeTsDyHpLBTp9og,4305
-llm_gemini-0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-llm_gemini-0.2.dist-info/METADATA,sha256=rVokMpbsBeOsCR59GzpyXcBlj99KFo3g4pO767oyi_k,3059
-llm_gemini-0.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-llm_gemini-0.2.dist-info/entry_points.txt,sha256=n544bpgUPIBc5l_cnwsTxPc3gMGJHPtAyqBNp-CkMWk,26
-llm_gemini-0.2.dist-info/top_level.txt,sha256=WUQmG6_2QKbT_8W4HH93qyKl_0SUteL4Ra6_PhyNGKU,11
-llm_gemini-0.2.dist-info/RECORD,,